Merge pull request 'testing' (#67) from testing into main

Reviewed-on: #67

controls_Weather.txt

@@ -1,4 +1,5 @@
-UPD 2023-01-07_13:28:16 57768 FHEM/59_Weather.pm
-UPD 2023-01-07_13:28:44 49884 lib/FHEM/APIs/Weather/DarkSkyAPI.pm
-UPD 2023-01-07_13:28:59 33258 lib/FHEM/APIs/Weather/OpenWeatherMapAPI.pm
-UPD 2023-01-07_13:29:12 36090 lib/FHEM/APIs/Weather/wundergroundAPI.pm
+UPD 2024-10-11_12:02:22 25848 FHEM/59_Weather.pm
+UPD 2024-10-11_11:59:21 34293 lib/FHEM/Core/Weather.pm
+UPD 2023-01-29_16:14:48 50106 lib/FHEM/APIs/Weather/DarkSkyAPI.pm
+UPD 2023-07-11_14:08:00 33779 lib/FHEM/APIs/Weather/OpenWeatherMapAPI.pm
+UPD 2024-10-11_12:02:42 37627 lib/FHEM/APIs/Weather/wundergroundAPI.pm

hooks/pre-commit

@@ -5,6 +5,7 @@ use POSIX qw(strftime);
 use strict;
 
 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',

lib/FHEM/APIs/Weather/DarkSkyAPI.pm

@@ -699,7 +699,7 @@ sub _CallWeatherCallbackFn {
     my $self = shift;
 
     #     ## Aufruf der callbackFn
-    return ::Weather_RetrieveCallbackFn( $self->{devName} );
+    return FHEM::Core::Weather::RetrieveCallbackFn( $self->{devName} );
 }
 
 sub _ErrorHandling {
@@ -709,8 +709,7 @@ sub _ErrorHandling {
     my $err  = shift;
 
     $self->{cached}->{current_date_time} =
-      __strftimeWrapper( "%a, %e %b %Y %H:%M",
-        localtime( $self->{fetchTime} ) );
+      _strftimeWrapper( "%a, %e %b %Y %H:%M", localtime( $self->{fetchTime} ) );
     $self->{cached}->{status}   = $err;
     $self->{cached}->{validity} = 'stale';
 
@@ -726,9 +725,9 @@ sub _CreateForecastRef {
         {
             lat           => $self->{lat},
             long          => $self->{long},
-            apiMaintainer => 'Marko Oldenburg ('
-              . $META->{x_fhem_maintainer}[0] . ')',
-            apiVersion => version->parse( __PACKAGE__->VERSION() )->normal,
+            apiMaintainer => $META->{author}[0],
+            apiVersion => version->parse( __PACKAGE__->VERSION() )->normal . '-'
+              . $META->{release_status},
         }
     );
 
@@ -773,12 +772,19 @@ sub _strftimeWrapper {
       "abstract": "Wetter API für Weather DarkSky"
     }
   },
-  "version": "v1.2.10",
+  "keywords": [
+	    "fhem-mod-device",
+	    "Weather",
+        "API"
+	  ],
+  "release_status": "stable",
+  "license": "GPL_2",
+  "version": "v1.2.12",
   "author": [
     "Marko Oldenburg <fhemdevelopment@cooltux.net>"
   ],
   "x_fhem_maintainer": [
-    "CoolTux"
+    "<a href=https://forum.fhem.de/index.php?action=profile;u=13684>CoolTux</a>"
   ],
   "x_fhem_maintainer_github": [
     "CoolTuxNet"
@@ -786,8 +792,9 @@ sub _strftimeWrapper {
   "prereqs": {
     "runtime": {
       "requires": {
+        "FHEM": 5.00918799,
+        "HttpUtils": 5.023,
         "FHEM::Meta": 0,
-        "HttpUtils": 0,
         "strict": 0,
         "warnings": 0,
         "constant": 0,

lib/FHEM/APIs/Weather/OpenWeatherMapAPI.pm

@@ -591,6 +591,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 +671,9 @@ sub _FillSelfHashWithWeatherResponseForForecastHourly {
                 ),
                 'cloudCover' => $data->{list}->[$i]->{clouds}->{all},
                 'code' => $codes{ $data->{list}->[$i]->{weather}->[0]->{id} },
-                'iconAPI' => $data->{list}->[$i]->{weather}->[0]->{icon},
-                'rain1h'  => (
+                'owmAPICode' => $data->{list}->[$i]->{weather}->[0]->{id},
+                'iconAPI'    => $data->{list}->[$i]->{weather}->[0]->{icon},
+                'rain1h'     => (
                       $data->{list}->[$i]->{rain}->{'1h'}
                     ? $data->{list}->[$i]->{rain}->{'1h'}
                     : 0
@@ -688,7 +690,7 @@ sub _FillSelfHashWithWeatherResponseForForecastHourly {
                 ),
                 'snow3h' => (
                       $data->{list}->[$i]->{snow}->{'3h'}
-                    ? $data->{list}->[$i]->{snow}->{'1h'}
+                    ? $data->{list}->[$i]->{snow}->{'3h'}
                     : 0
                 ),
             }
@@ -732,6 +734,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 +791,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 +837,9 @@ sub _FillSelfHashWithWeatherResponseForOnecallDaily {
                     $data->{daily}->[$i]->{weather}->[0]->{description}
                 ),
                 'code' => $codes{ $data->{daily}->[$i]->{weather}->[0]->{id} },
-                'iconAPI'  => $data->{daily}->[$i]->{weather}->[0]->{icon},
-                'pressure' => int(
+                'owmAPICode' => $data->{daily}->[$i]->{weather}->[0]->{id},
+                'iconAPI'    => $data->{daily}->[$i]->{weather}->[0]->{icon},
+                'pressure'   => int(
                     sprintf( "%.1f", $data->{daily}->[$i]->{pressure} ) + 0.5
                 ),
                 'wind' => int(
@@ -853,8 +858,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 +924,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},
-                'rain1h'  => (
+                'owmAPICode' => $data->{hourly}->[$i]->{weather}->[0]->{id},
+                'iconAPI'    => $data->{hourly}->[$i]->{weather}->[0]->{icon},
+                'rain1h'     => (
                       $data->{hourly}->[$i]->{rain}->{'1h'}
                     ? $data->{hourly}->[$i]->{rain}->{'1h'}
                     : 0
@@ -951,7 +956,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 +982,9 @@ sub _CreateForecastRef {
         {
             lat           => $self->{lat},
             long          => $self->{long},
-            apiMaintainer => 'Marko Oldenburg ('
-              . $META->{x_fhem_maintainer}[0] . ')',
-            apiVersion => version->parse( __PACKAGE__->VERSION() )->normal,
+            apiMaintainer => $META->{author}[0],
+            apiVersion => version->parse( __PACKAGE__->VERSION() )->normal . '-'
+              . $META->{release_status},
         }
     );
 
@@ -1024,7 +1029,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.7",
   "author": [
     "Marko Oldenburg <fhemdevelopment@cooltux.net>"
   ],
@@ -1037,8 +1049,9 @@ sub _strftimeWrapper {
   "prereqs": {
     "runtime": {
       "requires": {
+        "FHEM": 5.00918799,
+        "HttpUtils": 5.023,
         "FHEM::Meta": 0,
-        "HttpUtils": 0,
         "strict": 0,
         "warnings": 0,
         "constant": 0,

lib/FHEM/APIs/Weather/wundergroundAPI.pm

@@ -15,9 +15,9 @@ return "$@" if ($@);
 return $ret if ($ret);
 $::packages{wundergroundAPI}{META} = $META;
 
-use version 0.77; our $VERSION = $META->{version};
+use version 0.80; our $VERSION = $META->{version};
 
-# use Data::Dumper;
+use Data::Dumper;
 
 # try to use JSON::MaybeXS wrapper
 #   for chance of better performance + open code
@@ -103,10 +103,11 @@ sub new {
             ? $argsRef->{apikey}
             : 'none'
         ),
-        lang      => $argsRef->{language},
-        lat       => ( split( ',', $argsRef->{location} ) )[0],
-        long      => ( split( ',', $argsRef->{location} ) )[1],
-        fetchTime => 0,
+        lang              => $argsRef->{language},
+        lat               => ( split( ',', $argsRef->{location} ) )[0],
+        long              => ( split( ',', $argsRef->{location} ) )[1],
+        fetchTime         => 0,
+        forecastFetchTime => 0,
     };
 
     $self->{cachemaxage} = (
@@ -210,29 +211,66 @@ sub _RetrieveDataFromWU {
     return 0 unless ( __PACKAGE__ eq caller(0) );
 
     my $self = shift;
-
-    # retrieve data from cache
-    if (    ( time() - $self->{fetchTime} ) < $self->{cachemaxage}
-        and $self->{cached}->{lat} == $self->{lat}
-        and $self->{cached}->{long} == $self->{long} )
-    {
-        return _CallWeatherCallbackFn($self);
-    }
+    my $paramRef;
+    my $options;
 
     $self->{cached}->{lat} = $self->{lat}
       unless ( $self->{cached}->{lat} == $self->{lat} );
     $self->{cached}->{long} = $self->{long}
       unless ( $self->{cached}->{long} == $self->{long} );
 
-    my $paramRef = {
-        timeout  => 15,
-        self     => $self,
-        callback => (
-            $self->{stationId}
-            ? \&_RetrieveDataFromPWS
-            : \&_RetrieveDataFinished
-        ),
-    };
+    # retrieve forecast data from cache
+    if (    ( time() - $self->{forecastFetchTime} ) < $self->{cachemaxage}
+        and $self->{cached}->{lat} == $self->{lat}
+        and $self->{cached}->{long} == $self->{long} )
+    {
+        # old: return _CallWeatherCallbackFn($self);
+        # Do not just return but get PWS data without forecast
+        $paramRef = {
+            timeout  => 15,
+            self     => $self,
+            callback => \&_RetrieveDataFinished,
+        };
+
+        #Build station URL
+        $options = 'stationId=' . $self->{stationId};
+        $options .= '&format=json';
+        $options .= '&units=' . $self->{units};
+        $options .= '&numericPrecision=decimal';
+        $options .= '&apiKey=' . $self->{key};
+
+        $paramRef->{url} = $URL . 'v2/pws/observations/current?' . $options;
+    }
+    else {
+        # Get the complete data station and forecast
+        $paramRef = {
+            timeout  => 15,
+            self     => $self,
+            callback => (
+                $self->{stationId}
+                ? \&_RetrieveDataFromPWS
+                : \&_RetrieveDataFinished
+            ),
+        };
+
+        # Build forecast URL
+        $options = 'geocode=' . $self->{lat} . ',' . $self->{long};
+        $options .= '&format=json';
+        $options .= '&units=' . $self->{units};
+        $options .= '&language='
+          . (
+            $self->{lang} eq 'en'
+            ? 'en-US'
+            : $self->{lang} . '-' . uc( $self->{lang} )
+          );
+        $options .= '&apiKey=' . $self->{key};
+
+        $paramRef->{url} =
+            $URL
+          . 'v3/wx/forecast/daily/'
+          . $self->{days} . 'day' . '?'
+          . $options;
+    }
 
     if (   $self->{lat} eq 'error'
         or $self->{long} eq 'error'
@@ -250,23 +288,6 @@ sub _RetrieveDataFromWU {
           if ( $self->{key} eq 'none' );
     }
     else {
-        my $options = 'geocode=' . $self->{lat} . ',' . $self->{long};
-        $options .= '&format=json';
-        $options .= '&units=' . $self->{units};
-        $options .= '&language='
-          . (
-            $self->{lang} eq 'en'
-            ? 'en-US'
-            : $self->{lang} . '-' . uc( $self->{lang} )
-          );
-        $options .= '&apiKey=' . $self->{key};
-
-        $paramRef->{url} =
-            $URL
-          . 'v3/wx/forecast/daily/'
-          . $self->{days} . 'day' . '?'
-          . $options;
-
         if ( lc( $self->{key} ) eq 'demo' ) {
             _RetrieveDataFinished( $paramRef, undef, 'DEMODATA' . $DEMODATA );
         }
@@ -352,10 +373,20 @@ sub _RetrieveDataFinished {
         $self->{cached}{status}   = 'ok';
         $self->{cached}{validity} = 'up-to-date';
         $self->{fetchTime}        = time();
+
+        #print Dumper $response; ## for debugging
+        #print Dumper $data;     ## for debugging
+        #if (exists( $response->{daily} )) {
+        if ( $response =~ /{"daily":/ ) {
+            $self->{forecastFetchTime} = time();
+        }
         _ProcessingRetrieveData( $self, $response );
     }
     else {
         $self->{fetchTime} = time() if ( not defined( $self->{fetchTime} ) );
+        $self->{forecastFetchTime} = time()
+          if ( not defined( $self->{forecastFetchTime} ) );
+
         _ErrorHandling( $self, $err );
         _ProcessingRetrieveData( $self, $response );
     }
@@ -389,12 +420,15 @@ sub _ProcessingRetrieveData {
             #         'Code: ' . $data->{code} . ' Error: ' . $data->{error} );
             # }
             else {
-                # print Dumper $response;    ## für Debugging
-                # print Dumper $data;    ## für Debugging
+                # print Dumper $response; ## for debugging
+                # print Dumper $data;     ## for debugging
 
                 $self->{cached}{current_date_time} =
                   _strftimeWrapper( "%a, %e %b %Y %H:%M",
                     localtime( $self->{fetchTime} ) );
+                $self->{cached}{current_forecast_date_time} =
+                  _strftimeWrapper( "%a, %e %b %Y %H:%M",
+                    localtime( $self->{forecastFetchTime} ) );
 
                 # $self->{cached}{timezone} = $data->{timezone};
                 $self->{cached}{license}{text} =
@@ -423,34 +457,22 @@ sub _ProcessingRetrieveData {
                     );
 
                     $self->{cached}{current} = {
-                        'dewPoint' =>
-                          int( sprintf( "%.1f", $data->{$unit}{dewpt} ) + 0.5 ),
-                        'heatIndex'   => $data->{$unit}{heatIndex},
+                        'dewPoint'  => sprintf( "%.1f", $data->{$unit}{dewpt} ),
+                        'heatIndex' => $data->{$unit}{heatIndex},
                         'precipRate'  => $data->{$unit}{precipRate},
                         'precipTotal' => $data->{$unit}{precipTotal},
-                        'pressure'    => int(
-                            sprintf( "%.1f", $data->{$unit}{pressure} ) + 0.5
-                        ),
+                        'pressure'    =>
+                          sprintf( "%.1f", $data->{$unit}{pressure} ),
                         'temperature' =>
-                          int( sprintf( "%.1f", $data->{$unit}{temp} ) + 0.5 ),
-                        'temp_c' =>
-                          int( sprintf( "%.1f", $data->{$unit}{temp} ) + 0.5 ),
-                        'wind_chill' => int(
-                            sprintf( "%.1f", ( $data->{$unit}{windChill} ) ) +
-                              0.5
-                        ),
-                        'windGust' => int(
-                            sprintf( "%.1f", ( $data->{$unit}{windGust} ) ) +
-                              0.5
-                        ),
-                        'wind' => int(
-                            sprintf( "%.1f", ( $data->{$unit}{windSpeed} ) ) +
-                              0.5
-                        ),
-                        'wind_speed' => int(
-                            sprintf( "%.1f", ( $data->{$unit}{windSpeed} ) ) +
-                              0.5
-                        ),
+                          sprintf( "%.1f", $data->{$unit}{temp} ),
+                        'temp_c'     => sprintf( "%.1f", $data->{$unit}{temp} ),
+                        'wind_chill' =>
+                          sprintf( "%.1f", $data->{$unit}{windChill} ),
+                        'windGust' =>
+                          sprintf( "%.1f", $data->{$unit}{windGust} ),
+                        'wind' => sprintf( "%.1f", $data->{$unit}{windSpeed} ),
+                        'wind_speed' =>
+                          sprintf( "%.1f", $data->{$unit}{windSpeed} ),
                         'wind_direction' => $data->{winddir},
                         'solarRadiation' => $data->{solarRadiation},
                         'uvIndex'        => $data->{uv},
@@ -542,6 +564,16 @@ sub _ProcessingRetrieveData {
                                         )
                                     )
                                 ),
+                                'temperature' => int(
+                                    sprintf(
+                                        "%.1f",
+                                        (
+                                              $data->{temperatureMax}[$i]
+                                            ? $data->{temperatureMax}[$i]
+                                            : 0
+                                        )
+                                    ) + 0.5
+                                ),
                                 'low_c' => int(
                                     sprintf( "%.1f",
                                         $data->{temperatureMin}[$i] ) + 0.5
@@ -732,8 +764,8 @@ sub _CallWeatherCallbackFn {
 
     my $self = shift;
 
-    #     ## Aufruf der callbackFn
-    return ::Weather_RetrieveCallbackFn( $self->{devName} );
+    ## Aufruf der callbackFn
+    return FHEM::Core::Weather::RetrieveCallbackFn( $self->{devName} );
 }
 
 sub _ErrorHandling {
@@ -744,6 +776,9 @@ sub _ErrorHandling {
 
     $self->{cached}{current_date_time} =
       _strftimeWrapper( "%a, %e %b %Y %H:%M", localtime( $self->{fetchTime} ) );
+    $self->{cached}{current_forecast_date_time} =
+      _strftimeWrapper( "%a, %e %b %Y %H:%M",
+        localtime( $self->{forecastFetchTime} ) );
     $self->{cached}{status}   = $err;
     $self->{cached}{validity} = 'stale';
 
@@ -805,7 +840,7 @@ sub _strftimeWrapper {
       "abstract": "Wetter API für Weather Underground"
     }
   },
-  "version": "v1.2.0",
+  "version": "v1.3.0",
   "author": [
     "Julian Pawlowski <julian.pawlowski@gmail.com>"
   ],