FHEM/mod-Weather
1
0
Fork 0
Code Issues Pull Requests Releases 3 Wiki Activity

Merge pull request 'fixes: #30' (#32) from patch-openweathermap into dev

Browse Source 
Reviewed-on: #32
This commit is contained in:
Marko Oldenburg 2023-01-08 16:54:10 +01:00
commit 908773420b
2 changed files with 16 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
controls_Weather.txt
View File

@ -1,4 +1,4 @@
UPD 2023-01-07_13:28:16 57768 FHEM/59_Weather.pm
UPD 2023-01-07_13:28:44 49884 lib/FHEM/APIs/Weather/DarkSkyAPI.pm
UPD 2023-01-07_13:28:59 33258 lib/FHEM/APIs/Weather/OpenWeatherMapAPI.pm
UPD 2023-01-07_13:29:12 36090 lib/FHEM/APIs/Weather/wundergroundAPI.pm
UPD 2023-01-07_19:00:05 57768 FHEM/59_Weather.pm
UPD 2023-01-07_19:00:05 49884 lib/FHEM/APIs/Weather/DarkSkyAPI.pm
UPD 2023-01-08_16:45:16 33368 lib/FHEM/APIs/Weather/OpenWeatherMapAPI.pm
UPD 2023-01-07_19:00:05 36090 lib/FHEM/APIs/Weather/wundergroundAPI.pm

17
lib/FHEM/APIs/Weather/OpenWeatherMapAPI.pm
View File

@ -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,8 @@ 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,
}
);
@ -1024,6 +1023,13 @@ sub _strftimeWrapper {
"abstract": "Wetter API für OpenWeatherMap"
}
},
"keywords": [
"fhem-mod-device",
"Weather",
"API"
],
"release_status": "stable",
"license": "GPL_2",
"version": "v3.2.5",
"author": [
"Marko Oldenburg <fhemdevelopment@cooltux.net>"
@ -1037,8 +1043,9 @@ sub _strftimeWrapper {
"prereqs": {
"runtime": {
"requires": {
"FHEM": 5.00918799,
"HttpUtils": 5.023,
"FHEM::Meta": 0,
"HttpUtils": 0,
"strict": 0,
"warnings": 0,
"constant": 0,