diff --git a/fhem/FHEM/59_Weather.pm b/fhem/FHEM/59_Weather.pm
index a6de4ce44..680cf8609 100755
--- a/fhem/FHEM/59_Weather.pm
+++ b/fhem/FHEM/59_Weather.pm
@@ -251,7 +251,7 @@ sub Weather_RetrieveData($)
my $vis = (($2 eq "") ? " " : $2); # clear visibility field
readingsUpdate($hash, "visibility", $vis);
if ($3) { readingsUpdate($hash, "pressure", $3); }
- if ($4) { readingsUpdate($hash, "pressure-trend", $4); }
+ if ($4) { readingsUpdate($hash, "pressure_trend", $4); }
}
### wind
@@ -271,54 +271,6 @@ sub Weather_RetrieveData($)
} #end sub
-###################################
-sub Weather_RetrieveDataViaWeatherGoogle($)
-{
- my ($hash)= @_;
-
- # get weather information from Google weather API
- # see http://search.cpan.org/~possum/Weather-Google-0.03/lib/Weather/Google.pm
-
- my $location= $hash->{LOCATION};
- my $lang= $hash->{LANG};
- my $name = $hash->{NAME};
- my $WeatherObj;
-
- Log 4, "$name: Updating weather information for $location, language $lang.";
- eval {
- $WeatherObj= new Weather::Google($location, {language => $lang});
- };
-
- if($@) {
- Log 1, "$name: Could not retrieve weather information.";
- return 0;
- }
-
- # the current conditions contain temp_c and temp_f
- my $current = $WeatherObj->current_conditions;
- foreach my $condition ( keys ( %$current ) ) {
- my $value= $current->{$condition};
- Weather_UpdateReading($hash,"",$condition,$value);
- }
-
- my $fci= $WeatherObj->forecast_information;
- foreach my $i ( keys ( %$fci ) ) {
- my $reading= $i;
- my $value= $fci->{$i};
- Weather_UpdateReading($hash,"",$i,$value);
- }
-
- # the forecast conditions contain high and low (temperature)
- for(my $t= 0; $t<= 3; $t++) {
- my $fcc= $WeatherObj->forecast_conditions($t);
- my $prefix= sprintf("fc%d_", $t);
- foreach my $condition ( keys ( %$fcc ) ) {
- my $value= $fcc->{$condition};
- Weather_UpdateReading($hash,$prefix,$condition,$value);
- }
- }
-
-}
###################################
sub Weather_GetUpdate($)
diff --git a/fhem/docs/commandref.html b/fhem/docs/commandref.html
index 9ca77e467..3fc1c00eb 100644
--- a/fhem/docs/commandref.html
+++ b/fhem/docs/commandref.html
@@ -5163,23 +5163,18 @@ To send the data, both send or write could be used.
define <name> Weather <location> [<interval> [<language>]]
location
is any string that is recognized as a
- location, either a town name or a zip code or latitude/longitude (in decimal notation,
- multiplied by one million). Browse to the URL
- http://www.google.de/ig/api?weather=location&hl=en
- to see the raw output for your location.location
is the WOEID (WHERE-ON-EARTH-ID), go to
+ http://weather.yahoo.com to find it out for your location.interval
is the time between subsequent updates
in seconds. It defaults to 3600 (1 hour).- define MyWeather Weather Frankfurt,HE - define Forecast Weather Amsterdam,NL 1800 - define weather Weather 30000,France 3600 fr - define W Weather ,,,50500000,30500000 600 es -+ define MyWeather Weather 673513 + define Forecast Weather 673513 1800 +
get <name> <reading>
city | name of town returned for location |
condition | current condition, one of Sunny, Clear, Partly Cloudy, Mostly Cloudy, Overcast, Chance of Rain |
code | current condition code |
condition | current condition |
current_date_time | last update of forecast on server |
fc?_code | forecast condition code |
fc?_condition | forecast condition |
fc?_day_of_week | day of week for day +? |
fc?_high_c | forecasted daily high in degrees centigrade |
fc?_icon | relative path for forecast icon, prefix with http://www.google.com to form a valid URL for display in web interfaces |
fc?_icon | forecast icon |
fc?_low_c | forecasted daily low in degrees centigrade |
humidity | current humidity in % |
icon | relative path for current icon |
postal_code | location sent to server |
pressure | air pressure in hPa |
pressure_trend | air pressure trend (unit?) |
temperature | current temperature in degrees centigrade |
temp_c | current temperature in degrees centigrade |
temp_f | current temperature in degrees Fahrenheit |
wind | wind speed in km/h |
wind_chill | ? |
wind_condition | wind direction and speed |
wind_direction | direction wind comes from in degrees (0 = north wind) |
wind_speed | same as wind |