diff --git a/src/main/java/no/nibio/vips/model/psilarosaetempmodel/PsilaRosaeTempModel.java b/src/main/java/no/nibio/vips/model/psilarosaetempmodel/PsilaRosaeTempModel.java index f9f1317ddf7f544310150d1178644af05b0df1d7..5c8df3366a3e20b5a290d29f4bdc1d4e2bf1672e 100755 --- a/src/main/java/no/nibio/vips/model/psilarosaetempmodel/PsilaRosaeTempModel.java +++ b/src/main/java/no/nibio/vips/model/psilarosaetempmodel/PsilaRosaeTempModel.java @@ -223,8 +223,6 @@ public class PsilaRosaeTempModel extends I18nImpl implements Model { // Init data matrix this.dataMatrix = new DataMatrix(); - ObjectMapper mapper = new ObjectMapper(); - // Setting timezone this.timeZone = TimeZone.getTimeZone((String) config.getConfigParameter("timeZone")); //System.out.println("TimeZone=" + this.timeZone); @@ -232,7 +230,12 @@ public class PsilaRosaeTempModel extends I18nImpl implements Model { // Importing weather data, creating collections // Can accept both hourly and daily data WeatherUtil wUtil = new WeatherUtil(); - List<WeatherObservation> observations = mapper.convertValue(config.getConfigParameter("observations"), new TypeReference<List<WeatherObservation>>(){}); + + List<WeatherObservation> observations = modelUtil.extractWeatherObservationList(config.getConfigParameter("observations")); + if(observations == null || observations.isEmpty()) + { + throw new ConfigValidationException("Please provide weather data."); + } for(WeatherObservation o:observations) { switch(o.getElementMeasurementTypeId())