Skip to content
Snippets Groups Projects
Commit da578642 authored by Tor-Einar Skog's avatar Tor-Einar Skog
Browse files

Serialization/deserialization issue fixed for good

parent 98891f4b
Branches
Tags
1 merge request!1Master
......@@ -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())
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment