|
From: Sebastian N. <no...@us...> - 2005-01-01 12:34:12
|
Update of /cvsroot/php-blog/additional_plugins/serendipity_plugin_weather In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv25465/serendipity_plugin_weather Modified Files: serendipity_plugin_weather.php Log Message: Changes by Matthew Groeninger Index: serendipity_plugin_weather.php =================================================================== RCS file: /cvsroot/php-blog/additional_plugins/serendipity_plugin_weather/serendipity_plugin_weather.php,v retrieving revision 1.8 retrieving revision 1.9 diff -u -d -r1.8 -r1.9 --- serendipity_plugin_weather.php 2 Dec 2004 08:26:34 -0000 1.8 +++ serendipity_plugin_weather.php 1 Jan 2005 12:34:01 -0000 1.9 @@ -26,6 +26,19 @@ @define('PLUGIN_SIDEBAR_WEATHER_DATA_HUMIDITY', 'rel. Luftfeuchtigkeit:'); @define('PLUGIN_SIDEBAR_WEATHER_DATA_PRESSURE', 'Luftdruck:'); @define('PLUGIN_SIDEBAR_WEATHER_DATA_RAIN', 'Regen:'); + @define('PLUGIN_SIDEBAR_WEATHER_DATA_S', 'South'); //Translate + @define('PLUGIN_SIDEBAR_WEATHER_DATA_SSW', 'South/Southwest'); //Translate + @define('PLUGIN_SIDEBAR_WEATHER_DATA_SSE', 'South/Southeast'); //Translate + @define('PLUGIN_SIDEBAR_WEATHER_DATA_WSW', 'West/Southwest'); //Translate + @define('PLUGIN_SIDEBAR_WEATHER_DATA_E', 'East'); //Translate + @define('PLUGIN_SIDEBAR_WEATHER_DATA_ESE', 'East/Southeast'); //Translate + @define('PLUGIN_SIDEBAR_WEATHER_DATA_ENE', 'East/Northeast'); //Translate + @define('PLUGIN_SIDEBAR_WEATHER_DATA_N', 'North'); //Translate + @define('PLUGIN_SIDEBAR_WEATHER_DATA_NNW', 'North/Northwest'); //Translate + @define('PLUGIN_SIDEBAR_WEATHER_DATA_NNE', 'North/Northeast'); //Translate + @define('PLUGIN_SIDEBAR_WEATHER_DATA_W', 'West'); //Translate + @define('PLUGIN_SIDEBAR_WEATHER_DATA_WNW', 'West/Northwest'); //Translate + @define('PLUGIN_SIDEBAR_WEATHER_DATA_V', 'Variable'); //Translate break; case 'en': default: @@ -47,10 +60,23 @@ @define('PLUGIN_SIDEBAR_WEATHER_DATA_CLOUDS_AMOUNT', 'Clouds amount:'); @define('PLUGIN_SIDEBAR_WEATHER_DATA_CLOUDS_HEIGHT', 'Clouds height:'); @define('PLUGIN_SIDEBAR_WEATHER_DATA_TEMPERATURE', 'Temperature:'); - @define('PLUGIN_SIDEBAR_WEATHER_DATA_FELT_TEMPERATURE', 'Felt Temperature:'); + @define('PLUGIN_SIDEBAR_WEATHER_DATA_FELT_TEMPERATURE', 'Feels Like:'); @define('PLUGIN_SIDEBAR_WEATHER_DATA_HUMIDITY', 'Humidity:'); @define('PLUGIN_SIDEBAR_WEATHER_DATA_PRESSURE', 'Pressure:'); @define('PLUGIN_SIDEBAR_WEATHER_DATA_RAIN', 'Rain:'); + @define('PLUGIN_SIDEBAR_WEATHER_DATA_S', 'South'); + @define('PLUGIN_SIDEBAR_WEATHER_DATA_SSW', 'South/Southwest'); + @define('PLUGIN_SIDEBAR_WEATHER_DATA_SSE', 'South/Southeast'); + @define('PLUGIN_SIDEBAR_WEATHER_DATA_WSW', 'West/Southwest'); + @define('PLUGIN_SIDEBAR_WEATHER_DATA_E', 'East'); + @define('PLUGIN_SIDEBAR_WEATHER_DATA_ESE', 'East/Southeast'); + @define('PLUGIN_SIDEBAR_WEATHER_DATA_ENE', 'East/Northeast'); + @define('PLUGIN_SIDEBAR_WEATHER_DATA_N', 'North'); + @define('PLUGIN_SIDEBAR_WEATHER_DATA_NNW', 'North/Northwest'); + @define('PLUGIN_SIDEBAR_WEATHER_DATA_NNE', 'North/Northeast'); + @define('PLUGIN_SIDEBAR_WEATHER_DATA_W', 'West'); + @define('PLUGIN_SIDEBAR_WEATHER_DATA_WNW', 'West/Northwest'); + @define('PLUGIN_SIDEBAR_WEATHER_DATA_V', 'Variable'); break; } // switch @@ -129,7 +155,7 @@ $unitString = $this->get_config('units','metric'); require_once('Services/Weather.php'); - + $metar = &Services_Weather::service('METAR', array('debug' => 0)); if (Services_Weather::isError($metar)) { die('Error: ' . $metar->getMessage()); @@ -143,18 +169,33 @@ // $metar->setDateTimeFormat('d.m.Y', 'H:i'); // $metar_data->setDateTimeFormat('j M Y', 'H:i'); - $status = $metar->setCache('file', array('cache_dir' => '/tmp')); + $status = $metar->setCache('file', array('cache_dir' => $serendipity['serendipityPath'].'/templates_c')); if (Services_Weather::isError($status)) { echo 'Error: ' . $status->getMessage(); } - $units = array('wind' => 'km/h', - 'vis' => 'km', - 'height' => 'km', - 'temp' => '°C', - 'pres' => 'mb', - 'rain' => 'mm'); + switch($unitString) + { + case "metric": + $units = array('wind' => 'km/h', + 'vis' => 'km', + 'height' => 'km', + 'temp' => '°C', + 'pres' => 'mb', + 'rain' => 'mm'); + break; + case "standard": + $units = array('wind' => 'mph', + 'vis' => 'mi', + 'height' => 'mi', + 'temp' => '°F', + 'pres' => 'in', + 'rain' => 'in'); + break; + } + + $weather_data = $metar->getWeather($metar_site); if (Services_Weather::isError($weather_data)) { echo 'Error: ' . $weather_data->getMessage(); @@ -176,57 +217,75 @@ switch ($windDir) { case 'S': $windDirIcon = $serendipity['serendipityHTTPPath'] . 'pixel/icons/serendipity_weather_plugin/sss.png'; + $windDir = PLUGIN_SIDEBAR_WEATHER_DATA_S; break; case 'SSW': $windDirIcon = $serendipity['serendipityHTTPPath'] . 'pixel/icons/serendipity_weather_plugin/ssw.png'; + $windDir = PLUGIN_SIDEBAR_WEATHER_DATA_SSW; break; case 'SSE': $windDirIcon = $serendipity['serendipityHTTPPath'] . 'pixel/icons/serendipity_weather_plugin/sse.png'; + $windDir = PLUGIN_SIDEBAR_WEATHER_DATA_SSE; break; case 'SW': $windDirIcon = $serendipity['serendipityHTTPPath'] . 'pixel/icons/serendipity_weather_plugin/sw.png'; + $windDir = PLUGIN_SIDEBAR_WEATHER_DATA_SW; break; case 'WSW': $windDirIcon = $serendipity['serendipityHTTPPath'] . 'pixel/icons/serendipity_weather_plugin/sww.png'; + $windDir = PLUGIN_SIDEBAR_WEATHER_DATA_WSW; break; case 'E': $windDirIcon = $serendipity['serendipityHTTPPath'] . 'pixel/icons/serendipity_weather_plugin/eee.png'; + $windDir = PLUGIN_SIDEBAR_WEATHER_DATA_E; break; case 'ESE': $windDirIcon = $serendipity['serendipityHTTPPath'] . 'pixel/icons/serendipity_weather_plugin/see.png'; + $windDir = PLUGIN_SIDEBAR_WEATHER_DATA_ESE; break; case 'ENE': $windDirIcon = $serendipity['serendipityHTTPPath'] . 'pixel/icons/serendipity_weather_plugin/nee.png'; + $windDir = PLUGIN_SIDEBAR_WEATHER_DATA_ENE; break; case 'N': $windDirIcon = $serendipity['serendipityHTTPPath'] . 'pixel/icons/serendipity_weather_plugin/nnn.png'; + $windDir = PLUGIN_SIDEBAR_WEATHER_DATA_N; break; case 'NNW': $windDirIcon = $serendipity['serendipityHTTPPath'] . 'pixel/icons/serendipity_weather_plugin/nnw.png'; + $windDir = PLUGIN_SIDEBAR_WEATHER_DATA_NNW; break; case 'NNE': $windDirIcon = $serendipity['serendipityHTTPPath'] . 'pixel/icons/serendipity_weather_plugin/nne.png'; + $windDir = PLUGIN_SIDEBAR_WEATHER_DATA_NNE; break; case 'NW': $windDirIcon = $serendipity['serendipityHTTPPath'] . 'pixel/icons/serendipity_weather_plugin/nw.png'; + $windDir = PLUGIN_SIDEBAR_WEATHER_DATA_NW; break; case 'NE': $windDirIcon = $serendipity['serendipityHTTPPath'] . 'pixel/icons/serendipity_weather_plugin/ne.png'; + $windDir = PLUGIN_SIDEBAR_WEATHER_DATA_NE; break; case 'SE': $windDirIcon = $serendipity['serendipityHTTPPath'] . 'pixel/icons/serendipity_weather_plugin/se.png'; + $windDir = PLUGIN_SIDEBAR_WEATHER_DATA_SE; break; case 'W': $windDirIcon = $serendipity['serendipityHTTPPath'] . 'pixel/icons/serendipity_weather_plugin/www.png'; + $windDir = PLUGIN_SIDEBAR_WEATHER_DATA_W; break; case 'WNW': $windDirIcon = $serendipity['serendipityHTTPPath'] . 'pixel/icons/serendipity_weather_plugin/nww.png'; + $windDir = PLUGIN_SIDEBAR_WEATHER_DATA_WNW; break; case 'Variable': - $windDirIcon = $serendipity['serendipityHTTPPath'] . 'pixel/icons/serendipity_weather_plugin/vrb.png'; + $windDirIcon = $serendipity['serendipityHTTPPath'] . 'pixel/icons/serendipity_weather_plugin/vrb.gif'; + $windDir = PLUGIN_SIDEBAR_WEATHER_DATA_V; break; default : $windDirIcon = $serendipity['serendipityHTTPPath'] . 'pixel/icons/serendipity_weather_plugin/wind_nodata.png'; + $windDir = "No recorded data."; } // Turn the GMT time from the update into a local time @@ -385,18 +444,18 @@ // FIXXME: Translate the Winddirection $content .= '<dl><dt>'.PLUGIN_SIDEBAR_WEATHER_DATA_WINDDIRECTION.'</dt><dd><img src="' . $windDirIcon . '" alt="" /><br />' . - $weather_data["windDirection"] . ', ' . $weather_data["wind"] . $units['wind'] . ' <br />'; + $windDir . ' at ' . $weather_data["wind"] . ' ' .$units['wind'] . ' <br />'; $content .= '<dt>'.PLUGIN_SIDEBAR_WEATHER_DATA_TEMPERATURE.'</dt><dd>'. - $weather_data["temperature"]. $units['temp'].'</dd>'; + $weather_data["temperature"].' '. $units['temp'].'</dd>'; $content .= '<dt>'.PLUGIN_SIDEBAR_WEATHER_DATA_FELT_TEMPERATURE.'</dt><dd>'. - $weather_data["feltTemperature"]. $units['temp'] .'</dd>'; + $weather_data["feltTemperature"].' '. $units['temp'] .'</dd>'; $content .= '<dt>'.PLUGIN_SIDEBAR_WEATHER_DATA_HUMIDITY.'</dt><dd>' . - $weather_data["humidity"] . '%</dd>'; + $weather_data["humidity"] .' '. '%</dd>'; $content .= '<dt>'.PLUGIN_SIDEBAR_WEATHER_DATA_PRESSURE.'</dt><dd>' . - $weather_data['pressure'] . '</dd>'; + $weather_data['pressure'] .' '. $units['pres'].'</dd>'; $content .= '<dt>'.PLUGIN_SIDEBAR_WEATHER_DATA_VISIBILITY.'</dt><dd>' . - $weather_data["visibility"] . $units['vis'] . '</dd>'; + $weather_data["visibility"] .' '. $units['vis'] . '</dd>'; $content .= '<dt>'.PLUGIN_SIDEBAR_WEATHER_DATA_UPDATE.'</dt><dd>' . $localTime . '</dd></dl>'; @@ -405,3 +464,4 @@ } // class ?> + |
