simple-dwd-weatherforecast 2.1.14__py3-none-any.whl → 2.1.16__py3-none-any.whl

simple_dwd_weatherforecast/dwdforecast.py

@@ -14,14 +14,22 @@ import arrow
 import requests
 from lxml import etree
 
-with importlib.resources.files("simple_dwd_weatherforecast").joinpath(  # type: ignore
-    "stations.json"
-).open("r", encoding="utf-8") as file:
+with (
+    importlib.resources.files("simple_dwd_weatherforecast")
+    .joinpath(  # type: ignore
+        "stations.json"
+    )
+    .open("r", encoding="utf-8") as file
+):
     stations = json.load(file)
 
-with importlib.resources.files("simple_dwd_weatherforecast").joinpath(  # type: ignore
-    "uv_stations.json"
-).open("r", encoding="utf-8") as file:
+with (
+    importlib.resources.files("simple_dwd_weatherforecast")
+    .joinpath(  # type: ignore
+        "uv_stations.json"
+    )
+    .open("r", encoding="utf-8") as file
+):
     uv_stations = json.load(file)
 
 
@@ -483,12 +491,13 @@ class Weather:
         value = None
         for item in weather_data:
             value_new = item[weatherDataType.value[0]]
-            if value_new:
-                if not value:
+            if value_new is not None:
+                if value is None:
                     value = -9999999
                 if value_new > value:
                     value = value_new
-        if value:
+
+        if value is not None:
             return round(value, 2)
         return None
 
@@ -520,13 +529,13 @@ class Weather:
         value = None
         for item in weather_data:
             value_new = item[weatherDataType.value[0]]
-            if value_new:
-                if not value:
+            if value_new is not None:
+                if value is None:
                     value = 9999999
                 if value_new < value:
                     value = value_new
 
-        if value:
+        if value is not None:
             return round(value, 2)
         return None
 
@@ -558,7 +567,7 @@ class Weather:
         value_sum = 0.0
         for item in weather_data:
             value = item[weatherDataType.value[0]]
-            if value:
+            if value is not None:
                 value_sum += float(value)
         return round(value_sum, 2)
 

simple_dwd_weatherforecast/dwdmap.py

@@ -9,7 +9,8 @@ from datetime import datetime, timedelta, timezone
 
 
 class WeatherMapType(Enum):
-    NIEDERSCHLAGSRADAR = "dwd:Niederschlagsradar,dwd:NCEW_EU"
+    NIEDERSCHLAGSRADAR = "dwd:Niederschlagsradar"
+    BLITZSCHLAG = "dwd:NCEW_EU"
     MAXTEMP = "dwd:GefuehlteTempMax"
     UVINDEX = "dwd:UVI_CS"
     POLLENFLUG = "dwd:Pollenflug"
