simple-dwd-weatherforecast 2.1.14__tar.gz → 2.1.16__tar.gz

{simple_dwd_weatherforecast-2.1.14/simple_dwd_weatherforecast.egg-info → simple_dwd_weatherforecast-2.1.16}/PKG-INFO

@@ -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 → simple_dwd_weatherforecast-2.1.16}/setup.py

@@ -5,7 +5,7 @@ with open("README.md", "r") as fh:
 
 setuptools.setup(
     name="simple_dwd_weatherforecast",
-    version="v2.1.14",
+    version="v2.1.16",
     author="Max Fermor",
     description="A simple tool to retrieve a weather forecast from DWD OpenData",
     long_description=long_description,

{simple_dwd_weatherforecast-2.1.14 → simple_dwd_weatherforecast-2.1.16}/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-2.1.14 → simple_dwd_weatherforecast-2.1.16}/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 → simple_dwd_weatherforecast-2.1.16/simple_dwd_weatherforecast.egg-info}/PKG-INFO

@@ -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 → simple_dwd_weatherforecast-2.1.16}/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)