diff --git a/fhem/CHANGED b/fhem/CHANGED index 4c7ac3eb7..321d59aea 100644 --- a/fhem/CHANGED +++ b/fhem/CHANGED @@ -1,5 +1,6 @@ # Add changes at the top of the list. Keep it in ASCII, and 80-char wide. # Do not insert empty lines here, update check depends on it. + - feature: 59_Weather: fix multiple issues in API modules - feature: 59_Weather: support for new openweathermap mod onecall - rewrite old parts of api modules - move apo modules to new directory structure diff --git a/fhem/lib/FHEM/APIs/Weather/DarkSkyAPI.pm b/fhem/lib/FHEM/APIs/Weather/DarkSkyAPI.pm index 97e66b7a3..6811f5d97 100644 --- a/fhem/lib/FHEM/APIs/Weather/DarkSkyAPI.pm +++ b/fhem/lib/FHEM/APIs/Weather/DarkSkyAPI.pm @@ -726,9 +726,9 @@ sub _CreateForecastRef { { lat => $self->{lat}, long => $self->{long}, - apiMaintainer => 'Marko Oldenburg (' - . $META->{x_fhem_maintainer}[0] . ')', - apiVersion => version->parse( __PACKAGE__->VERSION() )->normal, + apiMaintainer => $META->{author}[0], + apiVersion => version->parse( __PACKAGE__->VERSION() )->normal . '-' + . $META->{release_status}, } ); @@ -773,12 +773,19 @@ sub _strftimeWrapper { "abstract": "Wetter API für Weather DarkSky" } }, - "version": "v1.2.10", + "keywords": [ + "fhem-mod-device", + "Weather", + "API" + ], + "release_status": "stable", + "license": "GPL_2", + "version": "v1.2.11", "author": [ "Marko Oldenburg " ], "x_fhem_maintainer": [ - "CoolTux" + "CoolTux" ], "x_fhem_maintainer_github": [ "CoolTuxNet" @@ -786,8 +793,9 @@ sub _strftimeWrapper { "prereqs": { "runtime": { "requires": { + "FHEM": 5.00918799, + "HttpUtils": 5.023, "FHEM::Meta": 0, - "HttpUtils": 0, "strict": 0, "warnings": 0, "constant": 0, diff --git a/fhem/lib/FHEM/APIs/Weather/OpenWeatherMapAPI.pm b/fhem/lib/FHEM/APIs/Weather/OpenWeatherMapAPI.pm index 8974fa63c..539dc4969 100644 --- a/fhem/lib/FHEM/APIs/Weather/OpenWeatherMapAPI.pm +++ b/fhem/lib/FHEM/APIs/Weather/OpenWeatherMapAPI.pm @@ -688,7 +688,7 @@ sub _FillSelfHashWithWeatherResponseForForecastHourly { ), 'snow3h' => ( $data->{list}->[$i]->{snow}->{'3h'} - ? $data->{list}->[$i]->{snow}->{'1h'} + ? $data->{list}->[$i]->{snow}->{'3h'} : 0 ), } @@ -977,9 +977,9 @@ sub _CreateForecastRef { { lat => $self->{lat}, long => $self->{long}, - apiMaintainer => 'Marko Oldenburg (' - . $META->{x_fhem_maintainer}[0] . ')', - apiVersion => version->parse( __PACKAGE__->VERSION() )->normal, + apiMaintainer => $META->{author}[0], + apiVersion => version->parse( __PACKAGE__->VERSION() )->normal . '-' + . $META->{release_status}, } ); @@ -1024,7 +1024,14 @@ sub _strftimeWrapper { "abstract": "Wetter API für OpenWeatherMap" } }, - "version": "v3.2.5", + "keywords": [ + "fhem-mod-device", + "Weather", + "API" + ], + "release_status": "stable", + "license": "GPL_2", + "version": "v3.2.6", "author": [ "Marko Oldenburg " ], @@ -1037,8 +1044,9 @@ sub _strftimeWrapper { "prereqs": { "runtime": { "requires": { + "FHEM": 5.00918799, + "HttpUtils": 5.023, "FHEM::Meta": 0, - "HttpUtils": 0, "strict": 0, "warnings": 0, "constant": 0,