Fixed bug where measurements were incorrect if EPS wasn't available. …

…Changed measurements default '0.0' values to 'null'. Converted danish named precipitation types and wind directions to english names and abbreviations.
rugaard · Jul 19, 2019 · cfd4c47 · cfd4c47
1 parent bea71e8
commit cfd4c47
Show file tree

Hide file tree

Showing 14 changed files with 262 additions and 150 deletions.
diff --git a/src/DTO/Measurements/Humidity.php b/src/DTO/Measurements/Humidity.php
@@ -19,7 +19,7 @@ class Humidity extends AbstractDTO
      *
      * @var float|null
      */
-    protected $value = 0.0;
+    protected $value;
 
     /**
      * Unit type.
@@ -49,7 +49,7 @@ public function __construct(array $data = [])
      */
     public function parse(array $data): void
     {
-        $this->setValue((float) $data['humidity']);
+        $this->setValue($data['humidity'] ?? null);
     }
 
     /**
@@ -60,7 +60,7 @@ public function parse(array $data): void
      */
     public function setValue(?float $value) : self
     {
-        $this->value = $value !== null ? (float) $value : 0.0;
+        $this->value = $value !== null ? (float) $value : null;
         return $this;
     }
 

diff --git a/src/DTO/Measurements/Precipitation.php b/src/DTO/Measurements/Precipitation.php
@@ -26,21 +26,21 @@ class Precipitation extends AbstractDTO
      *
      * @var float|null
      */
-    protected $value = 0.0;
+    protected $value;
 
     /**
      * Lowest predicted amount (uncertain).
      *
-     * @var float
+     * @var float|null
      */
-    protected $lowestValue = 0.0;
+    protected $lowestValue;
 
     /**
      * Highest predicted amount (uncertain).
      *
-     * @var float
+     * @var float|null
      */
-    protected $highestValue = 0.0;
+    protected $highestValue;
 
     /**
      * Unit type.
@@ -70,22 +70,52 @@ public function __construct(array $data = [])
      */
     public function parse(array $data): void
     {
-        $this->setType($data['precipType'])
-             ->setValue((float) ($data['prec50'] ?? $data['precip3'] ?? null));
+        // Set precipitation type based on danish key.
+        $this->setTypeByDanishKey($data['precipType'] ?? null);
+
+        // If "temp50" is empty,
+        // then we know EPS is not available.
+        if (!empty($data['temp50'])) {
+            $this->setValue($data['prec50'] ?? null)
+                 ->setLowestValue($data['prec10'] ?? null)
+                 ->setHighestValue($data['prec90'] ?? null);
+        } else {
+            $this->setValue($data['precip1'] ?? null);
+        }
+    }
 
-        if (!empty($data['prec50'])) {
-            $this->setLowestValue((float) $data['prec10'])
-                 ->setHighestValue((float) $data['prec90']);
+    /**
+     * Set precipitation type by danish key.
+     *
+     * @param  string|null $key
+     * @return $this
+     */
+    public function setTypeByDanishKey(?string $key) : self
+    {
+        switch ($key) {
+            case 'regn':
+                $this->setType('rain');
+                break;
+            case 'hagl':
+                $this->setType('hail');
+                break;
+            case 'slud':
+                $this->setType('sleet');
+                break;
+            case 'sne':
+                $this->setType('snow');
+                break;
         }
+        return $this;
     }
 
     /**
      * Set precipitation type.
      *
-     * @param  string $type
+     * @param  string|null $type
      * @return $this
      */
-    public function setType(string $type) : self
+    public function setType(?string $type) : self
     {
         $this->type = $type;
         return $this;
@@ -109,7 +139,7 @@ public function getType() :? string
      */
     public function setValue(?float $value) : self
     {
-        $this->value = (float) ($value < 0.1 ? 0.0 : $value);
+        $this->value = $value !== null ? (float) ($value < 0.1 ? 0.0 : $value) : null;
         return $this;
     }
 
@@ -131,7 +161,7 @@ public function getValue() :? float
      */
     public function setLowestValue(?float $value) : self
     {
-        $this->lowestValue = (float) ($value < 0.1 ? 0.0 : $value);
+        $this->lowestValue = $value !== null ? (float) ($value < 0.1 ? 0.0 : $value) : null;
         return $this;
     }
 
@@ -153,7 +183,7 @@ public function getLowestValue() :? float
      */
     public function setHighestValue(?float $value) : self
     {
-        $this->highestValue = (float) ($value < 0.1 ? 0 : $value);
+        $this->highestValue = $value !== null ? (float) ($value < 0.1 ? 0 : $value) : null;
         return $this;
     }
 

diff --git a/src/DTO/Measurements/Pressure.php b/src/DTO/Measurements/Pressure.php
@@ -17,9 +17,9 @@ class Pressure extends AbstractDTO
     /**
      * Pressure value.
      *
-     * @var float
+     * @var float|null
      */
-    protected $value  = 0.0;
+    protected $value;
 
     /**
      * Unit type.
@@ -49,7 +49,7 @@ public function __construct(array $data = [])
      */
     public function parse(array $data): void
     {
-        $this->setValue((float) $data['pressure']);
+        $this->setValue($data['pressure'] ?? null);
     }
 
     /**
@@ -60,7 +60,7 @@ public function parse(array $data): void
      */
     public function setValue(?float $value) : self
     {
-        $this->value = $value !== null ? (float) $value : 0.0;
+        $this->value = $value !== null ? (float) $value : null;
         return $this;
     }
 

diff --git a/src/DTO/Measurements/Temperature.php b/src/DTO/Measurements/Temperature.php
@@ -17,23 +17,23 @@ class Temperature extends AbstractDTO
     /**
      * Predicted/expected temperature.
      *
-     * @var float
+     * @var float|null
      */
-    protected $value = 0.0;
+    protected $value;
 
     /**
      * Lowest predicted temperature (uncertain).
      *
-     * @var float
+     * @var float|null
      */
-    protected $lowestValue = 0.0;
+    protected $lowestValue;
 
     /**
      * Highest predicted temperature (uncertain).
      *
-     * @var float
+     * @var float|null
      */
-    protected $highestValue = 0.0;
+    protected $highestValue;
 
     /**
      * Unit type.
@@ -63,11 +63,14 @@ public function __construct(array $data = [])
      */
     public function parse(array $data): void
     {
-        $this->setValue((float) ($data['temp50'] ?? $data['temp'] ?? null));
-
+        // If "temp50" is empty,
+        // then we know EPS is not available.
         if (!empty($data['temp50'])) {
-            $this->setLowestValue((float) $data['temp10'])
-                 ->setHighestValue((float) $data['temp90']);
+            $this->setValue($data['temp50'] ?? null)
+                 ->setLowestValue($data['temp10'] ?? null)
+                 ->setHighestValue($data['temp90'] ?? null);
+        } else {
+            $this->setValue($data['temp'] ?? null);
         }
     }
 
@@ -79,7 +82,7 @@ public function parse(array $data): void
      */
     public function setValue(?float $value) : self
     {
-        $this->value = $value !== null ? (float) $value : 0.0;
+        $this->value = $value !== null ? (float) $value : null;
         return $this;
     }
 
@@ -101,7 +104,7 @@ public function getValue() :? float
      */
     public function setLowestValue(?float $value) : self
     {
-        $this->lowestValue = $value !== null ? (float) $value : 0.0;
+        $this->lowestValue = $value !== null ? (float) $value : null;
         return $this;
     }
 
@@ -123,7 +126,7 @@ public function getLowestValue() :? float
      */
     public function setHighestValue(?float $value) : self
     {
-        $this->highestValue = $value !== null ? (float) $value : 0.0;
+        $this->highestValue = $value !== null ? (float) $value : null;
         return $this;
     }
 

diff --git a/src/DTO/Measurements/Visibility.php b/src/DTO/Measurements/Visibility.php
@@ -17,9 +17,9 @@ class Visibility extends AbstractDTO
     /**
      * Visibility value.
      *
-     * @var float
+     * @var float|null
      */
-    protected $value = 0.0;
+    protected $value;
 
     /**
      * Unit type.
@@ -49,7 +49,7 @@ public function __construct(array $data = [])
      */
     public function parse(array $data): void
     {
-        $this->setValue((float) $data['visibility']);
+        $this->setValue($data['visibility'] ?? null);
     }
 
     /**
@@ -60,7 +60,7 @@ public function parse(array $data): void
      */
     public function setValue(?float $value) : self
     {
-        $this->value = $value !== null ? (float) $value : 0.0;
+        $this->value = $value !== null ? (float) $value : null;
         return $this;
     }