Change location of ini file.

Author: cmfcmf

Cmfcmf/OpenWeatherMap.php

@@ -444,7 +444,7 @@ private function buildQueryUrlParameter($query)
             case is_string($query):
                 return 'q='.urlencode($query);
             default:
-                throw new \InvalidArgumentException('Error: $query has the wrong format. See the documentation of OpenWeatherMap::getRawData() to read about valid formats.');
+                throw new \InvalidArgumentException('Error: $query has the wrong format. See the documentation of OpenWeatherMap::getWeather() to read about valid formats.');
         }
     }
 

Examples.ini.tmpl

@@ -0,0 +1,4 @@
+[OpenWeatherMap]
+# Get an API Key from http://home.openweathermap.org/
+api_key = 2f8796eefe67558dc205b09dd336d022
+

Examples/ApiKey.ini

@@ -81,14 +81,18 @@ public function setCached($url, $content)
     }
 }
 
+// Load the api key.
+$ini = parse_ini_file('ApiKey.ini');
+$myApiKey = $ini['api_key'];
+
 // Language of data (try your own language here!):
 $lang = 'de';
 
 // Units (can be 'metric' or 'imperial' [default]):
 $units = 'metric';
 
 // Example 1: Use your own cache implementation. Cache for 10 seconds only in this example.
-$owm = new OpenWeatherMap(null, new ExampleCache(), 10);
+$owm = new OpenWeatherMap($myApiKey, null, new ExampleCache(), 10);
 
 $weather = $owm->getWeather('Berlin', $units, $lang);
 echo "EXAMPLE 1<hr />\n\n\n";

Examples/Cache.php

@@ -26,8 +26,8 @@
     require '../../../autoload.php';
 }
 
-// Load the app configuration
-$ini = parse_ini_file('../Examples.ini');
+// Load the api key.
+$ini = parse_ini_file('ApiKey.ini');
 $myApiKey = $ini['api_key'];
 
 // Language of data (try your own language here!):
@@ -235,9 +235,3 @@
     echo 'General exception: '.$e->getMessage().' (Code '.$e->getCode().').';
     echo "<br />\n";
 }
-
-// Example 15: Using an api key:
-echo "<br /><br />\n\n\nEXAMPLE 15<hr />\n\n\n";
-$weather = $owm->getWeather('Berlin', $units, $lang, $myApiKey);
-echo $weather->temperature."\n";
-echo "<br />\n";

Examples/CurrentWeather.php

@@ -26,8 +26,8 @@
     require('../../../autoload.php');
 }
 
-// Load the app configuration
-$ini = parse_ini_file('../Examples.ini');
+// Load the api key.
+$ini = parse_ini_file('ApiKey.ini');
 $myApiKey = $ini['api_key'];
 
 // Language of data (try your own language here!):
@@ -37,8 +37,7 @@
 $units = 'metric';
 
 // Get OpenWeatherMap object. Don't use caching (take a look into Example_Cache.php to see how it works).
-$owm = new OpenWeatherMap();
-$owm->setApiKey($myApiKey);
+$owm = new OpenWeatherMap($myApiKey);
 
 // Example 1: Get forecast for the next 10 days for Berlin.
 $forecast = $owm->getWeatherForecast('Berlin', $units, $lang, '', 10);
@@ -71,4 +70,4 @@
     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";
-}
+}

Examples/WeatherForecast.php

@@ -25,8 +25,8 @@
     require '../../../autoload.php';
 }
 
-// Load the app configuration
-$ini = parse_ini_file('../Examples.ini');
+// Load the api key.
+$ini = parse_ini_file('ApiKey.ini');
 $myApiKey = $ini['api_key'];
 
 // Language of data (try your own language here!):
@@ -36,12 +36,11 @@
 $units = 'metric';
 
 // Get OpenWeatherMap object. Don't use caching (take a look into Example_Cache.php to see how it works).
-$owm = new OpenWeatherMap();
-$owm->setApiKey($myApiKey);
+$owm = new OpenWeatherMap($myApiKey);
 
 // 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 />";
-}
+}