From 52c3db1ea84e000c542a44c35bd949386e0a60a7 Mon Sep 17 00:00:00 2001
From: Tor-Einar Skog <tor-einar.skog@nibio.no>
Date: Tue, 28 Apr 2020 17:44:55 +0200
Subject: [PATCH] Fixing deserialization of Weather data
---
.../SeptoriaReferenceHumidityModel.java | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/src/main/java/no/nibio/vips/model/septoriareferencehumiditymodel/SeptoriaReferenceHumidityModel.java b/src/main/java/no/nibio/vips/model/septoriareferencehumiditymodel/SeptoriaReferenceHumidityModel.java
index 8b7fa86..b495b56 100644
--- a/src/main/java/no/nibio/vips/model/septoriareferencehumiditymodel/SeptoriaReferenceHumidityModel.java
+++ b/src/main/java/no/nibio/vips/model/septoriareferencehumiditymodel/SeptoriaReferenceHumidityModel.java
@@ -33,6 +33,7 @@ import no.nibio.vips.model.ConfigValidationException;
import no.nibio.vips.model.Model;
import no.nibio.vips.model.ModelExcecutionException;
import no.nibio.vips.model.ModelId;
+import no.nibio.vips.util.ModelUtil;
import no.nibio.vips.util.WeatherElements;
import no.nibio.vips.util.WeatherUtil;
import no.nibio.vips.util.XDate;
@@ -219,7 +220,7 @@ public class SeptoriaReferenceHumidityModel implements Model {
public void setConfiguration(ModelConfiguration config) throws ConfigValidationException {
ObjectMapper mapper = new ObjectMapper();
this.timeZone = TimeZone.getTimeZone((String) config.getConfigParameter("timeZone"));
- this.observations = mapper.convertValue(config.getConfigParameter("observations"), new TypeReference<List<WeatherObservation>>(){});
+ this.observations = new ModelUtil().extractWeatherObservationList(config.getConfigParameter("observations"));
}
}
--
GitLab