Bugfix: Aggregation of hourly values

src/main/java/no/nibio/vips/model/lygusrugulipennismodel/LygusRugulipennisModel.java

@@ -217,7 +217,7 @@ public class LygusRugulipennisModel extends I18nImpl implements Model{
         // OR lastly hourly values of TM (not optimal, but better than nothing)
         List<WeatherObservation> TM = new ArrayList<>();
         WeatherUtil wUtil = new WeatherUtil();
-        List<WeatherObservation> observations = mapper.convertValue(config.getConfigParameter("observations"), new TypeReference<List<WeatherObservation>>(){});
+        List<WeatherObservation> observations = modelUtil.extractWeatherObservationList(config.getConfigParameter("observations"));
         for(WeatherObservation o:observations)
         {
             switch(o.getElementMeasurementTypeId())
@@ -250,7 +250,7 @@ public class LygusRugulipennisModel extends I18nImpl implements Model{
             {
                 try
                 {
-                    TXDCalculated = new WeatherUtil().getAggregatedDailyValues(TX, timeZone, 15, 15, WeatherUtil.AGGREGATION_TYPE_MAXIMUM);
+                    TXDCalculated = new WeatherUtil().getAggregatedDailyValues(TX, timeZone, 15, WeatherUtil.AGGREGATION_TYPE_MAXIMUM);
                 }catch(WeatherObservationListException | InvalidAggregationTypeException ex)
                 {
                     throw new ConfigValidationException(ex.getMessage());
@@ -260,7 +260,7 @@ public class LygusRugulipennisModel extends I18nImpl implements Model{
             {
                 try
                 {
-                    TXDCalculated = new WeatherUtil().getAggregatedDailyValues(TM, timeZone, 15, 15, WeatherUtil.AGGREGATION_TYPE_MAXIMUM);
+                    TXDCalculated = new WeatherUtil().getAggregatedDailyValues(TM, timeZone, 15, WeatherUtil.AGGREGATION_TYPE_MAXIMUM);
                 }catch(WeatherObservationListException | InvalidAggregationTypeException ex)
                 {
                     throw new ConfigValidationException(ex.getMessage());

src/test/java/no/nibio/vips/model/lygusrugulipennismodel/LygusRugulipennisModelTest.java

@@ -45,7 +45,7 @@ import static org.junit.Assert.*;
 
 /**
  *
- * @author treinar
+ * @author Tor-Einar Skog <tor-einar.skog@nibio.no>
  */
 public class LygusRugulipennisModelTest {
     
@@ -79,6 +79,10 @@ public class LygusRugulipennisModelTest {
         instance.setConfiguration(config);
         List<Result> result = instance.getResult();
         assertNotNull(result);
+        config = this.getConfiguration("/AgDir_2023.json");
+        instance.setConfiguration(config);
+        result = instance.getResult();
+        assertNotNull(result);
         /*
         Collections.sort(result);
         for(Result oneResult:result)