From 9bdf4a3398f75a3b0881e0e1602d319bfb6c86bf Mon Sep 17 00:00:00 2001
From: Tor-Einar Skog <tor-einar.skog@nibio.no>
Date: Tue, 28 Apr 2020 17:13:22 +0200
Subject: [PATCH] Fixing deserialization of Weather data
---
.../nibio/vips/model/grassdryingmodel/GrassDryingModel.java | 5 +++--
1 file changed, 3 insertions(+), 2 deletions(-)
diff --git a/src/main/java/no/nibio/vips/model/grassdryingmodel/GrassDryingModel.java b/src/main/java/no/nibio/vips/model/grassdryingmodel/GrassDryingModel.java
index bd23b7b..9293223 100755
--- a/src/main/java/no/nibio/vips/model/grassdryingmodel/GrassDryingModel.java
+++ b/src/main/java/no/nibio/vips/model/grassdryingmodel/GrassDryingModel.java
@@ -37,6 +37,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.WeatherObservationListException;
import no.nibio.vips.util.WeatherUtil;
@@ -284,8 +285,8 @@ public class GrassDryingModel extends I18nImpl implements Model{
// ############ Weather data ##############
// Getting weather data, validating
- List<WeatherObservation> observations = mapper.convertValue(config.getConfigParameter("observations"), new TypeReference<List<WeatherObservation>>(){});
-
+ ModelUtil modelUtil = new ModelUtil();
+ List<WeatherObservation> observations = modelUtil.extractWeatherObservationList(config.getConfigParameter("observations"));
for(WeatherObservation o:observations)
{
switch(o.getElementMeasurementTypeId())
--
GitLab