Fix Weather.pm to use READINGS instead of readings

This commit corrects the hash key used to access device readings in the
 Weather.pm module. All instances of the lowercase 'readings' hash key
 have been changed to the uppercase 'READINGS', which is the standard
 convention in FHEM. This fixes potential issues where weather data
 wasn't being properly accessed or displayed because the module was
 looking for readings in the wrong hash location. The change affects
 the Get function and HTML rendering methods for both vertical and
 horizontal layouts.

controls_Weather.txt

@@ -1,4 +1,4 @@
-UPD 2023-01-07_13:28:16 57768 FHEM/59_Weather.pm
+UPD 2025-10-16_18:59:55 24515 FHEM/59_Weather.pm
-UPD 2023-01-07_13:28:44 49884 lib/FHEM/APIs/Weather/DarkSkyAPI.pm
+UPD 2025-10-16_18:59:41 34158 lib/FHEM/Core/Weather.pm
-UPD 2023-01-07_13:28:59 33258 lib/FHEM/APIs/Weather/OpenWeatherMapAPI.pm
+UPD 2025-10-14_07:39:57 33545 lib/FHEM/APIs/Weather/OpenWeatherMapAPI.pm
-UPD 2023-01-07_13:29:12 36090 lib/FHEM/APIs/Weather/wundergroundAPI.pm
+UPD 2025-10-14_07:20:30 38721 lib/FHEM/APIs/Weather/wundergroundAPI.pm

hooks/pre-commit

@@ -4,32 +4,34 @@ use File::Basename;
 use POSIX qw(strftime);
 use strict;
 
-my @filenames = (   'FHEM/59_Weather.pm',
+my @filenames = (
-		    'lib/FHEM/APIs/Weather/DarkSkyAPI.pm',
+    'FHEM/59_Weather.pm',
-		    'lib/FHEM/APIs/Weather/OpenWeatherMapAPI.pm',
+    'lib/FHEM/Core/Weather.pm',
-		    'lib/FHEM/APIs/Weather/wundergroundAPI.pm',
+    'lib/FHEM/APIs/Weather/OpenWeatherMapAPI.pm',
-    );
+    'lib/FHEM/APIs/Weather/wundergroundAPI.pm',
+);
 
-my $controlsfile    = 'controls_Weather.txt';
+my $controlsfile = 'controls_Weather.txt';
 
-open(FH, ">$controlsfile") || return("Can't open $controlsfile: $!");
+open( FH, ">$controlsfile" ) || return ("Can't open $controlsfile: $!");
 
