From 5015d51e97d4a603d6def5fd24214ebc2afe6393 Mon Sep 17 00:00:00 2001
From: Tor-Einar Skog <tor-einar.skog@bioforsk.no>
Date: Mon, 26 May 2014 15:31:22 +0200
Subject: [PATCH] Adding timezone awareness to avoid trouble with daily
temperature timestamps
---
.../vips/model/oatfloweringmodel/OatFloweringModel.java | 5 ++++-
1 file changed, 4 insertions(+), 1 deletion(-)
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 c27007a..e6ff112 100644
--- a/src/main/java/no/bioforsk/vips/model/oatfloweringmodel/OatFloweringModel.java
+++ b/src/main/java/no/bioforsk/vips/model/oatfloweringmodel/OatFloweringModel.java
@@ -19,11 +19,13 @@
package no.bioforsk.vips.model.oatfloweringmodel;
+
import java.util.ArrayList;
import java.util.Calendar;
import java.util.Collections;
import java.util.Date;
import java.util.List;
+import java.util.TimeZone;
import no.bioforsk.vips.entity.ModelConfiguration;
import no.bioforsk.vips.entity.Result;
import no.bioforsk.vips.entity.ResultImpl;
@@ -46,6 +48,7 @@ public class OatFloweringModel extends I18nImpl implements Model{
private List<WeatherObservation> TM;
private Date dateOfSowing;
+ private final static TimeZone DEFAULT_TIME_ZONE = TimeZone.getTimeZone("Europe/Oslo");
private final static ModelId MODEL_ID = new ModelId("OATFLOWERM");
@@ -220,7 +223,7 @@ public class OatFloweringModel extends I18nImpl implements Model{
// Must be complete set of daily mean temperatures
WeatherUtil wUtil = new WeatherUtil();
- Date potentialHole = wUtil.findFirstHoleInObservationSeries(observations, WeatherObservation.LOG_INTERVAL_ID_1D);
+ Date potentialHole = wUtil.findFirstHoleInObservationSeries(observations, WeatherObservation.LOG_INTERVAL_ID_1D, OatFloweringModel.DEFAULT_TIME_ZONE);
if(potentialHole != null)
{
throw new ConfigValidationException("Hole found in temperature series at = " + potentialHole);
--
GitLab