Add timezone property to city.

Author: Hennell

Cmfcmf/OpenWeatherMap/CurrentWeather.php

@@ -104,7 +104,7 @@ public function __construct($data, $units)
         $utctz = new \DateTimeZone('UTC');
 
         if ($data instanceof \SimpleXMLElement) {
-            $this->city = new City($data->city['id'], $data->city['name'], $data->city->coord['lat'], $data->city->coord['lon'], $data->city->country);
+            $this->city = new City($data->city['id'], $data->city['name'], $data->city->coord['lat'], $data->city->coord['lon'], $data->city->country, null, $data->city->timezone);
             $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']);
@@ -118,7 +118,7 @@ public function __construct($data, $units)
             $this->weather = new Weather($data->weather['number'], $data->weather['value'], $data->weather['icon']);
             $this->lastUpdate = new \DateTime($data->lastupdate['value'], $utctz);
         } else {
-            $this->city = new City($data->id, $data->name, $data->coord->lat, $data->coord->lon, $data->sys->country);
+            $this->city = new City($data->id, $data->name, $data->coord->lat, $data->coord->lon, $data->sys->country, null, $data->timezone);
             $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');

Cmfcmf/OpenWeatherMap/Util/City.php

@@ -43,6 +43,10 @@ class City extends Location
      */
     public $population;
 
+    /**
+     * @var int The shift in seconds from UTC
+     */
+    public $timezone;
     /**
      * Create a new city object.
      *
@@ -52,15 +56,17 @@ class City extends Location
      * @param float  $lon        The longitude of the city.
      * @param string $country    The abbreviation of the country the city is located in
      * @param int    $population The city's population.
+     * @param int    $timezone   The shift in seconds from UTC.
      *
      * @internal
      */
-    public function __construct($id, $name = null, $lat = null, $lon = null, $country = null, $population = null)
+    public function __construct($id, $name = null, $lat = null, $lon = null, $country = null, $population = null, $timezone = null)
     {
         $this->id = (int)$id;
         $this->name = isset($name) ? (string)$name : null;
         $this->country = isset($country) ? (string)$country : null;
         $this->population = isset($population) ? (int)$population : null;
+        $this->timezone = isset($timezone) ? (int)$timezone : null;
 
         parent::__construct($lat, $lon);
     }

Cmfcmf/OpenWeatherMap/WeatherForecast.php

@@ -74,7 +74,7 @@ class WeatherForecast implements \Iterator
      */
     public function __construct($xml, $units, $days)
     {
-        $this->city = new City($xml->location->location['geobaseid'], $xml->location->name, $xml->location->location['latitude'], $xml->location->location['longitude'], $xml->location->country);
+        $this->city = new City($xml->location->location['geobaseid'], $xml->location->name, $xml->location->location['latitude'], $xml->location->location['longitude'], $xml->location->country, null, $xml->location->timezone);
         $utctz = new \DateTimeZone('UTC');
         $this->sun = new Sun(new \DateTime($xml->sun['rise'], $utctz), new \DateTime($xml->sun['set'], $utctz));
         $this->lastUpdate = new \DateTime($xml->meta->lastupdate, $utctz);

tests/FakeData.php

@@ -23,6 +23,7 @@ class FakeData
     const WEATHER_GROUP_JSON = '{
             "list":[{
                 "id":1851632,
+                "timezone": 32400,
                 "dt":1406106000,
                 "coord":{"lon":138.933334,"lat":34.966671},
                 "sys":{"type":3,"id":168940,"message":0.0297,"country":"US","sunrise":1427723751,"sunset":1427768967},
@@ -43,6 +44,7 @@ class FakeData
             },{
                 "id":1851633,
                 "dt":1406106000,
+                "timezone": 32400,
                 "coord":{"lon":138.933334,"lat":34.966671},
                 "sys":{"type":3,"id":168940,"message":0.0297,"country":"US","sunrise":1427723751,"sunset":1427768967},
                 "name":"Shuzenji",
@@ -110,6 +112,7 @@ public static function forecastXML()
     <city id="2950159" name="Berlin">
         <coord lon="13.41" lat="52.52"></coord>
         <country>DE</country>
+        <timezone>3600</timezone>
         <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>
@@ -137,6 +140,7 @@ public static function forecastXML()
 <city id="2950159" name="Berlin">
     <coord lon="13.41" lat="52.52"></coord>
     <country>DE</country>
+    <timezone>3600</timezone>
     <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>