Improve examples.

Author: cmfcmf

Examples/CurrentWeather.php

@@ -19,6 +19,13 @@
 
 require_once __DIR__ . '/bootstrap.php';
 
+$cli = false;
+$lf = '<br>';
+if (php_sapi_name() === 'cli') {
+    $lf = "\n";
+    $cli = true;
+}
+
 // Language of data (try your own language here!):
 $lang = 'de';
 
@@ -31,26 +38,26 @@
 
 // Example 1: Get current temperature in Berlin.
 $weather = $owm->getWeather('Berlin', $units, $lang);
-echo "EXAMPLE 1<hr />\n\n\n";
+echo "EXAMPLE 1$lf";
 
 // $weather contains all available weather information for Berlin.
 // Let's get the temperature:
 
 // Returns it as formatted string (using __toString()):
 echo $weather->temperature;
-echo "<br />\n";
+echo $lf;
 
 // Returns it as formatted string (using a method):
 echo $weather->temperature->getFormatted();
-echo "<br />\n";
+echo $lf;
 
 // Returns the value only:
 echo $weather->temperature->getValue();
-echo "<br />\n";
+echo $lf;
 
 // Returns the unit only:
 echo $weather->temperature->getUnit();
-echo "<br />\n";
+echo $lf;
 
 /*
  * In the example above we're using a "shortcut". OpenWeatherMap returns the minimum temperature of a day,
@@ -61,173 +68,183 @@
 
 // Returns the current temperature:
 echo 'Current: '.$weather->temperature->now;
-echo "<br />\n";
+echo $lf;
 
 // Returns the minimum temperature:
 echo 'Minimum: '.$weather->temperature->min;
-echo "<br />\n";
+echo $lf;
 
 // Returns the maximum temperature:
 echo 'Maximum: '.$weather->temperature->max;
-echo "<br />\n";
+echo $lf;
 
 /*
  * When speaking about "current" and "now", this means when the weather data was last updated. You can get this
  * via a DateTime object:
  */
 echo 'Last update: '.$weather->lastUpdate->format('r');
-echo "<br />\n";
+echo $lf;
 
 // Example 2: Get current pressure and humidity in Hongkong.
 $weather = $owm->getWeather('Hongkong', $units, $lang);
-echo "<br /><br />\n\n\nEXAMPLE 2<hr />\n\n\n";
+echo "$lf$lf EXAMPLE 2$lf";
 
 /*
  * You can use the methods above to only get the value or the unit.
  */
 
 echo 'Pressure: '.$weather->pressure;
-echo "<br />\n";
+echo $lf;
 echo 'Humidity: '.$weather->humidity;
-echo "<br />\n";
+echo $lf;
 
 // Example 3: Get today's sunrise and sunset times.
-echo "<br /><br />\n\n\nEXAMPLE 3<hr />\n\n\n";
+echo "$lf$lf EXAMPLE 3$lf";
 
 /*
  * These functions return a DateTime object.
  */
 
 echo 'Sunrise: '.$weather->sun->rise->format('r');
-echo "<br />\n";
+echo $lf;
 echo 'Sunset: '.$weather->sun->set->format('r');
-echo "<br />\n";
+echo $lf;
 
 // Example 4: Get current temperature from coordinates (Greenland :-) ).
 $weather = $owm->getWeather(array('lat' => 77.73038, 'lon' => 41.89604), $units, $lang);
-echo "<br /><br />\n\n\nEXAMPLE 4<hr />\n\n\n";
+echo "$lf$lf EXAMPLE 4$lf";
 
 echo 'Temperature: '.$weather->temperature;
-echo "<br />\n";
+echo $lf;
 
 // Example 5: Get current temperature from city id. The city is an internal id used by OpenWeatherMap. See example 6 too.
 $weather = $owm->getWeather(2172797, $units, $lang);
-echo "<br /><br />\n\n\nEXAMPLE 5<hr />\n\n\n";
+echo "$lf$lf EXAMPLE 5$lf";
 
 echo 'City: '.$weather->city->name;
-echo "<br />\n";
+echo $lf;
 
 echo 'Temperature: '.$weather->temperature;
-echo "<br />\n";
+echo $lf;
 
 // Example 6: Get information about a city.
 $weather = $owm->getWeather('Paris', $units, $lang);
-echo "<br /><br />\n\n\nEXAMPLE 6<hr />\n\n\n";
+echo "$lf$lf EXAMPLE 6$lf";
 
 echo 'Id: '.$weather->city->id;
-echo "<br />\n";
+echo $lf;
 
 echo 'Name: '.$weather->city->name;
-echo "<br />\n";
+echo $lf;
 
 echo 'Lon: '.$weather->city->lon;
-echo "<br />\n";
+echo $lf;
 
 echo 'Lat: '.$weather->city->lat;
-echo "<br />\n";
+echo $lf;
 
 echo 'Country: '.$weather->city->country;
-echo "<br />\n";
+echo $lf;
 
 // Example 7: Get wind information.
