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

feat: new reading owmAPICode for original code

Browse Source 
[Ticket: no]
This commit is contained in:
Marko Oldenburg 2023-07-11 14:10:13 +02:00
parent 9868f74a86
commit 2a06821252
2 changed files with 13 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
controls_Weather.txt
View File

@ -1,5 +1,5 @@
UPD 2023-01-29_16:14:48 25809 FHEM/59_Weather.pm UPD 2023-01-29_16:14:48 25809 FHEM/59_Weather.pm
UPD 2023-06-06_07:31:00 34254 lib/FHEM/Core/Weather.pm UPD 2023-06-06_07:31:00 34254 lib/FHEM/Core/Weather.pm
UPD 2023-01-29_16:14:48 50106 lib/FHEM/APIs/Weather/DarkSkyAPI.pm UPD 2023-01-29_16:14:48 50106 lib/FHEM/APIs/Weather/DarkSkyAPI.pm
UPD 2023-06-06_08:24:10 33488 lib/FHEM/APIs/Weather/OpenWeatherMapAPI.pm UPD 2023-07-11_14:08:00 33779 lib/FHEM/APIs/Weather/OpenWeatherMapAPI.pm
UPD 2023-06-02_05:03:58 36607 lib/FHEM/APIs/Weather/wundergroundAPI.pm UPD 2023-06-02_05:03:58 36607 lib/FHEM/APIs/Weather/wundergroundAPI.pm

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

@ -591,6 +591,7 @@ sub _FillSelfHashWithWeatherResponseForWeatherCurrent {
'wind_direction' => $data->{wind}->{deg}, 'wind_direction' => $data->{wind}->{deg},
'cloudCover' => $data->{clouds}->{all}, 'cloudCover' => $data->{clouds}->{all},
'code' => $codes{ $data->{weather}->[0]->{id} }, 'code' => $codes{ $data->{weather}->[0]->{id} },
'owmAPICode' => $data->{weather}->[0]->{id},
'iconAPI' => $data->{weather}->[0]->{icon}, 'iconAPI' => $data->{weather}->[0]->{icon},
'sunsetTime' => _strftimeWrapper( 'sunsetTime' => _strftimeWrapper(
"%a, %e %b %Y %H:%M", "%a, %e %b %Y %H:%M",
@ -670,8 +671,9 @@ sub _FillSelfHashWithWeatherResponseForForecastHourly {
), ),
'cloudCover' => $data->{list}->[$i]->{clouds}->{all}, 'cloudCover' => $data->{list}->[$i]->{clouds}->{all},
'code' => $codes{ $data->{list}->[$i]->{weather}->[0]->{id} }, 'code' => $codes{ $data->{list}->[$i]->{weather}->[0]->{id} },
'iconAPI' => $data->{list}->[$i]->{weather}->[0]->{icon}, 'owmAPICode' => $data->{list}->[$i]->{weather}->[0]->{id},
'rain1h' => ( 'iconAPI' => $data->{list}->[$i]->{weather}->[0]->{icon},
'rain1h' => (
$data->{list}->[$i]->{rain}->{'1h'} $data->{list}->[$i]->{rain}->{'1h'}
? $data->{list}->[$i]->{rain}->{'1h'} ? $data->{list}->[$i]->{rain}->{'1h'}
: 0 : 0
@ -732,6 +734,7 @@ sub _FillSelfHashWithWeatherResponseForOnecallCurrent {
'rain_1h' => ( $data->{rain}->{'1h'} ? $data->{rain}->{'1h'} : 0 ), 'rain_1h' => ( $data->{rain}->{'1h'} ? $data->{rain}->{'1h'} : 0 ),
'cloudCover' => $data->{current}->{clouds}, 'cloudCover' => $data->{current}->{clouds},
'code' => $codes{ $data->{current}->{weather}->[0]->{id} }, 'code' => $codes{ $data->{current}->{weather}->[0]->{id} },
'owmAPICode' => $data->{current}->{weather}->[0]->{id},
'iconAPI' => $data->{current}->{weather}->[0]->{icon}, 'iconAPI' => $data->{current}->{weather}->[0]->{icon},
'condition' => 'condition' =>
encode_utf8( $data->{current}->{weather}->[0]->{description} ), encode_utf8( $data->{current}->{weather}->[0]->{description} ),
@ -834,8 +837,9 @@ sub _FillSelfHashWithWeatherResponseForOnecallDaily {
$data->{daily}->[$i]->{weather}->[0]->{description} $data->{daily}->[$i]->{weather}->[0]->{description}
), ),
'code' => $codes{ $data->{daily}->[$i]->{weather}->[0]->{id} }, 'code' => $codes{ $data->{daily}->[$i]->{weather}->[0]->{id} },
'iconAPI' => $data->{daily}->[$i]->{weather}->[0]->{icon}, 'owmAPICode' => $data->{daily}->[$i]->{weather}->[0]->{id},
'pressure' => int( 'iconAPI' => $data->{daily}->[$i]->{weather}->[0]->{icon},
'pressure' => int(
sprintf( "%.1f", $data->{daily}->[$i]->{pressure} ) + 0.5 sprintf( "%.1f", $data->{daily}->[$i]->{pressure} ) + 0.5
), ),
'wind' => int( 'wind' => int(
@ -854,8 +858,7 @@ sub _FillSelfHashWithWeatherResponseForOnecallDaily {
sprintf( "%.1f", ( $data->{daily}->[$i]->{wind_deg} ) ) sprintf( "%.1f", ( $data->{daily}->[$i]->{wind_deg} ) )
), ),
'cloudCover' => $data->{daily}->[$i]->{clouds}, 'cloudCover' => $data->{daily}->[$i]->{clouds},
'code' => $codes{ $data->{daily}->[$i]->{weather}->[0]->{id} }, 'rain' => (
'rain' => (
$data->{daily}->[$i]->{rain} ? $data->{daily}->[$i]->{rain} $data->{daily}->[$i]->{rain} ? $data->{daily}->[$i]->{rain}
: 0 : 0
), ),
@ -921,8 +924,9 @@ sub _FillSelfHashWithWeatherResponseForOnecallHourly {
'wind_direction' => $data->{hourly}->[$i]->{wind_deg}, 'wind_direction' => $data->{hourly}->[$i]->{wind_deg},
'cloudCover' => $data->{hourly}->[$i]->{clouds}, 'cloudCover' => $data->{hourly}->[$i]->{clouds},
'code' => $codes{ $data->{hourly}->[$i]->{weather}->[0]->{id} }, 'code' => $codes{ $data->{hourly}->[$i]->{weather}->[0]->{id} },
'iconAPI' => $data->{hourly}->[$i]->{weather}->[0]->{icon}, 'owmAPICode' => $data->{hourly}->[$i]->{weather}->[0]->{id},
'rain1h' => ( 'iconAPI' => $data->{hourly}->[$i]->{weather}->[0]->{icon},
'rain1h' => (
$data->{hourly}->[$i]->{rain}->{'1h'} $data->{hourly}->[$i]->{rain}->{'1h'}
? $data->{hourly}->[$i]->{rain}->{'1h'} ? $data->{hourly}->[$i]->{rain}->{'1h'}
: 0 : 0