Added features to weather elements

src/main/java/no/bioforsk/vips/entity/WeatherObservation.java

@@ -20,7 +20,6 @@
 package no.bioforsk.vips.entity;
 
 import com.fasterxml.jackson.annotation.JsonFormat;
-import java.text.SimpleDateFormat;
 import java.util.Date;
 
 /**
@@ -32,9 +31,10 @@ import java.util.Date;
 public class WeatherObservation implements Comparable{
     
     public final static Integer LOG_INTERVAL_ID_1H = 1;
+    public final static Integer LOG_INTERVAL_ID_3H = 3;
+    public final static Integer LOG_INTERVAL_ID_6H = 6;
     public final static Integer LOG_INTERVAL_ID_1D = 2;
 
-   
     private String elementMeasurementTypeId;
     private Integer logIntervalId;
     private Date timeMeasured;
@@ -105,6 +105,7 @@ public class WeatherObservation implements Comparable{
         return "Observation \n" +
                 "elementMeasurementTypeId=" + this.getElementMeasurementTypeId() + "\n" +
                 "timeMeasured=" + this.getTimeMeasured().toString() + "\n" +
+                "logIntervalId=" + this.getLogIntervalId().toString() + "\n" +
                 "value=" + this.getValue();
     }
 

src/main/java/no/bioforsk/vips/util/WeatherElements.java

@@ -38,16 +38,24 @@ public class WeatherElements {
      * Maximum temperature (Celcius)
      */
     public static final String TEMPERATURE_MAXIMUM = "TX";
+    /**
+     * Instantaneous temperature (Celcius)
+     */
+    public static final String TEMPERATURE_INSTANTANEOUS = "TT";
     /**
      * Aggregated rainfall (millimeters)
      */
     public static final String PRECIPITATION = "RR";
     /**
-     * Relative humidity (%)
+     * Average relative humidity (%)
+     */
+    public static final String RELATIVE_HUMIDITY_MEAN = "UM";
+    /**
+     * Instantaneous relative humidity (%)
      */
-    public static final String RELATIVE_HUMIDITY = "UM";
+    public static final String RELATIVE_HUMIDITY_INSTANTANEOUS = "UU";
     /**
-     * Global radiation (unit??)
+     * Global radiation (W/sqm)
      */
     public static final String GLOBAL_RADIATION = "Q0";
     /**
@@ -55,7 +63,7 @@ public class WeatherElements {
      */
     public static final String LEAF_WETNESS = "BT";
     /**
-     * 
+     * Average wind speed (meters / second)
      */
     public static final String WIND_SPEED_2M = "FM2";
     

src/test/java/no/bioforsk/vips/util/WeatherUtilTest.java

@@ -231,7 +231,7 @@ public class WeatherUtilTest extends TestCase {
         {
             if(obs.getElementMeasurementTypeId().equals(WeatherElements.TEMPERATURE_MEAN))
                 TM.add(obs);
-            else if(obs.getElementMeasurementTypeId().equals(WeatherElements.RELATIVE_HUMIDITY))
+            else if(obs.getElementMeasurementTypeId().equals(WeatherElements.RELATIVE_HUMIDITY_MEAN))
                 UM.add(obs);
             else if(obs.getElementMeasurementTypeId().equals(WeatherElements.WIND_SPEED_2M))
                 FM2.add(obs);
@@ -358,7 +358,7 @@ public class WeatherUtilTest extends TestCase {
             {
                 RR.add(o);
             }
-            else if(o.getElementMeasurementTypeId().equals(WeatherElements.RELATIVE_HUMIDITY))
+            else if(o.getElementMeasurementTypeId().equals(WeatherElements.RELATIVE_HUMIDITY_MEAN))
             {
                 UM.add(o);
             }
@@ -402,7 +402,7 @@ public class WeatherUtilTest extends TestCase {
             {
                 RR.add(o);
             }
-            else if(o.getElementMeasurementTypeId().equals(WeatherElements.RELATIVE_HUMIDITY))
+            else if(o.getElementMeasurementTypeId().equals(WeatherElements.RELATIVE_HUMIDITY_MEAN))
             {
                 UM.add(o);
             }
@@ -437,7 +437,7 @@ public class WeatherUtilTest extends TestCase {
             {
                 RR.add(o);
             }
-            else if(o.getElementMeasurementTypeId().equals(WeatherElements.RELATIVE_HUMIDITY))
+            else if(o.getElementMeasurementTypeId().equals(WeatherElements.RELATIVE_HUMIDITY_MEAN))
             {
                 UM.add(o);
             }
@@ -472,7 +472,7 @@ public class WeatherUtilTest extends TestCase {
             {
                 RR.add(o);
             }
-            else if(o.getElementMeasurementTypeId().equals(WeatherElements.RELATIVE_HUMIDITY))
+            else if(o.getElementMeasurementTypeId().equals(WeatherElements.RELATIVE_HUMIDITY_MEAN))
             {
                 UM.add(o);
             }