-echo "<br /><br />\n\n\nEXAMPLE 7<hr />\n\n\n";
+echo "$lf$lf EXAMPLE 7$lf";
 
 echo 'Speed: '.$weather->wind->speed;
-echo "<br />\n";
+echo $lf;
 
 echo 'Direction: '.$weather->wind->direction;
-echo "<br />\n";
+echo $lf;
 
 /*
  * For speed and direction there is a description available, which isn't always translated.
  */
 
 echo 'Speed: '.$weather->wind->speed->getDescription();
-echo "<br />\n";
+echo $lf;
 
 echo 'Direction: '.$weather->wind->direction->getDescription();
-echo "<br />\n";
+echo $lf;
 
 // Example 8: Get information about the clouds.
-echo "<br /><br />\n\n\nEXAMPLE 8<hr />\n\n\n";
+echo "$lf$lf EXAMPLE 8$lf";
 
 // The number in braces seems to be an indicator how cloudy the sky is.
 echo 'Clouds: '.$weather->clouds->getDescription().' ('.$weather->clouds.')';
-echo "<br />\n";
+echo $lf;
 
 // Example 9: Get information about precipitation.
-echo "<br /><br />\n\n\nEXAMPLE 9<hr />\n\n\n";
+echo "$lf$lf EXAMPLE 9$lf";
 
 echo 'Precipation: '.$weather->precipitation->getDescription().' ('.$weather->precipitation.')';
-echo "<br />\n";
+echo $lf;
 
 // Example 10: Show copyright notice. WARNING: This is no official text. This hint was created by looking at http://www.http://openweathermap.org/copyright .
-echo "<br /><br />\n\n\nEXAMPLE 10<hr />\n\n\n";
+echo "$lf$lf EXAMPLE 10$lf";
 
 echo $owm::COPYRIGHT;
-echo "<br />\n";
+echo $lf;
 
 // Example 11: Retrieve weather icons.
-echo "<br /><br />\n\n\nEXAMPLE 11<hr />\n\n\n";
+echo "$lf$lf EXAMPLE 11$lf";
 $weather = $owm->getWeather('Berlin');
 echo $weather->weather->icon;
-echo "<br />\n";
+echo $lf;
 echo $weather->weather->getIconUrl();
 
 // Example 12: Get raw xml data.
-echo "<br /><br />\n\n\nEXAMPLE 12<hr />\n\n\n";
+echo "$lf$lf EXAMPLE 12$lf";
 
-echo '<pre><code>'.htmlspecialchars($owm->getRawWeatherData('Berlin', $units, $lang, null, 'xml')).'</code></pre>';
-echo "<br />\n";
+$xml = $owm->getRawWeatherData('Berlin', $units, $lang, null, 'xml');
+if ($cli) {
+    echo $xml;
+} else {
+    echo '<pre><code>'.htmlspecialchars($xml).'</code></pre>';
+}
+echo $lf;
 
 // Example 13: Get raw json data.
-echo "<br /><br />\n\n\nEXAMPLE 13<hr />\n\n\n";
+echo "$lf$lf EXAMPLE 13$lf";
 
-echo '<code>'.htmlspecialchars($owm->getRawWeatherData('Berlin', $units, $lang, null, 'json')).'</code>';
-echo "<br />\n";
+$json = $owm->getRawWeatherData('Berlin', $units, $lang, null, 'json');
+if ($cli) {
+    echo $json;
+} else {
+    echo '<pre><code>'.htmlspecialchars($json).'</code></pre>';
+}
+echo $lf;
 
 // Example 14: Get raw html data.
-echo "<br /><br />\n\n\nEXAMPLE 14<hr />\n\n\n";
+echo "$lf$lf EXAMPLE 14$lf";
 
 echo $owm->getRawWeatherData('Berlin', $units, $lang, null, 'html');
-echo "<br />\n";
+echo $lf;
 
 // Example 15: Error handling.
-echo "<br /><br />\n\n\nEXAMPLE 15<hr />\n\n\n";
+echo "$lf$lf EXAMPLE 15$lf";
 
 // Try wrong city name.
 try {
     $weather = $owm->getWeather('ThisCityNameIsNotValidAndDoesNotExist', $units, $lang);
 } catch (OWMException $e) {
     echo $e->getMessage().' (Code '.$e->getCode().').';
-    echo "<br />\n";
+    echo $lf;
 }
 
 // Try invalid $query.
 try {
     $weather = $owm->getWeather(new \DateTime('now'), $units, $lang);
 } catch (\Exception $e) {
     echo $e->getMessage().' (Code '.$e->getCode().').';
-    echo "<br />\n";
+    echo $lf;
 }
 
 // Full error handling would look like this:
 try {
     $weather = $owm->getWeather(-1, $units, $lang);
 } catch (OWMException $e) {
     echo 'OpenWeatherMap exception: '.$e->getMessage().' (Code '.$e->getCode().').';
-    echo "<br />\n";
+    echo $lf;
 } catch (\Exception $e) {
     echo 'General exception: '.$e->getMessage().' (Code '.$e->getCode().').';
-    echo "<br />\n";
+    echo $lf;
 }