Merge pull request #102 from cmfcmf/101-optional-wind-direction

Make wind direction optional

Author: cmfcmf

Cmfcmf/OpenWeatherMap/CurrentWeather.php

@@ -107,7 +107,10 @@ public function __construct($data, $units)
             $this->temperature = new Temperature(new Unit($data->temperature['value'], $data->temperature['unit']), new Unit($data->temperature['min'], $data->temperature['unit']), new Unit($data->temperature['max'], $data->temperature['unit']));
             $this->humidity = new Unit($data->humidity['value'], $data->humidity['unit']);
             $this->pressure = new Unit($data->pressure['value'], $data->pressure['unit']);
-            $this->wind = new Wind(new Unit($data->wind->speed['value'], $windSpeedUnit, $data->wind->speed['name']), new Unit($data->wind->direction['value'], $data->wind->direction['code'], $data->wind->direction['name']));
+            $this->wind = new Wind(
+                new Unit($data->wind->speed['value'], $windSpeedUnit, $data->wind->speed['name']),
+                property_exists($data->wind, 'direction') ? new Unit($data->wind->direction['value'], $data->wind->direction['code'], $data->wind->direction['name']) : null
+            );
             $this->clouds = new Unit($data->clouds['value'], null, $data->clouds['name']);
             $this->precipitation = new Unit($data->precipitation['value'], $data->precipitation['unit'], $data->precipitation['mode']);
             $this->sun = new Sun(new \DateTime($data->city->sun['rise'], $utctz), new \DateTime($data->city->sun['set'], $utctz));
@@ -118,7 +121,10 @@ public function __construct($data, $units)
             $this->temperature = new Temperature(new Unit($data->main->temp, $units), new Unit($data->main->temp_min, $units), new Unit($data->main->temp_max, $units));
             $this->humidity = new Unit($data->main->humidity, '%');
             $this->pressure = new Unit($data->main->pressure, 'hPa');
-            $this->wind = new Wind(new Unit($data->wind->speed, $windSpeedUnit), new Unit($data->wind->deg));
+            $this->wind = new Wind(
+                new Unit($data->wind->speed, $windSpeedUnit),
+                property_exists($data->wind, 'deg') ? new Unit($data->wind->deg) : null
+            );
             $this->clouds = new Unit($data->clouds->all, '%');
 
             // the rain field is not always present in the JSON response

Cmfcmf/OpenWeatherMap/Forecast.php

@@ -62,7 +62,10 @@ public function __construct(\SimpleXMLElement $xml, $units)
             $windSpeedUnit = 'mps';
         }
 
-        $this->wind = new Wind(new Unit($xml->windSpeed['mps'], $windSpeedUnit, $xml->windSpeed['name']), new Unit($xml->windDirection['deg'], $xml->windDirection['code'], $xml->windDirection['name']));
+        $this->wind = new Wind(
+            new Unit($xml->windSpeed['mps'], $windSpeedUnit, $xml->windSpeed['name']),
+            property_exists($xml, 'windDirection') ? new Unit($xml->windDirection['deg'], $xml->windDirection['code'], $xml->windDirection['name']) : null
+        );
         $this->clouds = new Unit($xml->clouds['all'], $xml->clouds['unit'], $xml->clouds['value']);
         $this->precipitation = new Unit($xml->precipitation['value'], null, $xml->precipitation['type']);
         $this->weather = new Weather($xml->symbol['number'], $xml->symbol['name'], $xml->symbol['var']);

Cmfcmf/OpenWeatherMap/History.php

@@ -98,7 +98,10 @@ public function __construct($city, $weather, $temperature, $pressure, $humidity,
         $this->humidity = new Unit($humidity, '%');
         $this->clouds = new Unit($clouds, '%');
         $this->precipitation = new Unit($rain['val'], $rain['unit']);
-        $this->wind = new Wind(new Unit($wind['speed']), new Unit($wind['deg']));
+        $this->wind = new Wind(
+            new Unit($wind['speed']),
+            isset($wind['deg']) ? new Unit($wind['deg']) : null
+        );
         $this->time = $time;
     }
 }

Cmfcmf/OpenWeatherMap/Util/Wind.php

@@ -40,7 +40,7 @@ class Wind
      *
      * @internal
      */
-    public function __construct(Unit $speed, Unit $direction)
+    public function __construct(Unit $speed, Unit $direction = null)
     {
         $this->speed = $speed;
         $this->direction = $direction;