diff --git a/.gitignore b/.gitignore
index 23176e3effbf3094ff070c26224e3b2d14427283..4bc1e934d1a2494c4b7a08a7b94ce0c6f5834c65 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,2 +1,3 @@
target/
classes/
+*~
diff --git a/src/main/java/no/bioforsk/vips/model/oatfloweringmodel/OatFloweringModel.java b/src/main/java/no/bioforsk/vips/model/oatfloweringmodel/OatFloweringModel.java
index 074055f4458b33f0711bfc09a17fc8fe18da40a0..6907b15ad3633014b7d99fcdb4b4ed8d4d8423e0 100644
--- a/src/main/java/no/bioforsk/vips/model/oatfloweringmodel/OatFloweringModel.java
+++ b/src/main/java/no/bioforsk/vips/model/oatfloweringmodel/OatFloweringModel.java
@@ -61,9 +61,9 @@ public class OatFloweringModel extends I18nImpl implements Model{
Double dayDegreeSum = 0.0;
List<Result> results = new ArrayList<>();
boolean z60Set = false, z625Set = false, z69Set = false;
- //System.out.println("TM size=" + TM.size());
for(WeatherObservation obs:this.TM)
{
+ System.out.println("Running");
if(obs.getTimeMeasured().compareTo(dateOfSowing) >= 0
&& obs.getValue() > 0)
{
@@ -211,6 +211,7 @@ public class OatFloweringModel extends I18nImpl implements Model{
case WeatherElements.TEMPERATURE_MEAN:
if(o.getLogIntervalId().equals(WeatherObservation.LOG_INTERVAL_ID_1D))
{
+ System.out.println("Adding TM");
this.TM.add(o);
}
break;
diff --git a/src/test/java/OatFloweringModelTest.java b/src/test/java/OatFloweringModelTest.java
index 0e6e8812dc4f7eb40b1c0ed788dab3f7977faf29..b504fea7e921c81c6c8791aac0c2742efe7f3120 100644
--- a/src/test/java/OatFloweringModelTest.java
+++ b/src/test/java/OatFloweringModelTest.java
@@ -130,19 +130,21 @@ public class OatFloweringModelTest {
if(all.isArray())
{
for(JsonNode node : all){
+ System.out.println(node.toString());
Date timeMeasured = (Date)mapper.convertValue(node.get("timeMeasured").getTextValue(), new TypeReference<Date>(){});
if(firstDate == null || firstDate.compareTo(timeMeasured) > 0)
{
firstDate = timeMeasured;
}
- //System.out.println(node.toString());
+ System.out.println(node.get("elementMeasurementTypeId"));
WeatherObservation observation = new WeatherObservation();
observation.setTimeMeasured(timeMeasured);
- observation.setLogIntervalId(node.get("logIntervalId").getIntValue());
+ observation.setLogIntervalId(Integer.valueOf(node.get("logIntervalId").getTextValue()));
observation.setElementMeasurementTypeId(node.get("elementMeasurementTypeId").getTextValue());
- observation.setValue(node.get("value").getDoubleValue());
+ observation.setValue(Double.valueOf(node.get("value").getTextValue()));
observations.add(observation);
+ System.out.println("logIntevalId=" + observation.getLogIntervalId());
}
}
@@ -152,7 +154,7 @@ public class OatFloweringModelTest {
}
config.setConfigParameter("observations", observations);
config.setConfigParameter("dateOfSowing", firstDate);
-
+ System.out.println("dateOfSowing = " + firstDate);
return config;
} catch (IOException ex) {
diff --git a/src/test/resources/JSONWeatherData.json b/src/test/resources/JSONWeatherData.json
index e282cef9b7846f6434b5d287345d78836ae85d96..8e86f68a8f8219698afbd78b19e4bc45ba32803b 100644
--- a/src/test/resources/JSONWeatherData.json
+++ b/src/test/resources/JSONWeatherData.json
@@ -1,188 +1,188 @@
[{"timeMeasured": "2014-03-28T00:00:00+01:00","elementMeasurementTypeId":"TM", "logIntervalId":"2", "value":"3.187125"},
{"timeMeasured": "2014-03-29T00:00:00+01:00","elementMeasurementTypeId":"TM", "logIntervalId":"2", "value":"3.7755"},
{"timeMeasured": "2014-03-30T00:00:00+01:00","elementMeasurementTypeId":"TM", "logIntervalId":"2", "value":"2.52720833333333"},
-{"timeMeasured": "2014-03-31T01:00:00+02:00","elementMeasurementTypeId":"TM", "logIntervalId":"2", "value":"2.88170833333333"},
-{"timeMeasured": "2014-04-01T01:00:00+02:00","elementMeasurementTypeId":"TM", "logIntervalId":"2", "value":"2.22045833333333"},
-{"timeMeasured": "2014-04-02T01:00:00+02:00","elementMeasurementTypeId":"TM", "logIntervalId":"2", "value":"0.838416666666666"},
-{"timeMeasured": "2014-04-03T01:00:00+02:00","elementMeasurementTypeId":"TM", "logIntervalId":"2", "value":"3.07804166666667"},
-{"timeMeasured": "2014-04-04T01:00:00+02:00","elementMeasurementTypeId":"TM", "logIntervalId":"2", "value":"3.168875"},
-{"timeMeasured": "2014-04-05T01:00:00+02:00","elementMeasurementTypeId":"TM", "logIntervalId":"2", "value":"3.005875"},
-{"timeMeasured": "2014-04-06T01:00:00+02:00","elementMeasurementTypeId":"TM", "logIntervalId":"2", "value":"6.31375"},
-{"timeMeasured": "2014-04-07T01:00:00+02:00","elementMeasurementTypeId":"TM", "logIntervalId":"2", "value":"7.553875"},
-{"timeMeasured": "2014-04-08T01:00:00+02:00","elementMeasurementTypeId":"TM", "logIntervalId":"2", "value":"7.042625"},
-{"timeMeasured": "2014-04-09T01:00:00+02:00","elementMeasurementTypeId":"TM", "logIntervalId":"2", "value":"6.18420833333333"},
-{"timeMeasured": "2014-04-10T01:00:00+02:00","elementMeasurementTypeId":"TM", "logIntervalId":"2", "value":"5.59254166666667"},
-{"timeMeasured": "2014-04-11T01:00:00+02:00","elementMeasurementTypeId":"TM", "logIntervalId":"2", "value":"5.43458333333333"},
-{"timeMeasured": "2014-04-12T01:00:00+02:00","elementMeasurementTypeId":"TM", "logIntervalId":"2", "value":"5.19945833333333"},
-{"timeMeasured": "2014-04-13T01:00:00+02:00","elementMeasurementTypeId":"TM", "logIntervalId":"2", "value":"5.49091666666667"},
-{"timeMeasured": "2014-04-14T01:00:00+02:00","elementMeasurementTypeId":"TM", "logIntervalId":"2", "value":"4.51645833333333"},
-{"timeMeasured": "2014-04-15T01:00:00+02:00","elementMeasurementTypeId":"TM", "logIntervalId":"2", "value":"3.23645833333333"},
-{"timeMeasured": "2014-04-16T01:00:00+02:00","elementMeasurementTypeId":"TM", "logIntervalId":"2", "value":"6.39941666666667"},
-{"timeMeasured": "2014-04-17T01:00:00+02:00","elementMeasurementTypeId":"TM", "logIntervalId":"2", "value":"6.4055"},
-{"timeMeasured": "2014-04-18T01:00:00+02:00","elementMeasurementTypeId":"TM", "logIntervalId":"2", "value":"6.15470833333333"},
-{"timeMeasured": "2014-04-19T01:00:00+02:00","elementMeasurementTypeId":"TM", "logIntervalId":"2", "value":"6.76183333333334"},
-{"timeMeasured": "2014-04-20T01:00:00+02:00","elementMeasurementTypeId":"TM", "logIntervalId":"2", "value":"10.3034166666667"},
-{"timeMeasured": "2014-04-21T01:00:00+02:00","elementMeasurementTypeId":"TM", "logIntervalId":"2", "value":"8.30004166666667"},
-{"timeMeasured": "2014-04-22T01:00:00+02:00","elementMeasurementTypeId":"TM", "logIntervalId":"2", "value":"7.305875"},
-{"timeMeasured": "2014-04-23T01:00:00+02:00","elementMeasurementTypeId":"TM", "logIntervalId":"2", "value":"8.74279166666667"},
-{"timeMeasured": "2014-04-24T01:00:00+02:00","elementMeasurementTypeId":"TM", "logIntervalId":"2", "value":"11.719375"},
-{"timeMeasured": "2014-04-25T01:00:00+02:00","elementMeasurementTypeId":"TM", "logIntervalId":"2", "value":"9.42291666666667"},
-{"timeMeasured": "2014-04-26T01:00:00+02:00","elementMeasurementTypeId":"TM", "logIntervalId":"2", "value":"9.03708333333333"},
-{"timeMeasured": "2014-04-27T01:00:00+02:00","elementMeasurementTypeId":"TM", "logIntervalId":"2", "value":"9.347125"},
-{"timeMeasured": "2014-04-28T01:00:00+02:00","elementMeasurementTypeId":"TM", "logIntervalId":"2", "value":"6.182375"},
-{"timeMeasured": "2014-04-29T01:00:00+02:00","elementMeasurementTypeId":"TM", "logIntervalId":"2", "value":"3.90258333333333"},
-{"timeMeasured": "2014-04-30T01:00:00+02:00","elementMeasurementTypeId":"TM", "logIntervalId":"2", "value":"2.49320833333333"},
-{"timeMeasured": "2014-05-01T01:00:00+02:00","elementMeasurementTypeId":"TM", "logIntervalId":"2", "value":"2.887"},
-{"timeMeasured": "2014-05-02T01:00:00+02:00","elementMeasurementTypeId":"TM", "logIntervalId":"2", "value":"3.220875"},
-{"timeMeasured": "2014-05-03T01:00:00+02:00","elementMeasurementTypeId":"TM", "logIntervalId":"2", "value":"3.46608333333333"},
-{"timeMeasured": "2014-05-04T01:00:00+02:00","elementMeasurementTypeId":"TM", "logIntervalId":"2", "value":"4.608"},
-{"timeMeasured": "2014-05-05T01:00:00+02:00","elementMeasurementTypeId":"TM", "logIntervalId":"2", "value":"6.39966666666667"},
-{"timeMeasured": "2014-05-06T01:00:00+02:00","elementMeasurementTypeId":"TM", "logIntervalId":"2", "value":"8.901875"},
-{"timeMeasured": "2014-05-07T01:00:00+02:00","elementMeasurementTypeId":"TM", "logIntervalId":"2", "value":"6.90829166666666"},
-{"timeMeasured": "2014-05-08T01:00:00+02:00","elementMeasurementTypeId":"TM", "logIntervalId":"2", "value":"7.26295833333333"},
-{"timeMeasured": "2014-05-09T01:00:00+02:00","elementMeasurementTypeId":"TM", "logIntervalId":"2", "value":"8.74204166666667"},
-{"timeMeasured": "2014-05-10T01:00:00+02:00","elementMeasurementTypeId":"TM", "logIntervalId":"2", "value":"7.97495833333333"},
-{"timeMeasured": "2014-05-11T01:00:00+02:00","elementMeasurementTypeId":"TM", "logIntervalId":"2", "value":"10.2695833333333"},
-{"timeMeasured": "2014-05-12T01:00:00+02:00","elementMeasurementTypeId":"TM", "logIntervalId":"2", "value":"9.01370833333334"},
-{"timeMeasured": "2014-05-13T01:00:00+02:00","elementMeasurementTypeId":"TM", "logIntervalId":"2", "value":"6.89804166666667"},
-{"timeMeasured": "2014-05-14T01:00:00+02:00","elementMeasurementTypeId":"TM", "logIntervalId":"2", "value":"5.52666666666667"},
-{"timeMeasured": "2014-05-15T01:00:00+02:00","elementMeasurementTypeId":"TM", "logIntervalId":"2", "value":"7.003"},
-{"timeMeasured": "2014-05-16T01:00:00+02:00","elementMeasurementTypeId":"TM", "logIntervalId":"2", "value":"11.3957916666667"},
-{"timeMeasured": "2014-05-17T01:00:00+02:00","elementMeasurementTypeId":"TM", "logIntervalId":"2", "value":"11.2930833333333"},
-{"timeMeasured": "2014-05-18T01:00:00+02:00","elementMeasurementTypeId":"TM", "logIntervalId":"2", "value":"15.4482083333333"},
-{"timeMeasured": "2014-05-19T01:00:00+02:00","elementMeasurementTypeId":"TM", "logIntervalId":"2", "value":"15.0975"},
-{"timeMeasured": "2014-05-20T01:00:00+02:00","elementMeasurementTypeId":"TM", "logIntervalId":"2", "value":"15.6725"},
-{"timeMeasured": "2014-05-21T01:00:00+02:00","elementMeasurementTypeId":"TM", "logIntervalId":"2", "value":"17.125"},
-{"timeMeasured": "2014-05-22T01:00:00+02:00","elementMeasurementTypeId":"TM", "logIntervalId":"2", "value":"18.85"},
-{"timeMeasured": "2014-05-23T01:00:00+02:00","elementMeasurementTypeId":"TM", "logIntervalId":"2", "value":"19.216666666667"},
-{"timeMeasured": "2014-05-24T01:00:00+02:00","elementMeasurementTypeId":"TM", "logIntervalId":"2", "value":"16.925"},
-{"timeMeasured": "2014-05-25T01:00:00+02:00","elementMeasurementTypeId":"TM", "logIntervalId":"2", "value":"12.225"},
-{"timeMeasured": "2014-05-26T01:00:00+02:00","elementMeasurementTypeId":"TM", "logIntervalId":"2", "value":"12.725"},
-{"timeMeasured": "2014-05-27T01:00:00+02:00","elementMeasurementTypeId":"TM", "logIntervalId":"2", "value":"14.825"},
-{"timeMeasured": "2014-05-28T01:00:00+02:00","elementMeasurementTypeId":"TM", "logIntervalId":"2", "value":"14.725"},
-{"timeMeasured": "2014-05-29T01:00:00+02:00","elementMeasurementTypeId":"TM", "logIntervalId":"2", "value":"12.325"},
-{"timeMeasured": "2014-05-30T01:00:00+02:00","elementMeasurementTypeId":"TM", "logIntervalId":"2", "value":"11.2"},
-{"timeMeasured": "2014-05-31T01:00:00+02:00","elementMeasurementTypeId":"TM", "logIntervalId":"2", "value":"11.3"},
-{"timeMeasured": "2014-06-01T01:00:00+02:00","elementMeasurementTypeId":"TM", "logIntervalId":"2", "value":"11.4"},
-{"timeMeasured": "2014-06-02T01:00:00+02:00","elementMeasurementTypeId":"TM", "logIntervalId":"2", "value":"11.5"},
-{"timeMeasured": "2014-06-03T01:00:00+02:00","elementMeasurementTypeId":"TM", "logIntervalId":"2", "value":"11.5"},
-{"timeMeasured": "2014-06-04T01:00:00+02:00","elementMeasurementTypeId":"TM", "logIntervalId":"2", "value":"11.6"},
-{"timeMeasured": "2014-06-05T01:00:00+02:00","elementMeasurementTypeId":"TM", "logIntervalId":"2", "value":"11.7"},
-{"timeMeasured": "2014-06-06T01:00:00+02:00","elementMeasurementTypeId":"TM", "logIntervalId":"2", "value":"11.8"},
-{"timeMeasured": "2014-06-07T01:00:00+02:00","elementMeasurementTypeId":"TM", "logIntervalId":"2", "value":"11.9"},
-{"timeMeasured": "2014-06-08T01:00:00+02:00","elementMeasurementTypeId":"TM", "logIntervalId":"2", "value":"12"},
-{"timeMeasured": "2014-06-09T01:00:00+02:00","elementMeasurementTypeId":"TM", "logIntervalId":"2", "value":"12"},
-{"timeMeasured": "2014-06-10T01:00:00+02:00","elementMeasurementTypeId":"TM", "logIntervalId":"2", "value":"12.1"},
-{"timeMeasured": "2014-06-11T01:00:00+02:00","elementMeasurementTypeId":"TM", "logIntervalId":"2", "value":"12.2"},
-{"timeMeasured": "2014-06-12T01:00:00+02:00","elementMeasurementTypeId":"TM", "logIntervalId":"2", "value":"12.2"},
-{"timeMeasured": "2014-06-13T01:00:00+02:00","elementMeasurementTypeId":"TM", "logIntervalId":"2", "value":"12.3"},
-{"timeMeasured": "2014-06-14T01:00:00+02:00","elementMeasurementTypeId":"TM", "logIntervalId":"2", "value":"12.4"},
-{"timeMeasured": "2014-06-15T01:00:00+02:00","elementMeasurementTypeId":"TM", "logIntervalId":"2", "value":"12.4"},
-{"timeMeasured": "2014-06-16T01:00:00+02:00","elementMeasurementTypeId":"TM", "logIntervalId":"2", "value":"12.5"},
-{"timeMeasured": "2014-06-17T01:00:00+02:00","elementMeasurementTypeId":"TM", "logIntervalId":"2", "value":"12.6"},
-{"timeMeasured": "2014-06-18T01:00:00+02:00","elementMeasurementTypeId":"TM", "logIntervalId":"2", "value":"12.6"},
-{"timeMeasured": "2014-06-19T01:00:00+02:00","elementMeasurementTypeId":"TM", "logIntervalId":"2", "value":"12.7"},
-{"timeMeasured": "2014-06-20T01:00:00+02:00","elementMeasurementTypeId":"TM", "logIntervalId":"2", "value":"12.7"},
-{"timeMeasured": "2014-06-21T01:00:00+02:00","elementMeasurementTypeId":"TM", "logIntervalId":"2", "value":"12.8"},
-{"timeMeasured": "2014-06-22T01:00:00+02:00","elementMeasurementTypeId":"TM", "logIntervalId":"2", "value":"12.8"},
-{"timeMeasured": "2014-06-23T01:00:00+02:00","elementMeasurementTypeId":"TM", "logIntervalId":"2", "value":"12.9"},
-{"timeMeasured": "2014-06-24T01:00:00+02:00","elementMeasurementTypeId":"TM", "logIntervalId":"2", "value":"12.9"},
-{"timeMeasured": "2014-06-25T01:00:00+02:00","elementMeasurementTypeId":"TM", "logIntervalId":"2", "value":"13"},
-{"timeMeasured": "2014-06-26T01:00:00+02:00","elementMeasurementTypeId":"TM", "logIntervalId":"2", "value":"13"},
-{"timeMeasured": "2014-06-27T01:00:00+02:00","elementMeasurementTypeId":"TM", "logIntervalId":"2", "value":"13.1"},
-{"timeMeasured": "2014-06-28T01:00:00+02:00","elementMeasurementTypeId":"TM", "logIntervalId":"2", "value":"13.1"},
-{"timeMeasured": "2014-06-29T01:00:00+02:00","elementMeasurementTypeId":"TM", "logIntervalId":"2", "value":"13.1"},
-{"timeMeasured": "2014-06-30T01:00:00+02:00","elementMeasurementTypeId":"TM", "logIntervalId":"2", "value":"13.2"},
-{"timeMeasured": "2014-07-01T01:00:00+02:00","elementMeasurementTypeId":"TM", "logIntervalId":"2", "value":"13.2"},
-{"timeMeasured": "2014-07-02T01:00:00+02:00","elementMeasurementTypeId":"TM", "logIntervalId":"2", "value":"13.3"},
-{"timeMeasured": "2014-07-03T01:00:00+02:00","elementMeasurementTypeId":"TM", "logIntervalId":"2", "value":"13.3"},
-{"timeMeasured": "2014-07-04T01:00:00+02:00","elementMeasurementTypeId":"TM", "logIntervalId":"2", "value":"13.3"},
-{"timeMeasured": "2014-07-05T01:00:00+02:00","elementMeasurementTypeId":"TM", "logIntervalId":"2", "value":"13.4"},
-{"timeMeasured": "2014-07-06T01:00:00+02:00","elementMeasurementTypeId":"TM", "logIntervalId":"2", "value":"13.4"},
-{"timeMeasured": "2014-07-07T01:00:00+02:00","elementMeasurementTypeId":"TM", "logIntervalId":"2", "value":"13.4"},
-{"timeMeasured": "2014-07-08T01:00:00+02:00","elementMeasurementTypeId":"TM", "logIntervalId":"2", "value":"13.5"},
-{"timeMeasured": "2014-07-09T01:00:00+02:00","elementMeasurementTypeId":"TM", "logIntervalId":"2", "value":"13.5"},
-{"timeMeasured": "2014-07-10T01:00:00+02:00","elementMeasurementTypeId":"TM", "logIntervalId":"2", "value":"13.5"},
-{"timeMeasured": "2014-07-11T01:00:00+02:00","elementMeasurementTypeId":"TM", "logIntervalId":"2", "value":"13.6"},
-{"timeMeasured": "2014-07-12T01:00:00+02:00","elementMeasurementTypeId":"TM", "logIntervalId":"2", "value":"13.6"},
-{"timeMeasured": "2014-07-13T01:00:00+02:00","elementMeasurementTypeId":"TM", "logIntervalId":"2", "value":"13.6"},
-{"timeMeasured": "2014-07-14T01:00:00+02:00","elementMeasurementTypeId":"TM", "logIntervalId":"2", "value":"13.7"},
-{"timeMeasured": "2014-07-15T01:00:00+02:00","elementMeasurementTypeId":"TM", "logIntervalId":"2", "value":"13.7"},
-{"timeMeasured": "2014-07-16T01:00:00+02:00","elementMeasurementTypeId":"TM", "logIntervalId":"2", "value":"13.7"},
-{"timeMeasured": "2014-07-17T01:00:00+02:00","elementMeasurementTypeId":"TM", "logIntervalId":"2", "value":"13.8"},
-{"timeMeasured": "2014-07-18T01:00:00+02:00","elementMeasurementTypeId":"TM", "logIntervalId":"2", "value":"13.8"},
-{"timeMeasured": "2014-07-19T01:00:00+02:00","elementMeasurementTypeId":"TM", "logIntervalId":"2", "value":"13.8"},
-{"timeMeasured": "2014-07-20T01:00:00+02:00","elementMeasurementTypeId":"TM", "logIntervalId":"2", "value":"13.8"},
-{"timeMeasured": "2014-07-21T01:00:00+02:00","elementMeasurementTypeId":"TM", "logIntervalId":"2", "value":"13.9"},
-{"timeMeasured": "2014-07-22T01:00:00+02:00","elementMeasurementTypeId":"TM", "logIntervalId":"2", "value":"13.9"},
-{"timeMeasured": "2014-07-23T01:00:00+02:00","elementMeasurementTypeId":"TM", "logIntervalId":"2", "value":"13.9"},
-{"timeMeasured": "2014-07-24T01:00:00+02:00","elementMeasurementTypeId":"TM", "logIntervalId":"2", "value":"14"},
-{"timeMeasured": "2014-07-25T01:00:00+02:00","elementMeasurementTypeId":"TM", "logIntervalId":"2", "value":"14"},
-{"timeMeasured": "2014-07-26T01:00:00+02:00","elementMeasurementTypeId":"TM", "logIntervalId":"2", "value":"14"},
-{"timeMeasured": "2014-07-27T01:00:00+02:00","elementMeasurementTypeId":"TM", "logIntervalId":"2", "value":"14"},
-{"timeMeasured": "2014-07-28T01:00:00+02:00","elementMeasurementTypeId":"TM", "logIntervalId":"2", "value":"14"},
-{"timeMeasured": "2014-07-29T01:00:00+02:00","elementMeasurementTypeId":"TM", "logIntervalId":"2", "value":"14"},
-{"timeMeasured": "2014-07-30T01:00:00+02:00","elementMeasurementTypeId":"TM", "logIntervalId":"2", "value":"14"},
-{"timeMeasured": "2014-07-31T01:00:00+02:00","elementMeasurementTypeId":"TM", "logIntervalId":"2", "value":"14.1"},
-{"timeMeasured": "2014-08-01T01:00:00+02:00","elementMeasurementTypeId":"TM", "logIntervalId":"2", "value":"14.1"},
-{"timeMeasured": "2014-08-02T01:00:00+02:00","elementMeasurementTypeId":"TM", "logIntervalId":"2", "value":"14.1"},
-{"timeMeasured": "2014-08-03T01:00:00+02:00","elementMeasurementTypeId":"TM", "logIntervalId":"2", "value":"14"},
-{"timeMeasured": "2014-08-04T01:00:00+02:00","elementMeasurementTypeId":"TM", "logIntervalId":"2", "value":"14"},
-{"timeMeasured": "2014-08-05T01:00:00+02:00","elementMeasurementTypeId":"TM", "logIntervalId":"2", "value":"14"},
-{"timeMeasured": "2014-08-06T01:00:00+02:00","elementMeasurementTypeId":"TM", "logIntervalId":"2", "value":"14"},
-{"timeMeasured": "2014-08-07T01:00:00+02:00","elementMeasurementTypeId":"TM", "logIntervalId":"2", "value":"14"},
-{"timeMeasured": "2014-08-08T01:00:00+02:00","elementMeasurementTypeId":"TM", "logIntervalId":"2", "value":"14"},
-{"timeMeasured": "2014-08-09T01:00:00+02:00","elementMeasurementTypeId":"TM", "logIntervalId":"2", "value":"13.9"},
-{"timeMeasured": "2014-08-10T01:00:00+02:00","elementMeasurementTypeId":"TM", "logIntervalId":"2", "value":"13.9"},
-{"timeMeasured": "2014-08-11T01:00:00+02:00","elementMeasurementTypeId":"TM", "logIntervalId":"2", "value":"13.8"},
-{"timeMeasured": "2014-08-12T01:00:00+02:00","elementMeasurementTypeId":"TM", "logIntervalId":"2", "value":"13.8"},
-{"timeMeasured": "2014-08-13T01:00:00+02:00","elementMeasurementTypeId":"TM", "logIntervalId":"2", "value":"13.7"},
-{"timeMeasured": "2014-08-14T01:00:00+02:00","elementMeasurementTypeId":"TM", "logIntervalId":"2", "value":"13.7"},
-{"timeMeasured": "2014-08-15T01:00:00+02:00","elementMeasurementTypeId":"TM", "logIntervalId":"2", "value":"13.6"},
-{"timeMeasured": "2014-08-16T01:00:00+02:00","elementMeasurementTypeId":"TM", "logIntervalId":"2", "value":"13.5"},
-{"timeMeasured": "2014-08-17T01:00:00+02:00","elementMeasurementTypeId":"TM", "logIntervalId":"2", "value":"13.4"},
-{"timeMeasured": "2014-08-18T01:00:00+02:00","elementMeasurementTypeId":"TM", "logIntervalId":"2", "value":"13.4"},
-{"timeMeasured": "2014-08-19T01:00:00+02:00","elementMeasurementTypeId":"TM", "logIntervalId":"2", "value":"13.3"},
-{"timeMeasured": "2014-08-20T01:00:00+02:00","elementMeasurementTypeId":"TM", "logIntervalId":"2", "value":"13.2"},
-{"timeMeasured": "2014-08-21T01:00:00+02:00","elementMeasurementTypeId":"TM", "logIntervalId":"2", "value":"13.1"},
-{"timeMeasured": "2014-08-22T01:00:00+02:00","elementMeasurementTypeId":"TM", "logIntervalId":"2", "value":"12.9"},
-{"timeMeasured": "2014-08-23T01:00:00+02:00","elementMeasurementTypeId":"TM", "logIntervalId":"2", "value":"12.8"},
-{"timeMeasured": "2014-08-24T01:00:00+02:00","elementMeasurementTypeId":"TM", "logIntervalId":"2", "value":"12.7"},
-{"timeMeasured": "2014-08-25T01:00:00+02:00","elementMeasurementTypeId":"TM", "logIntervalId":"2", "value":"12.6"},
-{"timeMeasured": "2014-08-26T01:00:00+02:00","elementMeasurementTypeId":"TM", "logIntervalId":"2", "value":"12.5"},
-{"timeMeasured": "2014-08-27T01:00:00+02:00","elementMeasurementTypeId":"TM", "logIntervalId":"2", "value":"12.3"},
-{"timeMeasured": "2014-08-28T01:00:00+02:00","elementMeasurementTypeId":"TM", "logIntervalId":"2", "value":"12.2"},
-{"timeMeasured": "2014-08-29T01:00:00+02:00","elementMeasurementTypeId":"TM", "logIntervalId":"2", "value":"12.1"},
-{"timeMeasured": "2014-08-30T01:00:00+02:00","elementMeasurementTypeId":"TM", "logIntervalId":"2", "value":"11.9"},
-{"timeMeasured": "2014-08-31T01:00:00+02:00","elementMeasurementTypeId":"TM", "logIntervalId":"2", "value":"11.8"},
-{"timeMeasured": "2014-09-01T01:00:00+02:00","elementMeasurementTypeId":"TM", "logIntervalId":"2", "value":"11.7"},
-{"timeMeasured": "2014-09-02T01:00:00+02:00","elementMeasurementTypeId":"TM", "logIntervalId":"2", "value":"11.5"},
-{"timeMeasured": "2014-09-03T01:00:00+02:00","elementMeasurementTypeId":"TM", "logIntervalId":"2", "value":"11.4"},
-{"timeMeasured": "2014-09-04T01:00:00+02:00","elementMeasurementTypeId":"TM", "logIntervalId":"2", "value":"11.2"},
-{"timeMeasured": "2014-09-05T01:00:00+02:00","elementMeasurementTypeId":"TM", "logIntervalId":"2", "value":"11.1"},
-{"timeMeasured": "2014-09-06T01:00:00+02:00","elementMeasurementTypeId":"TM", "logIntervalId":"2", "value":"11"},
-{"timeMeasured": "2014-09-07T01:00:00+02:00","elementMeasurementTypeId":"TM", "logIntervalId":"2", "value":"10.8"},
-{"timeMeasured": "2014-09-08T01:00:00+02:00","elementMeasurementTypeId":"TM", "logIntervalId":"2", "value":"10.7"},
-{"timeMeasured": "2014-09-09T01:00:00+02:00","elementMeasurementTypeId":"TM", "logIntervalId":"2", "value":"10.5"},
-{"timeMeasured": "2014-09-10T01:00:00+02:00","elementMeasurementTypeId":"TM", "logIntervalId":"2", "value":"10.4"},
-{"timeMeasured": "2014-09-11T01:00:00+02:00","elementMeasurementTypeId":"TM", "logIntervalId":"2", "value":"10.3"},
-{"timeMeasured": "2014-09-12T01:00:00+02:00","elementMeasurementTypeId":"TM", "logIntervalId":"2", "value":"10.1"},
-{"timeMeasured": "2014-09-13T01:00:00+02:00","elementMeasurementTypeId":"TM", "logIntervalId":"2", "value":"10"},
-{"timeMeasured": "2014-09-14T01:00:00+02:00","elementMeasurementTypeId":"TM", "logIntervalId":"2", "value":"9.9"},
-{"timeMeasured": "2014-09-15T01:00:00+02:00","elementMeasurementTypeId":"TM", "logIntervalId":"2", "value":"9.8"},
-{"timeMeasured": "2014-09-16T01:00:00+02:00","elementMeasurementTypeId":"TM", "logIntervalId":"2", "value":"9.6"},
-{"timeMeasured": "2014-09-17T01:00:00+02:00","elementMeasurementTypeId":"TM", "logIntervalId":"2", "value":"9.5"},
-{"timeMeasured": "2014-09-18T01:00:00+02:00","elementMeasurementTypeId":"TM", "logIntervalId":"2", "value":"9.4"},
-{"timeMeasured": "2014-09-19T01:00:00+02:00","elementMeasurementTypeId":"TM", "logIntervalId":"2", "value":"9.3"},
-{"timeMeasured": "2014-09-20T01:00:00+02:00","elementMeasurementTypeId":"TM", "logIntervalId":"2", "value":"9.2"},
-{"timeMeasured": "2014-09-21T01:00:00+02:00","elementMeasurementTypeId":"TM", "logIntervalId":"2", "value":"9.1"},
-{"timeMeasured": "2014-09-22T01:00:00+02:00","elementMeasurementTypeId":"TM", "logIntervalId":"2", "value":"9"},
-{"timeMeasured": "2014-09-23T01:00:00+02:00","elementMeasurementTypeId":"TM", "logIntervalId":"2", "value":"8.9"},
-{"timeMeasured": "2014-09-24T01:00:00+02:00","elementMeasurementTypeId":"TM", "logIntervalId":"2", "value":"8.8"},
-{"timeMeasured": "2014-09-25T01:00:00+02:00","elementMeasurementTypeId":"TM", "logIntervalId":"2", "value":"8.7"},
-{"timeMeasured": "2014-09-26T01:00:00+02:00","elementMeasurementTypeId":"TM", "logIntervalId":"2", "value":"8.6"},
-{"timeMeasured": "2014-09-27T01:00:00+02:00","elementMeasurementTypeId":"TM", "logIntervalId":"2", "value":"8.5"},
-{"timeMeasured": "2014-09-28T01:00:00+02:00","elementMeasurementTypeId":"TM", "logIntervalId":"2", "value":"8.4"},
-{"timeMeasured": "2014-09-29T01:00:00+02:00","elementMeasurementTypeId":"TM", "logIntervalId":"2", "value":"8.3"},
-{"timeMeasured": "2014-09-30T01:00:00+02:00","elementMeasurementTypeId":"TM", "logIntervalId":"2", "value":"8.2"},
-{"timeMeasured": "2014-10-01T01:00:00+02:00","elementMeasurementTypeId":"TM", "logIntervalId":"2", "value":"8.1"}]
\ No newline at end of file
+{"timeMeasured": "2014-03-31T00:00:00+02:00","elementMeasurementTypeId":"TM", "logIntervalId":"2", "value":"2.88170833333333"},
+{"timeMeasured": "2014-04-01T00:00:00+02:00","elementMeasurementTypeId":"TM", "logIntervalId":"2", "value":"2.22045833333333"},
+{"timeMeasured": "2014-04-02T00:00:00+02:00","elementMeasurementTypeId":"TM", "logIntervalId":"2", "value":"0.838416666666666"},
+{"timeMeasured": "2014-04-03T00:00:00+02:00","elementMeasurementTypeId":"TM", "logIntervalId":"2", "value":"3.07804166666667"},
+{"timeMeasured": "2014-04-04T00:00:00+02:00","elementMeasurementTypeId":"TM", "logIntervalId":"2", "value":"3.168875"},
+{"timeMeasured": "2014-04-05T00:00:00+02:00","elementMeasurementTypeId":"TM", "logIntervalId":"2", "value":"3.005875"},
+{"timeMeasured": "2014-04-06T00:00:00+02:00","elementMeasurementTypeId":"TM", "logIntervalId":"2", "value":"6.31375"},
+{"timeMeasured": "2014-04-07T00:00:00+02:00","elementMeasurementTypeId":"TM", "logIntervalId":"2", "value":"7.553875"},
+{"timeMeasured": "2014-04-08T00:00:00+02:00","elementMeasurementTypeId":"TM", "logIntervalId":"2", "value":"7.042625"},
+{"timeMeasured": "2014-04-09T00:00:00+02:00","elementMeasurementTypeId":"TM", "logIntervalId":"2", "value":"6.18420833333333"},
+{"timeMeasured": "2014-04-10T00:00:00+02:00","elementMeasurementTypeId":"TM", "logIntervalId":"2", "value":"5.59254166666667"},
+{"timeMeasured": "2014-04-11T00:00:00+02:00","elementMeasurementTypeId":"TM", "logIntervalId":"2", "value":"5.43458333333333"},
+{"timeMeasured": "2014-04-12T00:00:00+02:00","elementMeasurementTypeId":"TM", "logIntervalId":"2", "value":"5.19945833333333"},
+{"timeMeasured": "2014-04-13T00:00:00+02:00","elementMeasurementTypeId":"TM", "logIntervalId":"2", "value":"5.49091666666667"},
+{"timeMeasured": "2014-04-14T00:00:00+02:00","elementMeasurementTypeId":"TM", "logIntervalId":"2", "value":"4.51645833333333"},
+{"timeMeasured": "2014-04-15T00:00:00+02:00","elementMeasurementTypeId":"TM", "logIntervalId":"2", "value":"3.23645833333333"},
+{"timeMeasured": "2014-04-16T00:00:00+02:00","elementMeasurementTypeId":"TM", "logIntervalId":"2", "value":"6.39941666666667"},
+{"timeMeasured": "2014-04-17T00:00:00+02:00","elementMeasurementTypeId":"TM", "logIntervalId":"2", "value":"6.4055"},
+{"timeMeasured": "2014-04-18T00:00:00+02:00","elementMeasurementTypeId":"TM", "logIntervalId":"2", "value":"6.15470833333333"},
+{"timeMeasured": "2014-04-19T00:00:00+02:00","elementMeasurementTypeId":"TM", "logIntervalId":"2", "value":"6.76183333333334"},
+{"timeMeasured": "2014-04-20T00:00:00+02:00","elementMeasurementTypeId":"TM", "logIntervalId":"2", "value":"10.3034166666667"},
+{"timeMeasured": "2014-04-21T00:00:00+02:00","elementMeasurementTypeId":"TM", "logIntervalId":"2", "value":"8.30004166666667"},
+{"timeMeasured": "2014-04-22T00:00:00+02:00","elementMeasurementTypeId":"TM", "logIntervalId":"2", "value":"7.305875"},
+{"timeMeasured": "2014-04-23T00:00:00+02:00","elementMeasurementTypeId":"TM", "logIntervalId":"2", "value":"8.74279166666667"},
+{"timeMeasured": "2014-04-24T00:00:00+02:00","elementMeasurementTypeId":"TM", "logIntervalId":"2", "value":"11.719375"},
+{"timeMeasured": "2014-04-25T00:00:00+02:00","elementMeasurementTypeId":"TM", "logIntervalId":"2", "value":"9.42291666666667"},
+{"timeMeasured": "2014-04-26T00:00:00+02:00","elementMeasurementTypeId":"TM", "logIntervalId":"2", "value":"9.03708333333333"},
+{"timeMeasured": "2014-04-27T00:00:00+02:00","elementMeasurementTypeId":"TM", "logIntervalId":"2", "value":"9.347125"},
+{"timeMeasured": "2014-04-28T00:00:00+02:00","elementMeasurementTypeId":"TM", "logIntervalId":"2", "value":"6.182375"},
+{"timeMeasured": "2014-04-29T00:00:00+02:00","elementMeasurementTypeId":"TM", "logIntervalId":"2", "value":"3.90258333333333"},
+{"timeMeasured": "2014-04-30T00:00:00+02:00","elementMeasurementTypeId":"TM", "logIntervalId":"2", "value":"2.49320833333333"},
+{"timeMeasured": "2014-05-01T00:00:00+02:00","elementMeasurementTypeId":"TM", "logIntervalId":"2", "value":"2.887"},
+{"timeMeasured": "2014-05-02T00:00:00+02:00","elementMeasurementTypeId":"TM", "logIntervalId":"2", "value":"3.220875"},
+{"timeMeasured": "2014-05-03T00:00:00+02:00","elementMeasurementTypeId":"TM", "logIntervalId":"2", "value":"3.46608333333333"},
+{"timeMeasured": "2014-05-04T00:00:00+02:00","elementMeasurementTypeId":"TM", "logIntervalId":"2", "value":"4.608"},
+{"timeMeasured": "2014-05-05T00:00:00+02:00","elementMeasurementTypeId":"TM", "logIntervalId":"2", "value":"6.39966666666667"},
+{"timeMeasured": "2014-05-06T00:00:00+02:00","elementMeasurementTypeId":"TM", "logIntervalId":"2", "value":"8.901875"},
+{"timeMeasured": "2014-05-07T00:00:00+02:00","elementMeasurementTypeId":"TM", "logIntervalId":"2", "value":"6.90829166666666"},
+{"timeMeasured": "2014-05-08T00:00:00+02:00","elementMeasurementTypeId":"TM", "logIntervalId":"2", "value":"7.26295833333333"},
+{"timeMeasured": "2014-05-09T00:00:00+02:00","elementMeasurementTypeId":"TM", "logIntervalId":"2", "value":"8.74204166666667"},
+{"timeMeasured": "2014-05-10T00:00:00+02:00","elementMeasurementTypeId":"TM", "logIntervalId":"2", "value":"7.97495833333333"},
+{"timeMeasured": "2014-05-11T00:00:00+02:00","elementMeasurementTypeId":"TM", "logIntervalId":"2", "value":"10.2695833333333"},
+{"timeMeasured": "2014-05-12T00:00:00+02:00","elementMeasurementTypeId":"TM", "logIntervalId":"2", "value":"9.01370833333334"},
+{"timeMeasured": "2014-05-13T00:00:00+02:00","elementMeasurementTypeId":"TM", "logIntervalId":"2", "value":"6.89804166666667"},
+{"timeMeasured": "2014-05-14T00:00:00+02:00","elementMeasurementTypeId":"TM", "logIntervalId":"2", "value":"5.52666666666667"},
+{"timeMeasured": "2014-05-15T00:00:00+02:00","elementMeasurementTypeId":"TM", "logIntervalId":"2", "value":"7.003"},
+{"timeMeasured": "2014-05-16T00:00:00+02:00","elementMeasurementTypeId":"TM", "logIntervalId":"2", "value":"11.3957916666667"},
+{"timeMeasured": "2014-05-17T00:00:00+02:00","elementMeasurementTypeId":"TM", "logIntervalId":"2", "value":"11.2930833333333"},
+{"timeMeasured": "2014-05-18T00:00:00+02:00","elementMeasurementTypeId":"TM", "logIntervalId":"2", "value":"15.4482083333333"},
+{"timeMeasured": "2014-05-19T00:00:00+02:00","elementMeasurementTypeId":"TM", "logIntervalId":"2", "value":"15.0975"},
+{"timeMeasured": "2014-05-20T00:00:00+02:00","elementMeasurementTypeId":"TM", "logIntervalId":"2", "value":"15.6725"},
+{"timeMeasured": "2014-05-21T00:00:00+02:00","elementMeasurementTypeId":"TM", "logIntervalId":"2", "value":"17.125"},
+{"timeMeasured": "2014-05-22T00:00:00+02:00","elementMeasurementTypeId":"TM", "logIntervalId":"2", "value":"18.85"},
+{"timeMeasured": "2014-05-23T00:00:00+02:00","elementMeasurementTypeId":"TM", "logIntervalId":"2", "value":"19.216666666667"},
+{"timeMeasured": "2014-05-24T00:00:00+02:00","elementMeasurementTypeId":"TM", "logIntervalId":"2", "value":"16.925"},
+{"timeMeasured": "2014-05-25T00:00:00+02:00","elementMeasurementTypeId":"TM", "logIntervalId":"2", "value":"12.225"},
+{"timeMeasured": "2014-05-26T00:00:00+02:00","elementMeasurementTypeId":"TM", "logIntervalId":"2", "value":"12.725"},
+{"timeMeasured": "2014-05-27T00:00:00+02:00","elementMeasurementTypeId":"TM", "logIntervalId":"2", "value":"14.825"},
+{"timeMeasured": "2014-05-28T00:00:00+02:00","elementMeasurementTypeId":"TM", "logIntervalId":"2", "value":"14.725"},
+{"timeMeasured": "2014-05-29T00:00:00+02:00","elementMeasurementTypeId":"TM", "logIntervalId":"2", "value":"12.325"},
+{"timeMeasured": "2014-05-30T00:00:00+02:00","elementMeasurementTypeId":"TM", "logIntervalId":"2", "value":"11.2"},
+{"timeMeasured": "2014-05-31T00:00:00+02:00","elementMeasurementTypeId":"TM", "logIntervalId":"2", "value":"11.3"},
+{"timeMeasured": "2014-06-01T00:00:00+02:00","elementMeasurementTypeId":"TM", "logIntervalId":"2", "value":"11.4"},
+{"timeMeasured": "2014-06-02T00:00:00+02:00","elementMeasurementTypeId":"TM", "logIntervalId":"2", "value":"11.5"},
+{"timeMeasured": "2014-06-03T00:00:00+02:00","elementMeasurementTypeId":"TM", "logIntervalId":"2", "value":"11.5"},
+{"timeMeasured": "2014-06-04T00:00:00+02:00","elementMeasurementTypeId":"TM", "logIntervalId":"2", "value":"11.6"},
+{"timeMeasured": "2014-06-05T00:00:00+02:00","elementMeasurementTypeId":"TM", "logIntervalId":"2", "value":"11.7"},
+{"timeMeasured": "2014-06-06T00:00:00+02:00","elementMeasurementTypeId":"TM", "logIntervalId":"2", "value":"11.8"},
+{"timeMeasured": "2014-06-07T00:00:00+02:00","elementMeasurementTypeId":"TM", "logIntervalId":"2", "value":"11.9"},
+{"timeMeasured": "2014-06-08T00:00:00+02:00","elementMeasurementTypeId":"TM", "logIntervalId":"2", "value":"12"},
+{"timeMeasured": "2014-06-09T00:00:00+02:00","elementMeasurementTypeId":"TM", "logIntervalId":"2", "value":"12"},
+{"timeMeasured": "2014-06-10T00:00:00+02:00","elementMeasurementTypeId":"TM", "logIntervalId":"2", "value":"12.1"},
+{"timeMeasured": "2014-06-11T00:00:00+02:00","elementMeasurementTypeId":"TM", "logIntervalId":"2", "value":"12.2"},
+{"timeMeasured": "2014-06-12T00:00:00+02:00","elementMeasurementTypeId":"TM", "logIntervalId":"2", "value":"12.2"},
+{"timeMeasured": "2014-06-13T00:00:00+02:00","elementMeasurementTypeId":"TM", "logIntervalId":"2", "value":"12.3"},
+{"timeMeasured": "2014-06-14T00:00:00+02:00","elementMeasurementTypeId":"TM", "logIntervalId":"2", "value":"12.4"},
+{"timeMeasured": "2014-06-15T00:00:00+02:00","elementMeasurementTypeId":"TM", "logIntervalId":"2", "value":"12.4"},
+{"timeMeasured": "2014-06-16T00:00:00+02:00","elementMeasurementTypeId":"TM", "logIntervalId":"2", "value":"12.5"},
+{"timeMeasured": "2014-06-17T00:00:00+02:00","elementMeasurementTypeId":"TM", "logIntervalId":"2", "value":"12.6"},
+{"timeMeasured": "2014-06-18T00:00:00+02:00","elementMeasurementTypeId":"TM", "logIntervalId":"2", "value":"12.6"},
+{"timeMeasured": "2014-06-19T00:00:00+02:00","elementMeasurementTypeId":"TM", "logIntervalId":"2", "value":"12.7"},
+{"timeMeasured": "2014-06-20T00:00:00+02:00","elementMeasurementTypeId":"TM", "logIntervalId":"2", "value":"12.7"},
+{"timeMeasured": "2014-06-21T00:00:00+02:00","elementMeasurementTypeId":"TM", "logIntervalId":"2", "value":"12.8"},
+{"timeMeasured": "2014-06-22T00:00:00+02:00","elementMeasurementTypeId":"TM", "logIntervalId":"2", "value":"12.8"},
+{"timeMeasured": "2014-06-23T00:00:00+02:00","elementMeasurementTypeId":"TM", "logIntervalId":"2", "value":"12.9"},
+{"timeMeasured": "2014-06-24T00:00:00+02:00","elementMeasurementTypeId":"TM", "logIntervalId":"2", "value":"12.9"},
+{"timeMeasured": "2014-06-25T00:00:00+02:00","elementMeasurementTypeId":"TM", "logIntervalId":"2", "value":"13"},
+{"timeMeasured": "2014-06-26T00:00:00+02:00","elementMeasurementTypeId":"TM", "logIntervalId":"2", "value":"13"},
+{"timeMeasured": "2014-06-27T00:00:00+02:00","elementMeasurementTypeId":"TM", "logIntervalId":"2", "value":"13.1"},
+{"timeMeasured": "2014-06-28T00:00:00+02:00","elementMeasurementTypeId":"TM", "logIntervalId":"2", "value":"13.1"},
+{"timeMeasured": "2014-06-29T00:00:00+02:00","elementMeasurementTypeId":"TM", "logIntervalId":"2", "value":"13.1"},
+{"timeMeasured": "2014-06-30T00:00:00+02:00","elementMeasurementTypeId":"TM", "logIntervalId":"2", "value":"13.2"},
+{"timeMeasured": "2014-07-01T00:00:00+02:00","elementMeasurementTypeId":"TM", "logIntervalId":"2", "value":"13.2"},
+{"timeMeasured": "2014-07-02T00:00:00+02:00","elementMeasurementTypeId":"TM", "logIntervalId":"2", "value":"13.3"},
+{"timeMeasured": "2014-07-03T00:00:00+02:00","elementMeasurementTypeId":"TM", "logIntervalId":"2", "value":"13.3"},
+{"timeMeasured": "2014-07-04T00:00:00+02:00","elementMeasurementTypeId":"TM", "logIntervalId":"2", "value":"13.3"},
+{"timeMeasured": "2014-07-05T00:00:00+02:00","elementMeasurementTypeId":"TM", "logIntervalId":"2", "value":"13.4"},
+{"timeMeasured": "2014-07-06T00:00:00+02:00","elementMeasurementTypeId":"TM", "logIntervalId":"2", "value":"13.4"},
+{"timeMeasured": "2014-07-07T00:00:00+02:00","elementMeasurementTypeId":"TM", "logIntervalId":"2", "value":"13.4"},
+{"timeMeasured": "2014-07-08T00:00:00+02:00","elementMeasurementTypeId":"TM", "logIntervalId":"2", "value":"13.5"},
+{"timeMeasured": "2014-07-09T00:00:00+02:00","elementMeasurementTypeId":"TM", "logIntervalId":"2", "value":"13.5"},
+{"timeMeasured": "2014-07-10T00:00:00+02:00","elementMeasurementTypeId":"TM", "logIntervalId":"2", "value":"13.5"},
+{"timeMeasured": "2014-07-11T00:00:00+02:00","elementMeasurementTypeId":"TM", "logIntervalId":"2", "value":"13.6"},
+{"timeMeasured": "2014-07-12T00:00:00+02:00","elementMeasurementTypeId":"TM", "logIntervalId":"2", "value":"13.6"},
+{"timeMeasured": "2014-07-13T00:00:00+02:00","elementMeasurementTypeId":"TM", "logIntervalId":"2", "value":"13.6"},
+{"timeMeasured": "2014-07-14T00:00:00+02:00","elementMeasurementTypeId":"TM", "logIntervalId":"2", "value":"13.7"},
+{"timeMeasured": "2014-07-15T00:00:00+02:00","elementMeasurementTypeId":"TM", "logIntervalId":"2", "value":"13.7"},
+{"timeMeasured": "2014-07-16T00:00:00+02:00","elementMeasurementTypeId":"TM", "logIntervalId":"2", "value":"13.7"},
+{"timeMeasured": "2014-07-17T00:00:00+02:00","elementMeasurementTypeId":"TM", "logIntervalId":"2", "value":"13.8"},
+{"timeMeasured": "2014-07-18T00:00:00+02:00","elementMeasurementTypeId":"TM", "logIntervalId":"2", "value":"13.8"},
+{"timeMeasured": "2014-07-19T00:00:00+02:00","elementMeasurementTypeId":"TM", "logIntervalId":"2", "value":"13.8"},
+{"timeMeasured": "2014-07-20T00:00:00+02:00","elementMeasurementTypeId":"TM", "logIntervalId":"2", "value":"13.8"},
+{"timeMeasured": "2014-07-21T00:00:00+02:00","elementMeasurementTypeId":"TM", "logIntervalId":"2", "value":"13.9"},
+{"timeMeasured": "2014-07-22T00:00:00+02:00","elementMeasurementTypeId":"TM", "logIntervalId":"2", "value":"13.9"},
+{"timeMeasured": "2014-07-23T00:00:00+02:00","elementMeasurementTypeId":"TM", "logIntervalId":"2", "value":"13.9"},
+{"timeMeasured": "2014-07-24T00:00:00+02:00","elementMeasurementTypeId":"TM", "logIntervalId":"2", "value":"14"},
+{"timeMeasured": "2014-07-25T00:00:00+02:00","elementMeasurementTypeId":"TM", "logIntervalId":"2", "value":"14"},
+{"timeMeasured": "2014-07-26T00:00:00+02:00","elementMeasurementTypeId":"TM", "logIntervalId":"2", "value":"14"},
+{"timeMeasured": "2014-07-27T00:00:00+02:00","elementMeasurementTypeId":"TM", "logIntervalId":"2", "value":"14"},
+{"timeMeasured": "2014-07-28T00:00:00+02:00","elementMeasurementTypeId":"TM", "logIntervalId":"2", "value":"14"},
+{"timeMeasured": "2014-07-29T00:00:00+02:00","elementMeasurementTypeId":"TM", "logIntervalId":"2", "value":"14"},
+{"timeMeasured": "2014-07-30T00:00:00+02:00","elementMeasurementTypeId":"TM", "logIntervalId":"2", "value":"14"},
+{"timeMeasured": "2014-07-31T00:00:00+02:00","elementMeasurementTypeId":"TM", "logIntervalId":"2", "value":"14.1"},
+{"timeMeasured": "2014-08-01T00:00:00+02:00","elementMeasurementTypeId":"TM", "logIntervalId":"2", "value":"14.1"},
+{"timeMeasured": "2014-08-02T00:00:00+02:00","elementMeasurementTypeId":"TM", "logIntervalId":"2", "value":"14.1"},
+{"timeMeasured": "2014-08-03T00:00:00+02:00","elementMeasurementTypeId":"TM", "logIntervalId":"2", "value":"14"},
+{"timeMeasured": "2014-08-04T00:00:00+02:00","elementMeasurementTypeId":"TM", "logIntervalId":"2", "value":"14"},
+{"timeMeasured": "2014-08-05T00:00:00+02:00","elementMeasurementTypeId":"TM", "logIntervalId":"2", "value":"14"},
+{"timeMeasured": "2014-08-06T00:00:00+02:00","elementMeasurementTypeId":"TM", "logIntervalId":"2", "value":"14"},
+{"timeMeasured": "2014-08-07T00:00:00+02:00","elementMeasurementTypeId":"TM", "logIntervalId":"2", "value":"14"},
+{"timeMeasured": "2014-08-08T00:00:00+02:00","elementMeasurementTypeId":"TM", "logIntervalId":"2", "value":"14"},
+{"timeMeasured": "2014-08-09T00:00:00+02:00","elementMeasurementTypeId":"TM", "logIntervalId":"2", "value":"13.9"},
+{"timeMeasured": "2014-08-10T00:00:00+02:00","elementMeasurementTypeId":"TM", "logIntervalId":"2", "value":"13.9"},
+{"timeMeasured": "2014-08-11T00:00:00+02:00","elementMeasurementTypeId":"TM", "logIntervalId":"2", "value":"13.8"},
+{"timeMeasured": "2014-08-12T00:00:00+02:00","elementMeasurementTypeId":"TM", "logIntervalId":"2", "value":"13.8"},
+{"timeMeasured": "2014-08-13T00:00:00+02:00","elementMeasurementTypeId":"TM", "logIntervalId":"2", "value":"13.7"},
+{"timeMeasured": "2014-08-14T00:00:00+02:00","elementMeasurementTypeId":"TM", "logIntervalId":"2", "value":"13.7"},
+{"timeMeasured": "2014-08-15T00:00:00+02:00","elementMeasurementTypeId":"TM", "logIntervalId":"2", "value":"13.6"},
+{"timeMeasured": "2014-08-16T00:00:00+02:00","elementMeasurementTypeId":"TM", "logIntervalId":"2", "value":"13.5"},
+{"timeMeasured": "2014-08-17T00:00:00+02:00","elementMeasurementTypeId":"TM", "logIntervalId":"2", "value":"13.4"},
+{"timeMeasured": "2014-08-18T00:00:00+02:00","elementMeasurementTypeId":"TM", "logIntervalId":"2", "value":"13.4"},
+{"timeMeasured": "2014-08-19T00:00:00+02:00","elementMeasurementTypeId":"TM", "logIntervalId":"2", "value":"13.3"},
+{"timeMeasured": "2014-08-20T00:00:00+02:00","elementMeasurementTypeId":"TM", "logIntervalId":"2", "value":"13.2"},
+{"timeMeasured": "2014-08-21T00:00:00+02:00","elementMeasurementTypeId":"TM", "logIntervalId":"2", "value":"13.1"},
+{"timeMeasured": "2014-08-22T00:00:00+02:00","elementMeasurementTypeId":"TM", "logIntervalId":"2", "value":"12.9"},
+{"timeMeasured": "2014-08-23T00:00:00+02:00","elementMeasurementTypeId":"TM", "logIntervalId":"2", "value":"12.8"},
+{"timeMeasured": "2014-08-24T00:00:00+02:00","elementMeasurementTypeId":"TM", "logIntervalId":"2", "value":"12.7"},
+{"timeMeasured": "2014-08-25T00:00:00+02:00","elementMeasurementTypeId":"TM", "logIntervalId":"2", "value":"12.6"},
+{"timeMeasured": "2014-08-26T00:00:00+02:00","elementMeasurementTypeId":"TM", "logIntervalId":"2", "value":"12.5"},
+{"timeMeasured": "2014-08-27T00:00:00+02:00","elementMeasurementTypeId":"TM", "logIntervalId":"2", "value":"12.3"},
+{"timeMeasured": "2014-08-28T00:00:00+02:00","elementMeasurementTypeId":"TM", "logIntervalId":"2", "value":"12.2"},
+{"timeMeasured": "2014-08-29T00:00:00+02:00","elementMeasurementTypeId":"TM", "logIntervalId":"2", "value":"12.1"},
+{"timeMeasured": "2014-08-30T00:00:00+02:00","elementMeasurementTypeId":"TM", "logIntervalId":"2", "value":"11.9"},
+{"timeMeasured": "2014-08-31T00:00:00+02:00","elementMeasurementTypeId":"TM", "logIntervalId":"2", "value":"11.8"},
+{"timeMeasured": "2014-09-01T00:00:00+02:00","elementMeasurementTypeId":"TM", "logIntervalId":"2", "value":"11.7"},
+{"timeMeasured": "2014-09-02T00:00:00+02:00","elementMeasurementTypeId":"TM", "logIntervalId":"2", "value":"11.5"},
+{"timeMeasured": "2014-09-03T00:00:00+02:00","elementMeasurementTypeId":"TM", "logIntervalId":"2", "value":"11.4"},
+{"timeMeasured": "2014-09-04T00:00:00+02:00","elementMeasurementTypeId":"TM", "logIntervalId":"2", "value":"11.2"},
+{"timeMeasured": "2014-09-05T00:00:00+02:00","elementMeasurementTypeId":"TM", "logIntervalId":"2", "value":"11.1"},
+{"timeMeasured": "2014-09-06T00:00:00+02:00","elementMeasurementTypeId":"TM", "logIntervalId":"2", "value":"11"},
+{"timeMeasured": "2014-09-07T00:00:00+02:00","elementMeasurementTypeId":"TM", "logIntervalId":"2", "value":"10.8"},
+{"timeMeasured": "2014-09-08T00:00:00+02:00","elementMeasurementTypeId":"TM", "logIntervalId":"2", "value":"10.7"},
+{"timeMeasured": "2014-09-09T00:00:00+02:00","elementMeasurementTypeId":"TM", "logIntervalId":"2", "value":"10.5"},
+{"timeMeasured": "2014-09-10T00:00:00+02:00","elementMeasurementTypeId":"TM", "logIntervalId":"2", "value":"10.4"},
+{"timeMeasured": "2014-09-11T00:00:00+02:00","elementMeasurementTypeId":"TM", "logIntervalId":"2", "value":"10.3"},
+{"timeMeasured": "2014-09-12T00:00:00+02:00","elementMeasurementTypeId":"TM", "logIntervalId":"2", "value":"10.1"},
+{"timeMeasured": "2014-09-13T00:00:00+02:00","elementMeasurementTypeId":"TM", "logIntervalId":"2", "value":"10"},
+{"timeMeasured": "2014-09-14T00:00:00+02:00","elementMeasurementTypeId":"TM", "logIntervalId":"2", "value":"9.9"},
+{"timeMeasured": "2014-09-15T00:00:00+02:00","elementMeasurementTypeId":"TM", "logIntervalId":"2", "value":"9.8"},
+{"timeMeasured": "2014-09-16T00:00:00+02:00","elementMeasurementTypeId":"TM", "logIntervalId":"2", "value":"9.6"},
+{"timeMeasured": "2014-09-17T00:00:00+02:00","elementMeasurementTypeId":"TM", "logIntervalId":"2", "value":"9.5"},
+{"timeMeasured": "2014-09-18T00:00:00+02:00","elementMeasurementTypeId":"TM", "logIntervalId":"2", "value":"9.4"},
+{"timeMeasured": "2014-09-19T00:00:00+02:00","elementMeasurementTypeId":"TM", "logIntervalId":"2", "value":"9.3"},
+{"timeMeasured": "2014-09-20T00:00:00+02:00","elementMeasurementTypeId":"TM", "logIntervalId":"2", "value":"9.2"},
+{"timeMeasured": "2014-09-21T00:00:00+02:00","elementMeasurementTypeId":"TM", "logIntervalId":"2", "value":"9.1"},
+{"timeMeasured": "2014-09-22T00:00:00+02:00","elementMeasurementTypeId":"TM", "logIntervalId":"2", "value":"9"},
+{"timeMeasured": "2014-09-23T00:00:00+02:00","elementMeasurementTypeId":"TM", "logIntervalId":"2", "value":"8.9"},
+{"timeMeasured": "2014-09-24T00:00:00+02:00","elementMeasurementTypeId":"TM", "logIntervalId":"2", "value":"8.8"},
+{"timeMeasured": "2014-09-25T00:00:00+02:00","elementMeasurementTypeId":"TM", "logIntervalId":"2", "value":"8.7"},
+{"timeMeasured": "2014-09-26T00:00:00+02:00","elementMeasurementTypeId":"TM", "logIntervalId":"2", "value":"8.6"},
+{"timeMeasured": "2014-09-27T00:00:00+02:00","elementMeasurementTypeId":"TM", "logIntervalId":"2", "value":"8.5"},
+{"timeMeasured": "2014-09-28T00:00:00+02:00","elementMeasurementTypeId":"TM", "logIntervalId":"2", "value":"8.4"},
+{"timeMeasured": "2014-09-29T00:00:00+02:00","elementMeasurementTypeId":"TM", "logIntervalId":"2", "value":"8.3"},
+{"timeMeasured": "2014-09-30T00:00:00+02:00","elementMeasurementTypeId":"TM", "logIntervalId":"2", "value":"8.2"},
+{"timeMeasured": "2014-10-01T00:00:00+02:00","elementMeasurementTypeId":"TM", "logIntervalId":"2", "value":"8.1"}]
\ No newline at end of file
diff --git a/src/test/resources/JSONWeatherData.json~ b/src/test/resources/JSONWeatherData.json~
deleted file mode 100644
index 42f828b5bff46619b0eb015cbdaa2626e7e7033f..0000000000000000000000000000000000000000
--- a/src/test/resources/JSONWeatherData.json~
+++ /dev/null
@@ -1,39 +0,0 @@
-[
-{"timeMeasured": "2014-04-01T01:00:00+02:00","elementMeasurementTypeId":"TM", "logIntervalId":3, "value":2.27117391304348},
-{"timeMeasured": "2014-04-02T01:00:00+02:00","elementMeasurementTypeId":"TM", "logIntervalId":3, "value":4.11325},
-{"timeMeasured": "2014-04-03T01:00:00+02:00","elementMeasurementTypeId":"TM", "logIntervalId":3, "value":3.8994},
-{"timeMeasured": "2014-04-04T01:00:00+02:00","elementMeasurementTypeId":"TM", "logIntervalId":3, "value":2.944},
-{"timeMeasured": "2014-04-05T01:00:00+02:00","elementMeasurementTypeId":"TM", "logIntervalId":3, "value":0.661375},
-{"timeMeasured": "2014-04-06T01:00:00+02:00","elementMeasurementTypeId":"TM", "logIntervalId":3, "value":4.766125},
-{"timeMeasured": "2014-04-07T01:00:00+02:00","elementMeasurementTypeId":"TM", "logIntervalId":3, "value":7.769125},
-{"timeMeasured": "2014-04-08T01:00:00+02:00","elementMeasurementTypeId":"TM", "logIntervalId":3, "value":5.99891666666667},
-{"timeMeasured": "2014-04-09T01:00:00+02:00","elementMeasurementTypeId":"TM", "logIntervalId":3, "value":2.80245833333333},
-{"timeMeasured": "2014-04-10T01:00:00+02:00","elementMeasurementTypeId":"TM", "logIntervalId":3, "value":3.15925},
-{"timeMeasured": "2014-04-11T01:00:00+02:00","elementMeasurementTypeId":"TM", "logIntervalId":3, "value":6.15741666666667},
-{"timeMeasured": "2014-04-12T01:00:00+02:00","elementMeasurementTypeId":"TM", "logIntervalId":3, "value":3.96670833333333},
-{"timeMeasured": "2014-04-13T01:00:00+02:00","elementMeasurementTypeId":"TM", "logIntervalId":3, "value":7.102375},
-{"timeMeasured": "2014-04-14T01:00:00+02:00","elementMeasurementTypeId":"TM", "logIntervalId":3, "value":6.38904166666666},
-{"timeMeasured": "2014-04-15T01:00:00+02:00","elementMeasurementTypeId":"TM", "logIntervalId":3, "value":5.71329166666667},
-{"timeMeasured": "2014-04-16T01:00:00+02:00","elementMeasurementTypeId":"TM", "logIntervalId":3, "value":5.43008333333333},
-{"timeMeasured": "2014-04-17T01:00:00+02:00","elementMeasurementTypeId":"TM", "logIntervalId":3, "value":5.65616666666667},
-{"timeMeasured": "2014-04-18T01:00:00+02:00","elementMeasurementTypeId":"TM", "logIntervalId":3, "value":7.07616666666667},
-{"timeMeasured": "2014-04-19T01:00:00+02:00","elementMeasurementTypeId":"TM", "logIntervalId":3, "value":6.88533333333333},
-{"timeMeasured": "2014-04-20T01:00:00+02:00","elementMeasurementTypeId":"TM", "logIntervalId":3, "value":8.78733333333333},
-{"timeMeasured": "2014-04-21T01:00:00+02:00","elementMeasurementTypeId":"TM", "logIntervalId":3, "value":11.3544166666667},
-{"timeMeasured": "2014-04-22T01:00:00+02:00","elementMeasurementTypeId":"TM", "logIntervalId":3, "value":12.8357083333333},
-{"timeMeasured": "2014-04-23T01:00:00+02:00","elementMeasurementTypeId":"TM", "logIntervalId":3, "value":10.7384583333333},
-{"timeMeasured": "2014-04-24T01:00:00+02:00","elementMeasurementTypeId":"TM", "logIntervalId":3, "value":7.11995833333333},
-{"timeMeasured": "2014-04-25T01:00:00+02:00","elementMeasurementTypeId":"TM", "logIntervalId":3, "value":8.52258333333334},
-{"timeMeasured": "2014-04-26T01:00:00+02:00","elementMeasurementTypeId":"TM", "logIntervalId":3, "value":10.62575},
-{"timeMeasured": "2014-04-27T01:00:00+02:00","elementMeasurementTypeId":"TM", "logIntervalId":3, "value":12.5907083333333},
-{"timeMeasured": "2014-04-28T01:00:00+02:00","elementMeasurementTypeId":"TM", "logIntervalId":3, "value":12.268},
-{"timeMeasured": "2014-04-29T01:00:00+02:00","elementMeasurementTypeId":"TM", "logIntervalId":3, "value":6.748125},
-{"timeMeasured": "2014-04-30T01:00:00+02:00","elementMeasurementTypeId":"TM", "logIntervalId":3, "value":5.34483333333333},
-{"timeMeasured": "2014-05-01T01:00:00+02:00","elementMeasurementTypeId":"TM", "logIntervalId":3, "value":5.19366666666667},
-{"timeMeasured": "2014-05-02T01:00:00+02:00","elementMeasurementTypeId":"TM", "logIntervalId":3, "value":5.45320833333333},
-{"timeMeasured": "2014-05-03T01:00:00+02:00","elementMeasurementTypeId":"TM", "logIntervalId":3, "value":5.42604166666667},
-{"timeMeasured": "2014-05-04T01:00:00+02:00","elementMeasurementTypeId":"TM", "logIntervalId":3, "value":5.42966666666667},
-{"timeMeasured": "2014-05-05T01:00:00+02:00","elementMeasurementTypeId":"TM", "logIntervalId":3, "value":6.24733333333333},
-{"timeMeasured": "2014-05-06T01:00:00+02:00","elementMeasurementTypeId":"TM", "logIntervalId":3, "value":6.02966666666667},
-{"timeMeasured": "2014-05-07T01:00:00+02:00","elementMeasurementTypeId":"TM", "logIntervalId":3, "value":3.8485416666667},
-{"timeMeasured": "2014-05-08T01:00:00+02:00","elementMeasurementTypeId":"TM", "logIntervalId":3, "value":5.8916666666667}]