Skip to content
Snippets Groups Projects

Master

Merged Tor-Einar Skog requested to merge master into develop
1 file
+ 6
3
Compare changes
  • Side-by-side
  • Inline
@@ -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())
Loading