From ee572925919a9003f6a2b1e1f8d33900bf2a2a2d Mon Sep 17 00:00:00 2001
From: Tor-Einar Skog <tor-einar.skog@nibio.no>
Date: Tue, 28 Apr 2020 17:20:34 +0200
Subject: [PATCH] Fixing deserialization of Weather data
---
.../model/lygusrugulipennismodel/LygusRugulipennisModel.java | 3 +--
1 file changed, 1 insertion(+), 2 deletions(-)
diff --git a/src/main/java/no/nibio/vips/model/lygusrugulipennismodel/LygusRugulipennisModel.java b/src/main/java/no/nibio/vips/model/lygusrugulipennismodel/LygusRugulipennisModel.java
index 001fae2..929113b 100755
--- a/src/main/java/no/nibio/vips/model/lygusrugulipennismodel/LygusRugulipennisModel.java
+++ b/src/main/java/no/nibio/vips/model/lygusrugulipennismodel/LygusRugulipennisModel.java
@@ -220,7 +220,6 @@ public class LygusRugulipennisModel extends I18nImpl implements Model{
public void setConfiguration(ModelConfiguration config) throws ConfigValidationException {
this.dataMatrix = new DataMatrix();
- ObjectMapper mapper = new ObjectMapper();
// Setting timezone
this.timeZone = TimeZone.getTimeZone((String) config.getConfigParameter("timeZone"));
// Importing weather data, creating collections
@@ -230,7 +229,7 @@ public class LygusRugulipennisModel extends I18nImpl implements Model{
// OR lastly hourly values of TM (not optimal, but better than nothing)
List<WeatherObservation> TM = new ArrayList<>();
WeatherUtil wUtil = new WeatherUtil();
- List<WeatherObservation> observations = mapper.convertValue(config.getConfigParameter("observations"), new TypeReference<List<WeatherObservation>>(){});
+ List<WeatherObservation> observations = this.modelUtil.extractWeatherObservationList(config.getConfigParameter("observations"));
for(WeatherObservation o:observations)
{
switch(o.getElementMeasurementTypeId())
--
GitLab