@@ -158,7 +159,7 @@ def get_map(
         layers = f"{background_type.value}, {map_type.value}"
     else:
         layers = f"{map_type.value}, {background_type.value}"
-    url = f"https://maps.dwd.de/geoserver/dwd/wms?service=WMS&version=1.1.0&request=GetMap&layers={layers}&bbox={minx},{miny},{maxx},{maxy}&width={image_width}&height={image_height}&srs=EPSG:4326&styles=&format=image/png"
+    url = f"https://maps.dwd.de/geoserver/dwd/wms?service=WMS&version=1.1.1&request=GetMap&layers={layers}&bbox={minx},{miny},{maxx},{maxy}&width={image_width}&height={image_height}&srs=EPSG:4326&styles=&format=image/png"
     request = requests.get(url, stream=True)
     if request.status_code == 200:
         image = Image.open(BytesIO(request.content))
@@ -237,7 +238,13 @@ class ImageLoop:
 
         while now > self._last_update:
             self._last_update += timedelta(minutes=5)
-            self._images.append(self._get_image(self._last_update))
+            # Lightning in the NCEW_EU layer is only available in the last 5 minutes
+            self._images.append(
+                self._get_image(
+                    self._last_update,
+                    with_lightning=(now - self._last_update) < timedelta(minutes=5),
+                )
+            )
 
     def update(self):
         now = get_time_last_5_min(datetime.now(timezone.utc))
@@ -249,23 +256,31 @@ class ImageLoop:
         else:
             while now > self._last_update:
                 self._last_update += timedelta(minutes=5)
-                self._images.append(self._get_image(self._last_update))
+                self._images.append(
+                    self._get_image(self._last_update, with_lightning=True)
+                )
 
     def _get_image(
         self,
         date: datetime,
+        with_lightning: bool = False,
     ) -> ImageFile.ImageFile:
+        # Lightning in the NCEW_EU layer is only available in the last 5 minutes
+        layer = self._map_type.value
+        if with_lightning:
+            layer += ",dwd:NCEW_EU"
         if self._background_type in [
             WeatherBackgroundMapType.SATELLIT,
             WeatherBackgroundMapType.KREISE,
             WeatherBackgroundMapType.GEMEINDEN,
         ]:
-            layers = f"{self._background_type.value}, {self._map_type.value}"
+            layers = f"{self._background_type.value}, {layer}"
         else:
-            layers = f"{self._map_type.value}, {self._background_type.value}"
-        url = f"https://maps.dwd.de/geoserver/dwd/wms?service=WMS&version=1.1.0&request=GetMap&layers={layers}&bbox={self._minx},{self._miny},{self._maxx},{self._maxy}&width={self._image_width}&height={self._image_height}&srs=EPSG:4326&styles=&format=image/png&TIME={date.strftime('%Y-%m-%dT%H:%M:00.0Z')}"
+            layers = f"{layer}, {self._background_type.value}"
+
+        url = f"https://maps.dwd.de/geoserver/dwd/wms?service=WMS&version=1.1.1&request=GetMap&layers={layers}&bbox={self._minx},{self._miny},{self._maxx},{self._maxy}&width={self._image_width}&height={self._image_height}&srs=EPSG:4326&styles=&format=image/png&TIME={date.strftime('%Y-%m-%dT%H:%M:00.0Z')}"
         request = requests.get(url, stream=True)
-        if request.status_code != 200:
+        if request.status_code != 200 or request.headers["content-type"] != "image/png":
             raise ConnectionError("Error during image request from DWD servers")
         image = Image.open(BytesIO(request.content))
         if self.dark_mode:

{simple_dwd_weatherforecast-2.1.14.dist-info → simple_dwd_weatherforecast-2.1.16.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.2
 Name: simple_dwd_weatherforecast
-Version: 2.1.14
+Version: 2.1.16
 Summary: A simple tool to retrieve a weather forecast from DWD OpenData
 Home-page: https://github.com/FL550/simple_dwd_weatherforecast.git
 Author: Max Fermor

{simple_dwd_weatherforecast-2.1.14.dist-info → simple_dwd_weatherforecast-2.1.16.dist-info}/RECORD

@@ -1,6 +1,6 @@
 simple_dwd_weatherforecast/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-simple_dwd_weatherforecast/dwdforecast.py,sha256=emM_zYQ0fOZhDIDz60yCXN8vCI3Nsp9VKq8tcOn3TZQ,38973
-simple_dwd_weatherforecast/dwdmap.py,sha256=Ktokd5Yyj7FJKKlbJrqX8mj24v7IN_pLdY4rk6FbNUY,11894
+simple_dwd_weatherforecast/dwdforecast.py,sha256=uZRWMN9RIPvC9r47JAdw_AiP9V9M2rQxh_pOsVF15Sw,39094
+simple_dwd_weatherforecast/dwdmap.py,sha256=ckDP6MOTfzwvz01gjzkimIreVGUU7WqFV1CRoCQ9Z1k,12452
 simple_dwd_weatherforecast/stations.json,sha256=1u8qc2CT_rVy49SAlOicGixzHln6Y0FXevuFAz2maBw,838948
 simple_dwd_weatherforecast/uv_stations.json,sha256=ADenYo-aR6qbf0UFkfYr72kkFzL9HyUKe4VQ23POGF8,2292
 tests/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
@@ -10,7 +10,7 @@ tests/dummy_uv.py,sha256=TM1TwvNq_ea4WgIJyYsNAEXZJTx1dXH1ZVrW_LfLBLg,4548
 tests/test_get_daily_avg.py,sha256=MNd7u9Y7_E6SIyxg59EKfdKx4QJ7R_WT5wvRgm7Gzks,2315
 tests/test_get_daily_condition.py,sha256=9Qrhv14-vLnLz0N0FWG7Mv6_iEbNPqrHDDWWNQNydU0,2298
 tests/test_get_daily_max.py,sha256=schjGJDflg1YEQSdfRndw2NT4AvrVheSDveyVZrFySM,2220
-tests/test_get_daily_min.py,sha256=GzqlOfLdwLqGLYVeAJ0fbK1JRq-_fT7z6Gea74lSY7E,2224
+tests/test_get_daily_min.py,sha256=3q-l6EpyIDwX7zzOZGJ9OFyD7ZM1JYMAhXfbil-yoJA,2223
 tests/test_get_daily_sum.py,sha256=UEntbPwGSleHocu0587WnuC5ijptQtzVNreR1d6yoM0,2221
 tests/test_get_day_values.py,sha256=hDphH7fekfcWX7slJUF1QiH3B7te23nHiS5-Fro3HY4,31013
 tests/test_get_forecast_condition.py,sha256=YVapxXH5Svq5P7XvWn48n19hriQ1-7CSezuGc6DswJQ,2866
@@ -35,8 +35,8 @@ tests/test_update.py,sha256=AIzzHMxcjwQjeTB0l3YFgB7HkGDbuqiHofwy41mS0m4,7440
 tests/test_update_hourly.py,sha256=7Zl8ml3FTdqw3_Qwr_Tz-sWTzypvrBWmxeig2Vwp_ZQ,1781
 tests/test_uv_index.py,sha256=tr6wnOyHlXT1S3yp1oeHc4-Brmc-EMEdM4mtyrdpcHg,579
 tests/test_weather.py,sha256=ZyX4ldUoJpJp7YpiNQwU6Od-nYRay-3qcaDJdNq8fhY,780
-simple_dwd_weatherforecast-2.1.14.dist-info/LICENCE,sha256=27UG7gteqvSWuZlsbIq2_OAbh7VyifGGl-1zpuUoBcw,1072
-simple_dwd_weatherforecast-2.1.14.dist-info/METADATA,sha256=yOmvr1psI8zmU1eZstNMmOeEoc8w66wpig4Ljiv2nlY,12828
-simple_dwd_weatherforecast-2.1.14.dist-info/WHEEL,sha256=In9FTNxeP60KnTkGw7wk6mJPYd_dQSjEZmXdBdMCI-8,91
-simple_dwd_weatherforecast-2.1.14.dist-info/top_level.txt,sha256=iyEobUh14Tzitx39Oi8qm0NhBrnZovl_dNKtvLUkLEM,33
-simple_dwd_weatherforecast-2.1.14.dist-info/RECORD,,
+simple_dwd_weatherforecast-2.1.16.dist-info/LICENCE,sha256=27UG7gteqvSWuZlsbIq2_OAbh7VyifGGl-1zpuUoBcw,1072
+simple_dwd_weatherforecast-2.1.16.dist-info/METADATA,sha256=F-73LROsSo1La1YgnrUPxPmi7pwzxipgGSnAT4LaN2U,12828
+simple_dwd_weatherforecast-2.1.16.dist-info/WHEEL,sha256=jB7zZ3N9hIM9adW7qlTAyycLYW9npaWKLRzaoVcLKcM,91
+simple_dwd_weatherforecast-2.1.16.dist-info/top_level.txt,sha256=iyEobUh14Tzitx39Oi8qm0NhBrnZovl_dNKtvLUkLEM,33
+simple_dwd_weatherforecast-2.1.16.dist-info/RECORD,,

{simple_dwd_weatherforecast-2.1.14.dist-info → simple_dwd_weatherforecast-2.1.16.dist-info}/WHEEL

@@ -1,5 +1,5 @@
 Wheel-Version: 1.0
-Generator: setuptools (75.8.0)
+Generator: setuptools (75.8.2)
 Root-Is-Purelib: true
 Tag: py3-none-any
 

tests/test_get_daily_min.py

@@ -34,7 +34,7 @@ class Weather_get_daily_min(unittest.TestCase):
         test_time = datetime(2020, 11, 6, 10, 0)
         self.assertEqual(
             self.dwd_weather.get_daily_min(WeatherDataType.PRECIPITATION, test_time),
-            0.01,
+            0.0,
         )
 
     @patch("simple_dwd_weatherforecast.dwdforecast.Weather.update", return_value=None)