patch-specials #18

Merged
marko merged 2 commits from patch-specials into dev 2023-01-02 08:28:49 +00:00
2 changed files with 10 additions and 10 deletions

View File

@ -1,4 +1,4 @@
UPD 2022-12-30_12:22:17 54815 FHEM/59_Weather.pm UPD 2022-12-30_12:22:17 54815 FHEM/59_Weather.pm
UPD 2022-12-30_12:22:17 49883 lib/FHEM/APIs/Weather/DarkSkyAPI.pm UPD 2022-12-30_12:22:17 49883 lib/FHEM/APIs/Weather/DarkSkyAPI.pm
UPD 2022-12-30_12:22:17 32101 lib/FHEM/APIs/Weather/OpenWeatherMapAPI.pm UPD 2022-12-30_12:22:17 32101 lib/FHEM/APIs/Weather/OpenWeatherMapAPI.pm
UPD 2022-12-30_13:17:00 36076 lib/FHEM/APIs/Weather/wundergroundAPI.pm UPD 2023-01-02_09:25:12 36090 lib/FHEM/APIs/Weather/wundergroundAPI.pm

View File

@ -492,13 +492,13 @@ sub _ProcessingRetrieveData {
my $i = 0; my $i = 0;
while ( $i < $days ) { while ( $i < $days ) {
$data->{moonriseTimeLocal}[$i] =~ $data->{moonriseTimeLocal}[$i] =~
s/^(....-..-..T..:..).*/$1/; s/^(....-..-..T..:..:..).*/$1/x;
$data->{moonsetTimeLocal}[$i] =~ $data->{moonsetTimeLocal}[$i] =~
s/^(....-..-..T..:..).*/$1/; s/^(....-..-..T..:..:..).*/$1/x;
$data->{sunriseTimeLocal}[$i] =~ $data->{sunriseTimeLocal}[$i] =~
s/^(....-..-..T..:..).*/$1/; s/^(....-..-..T..:..:..).*/$1/x;
$data->{sunsetTimeLocal}[$i] =~ $data->{sunsetTimeLocal}[$i] =~
s/^(....-..-..T..:..).*/$1/; s/^(....-..-..T..:..:..).*/$1/x;
push( push(
@{ $self->{cached}{forecast}{daily} }, @{ $self->{cached}{forecast}{daily} },
@ -507,7 +507,10 @@ sub _ProcessingRetrieveData {
'moonPhase' => $data->{moonPhase}[$i], 'moonPhase' => $data->{moonPhase}[$i],
'moonPhaseCode' => $data->{moonPhaseCode}[$i], 'moonPhaseCode' => $data->{moonPhaseCode}[$i],
'moonPhaseDay' => $data->{moonPhaseDay}[$i], 'moonPhaseDay' => $data->{moonPhaseDay}[$i],
'moonriseTime' => _strftimeWrapper( 'narrative' => $data->{narrative}[$i],
'precipProbability' => $data->{qpf}[$i],
'precipProbabilitySnow' => $data->{qpfSnow}[$i],
'moonriseTime' => _strftimeWrapper(
"%a, %e %b %Y %H:%M", "%a, %e %b %Y %H:%M",
localtime( localtime(
main::time_str2num( main::time_str2num(
@ -523,10 +526,7 @@ sub _ProcessingRetrieveData {
) )
) )
), ),
'narrative' => $data->{narrative}[$i], 'sunriseTime' => _strftimeWrapper(
'precipProbability' => $data->{qpf}[$i],
'precipProbabilitySnow' => $data->{qpfSnow}[$i],
'sunriseTime' => _strftimeWrapper(
"%a, %e %b %Y %H:%M", "%a, %e %b %Y %H:%M",
localtime( localtime(
main::time_str2num( main::time_str2num(