testing #29

Merged
marko merged 73 commits from testing into main 2023-01-07 12:49:01 +00:00
2 changed files with 10 additions and 10 deletions
Showing only changes of commit 611befc716 - Show all commits

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