-for my  $filename (@filenames) {
+for my $filename (@filenames) {
     my @statOutput = stat($filename);
 
-    if (scalar @statOutput != 13) {
+    if ( scalar @statOutput != 13 ) {
-        printf 'error: stat has unexpected return value for ' . $filename . "\n";
+        printf 'error: stat has unexpected return value for '
+          . $filename . "\n";
         next;
     }
 
-    my $mtime = $statOutput[9];
+    my $mtime    = $statOutput[9];
-    my $date = POSIX::strftime("%Y-%m-%d", localtime($mtime));
+    my $date     = POSIX::strftime( "%Y-%m-%d", localtime($mtime) );
-    my $time = POSIX::strftime("%H:%M:%S", localtime($mtime));
+    my $time     = POSIX::strftime( "%H:%M:%S", localtime($mtime) );
-    my $filetime = $date."_".$time;
+    my $filetime = $date . "_" . $time;
 
     my $filesize = $statOutput[7];
 
-    printf FH 'UPD ' . $filetime . ' ' . $filesize . ' ' .$filename . "\n";
+    printf FH 'UPD ' . $filetime . ' ' . $filesize . ' ' . $filename . "\n";
 }
 
 close(FH);

lib/FHEM/APIs/Weather/OpenWeatherMapAPI.pm

@@ -3,7 +3,7 @@
 #
 # Developed with VSCodium and richterger perl plugin
 #
-#  (c) 2019-2023 Copyright: Marko Oldenburg (fhemdevelopment at cooltux dot net)
+#  (c) 2019-2025 Copyright: Marko Oldenburg (fhemdevelopment at cooltux dot net)
 #  All rights reserved
 #
 #   Special thanks goes to:
@@ -41,7 +41,8 @@ use FHEM::Meta;
 
 use POSIX;
 use HttpUtils;
-use experimental qw /switch/;
+
+#use experimental qw /switch/;
 
 my $META = {};
 my $ret  = FHEM::Meta::getMetadata( __FILE__, $META );
@@ -423,7 +424,7 @@ sub _ProcessingRetrieveData {
                 _ErrorHandling( $self,
                     'OpenWeatherMap Weather decode JSON err ' . $@ );
             }
-            elsif (defined( $data->{cod} )
+            elsif ( defined( $data->{cod} )
                 && $data->{cod}
                 && $data->{cod} != 200
                 && defined( $data->{message} )
@@ -466,67 +467,59 @@ sub _FillSelfHashWithWeatherResponse {
     $self->{cached}->{city}          = encode_utf8( $data->{name} );
     $self->{cached}->{license}{text} = 'none';
 
-    given ( $self->{endpoint} ) {
+    if ( $self->{endpoint} eq 'onecall' ) {
-        when ('onecall') {
+        ## löschen des alten current Datensatzes
-            ## löschen des alten current Datensatzes
+        delete $self->{cached}->{current};
-            delete $self->{cached}->{current};
 
-            ## löschen des alten forecast Datensatzes
+        ## löschen des alten forecast Datensatzes
-            delete $self->{cached}->{forecast};
+        delete $self->{cached}->{forecast};
 
-            ## löschen des alten Alerts Datensatzes
+        ## löschen des alten Alerts Datensatzes
-            delete $self->{cached}->{alerts};
+        delete $self->{cached}->{alerts};
 
+        $self =
+          _FillSelfHashWithWeatherResponseForOnecallCurrent( $self, $data );
+
+        if ( ref( $data->{hourly} ) eq "ARRAY"
+            && scalar( @{ $data->{hourly} } ) > 0 )
+        {
             $self =
-              _FillSelfHashWithWeatherResponseForOnecallCurrent( $self, $data );
+              _FillSelfHashWithWeatherResponseForOnecallHourly( $self, $data );
-
-            if ( ref( $data->{hourly} ) eq "ARRAY"
-                && scalar( @{ $data->{hourly} } ) > 0 )
-            {
-                $self =
-                  _FillSelfHashWithWeatherResponseForOnecallHourly( $self,
-                    $data );
-            }
-
-            if ( ref( $data->{daily} ) eq "ARRAY"
-                && scalar( @{ $data->{daily} } ) > 0 )
-            {
-                $self =
-                  _FillSelfHashWithWeatherResponseForOnecallDaily( $self,
-                    $data );
-            }
-
-            if ( ref( $data->{alerts} ) eq "ARRAY"
-                && scalar( @{ $data->{alerts} } ) > 0 )
-            {
-                $self =
-                  _FillSelfHashWithWeatherResponseForOnecallAlerts( $self,
-                    $data );
-            }
         }
 
-        when ('weather') {
+        if ( ref( $data->{daily} ) eq "ARRAY"
-            ## löschen des alten current Datensatzes
+            && scalar( @{ $data->{daily} } ) > 0 )
-            delete $self->{cached}->{current};
+        {
-
-            ## löschen des alten Alerts Datensatzes
-            delete $self->{cached}->{alerts};
-
             $self =
-              _FillSelfHashWithWeatherResponseForWeatherCurrent( $self, $data );
+              _FillSelfHashWithWeatherResponseForOnecallDaily( $self, $data );
         }
 
-        when ('forecast') {
+        if ( ref( $data->{alerts} ) eq "ARRAY"
-            ## löschen des alten forecast Datensatzes
+            && scalar( @{ $data->{alerts} } ) > 0 )
-            delete $self->{cached}->{forecast};
+        {
+            $self =
+              _FillSelfHashWithWeatherResponseForOnecallAlerts( $self, $data );
+        }
+    }
+    elsif ( $self->{endpoint} eq 'weather' ) {
+        ## löschen des alten current Datensatzes
+        delete $self->{cached}->{current};
 
-            if ( ref( $data->{list} ) eq "ARRAY"
+        ## löschen des alten Alerts Datensatzes
-                and scalar( @{ $data->{list} } ) > 0 )
+        delete $self->{cached}->{alerts};
-            {
+
-                $self =
+        $self =
-                  _FillSelfHashWithWeatherResponseForForecastHourly( $self,
+          _FillSelfHashWithWeatherResponseForWeatherCurrent( $self, $data );
-                    $data );
+    }
-            }
+    elsif ( $self->{endpoint} eq 'forecast' ) {
+        ## löschen des alten forecast Datensatzes
+        delete $self->{cached}->{forecast};
+
+        if ( ref( $data->{list} ) eq "ARRAY"
+            and scalar( @{ $data->{list} } ) > 0 )
+        {
+            $self =
+              _FillSelfHashWithWeatherResponseForForecastHourly( $self, $data );
         }
     }
 
@@ -591,6 +584,7 @@ sub _FillSelfHashWithWeatherResponseForWeatherCurrent {
         'wind_direction' => $data->{wind}->{deg},
         'cloudCover'     => $data->{clouds}->{all},
         'code'           => $codes{ $data->{weather}->[0]->{id} },
+        'owmAPICode'     => $data->{weather}->[0]->{id},
         'iconAPI'        => $data->{weather}->[0]->{icon},
         'sunsetTime'     => _strftimeWrapper(
             "%a, %e %b %Y %H:%M",
@@ -670,8 +664,9 @@ sub _FillSelfHashWithWeatherResponseForForecastHourly {
                 ),
                 'cloudCover' => $data->{list}->[$i]->{clouds}->{all},
                 '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'}
                     : 0
@@ -688,7 +683,7 @@ sub _FillSelfHashWithWeatherResponseForForecastHourly {
                 ),
                 'snow3h' => (
                       $data->{list}->[$i]->{snow}->{'3h'}
-                    ? $data->{list}->[$i]->{snow}->{'1h'}
+                    ? $data->{list}->[$i]->{snow}->{'3h'}
                     : 0
                 ),
             }
@@ -732,6 +727,7 @@ sub _FillSelfHashWithWeatherResponseForOnecallCurrent {
         'rain_1h'    => ( $data->{rain}->{'1h'} ? $data->{rain}->{'1h'} : 0 ),
         'cloudCover' => $data->{current}->{clouds},
         'code'       => $codes{ $data->{current}->{weather}->[0]->{id} },
+        'owmAPICode' => $data->{current}->{weather}->[0]->{id},
         'iconAPI'    => $data->{current}->{weather}->[0]->{icon},
         'condition'  =>
           encode_utf8( $data->{current}->{weather}->[0]->{description} ),
@@ -788,6 +784,7 @@ sub _FillSelfHashWithWeatherResponseForOnecallDaily {
                 'moonset'    => strftime(
                     "%a, %H:%M", localtime( $data->{daily}->[$i]->{moonset} )
                 ),
+                'summary'     => $data->{daily}->[$i]->{summary},
                 'temperature' =>
                   int( sprintf( "%.0f", $data->{daily}->[$i]->{temp}->{day} ) ),
                 'temperature_morn' => int(
@@ -833,8 +830,9 @@ sub _FillSelfHashWithWeatherResponseForOnecallDaily {
                     $data->{daily}->[$i]->{weather}->[0]->{description}
                 ),
                 '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
                 ),
                 'wind' => int(
@@ -853,8 +851,7 @@ sub _FillSelfHashWithWeatherResponseForOnecallDaily {
                     sprintf( "%.1f", ( $data->{daily}->[$i]->{wind_deg} ) )
                 ),
                 'cloudCover' => $data->{daily}->[$i]->{clouds},
-                'code' => $codes{ $data->{daily}->[$i]->{weather}->[0]->{id} },
+                'rain'       => (
-                'rain' => (
                     $data->{daily}->[$i]->{rain} ? $data->{daily}->[$i]->{rain}
                     : 0
                 ),
@@ -920,8 +917,9 @@ sub _FillSelfHashWithWeatherResponseForOnecallHourly {
                 'wind_direction' => $data->{hourly}->[$i]->{wind_deg},
                 'cloudCover'     => $data->{hourly}->[$i]->{clouds},
                 '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'}
                     : 0
@@ -951,7 +949,7 @@ sub _CallWeatherCallbackFn {
 
     #     print 'Dumperausgabe: ' . Dumper $self;
     ### Aufruf der callbackFn
-    return ::Weather_RetrieveCallbackFn( $self->{devName} );
+    return FHEM::Core::Weather::RetrieveCallbackFn( $self->{devName} );
 }
 
 sub _ErrorHandling {
@@ -977,9 +975,9 @@ sub _CreateForecastRef {
         {
             lat           => $self->{lat},
             long          => $self->{long},
-            apiMaintainer => 'Marko Oldenburg ('
+            apiMaintainer => $META->{author}[0],
-              . $META->{x_fhem_maintainer}[0] . ')',
+            apiVersion => version->parse( __PACKAGE__->VERSION() )->normal . '-'
-            apiVersion => version->parse( __PACKAGE__->VERSION() )->normal,
+              . $META->{release_status},
         }
     );
 
@@ -1024,7 +1022,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.8",
   "author": [
     "Marko Oldenburg <fhemdevelopment@cooltux.net>"
   ],
@@ -1037,8 +1042,9 @@ sub _strftimeWrapper {
   "prereqs": {
     "runtime": {
       "requires": {
+        "FHEM": 5.00918799,
+        "HttpUtils": 5.023,
         "FHEM::Meta": 0,
-        "HttpUtils": 0,
         "strict": 0,
         "warnings": 0,
         "constant": 0,