Fixed minor bugs.

Author: cmfcmf

Cmfcmf/OpenWeatherMap/WeatherHistory.php

@@ -51,13 +51,24 @@ class WeatherHistory implements \Iterator
      */
     private $position = 0;
 
-    function __construct($weatherHistory, $query)
+    public function __construct($weatherHistory, $query)
     {
-        $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, $weatherHistory['list'][0]['city']['country'], $weatherHistory['list'][0]['city']['population']);
+        if (isset($weatherHistory['list'][0]['city'])) {
+            $country = $weatherHistory['list'][0]['city']['country'];
+            $population = $weatherHistory['list'][0]['city']['population'];
+        } else {
+            $country = null;
+            $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->calctime = $weatherHistory['calctime'];
 
         foreach ($weatherHistory['list'] as $history) {
-            $units = array_keys($history['rain']);
+            if (isset($history['rain'])) {
+                $units = array_keys($history['rain']);
+            }
+
             $this->histories[] = new History(
                 $this->city,
                 $history['weather'][0],
@@ -69,7 +80,7 @@ function __construct($weatherHistory, $query)
                 $history['main']['pressure'],
                 $history['main']['humidity'],
                 $history['clouds']['all'],
-                array('val' => $history['rain'][($units[0])], 'unit' => $units[0]),
+                isset($history['rain']) ? array('val' => $history['rain'][($units[0])], 'unit' => $units[0]) : null,
                 $history['wind'],
                 \DateTime::createFromFormat('U', $history['dt'])
             );

Examples/WeatherHistory.php

@@ -33,8 +33,8 @@
 // Get OpenWeatherMap object. Don't use caching (take a look into Example_Cache.php to see how it works).
 $owm = new OpenWeatherMap();
 
-// Example 1: Get hourly weather history between yesterday and today.
-$history = $owm->getWeatherHistory('Berlin', new \DateTime('yesterday'), new \DateTime('now'), 'day', $units, $lang);
+// Example 1: Get hourly weather history between 2014-01-01 and today.
+$history = $owm->getWeatherHistory('Berlin', new \DateTime('2014-01-01'), new \DateTime('now'), 'hour', $units, $lang);
 
 foreach ($history as $weather) {
     echo "Average temperature at " . $weather->time->format('d.m.Y H:i') . ": " . $weather->temperature . "\n\r<br />";