From ca559c359c33c9c6ff8dbfc0a89b212a812a3b3a Mon Sep 17 00:00:00 2001
From: Tor-Einar Skog <tor-einar.skog@nibio.no>
Date: Sun, 24 May 2020 16:53:07 +0200
Subject: [PATCH] Making some pragmatic changes in weather parameter conversion
---
src/main/java/no/nibio/vips/ipmdecisions/DataTransformer.java | 1 -
.../no/nibio/vips/ipmdecisions/IPMDecisionsWeatherUtil.java | 4 ++++
2 files changed, 4 insertions(+), 1 deletion(-)
diff --git a/src/main/java/no/nibio/vips/ipmdecisions/DataTransformer.java b/src/main/java/no/nibio/vips/ipmdecisions/DataTransformer.java
index 189cfae..df9621c 100644
--- a/src/main/java/no/nibio/vips/ipmdecisions/DataTransformer.java
+++ b/src/main/java/no/nibio/vips/ipmdecisions/DataTransformer.java
@@ -26,7 +26,6 @@ import java.util.Date;
import java.util.HashSet;
import java.util.List;
import java.util.Set;
-import java.util.stream.Collectors;
import net.ipmdecisions.model.entity.LocationResult;
import net.ipmdecisions.model.entity.ModelOutput;
import net.ipmdecisions.weather.entity.LocationWeatherData;
diff --git a/src/main/java/no/nibio/vips/ipmdecisions/IPMDecisionsWeatherUtil.java b/src/main/java/no/nibio/vips/ipmdecisions/IPMDecisionsWeatherUtil.java
index 67b01eb..ab91109 100644
--- a/src/main/java/no/nibio/vips/ipmdecisions/IPMDecisionsWeatherUtil.java
+++ b/src/main/java/no/nibio/vips/ipmdecisions/IPMDecisionsWeatherUtil.java
@@ -36,9 +36,13 @@ public class IPMDecisionsWeatherUtil {
);
private final Map<Integer, String> IPMToVIPS = Map.of(
+ 1001,WeatherElements.TEMPERATURE_MEAN, // TM (Actually TT...)
1002,WeatherElements.TEMPERATURE_MEAN, // TM
2001, WeatherElements.PRECIPITATION, // RR
+ 3001, WeatherElements.RELATIVE_HUMIDITY_MEAN, // UU/UM
3002, WeatherElements.RELATIVE_HUMIDITY_MEAN, // UM
+ 4002, WeatherElements.WIND_SPEED_2M, // FM2/FF2
+ 4003, WeatherElements.WIND_SPEED_2M, // FM2/FF2
5001, WeatherElements.GLOBAL_RADIATION, // Q0
3101, WeatherElements.LEAF_WETNESS_DURATION // BT
);
--
GitLab