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.

CHANGELOG.md

@@ -1,4 +1,250 @@
-### feat: remove DarkSky, change versions remove DarkSkyAPI, no longer supported change Copyright years and versions of OWM API (HEAD -> patch-changeVersion)
+### Update version to 2.3.1 and fix conditionals in Weather.pm (HEAD -> patch-mod-weather)
+>Thu, 16 Oct 2025 19:01:00 +0200
+
+>Author: Marko Oldenburg (fhemdevelopment@cooltux.net)
+
+>Commiter: Marko Oldenburg (fhemdevelopment@cooltux.net)
+
+This commit updates the version number in the FHEM weather module
+from 2.3.0 to 2.3.1 to reflect the latest changes.
+
+In addition to the version bump, several conditionals in
+lib/FHEM/Core/Weather.pm have been corrected. Specifically, the
+syntax for checking the command attributes has been fixed to ensure
+proper evaluation of the conditions.
+
+These changes improve code clarity and correctness, which helps
+in maintaining the module. There are no breaking changes in this
+commit, and existing functionality remains intact.
+
+
+
+### Remove DarkSky API support from Weather module (tag: v2.3.0, origin/testing, origin/main, origin/dev, origin/HEAD, testing, main, dev)
+>Tue, 14 Oct 2025 07:35:31 +0200
+
+>Author: Marko Oldenburg (fhemdevelopment@cooltux.net)
+
+>Commiter: Marko Oldenburg (fhemdevelopment@cooltux.net)
+
+The DarkSky API support has been removed from the Weather module
+documentation, affecting both English and German sections. The API
+documentation now focuses solely on the OpenWeatherMap API.
+
+Changes include the deletion of DarkSky references in `59_Weather.pm`
+and updates to example command snippets to refer to the
+OpenWeatherMap API. The version number was incremented from
+v2.2.35 to v2.3.0, and the OpenWeatherMap API version was updated
+from v3.2.7 to v3.2.8.
+
+These updates were necessary as DarkSky has been discontinued,
+streamlining the module's functionality. There are no breaking
+changes for current OpenWeatherMap API users.
+
+Additionally, the language handling in the Weather API was
+refactored to replace the experimental `given/when` construct
+with standard `if/elsif` statements for better readability
+and maintainability. This change does not introduce any breaking
+changes and enhances code clarity.
+
+
+
+### Remove DarkSky API support from Weather module
+>Tue, 14 Oct 2025 07:35:18 +0200
+
+>Author: Marko Oldenburg (fhemdevelopment@cooltux.net)
+
+>Commiter: Marko Oldenburg (fhemdevelopment@cooltux.net)
+
+The DarkSky API support has been removed from the Weather module documentation,
+including its references in both English and German sections. The API
+documentation has been updated to exclusively focus on the
+OpenWeatherMap API.
+
+The changes made to `59_Weather.pm` include:
+
+- Deleted mentions of the DarkSky API in the documentation.
+- Updated example command snippets to reference the
+  OpenWeatherMap API.
+- Version number has been incremented from v2.2.35 to v2.3.0.
+
+In addition, the version number for the OpenWeatherMap API support
+has been updated from v3.2.7 to v3.2.8 in the corresponding API file.
+
+These updates were necessary to streamline the module's
+functionality and align it with current API availability, as
+DarkSky has been discontinued. There are no breaking changes
+for existing users of the OpenWeatherMap API.
+
+
+
+### Refactor language handling in Weather API
+>Tue, 14 Oct 2025 07:04:00 +0200
+
+>Author: Marko Oldenburg (fhemdevelopment@cooltux.net)
+
+>Commiter: Marko Oldenburg (fhemdevelopment@cooltux.net)
+
+Improved the language initialization logic by replacing the
+experimental `given/when` construct with a more standard
+`if/elsif` structure to enhance code readability and
+maintainability. The attribute handling in the `Attr` subroutine
+was simplified for clarity, removing unnecessary usage
+of `given/when`, which helps reduce complexity throughout
+the codebase.
+
+Additionally, in the OpenWeatherMapAPI module, the logic for
+handling weather response data was streamlined by removing
+`given/when` statements in favor of `if` conditions. This change
+avoids potential confusion and enhances the clarity of the
+code logic. No breaking changes were introduced; the overall
+functionality remains intact.
+
+
+
+### Refactor language handling in Weather API
+>Tue, 14 Oct 2025 07:03:38 +0200
+
+>Author: Marko Oldenburg (fhemdevelopment@cooltux.net)
+
+>Commiter: Marko Oldenburg (fhemdevelopment@cooltux.net)
+
+Improved the language initialization logic by replacing the
+experimental `given/when` construct with a more standard
+`if/elsif` structure, enhancing code readability and
+maintainability. The attribute handling in the `Attr` subroutine
+was also refactored for clarity, removing unnecessary usage
+of `given/when`, which helps reduce complexity throughout
+the codebase.
+
+In the OpenWeatherMapAPI module, the logic for handling
+weather response data was streamlined by removing `given/when`
+statements in favor of `if` conditions. This change avoids
+potential confusion and enhances the clarity of the code logic.
+No breaking changes were introduced; the overall functionality
+remains intact.
+
+
+
+### Refactor language handling to improve readability
+>Tue, 14 Oct 2025 07:01:07 +0200
+
+>Author: Marko Oldenburg (fhemdevelopment@cooltux.net)
+
+>Commiter: Marko Oldenburg (fhemdevelopment@cooltux.net)
+
+Improved the language initialization logic by replacing the
+experimental `given/when` construct with a more standard
+`if/elsif` structure, enhancing code readability and
+maintainability. Additionally, the attribute handling in the
+`Attr` subroutine was refactored for clarity, removing
+unnecessary usage of `given/when`, which helps reduce
+complexity across the codebase.
+
+Furthermore, in the OpenWeatherMapAPI module, logic for
+handling weather response data was streamlined by removing
+the `given/when` statements in favor of `if` conditions.
+This change eliminates potential confusion and enhances
+the clarity of the code logic. No breaking changes were
+introduced; the overall functionality remains intact.
+
+
+
+### Refactor language initialization and attribute handling
+>Tue, 14 Oct 2025 06:53:44 +0200
+
+>Author: Marko Oldenburg (fhemdevelopment@cooltux.net)
+
+>Commiter: Marko Oldenburg (fhemdevelopment@cooltux.net)
+
+Improved the language initialization logic by replacing
+the experimental `given/when` construct with a more
+standard `if/elsif` structure. This change enhances code
+readability and maintainability, making it easier to follow
+the flow of language assignments.
+
+Additionally, refactored attribute handling in the `Attr`
+subroutine by streamlining the conditions, removing
+unnecessary `given/when` usage, and maintaining clarity
+in the logic for setting and deleting forecasts and alerts.
+These changes help reduce complexity and improve
+consistency throughout the codebase.
+
+
+
+### ``` Refactor pre-commit hook by removing DarkSkyAPI references
+>Wed, 5 Feb 2025 07:08:45 +0100
+
+>Author: Marko Oldenburg (fhemdevelopment@cooltux.net)
+
+>Commiter: Marko Oldenburg (fhemdevelopment@cooltux.net)
+
+Updated the pre-commit hook to eliminate references to
+'lib/FHEM/APIs/Weather/DarkSkyAPI.pm'. This change was made to
+simplify the codebase and make it more relevant by focusing on
+the other weather API files.
+
+Additionally, the output formatting of the pre-commit hook
+has been improved for better readability, and the order of
+the files in the @filenames array has been restructured for
+clarity.
+
+No breaking changes have been introduced; the pre-commit
+hook continues to operate as intended.
+```
+
+
+
+### ``` Refactor pre-commit hook file list and output formatting
+>Wed, 5 Feb 2025 07:07:52 +0100
+
+>Author: Marko Oldenburg (fhemdevelopment@cooltux.net)
+
+>Commiter: Marko Oldenburg (fhemdevelopment@cooltux.net)
+
+Updated the list of files in the pre-commit hook to remove
+references to 'lib/FHEM/APIs/Weather/DarkSkyAPI.pm' and adjusted
+the output formatting for better readability. The order of the
+files in the @filenames array has been restructured for clarity.
+These changes were necessary to ensure our code base focuses on
+the more relevant weather API files.
+
+No breaking changes introduced; the pre-commit hook continues to
+function as intended.
+```
+
+
+
+### docs: add changelog
+>Tue, 4 Feb 2025 21:27:10 +0100
+
+>Author: Marko Oldenburg (fhemdevelopment@cooltux.net)
+
+>Commiter: Marko Oldenburg (fhemdevelopment@cooltux.net)
+
+
+
+
+### docs: fix unbalanced p
+>Tue, 4 Feb 2025 21:26:52 +0100
+
+>Author: Marko Oldenburg (fhemdevelopment@cooltux.net)
+
+>Commiter: Marko Oldenburg (fhemdevelopment@cooltux.net)
+
+
+
+
+### docs: add changelog
+>Tue, 4 Feb 2025 21:01:33 +0100
+
+>Author: Marko Oldenburg (fhemdevelopment@cooltux.net)
+
+>Commiter: Marko Oldenburg (fhemdevelopment@cooltux.net)
+
+
+
+
+### feat: remove DarkSky, change versions remove DarkSkyAPI, no longer supported change Copyright years and versions of OWM API
 >Tue, 4 Feb 2025 21:01:17 +0100
 
 >Author: Marko Oldenburg (fhemdevelopment@cooltux.net)

FHEM/59_Weather.pm

@@ -74,11 +74,10 @@ __END__
 <h3>Weather</h3>
 <ul>
   Note: you need the JSON perl module. Use <code>apt-get install
-  libjson-perl</code> on Debian and derivatives.<p><p>
+  libjson-perl</code> on Debian and derivatives.<p></p>
 
   The Weather module works with various weather APIs:
   <ul>
-    <li>DarkSky (<a href="https://darksky.net">web site</a>, standard)</li>
     <li>OpenWeatherMap (<a href="https://openweathermap.org/">web site)</a></li>
     <li>Wunderground (<a href="https://www.wunderground.com/member/api-keys">web site)</a></li>
   </ul>
@@ -96,7 +95,7 @@ __END__
        The parameters have the following meanings:<br>
 
        <table>
-       <tr><td><code>API</code></td><td>name of the weather API, e.g. <code>DarkSkyAPI</code></td></tr>
+       <tr><td><code>API</code></td><td>name of the weather API, e.g. <code>OpenWeatherMapAPI</code></td></tr>
        <tr><td><code>apioptions</code></td><td>indivual options for the chosen API</td></tr>
        <tr><td><code>apikey</code></td><td>key for the chosen API</td></tr>
        <tr><td><code>location</code></td><td>location for the weather forecast;
@@ -105,12 +104,12 @@ __END__
        <tr><td><code>lang</code></td><td>language of the forecast: <code>de</code>,
          <code>en</code>, <code>pl</code>, <code>fr</code>, <code>it</code> or <code>nl</code></td></tr>
        </table>
-       <p>
+       <p></p>
 
     A very simple definition is:<br><br>
-    <code>define &lt;name&gt; Weather apikey=&lt;DarkSkyAPISecretKey&gt;</code><br><br>
+    <code>define &lt;name&gt; Weather apikey=&lt;OpenWeatherMapAPISecretKey&gt;</code><br><br>
     This uses the Dark Sky API with an individual key that you need to
-    retrieve from the Dark Sky web site.<p><p>
+    retrieve from the Dark Sky web site.<p></p>
 
     Examples:
     <pre>
@@ -120,22 +119,9 @@ __END__
     </pre>
 
 
-    API-specific documentation follows.<p>
+    API-specific documentation follows.<p></p>
 
-        <h4>Dark Sky</h4><p>
+        <h4>OpenWeatherMap</h4><p></p>
-
-        <table>
-        <tr><td>API</td><td><code>DarkSkyAPI</code></td></tr>
-        <tr><td>apioptions</td><td><code>cachemaxage:&lt;cachemaxage&gt;</code><br>duration
-          in seconds to retrieve the forecast from the cache instead from the API</td></tr>
-        <tr><td>location</td><td><code>&lt;latitude,longitude&gt;</code><br>
-          geographic coordinates in degrees of the location for which the
-          weather is forecast; if missing, the values of the attributes
-          of the <code>global</code> device are taken, if these exist.</td></tr>
-        </table>
-        <p><p>
-
-        <h4>OpenWeatherMap</h4><p>
 
         <table>
         <tr><td>API</td><td><code>OpenWeatherMapAPI</code></td></tr>
@@ -151,9 +137,9 @@ __END__
           weather is forecast; if missing, the values of the attributes
           of the <code>global</code> device are taken, if these exist.</td></tr>
         </table>
-        <p><p>
+        <p></p>
         
-        <h4>Wunderground</h4><p>
+        <h4>Wunderground</h4><p></p>
 
         <table>
         <tr><td>API</td><td><code>wundergroundAPI</code></td></tr>
@@ -165,7 +151,7 @@ __END__
           weather is forecast; if missing, the values of the attributes
           of the <code>global</code> device are taken, if these exist.</td></tr>
         </table>
-        <p><p>
+        <p></p>
 
     The module provides four additional functions <code>WeatherAsHtml</code>,
     <code>WeatherAsHtmlV</code>, <code>WeatherAsHtmlH</code> and
@@ -303,7 +289,7 @@ __END__
 <ul>
     Hinweis: es wird das Perl-Modul JSON ben&ouml;tigt. Mit <code>apt-get install
     libjson-perl</code> kann es unter Debian und Derivaten installiert
-    werden.<p><p>
+    werden.<p></p>
 
     Das Weather-Modul arbeitet mit verschiedenen Wetter-APIs zusammen:
     <ul>
@@ -324,7 +310,7 @@ __END__
     Die Parameter haben die folgende Bedeutung:<br>
 
     <table>
-    <tr><td><code>API</code></td><td>Name des Wetter-APIs, z.B. <code>DarkSkyAPI</code></td></tr>
+    <tr><td><code>API</code></td><td>Name des Wetter-APIs, z.B. <code>OpenWeatherMapAPI</code></td></tr>
     <tr><td><code>apioptions</code></td><td>Individuelle Optionen f&uuml;r das gew&auml;hlte API</td></tr>
     <tr><td><code>apikey</code></td><td>Schl&uuml;ssel f&uuml;r das gew&auml;hlte API</td></tr>
     <tr><td><code>location</code></td><td>Ort, f&uuml;r den das Wetter vorhergesagt wird.
@@ -334,14 +320,15 @@ __END__
     <tr><td><code>lang</code></td><td>Sprache der Wettervorhersage: <code>de</code>,
       <code>en</code>, <code>pl</code>, <code>fr</code>, <code>it</code> oder <code>nl</code></td></tr>
     </table>
-    <p>
+    <p></p>
+
 
     Eine ganz einfache Definition ist:<br><br>
-    <code>define &lt;name&gt; Weather apikey=&lt;DarkSkyAPISecretKey&gt;</code><br><br>
+    <code>define &lt;name&gt; Weather apikey=&lt;OpenWeatherMapAPISecretKey&gt;</code><br><br>
 
     Bei dieser Definition wird die API von Dark Sky verwendet mit einem
     individuellen Schl&uuml;ssel, den man sich auf der Webseite von Dark Sky
-     beschaffen muss.<p><p>
+     beschaffen muss.<p></p>
 
     Beispiele:
     <pre>
@@ -350,23 +337,9 @@ __END__
       define <name> Weather API=wundergroundAPI,stationId:IHAUIDELB111 apikey=ed64ccc80f004556a4e3456567800b6324a
     </pre>
 
-    Es folgt die API-spezifische Dokumentation.<p>
+    Es folgt die API-spezifische Dokumentation.<p></p>
 
-    <h4>Dark Sky</h4><p>
+    <h4>OpenWeatherMap</h4><p></p>
-
-    <table>
-    <tr><td>API</td><td><code>DarkSkyAPI</code></td></tr>
-    <tr><td>apioptions</td><td><code>cachemaxage:&lt;cachemaxage&gt;</code><br>Zeitdauer in
-      Sekunden, innerhalb derer die Wettervorhersage nicht neu abgerufen
-      sondern aus dem Cache zur&uuml;ck geliefert wird.</td></tr>
-    <tr><td>location</td><td><code>&lt;latitude,longitude&gt;</code><br> Geographische Breite
-      und L&auml;nge des Ortes in Grad, f&uuml;r den das Wetter vorhergesagt wird.
-      Bei fehlender Angabe werden die Werte aus den gleichnamigen Attributen
-      des <code>global</code>-Device genommen, sofern vorhanden.</td></tr>
-    </table>
-    <p><p>
-
-    <h4>OpenWeatherMap</h4><p>
 
     <table>
     <tr><td>API</td><td><code>OpenWeatherMapAPI</code></td></tr>
@@ -385,9 +358,9 @@ __END__
       Bei fehlender Angabe werden die Werte aus den gleichnamigen Attributen
       des <code>global</code>-Device genommen, sofern vorhanden.</td></tr>
     </table>
-    <p><p>
+    <p></p>
     
-    <h4>Wunderground</h4><p>
+    <h4>Wunderground</h4><p></p>
 
     <table>
     <tr><td>API</td><td><code>wundergroundAPI</code></td></tr>
@@ -400,7 +373,7 @@ __END__
       Bei fehlender Angabe werden die Werte aus den gleichnamigen Attributen
       des <code>global</code>-Device genommen, sofern vorhanden.</td></tr>
     </table>
-    <p><p>
+    <p></p>
 
     Das Modul unterst&uuml;tzt zus&auml;tzlich vier verschiedene Funktionen
     <code>WeatherAsHtml</code>, <code>WeatherAsHtmlV</code>,
@@ -538,13 +511,12 @@ __END__
     "fhem-mod-device",
     "fhem-core",
     "Weather",
-    "DarkSky",
     "OpenWeatherMap",
     "Underground"
   ],
   "release_status": "stable",
   "license": "GPL_2",
-  "version": "v2.2.35",
+  "version": "v2.3.1",
   "author": [
     "Marko Oldenburg <fhemdevelopment@cooltux.net>"
   ],

controls_Weather.txt

@@ -1,4 +1,4 @@
-UPD 2025-02-04_20:57:25 25848 FHEM/59_Weather.pm
+UPD 2025-10-16_18:59:55 24515 FHEM/59_Weather.pm
-UPD 2025-02-04_20:58:03 34419 lib/FHEM/Core/Weather.pm
+UPD 2025-10-16_18:59:41 34158 lib/FHEM/Core/Weather.pm
-UPD 2025-02-04_20:58:29 33780 lib/FHEM/APIs/Weather/OpenWeatherMapAPI.pm
+UPD 2025-10-14_07:39:57 33545 lib/FHEM/APIs/Weather/OpenWeatherMapAPI.pm
-UPD 2025-02-04_20:57:50 38751 lib/FHEM/APIs/Weather/wundergroundAPI.pm
+UPD 2025-10-14_07:20:30 38721 lib/FHEM/APIs/Weather/wundergroundAPI.pm

hooks/pre-commit

@@ -4,9 +4,9 @@ use File::Basename;
 use POSIX qw(strftime);
 use strict;
 
-my @filenames = (   'FHEM/59_Weather.pm',
+my @filenames = (
+    'FHEM/59_Weather.pm',
     'lib/FHEM/Core/Weather.pm',
-		    'lib/FHEM/APIs/Weather/DarkSkyAPI.pm',
     'lib/FHEM/APIs/Weather/OpenWeatherMapAPI.pm',
     'lib/FHEM/APIs/Weather/wundergroundAPI.pm',
 );
@@ -19,7 +19,8 @@ for my  $filename (@filenames) {
     my @statOutput = stat($filename);
 
     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;
     }
 

lib/FHEM/APIs/Weather/OpenWeatherMapAPI.pm

@@ -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 );
@@ -466,8 +467,7 @@ 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
         delete $self->{cached}->{current};
 
@@ -484,28 +484,24 @@ sub _FillSelfHashWithWeatherResponse {
             && scalar( @{ $data->{hourly} } ) > 0 )
         {
             $self =
-                  _FillSelfHashWithWeatherResponseForOnecallHourly( $self,
+              _FillSelfHashWithWeatherResponseForOnecallHourly( $self, $data );
-                    $data );
         }
 
         if ( ref( $data->{daily} ) eq "ARRAY"
             && scalar( @{ $data->{daily} } ) > 0 )
         {
             $self =
-                  _FillSelfHashWithWeatherResponseForOnecallDaily( $self,
+              _FillSelfHashWithWeatherResponseForOnecallDaily( $self, $data );
-                    $data );
         }
 
         if ( ref( $data->{alerts} ) eq "ARRAY"
             && scalar( @{ $data->{alerts} } ) > 0 )
         {
             $self =
-                  _FillSelfHashWithWeatherResponseForOnecallAlerts( $self,
+              _FillSelfHashWithWeatherResponseForOnecallAlerts( $self, $data );
-                    $data );
         }
     }
-
+    elsif ( $self->{endpoint} eq 'weather' ) {
-        when ('weather') {
         ## löschen des alten current Datensatzes
         delete $self->{cached}->{current};
 
@@ -515,8 +511,7 @@ sub _FillSelfHashWithWeatherResponse {
         $self =
           _FillSelfHashWithWeatherResponseForWeatherCurrent( $self, $data );
     }
-
+    elsif ( $self->{endpoint} eq 'forecast' ) {
-        when ('forecast') {
         ## löschen des alten forecast Datensatzes
         delete $self->{cached}->{forecast};
 
@@ -524,9 +519,7 @@ sub _FillSelfHashWithWeatherResponse {
             and scalar( @{ $data->{list} } ) > 0 )
         {
             $self =
-                  _FillSelfHashWithWeatherResponseForForecastHourly( $self,
+              _FillSelfHashWithWeatherResponseForForecastHourly( $self, $data );
-                    $data );
-            }
         }
     }
 
@@ -1036,7 +1029,7 @@ sub _strftimeWrapper {
 	  ],
   "release_status": "stable",
   "license": "GPL_2",
-  "version": "v3.2.7",
+  "version": "v3.2.8",
   "author": [
     "Marko Oldenburg <fhemdevelopment@cooltux.net>"
   ],

lib/FHEM/APIs/Weather/wundergroundAPI.pm

@@ -6,7 +6,6 @@ use FHEM::Meta;
 
 use POSIX;
 use HttpUtils;
-use experimental qw /switch/;
 use Encode;
 
 my $META = {};

lib/FHEM/Core/Weather.pm

@@ -41,10 +41,7 @@ eval { use Time::HiRes qw /gettimeofday/; 1 }
 eval { use Readonly; 1 }
   or $missingModul .= "libreadonly-perl ";
 
-#use Time::HiRes  qw(gettimeofday);
+#use experimental qw /switch/;
-use experimental qw /switch/;
-
-#use Readonly;
 
 use FHEM::Meta;
 
@@ -224,48 +221,45 @@ sub _LanguageInitialize {
 
     my $lang = shift;
 
-    given ($lang) {
+    if ( $lang eq 'de' ) {
-        when ('de') {
         %wdays_txt_i18n          = %wdays_txt_de;
         @directions_txt_i18n     = @directions_txt_de;
         %pressure_trend_txt_i18n = %pressure_trend_txt_de;
         %status_items_txt_i18n   = %status_items_txt_de;
     }
-
+    elsif ( $lang eq 'nl' ) {
-        when ('nl') {
         %wdays_txt_i18n          = %wdays_txt_nl;
         @directions_txt_i18n     = @directions_txt_nl;
         %pressure_trend_txt_i18n = %pressure_trend_txt_nl;
         %status_items_txt_i18n   = %status_items_txt_nl;
     }
-
+    elsif ( $lang eq 'fr' ) {
-        when ('fr') {
         %wdays_txt_i18n          = %wdays_txt_fr;
         @directions_txt_i18n     = @directions_txt_fr;
         %pressure_trend_txt_i18n = %pressure_trend_txt_fr;
         %status_items_txt_i18n   = %status_items_txt_fr;
-        }
 
-        when ('pl') {
+    }
+    elsif ( $lang eq 'pl' ) {
         %wdays_txt_i18n          = %wdays_txt_pl;
         @directions_txt_i18n     = @directions_txt_pl;
         %pressure_trend_txt_i18n = %pressure_trend_txt_pl;
         %status_items_txt_i18n   = %status_items_txt_pl;
-        }
 
-        when ('it') {
+    }
+    elsif ( $lang eq 'it' ) {
         %wdays_txt_i18n          = %wdays_txt_it;
         @directions_txt_i18n     = @directions_txt_it;
         %pressure_trend_txt_i18n = %pressure_trend_txt_it;
         %status_items_txt_i18n   = %status_items_txt_it;
-        }
 
-        default {
+    }
+    else {
         %wdays_txt_i18n          = %wdays_txt_en;
         @directions_txt_i18n     = @directions_txt_en;
         %pressure_trend_txt_i18n = %pressure_trend_txt_en;
         %status_items_txt_i18n   = %status_items_txt_en;
-        }
+
     }
 
     return;
@@ -650,13 +644,13 @@ sub Get {
     my $reading = shift @$aRef // return;
     my $value;
 
-    if ( defined( $hash->{readings}->{$reading} ) ) {
+    if ( defined( $hash->{READINGS}->{$reading} ) ) {
-        $value = $hash->{readings}->{$reading}->{VAL};
+        $value = $hash->{READINGS}->{$reading}->{VAL};
     }
     else {
         my $rt = '';
-        if ( defined( $hash->{readings} ) ) {
+        if ( defined( $hash->{READINGS} ) ) {
-            $rt = join( ":noArg ", sort keys %{ $hash->{readings} } );
+            $rt = join( ":noArg ", sort keys %{ $hash->{READINGS} } );
         }
 
         return "Unknown reading $reading, choose one of " . $rt;
@@ -862,8 +856,7 @@ sub Attr {
     my ( $cmd, $name, $attrName, $AttrVal ) = @_;
     my $hash = $::defs{$name};
 
-    given ($attrName) {
+    if ( $attrName eq 'forecast' ) {
-        when ('forecast') {
         if ( $cmd eq 'set' ) {
             $hash->{fhem}->{api}->setForecast($AttrVal);
         }
@@ -874,13 +867,11 @@ sub Attr {
         ::InternalTimer( gettimeofday() + 0.5,
             \&FHEM::Core::Weather::DeleteForecastreadings, $hash );
     }
-
+    elsif ( $cmd eq 'forecastLimit' ) {
-        when ('forecastLimit') {
         ::InternalTimer( gettimeofday() + 0.5,
             \&FHEM::Core::Weather::DeleteForecastreadings, $hash );
     }
-
+    elsif ( $cmd eq 'alerts' ) {
-        when ('alerts') {
         if ( $cmd eq 'set' ) {
             $hash->{fhem}->{api}->setAlerts($AttrVal);
         }
@@ -891,7 +882,6 @@ sub Attr {
         ::InternalTimer( gettimeofday() + 0.5,
             \&FHEM::Core::Weather::DeleteAlertsreadings, $hash );
     }
-    }
 
     return;
 }
@@ -943,8 +933,8 @@ sub WeatherAsHtmlV {
     else {
         $fc = (
             (
-                defined( $h->{readings}->{fc1_day_of_week} )
+                defined( $h->{READINGS}->{fc1_day_of_week} )
-                  && $h->{readings}->{fc1_day_of_week}
+                  && $h->{READINGS}->{fc1_day_of_week}
             ) ? 'fc' : 'hfc'
         );
     }
@@ -960,8 +950,8 @@ sub WeatherAsHtmlV {
     );
 
     for ( my $i = 1 ; $i < $items ; $i++ ) {
-        if ( defined( $h->{readings}->{"${fc}${i}_low_c"} )
+        if ( defined( $h->{READINGS}->{"${fc}${i}_low_c"} )
-            && $h->{readings}->{"${fc}${i}_low_c"} )
+            && $h->{READINGS}->{"${fc}${i}_low_c"} )
         {
             $ret .= sprintf(
 '<tr><td class="weatherIcon" width=%d>%s</td><td class="weatherValue"><span class="weatherDay">%s: %s</span><br><span class="weatherMin">min %s°C</span> <span class="weatherMax">max %s°C</span><br>%s</td></tr>',
@@ -1031,8 +1021,8 @@ sub WeatherAsHtmlH {
     else {
         $fc = (
             (
-                defined( $h->{readings}->{fc1_day_of_week} )
+                defined( $h->{READINGS}->{fc1_day_of_week} )
-                  && $h->{readings}->{fc1_day_of_week}
+                  && $h->{READINGS}->{fc1_day_of_week}
             ) ? 'fc' : 'hfc'
         );
     }
@@ -1066,8 +1056,8 @@ sub WeatherAsHtmlH {
         ::ReadingsVal( $d, "humidity", "" )
     );
     for ( my $i = 1 ; $i < $items ; $i++ ) {
-        if ( defined( $h->{readings}->{"${fc}${i}_low_c"} )
+        if ( defined( $h->{READINGS}->{"${fc}${i}_low_c"} )
-            && $h->{readings}->{"${fc}${i}_low_c"} )
+            && $h->{READINGS}->{"${fc}${i}_low_c"} )
         {
             $ret .= sprintf( '<td class="weatherMin">min %s°C</td>',
                 ::ReadingsVal( $d, "${fc}${i}_low_c", " - " ) );
@@ -1084,8 +1074,8 @@ sub WeatherAsHtmlH {
     $ret .= sprintf( '<tr><td class="weatherMax">%s</td>',
         ::ReadingsVal( $d, "wind_condition", "" ) );
     for ( my $i = 1 ; $i < $items ; $i++ ) {
-        if ( defined( $h->{readings}->{"${fc}${i}_high_c"} )
+        if ( defined( $h->{READINGS}->{"${fc}${i}_high_c"} )
-            && $h->{readings}->{"${fc}${i}_high_c"} )
+            && $h->{READINGS}->{"${fc}${i}_high_c"} )
         {
             $ret .= sprintf( '<td class="weatherMax">max %s°C</td>',
                 ::ReadingsVal( $d, "${fc}${i}_high_c", " - " ) );