Fixed number of days returned for forecasts, thanks @goranata, closes #10.

Author: cmfcmf

Cmfcmf/OpenWeatherMap.php

@@ -219,7 +219,7 @@ public function getWeatherForecast($query, $units = 'imperial', $lang = 'en', $a
         if ($days <= 5) {
             $answer = $this->getRawHourlyForecastData($query, $units, $lang, $appid, 'xml');
         } else if ($days <= 14) {
-            $answer = $this->getRawDailyForecastData($query, $units, $lang, $appid, 'xml');
+            $answer = $this->getRawDailyForecastData($query, $units, $lang, $appid, 'xml', $days);
         } else {
             throw new \InvalidArgumentException('Error: forecasts are only available for the next 14 days. $days must be lower than 15.');
         }
@@ -237,7 +237,7 @@ public function getWeatherForecast($query, $units = 'imperial', $lang = 'en', $a
             }
         }
 
-        return new WeatherForecast($xml, $units);
+        return new WeatherForecast($xml, $units, $days);
     }
 
     /**
@@ -404,8 +404,10 @@ public function getRawHourlyForecastData($query, $units = 'imperial', $lang = 'e
      * @param string           $units Can be either 'metric' or 'imperial' (default). This affects almost all units returned.
      * @param string           $lang The language to use for descriptions, default is 'en'. For possible values see below.
      * @param string           $appid Your app id, default ''. See http://openweathermap.org/appid for more details.
-     * @param string           $mode The format of the data fetched. Possible values are 'json', 'html' and 'xml' (default).
+     * @param string           $mode The format of the data fetched. Possible values are 'json', 'html' and 'xml' (default)
+     * @param int              $cnt How many days of forecast shall be returned? Maximum (and default): 14
      *
+     * @throws \InvalidArgumentException If $cnt is higher than 14.
      * @return string Returns false on failure and the fetched data in the format you specified on success.
      *
      * Warning If an error occurred, OpenWeatherMap returns data in json format ALWAYS
@@ -436,9 +438,12 @@ public function getRawHourlyForecastData($query, $units = 'imperial', $lang = 'e
      *
      * @api
      */
-    public function getRawDailyForecastData($query, $units = 'imperial', $lang = 'en', $appid = '', $mode = 'xml')
+    public function getRawDailyForecastData($query, $units = 'imperial', $lang = 'en', $appid = '', $mode = 'xml', $cnt = 14)
     {
-        $url = $this->buildUrl($query, $units, $lang, $appid, $mode, $this->weatherDailyForecastUrl);
+        if ($cnt > 14) {
+            throw new \InvalidArgumentException('$cnt must be 14 or below!');
+        }
+        $url = $this->buildUrl($query, $units, $lang, $appid, $mode, $this->weatherDailyForecastUrl) . "&cnt=$cnt";
 
         return $this->cacheOrFetchResult('dailyForecast', $query, $units, $lang, $mode, $url);
     }

Cmfcmf/OpenWeatherMap/WeatherForecast.php

@@ -59,18 +59,28 @@ class WeatherForecast implements \Iterator
      *
      * @param        $xml
      * @param string $units
+     * @param int    $days  How many days of forecast to receive.
      *
      * @internal
      */
-    public function __construct($xml, $units)
+    public function __construct($xml, $units, $days)
     {
         $this->city = new City(-1, $xml->location->name, $xml->location->location['longitude'], $xml->location->location['latitude'], $xml->location->country);
         $this->lastUpdate = new \DateTime($xml->meta->lastupdate);
 
+        $counter = 0;
         foreach ($xml->forecast->time as $time) {
             $forecast = new Forecast($time, $units);
             $forecast->city = $this->city;
             $this->forecasts[] = $forecast;
+
+            $counter++;
+            // Make sure to only return the requested number of days.
+            if ($days <= 5 && $counter == $days * 8) {
+                break;
+            } else if ($days > 5 && $counter == $days) {
+                break;
+            }
         }
     }
 

Examples/WeatherForecast.php

@@ -60,6 +60,6 @@
 
 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 />";
-    echo "---<br />";
+    echo $weather->temperature . "<br />\n";
+    echo "---<br />\n";
 }