From 2a9347d3ff2147fd355ba700471a1815182cb22d Mon Sep 17 00:00:00 2001 From: Tor-Einar Skog <tor-einar.skog@nibio.no> Date: Sat, 4 Jul 2020 11:17:15 +0200 Subject: [PATCH] Simplifying weather Observation imports from ModelConfiguration --- .../nibio/vips/model/alternariamodel/AlternariaModel.java | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/src/main/java/no/nibio/vips/model/alternariamodel/AlternariaModel.java b/src/main/java/no/nibio/vips/model/alternariamodel/AlternariaModel.java index 425324f..5ab450b 100644 --- a/src/main/java/no/nibio/vips/model/alternariamodel/AlternariaModel.java +++ b/src/main/java/no/nibio/vips/model/alternariamodel/AlternariaModel.java @@ -382,11 +382,7 @@ public class AlternariaModel extends I18nImpl implements Model{ WeatherUtil weatherUtil = new WeatherUtil(); - List<WeatherObservation> observations = mapper.convertValue - ( - config.getConfigParameter("observations") - , new TypeReference<List<WeatherObservation>>(){} - ); + List<WeatherObservation> observations = modelUtil.extractWeatherObservationList(config.getConfigParameter("observations")); List<Date> sprayingDates = null; List<WeatherObservation> altenariaWeatherLIstHourly_tm = new ArrayList<WeatherObservation>(); List<WeatherObservation> altenariaWeatherLIstHourly_lw = new ArrayList<WeatherObservation>(); -- GitLab