Fix multiple timezone related errors, closes #73. (#75)

cmfcmf · Apr 17, 2016 · 96e95ef · 96e95ef
1 parent f4fc509
commit 96e95ef
Show file tree

Hide file tree

Showing 4 changed files with 35 additions and 7 deletions.
diff --git a/Cmfcmf/OpenWeatherMap/Forecast.php b/Cmfcmf/OpenWeatherMap/Forecast.php
@@ -46,8 +46,6 @@ class Forecast extends CurrentWeather
      */
     public function __construct(\SimpleXMLElement $xml, $units)
     {
-        $this->city = new City($xml->city['id'], $xml->city['name'], $xml->city->coord['lon'], $xml->city->coord['lat'], $xml->city->country);
-
         if ($units == 'metric') {
             $temperatureUnit = "&deg;C";
         } else {
@@ -70,7 +68,6 @@ public function __construct(\SimpleXMLElement $xml, $units)
         $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->clouds = new Unit($xml->clouds['all'], $xml->clouds['unit'], $xml->clouds['value']);
         $this->precipitation = new Unit($xml->precipitation['value'], null, $xml->precipitation['type']);
-        $this->sun = new Sun(new \DateTime($xml->city->sun['rise']), new \DateTime($xml->city->sun['set']));
         $this->weather = new WeatherObj($xml->symbol['number'], $xml->symbol['name'], $xml->symbol['var']);
         $this->lastUpdate = new \DateTime($xml->lastupdate['value']);
 

diff --git a/Cmfcmf/OpenWeatherMap/WeatherForecast.php b/Cmfcmf/OpenWeatherMap/WeatherForecast.php
@@ -75,7 +75,8 @@ class WeatherForecast implements \Iterator
     public function __construct($xml, $units, $days)
     {
         $this->city = new City($xml->location->location['geobaseid'], $xml->location->name, $xml->location->location['longitude'], $xml->location->location['latitude'], $xml->location->country);
-        $this->sun = new Sun(new \DateTime($xml->sun['rise']), new \DateTime($xml->sun['set']));
+        $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);
 
         $today = new \DateTime();
@@ -90,6 +91,7 @@ public function __construct($xml, $units, $days)
             }
             $forecast = new Forecast($time, $units);
             $forecast->city = $this->city;
+            $forecast->sun = $this->sun;
             $this->forecasts[] = $forecast;
 
             $counter++;

diff --git a/Cmfcmf/OpenWeatherMap/WeatherHistory.php b/Cmfcmf/OpenWeatherMap/WeatherHistory.php
@@ -18,6 +18,7 @@
 namespace Cmfcmf\OpenWeatherMap;
 
 use Cmfcmf\OpenWeatherMap;
+use Cmfcmf\OpenWeatherMap\Util\City;
 
 /**
  * Class WeatherHistory.
@@ -62,17 +63,40 @@ public function __construct($weatherHistory, $query)
             $population = null;
         }
 
-        $this->city = new OpenWeatherMap\Util\City($weatherHistory['city_id'], (is_string($query)) ? $query : null, (isset($query['lon'])) ? $query['lon'] : null, (isset($query['lat'])) ? $query['lat'] : null, $country, $population);
+        $this->city = new City(
+            $weatherHistory['city_id'],
+            (is_string($query)) ? $query : null,
+            (isset($query['lon'])) ? $query['lon'] : null,
+            (isset($query['lat'])) ? $query['lat'] : null,
+            $country,
+            $population
+        );
         $this->calctime = $weatherHistory['calctime'];
 
+        $utctz = new \DateTimeZone('UTC');
         foreach ($weatherHistory['list'] as $history) {
             if (isset($history['rain'])) {
                 $units = array_keys($history['rain']);
             } else {
                 $units = array(0 => null);
             }
 
-            $this->histories[] = new History($this->city, $history['weather'][0], array('now' => $history['main']['temp'], 'min' => $history['main']['temp_min'], 'max' => $history['main']['temp_max']), $history['main']['pressure'], $history['main']['humidity'], $history['clouds']['all'], isset($history['rain']) ? array('val' => $history['rain'][($units[0])], 'unit' => $units[0]) : null, $history['wind'], \DateTime::createFromFormat('U', $history['dt']));
+            $this->histories[] = new History(
+                $this->city,
+                $history['weather'][0],
+                array(
+                    'now' => $history['main']['temp'],
+                    'min' => $history['main']['temp_min'],
+                    'max' => $history['main']['temp_max']
+                ),
+                $history['main']['pressure'],
+                $history['main']['humidity'],
+                $history['clouds']['all'],
+                isset($history['rain']) ? array(
+                    'val' => $history['rain'][($units[0])],
+                    'unit' => $units[0]) : null,
+                $history['wind'],
+                \DateTime::createFromFormat('U', $history['dt'], $utctz));
         }
     }
 

diff --git a/Examples/WeatherForecast.php b/Examples/WeatherForecast.php
@@ -36,7 +36,7 @@
 echo "<br />\n";
 echo "LastUpdate: " . $forecast->lastUpdate->format('d.m.Y H:i');
 echo "<br />\n";
-echo "Sunrise : " . $forecast->sun->rise->format("H:i:s") . " Sunset : " . $forecast->sun->set->format("H:i:s");
+echo "Sunrise : " . $forecast->sun->rise->format("H:i:s (e)") . " Sunset : " . $forecast->sun->set->format("H:i:s (e)");
 echo "<br />\n";
 echo "<br />\n";
 
@@ -47,6 +47,8 @@
     echo "<br />\n";
     echo $weather->temperature;
     echo "<br />\n";
+    echo "Sun rise: " . $weather->sun->rise->format('d.m.Y H:i (e)');
+    echo "<br />\n";
     echo "---";
     echo "<br />\n";
 }
@@ -58,5 +60,8 @@
 foreach ($forecast as $weather) {
     echo "Weather forecast at " . $weather->time->day->format('d.m.Y') . " from " . $weather->time->from->format('H:i') . " to " . $weather->time->to->format('H:i') . "<br />";
     echo $weather->temperature . "<br />\n";
+    echo "<br />\n";
+    echo "Sun rise: " . $weather->sun->rise->format('d.m.Y H:i (e)');
+    echo "<br />\n";
     echo "---<br />\n";
 }