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

Weather parameter refactoring

parent 0f1be056
No related branches found
No related tags found
No related merge requests found
Pipeline #63 failed
...@@ -141,7 +141,7 @@ public class SeptoriaHumidityModel extends I18nImpl implements Model { ...@@ -141,7 +141,7 @@ public class SeptoriaHumidityModel extends I18nImpl implements Model {
{ {
r.setValue(SeptoriaHumidityModel.MODEL_ID.toString(), DataMatrix.SPP, "1"); r.setValue(SeptoriaHumidityModel.MODEL_ID.toString(), DataMatrix.SPP, "1");
} }
r.setValue(CommonNamespaces.NS_WEATHER, WeatherElements.LEAF_WETNESS, String.valueOf(this.dataMatrix.getParamDoubleValueForDate(currentDate, DataMatrix.BT))); r.setValue(CommonNamespaces.NS_WEATHER, WeatherElements.LEAF_WETNESS_DURATION, String.valueOf(this.dataMatrix.getParamDoubleValueForDate(currentDate, DataMatrix.BT)));
r.setValue(CommonNamespaces.NS_WEATHER, WeatherElements.RELATIVE_HUMIDITY_MEAN, String.valueOf(this.dataMatrix.getParamDoubleValueForDate(currentDate, DataMatrix.UM))); r.setValue(CommonNamespaces.NS_WEATHER, WeatherElements.RELATIVE_HUMIDITY_MEAN, String.valueOf(this.dataMatrix.getParamDoubleValueForDate(currentDate, DataMatrix.UM)));
r.setValue(CommonNamespaces.NS_WEATHER, WeatherElements.PRECIPITATION, String.valueOf(this.dataMatrix.getParamDoubleValueForDate(currentDate, DataMatrix.RR))); r.setValue(CommonNamespaces.NS_WEATHER, WeatherElements.PRECIPITATION, String.valueOf(this.dataMatrix.getParamDoubleValueForDate(currentDate, DataMatrix.RR)));
...@@ -416,7 +416,7 @@ public class SeptoriaHumidityModel extends I18nImpl implements Model { ...@@ -416,7 +416,7 @@ public class SeptoriaHumidityModel extends I18nImpl implements Model {
this.dataMatrix.setParamDoubleValueForDate(o.getTimeMeasured(), DataMatrix.UM, o.getValue()); this.dataMatrix.setParamDoubleValueForDate(o.getTimeMeasured(), DataMatrix.UM, o.getValue());
} }
break; break;
case WeatherElements.LEAF_WETNESS: case WeatherElements.LEAF_WETNESS_DURATION:
if(o.getLogIntervalId().equals(WeatherObservation.LOG_INTERVAL_ID_1H)) if(o.getLogIntervalId().equals(WeatherObservation.LOG_INTERVAL_ID_1H))
{ {
this.dataMatrix.setParamDoubleValueForDate(o.getTimeMeasured(), DataMatrix.BT, o.getValue()); this.dataMatrix.setParamDoubleValueForDate(o.getTimeMeasured(), DataMatrix.BT, o.getValue());
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment