Handle wind direction of null in weather groups, closes #137

Author: cmfcmf

Cmfcmf/OpenWeatherMap/CurrentWeather.php

@@ -124,7 +124,7 @@ public function __construct($data, $units)
             $this->pressure = new Unit($data->main->pressure, 'hPa');
             $this->wind = new Wind(
                 new Unit($data->wind->speed, $windSpeedUnit),
-                property_exists($data->wind, 'deg') ? new Unit($data->wind->deg) : null
+                property_exists($data->wind, 'deg') && $data->wind->deg !== null ? new Unit($data->wind->deg) : null
             );
             $this->clouds = new Unit($data->clouds->all, '%');
 

Cmfcmf/OpenWeatherMap/Util/Wind.php

@@ -29,7 +29,7 @@ class Wind
     public $speed;
 
     /**
-     * @var Unit The wind direction.
+     * @var Unit|null The wind direction.
      */
     public $direction;
 

tests/FakeData.php

@@ -41,7 +41,7 @@ class FakeData
                 "wind":{"speed":5.71,"deg":229.501},
                 "dt_txt":"2014-07-23 09:00:00"
             },{
-                "id":1851632,
+                "id":1851633,
                 "dt":1406106000,
                 "coord":{"lon":138.933334,"lat":34.966671},
                 "sys":{"type":3,"id":168940,"message":0.0297,"country":"US","sunrise":1427723751,"sunset":1427768967},
@@ -57,7 +57,7 @@ class FakeData
                 },
                 "weather":[{"id":804,"main":"Clouds","description":"overcast clouds","icon":"04d"}],
                 "clouds":{"all":88},
-                "wind":{"speed":5.71,"deg":229.501},
+                "wind":{"speed":5.71,"deg":null},
                 "dt_txt":"2014-07-23 09:00:00"
             }]
         }';
@@ -127,4 +127,26 @@ public static function forecastXML()
     <lastupdate value="2017-01-02T12:20:00"></lastupdate>
 </current>
 XML;
+
+const CURRENT_WEATHER_XML_NO_WIND_DIRECTION = <<<XML
+<current>
+<city id="2950159" name="Berlin">
+    <coord lon="13.41" lat="52.52"></coord>
+    <country>DE</country>
+    <sun rise="2017-01-02T07:16:51" set="2017-01-02T15:04:50"></sun>
+</city>
+<temperature value="36.48" min="35.6" max="37.4" unit="fahrenheit"></temperature>
+<humidity value="86" unit="%"></humidity>
+<pressure value="1014" unit="hPa"></pressure>
+<wind>
+    <speed value="9.17" name="Fresh Breeze"></speed>
+    <gusts></gusts>
+</wind>
+<clouds value="75" name="broken clouds"></clouds>
+<visibility value="8000"></visibility>
+<precipitation mode="no"></precipitation>
+<weather number="500" value="light rain" icon="10d"></weather>
+<lastupdate value="2017-01-02T12:20:00"></lastupdate>
+</current>
+XML;
 }

tests/OpenWeatherMap/CurrentWeatherGroupTest.php

@@ -32,6 +32,13 @@ public function setUp()
         $this->currentWeatherGroup = new CurrentWeatherGroup($this->fakeJson, 'metric');
     }
 
+    public function testWindDirection()
+    {
+        $this->assertSame($this->currentWeatherGroup->current()->wind->direction->getValue(), 229.501);
+        $this->currentWeatherGroup->next();
+        $this->assertNull($this->currentWeatherGroup->current()->wind->direction);
+    }
+
     public function testRewind()
     {
         $expectIndex = 1851632;
@@ -50,7 +57,7 @@ public function testCurrent()
     }
     public function testNext()
     {
-        $expectIndex = 1851632;
+        $expectIndex = 1851633;
         $this->currentWeatherGroup->next();
         $position = $this->currentWeatherGroup->key();
 

tests/OpenWeatherMap/CurrentWeatherTest.php

@@ -0,0 +1,36 @@
+<?php
+
+/*
+ * OpenWeatherMap-PHP-API — A PHP API to parse weather data from https://OpenWeatherMap.org.
+ *
+ * @license MIT
+ *
+ * Please see the LICENSE file distributed with this source code for further
+ * information regarding copyright and licensing.
+ *
+ * Please visit the following links to read about the usage policies and the license of
+ * OpenWeatherMap data before using this library:
+ *
+ * @see https://OpenWeatherMap.org/price
+ * @see https://OpenWeatherMap.org/terms
+ * @see https://OpenWeatherMap.org/appid
+ */
+
+namespace Cmfcmf\OpenWeatherMap\Tests\OpenWeatherMap;
+
+use Cmfcmf\OpenWeatherMap\CurrentWeather;
+use Cmfcmf\OpenWeatherMap\Tests\FakeData;
+
+class CurrentWeatherTest extends \PHPUnit_Framework_TestCase
+{
+    public function testWindDirection()
+    {
+        $fakeXml = new \SimpleXMLElement(FakeData::CURRENT_WEATHER_XML);
+        $weather = new CurrentWeather($fakeXml, "metric");
+        $this->assertSame($weather->wind->direction->getValue(), 300.0);
+
+        $fakeXml = new \SimpleXMLElement(FakeData::CURRENT_WEATHER_XML_NO_WIND_DIRECTION);
+        $weather = new CurrentWeather($fakeXml, "metric");
+        $this->assertNull($weather->wind->direction);
+    }
+}