simple-dwd-weatherforecast 3.0.0__tar.gz → 3.0.2__tar.gz

{simple_dwd_weatherforecast-3.0.0/simple_dwd_weatherforecast.egg-info → simple_dwd_weatherforecast-3.0.2}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: simple_dwd_weatherforecast
-Version: 3.0.0
+Version: 3.0.2
 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-3.0.0 → simple_dwd_weatherforecast-3.0.2}/setup.py

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

{simple_dwd_weatherforecast-3.0.0 → simple_dwd_weatherforecast-3.0.2}/simple_dwd_weatherforecast/dwdmap.py

@@ -181,13 +181,18 @@ def get_map(
     # Combine layers with special layers first, then map types, then other layers
     layers = f"{','.join(special_layers)},{map_layers},{','.join(other_layers)}".lstrip(
         ","
-    )
+    ).rstrip(",")
 
     url = f"https://maps.dwd.de/geoserver/dwd/wms?service=WMS&version=1.3.0&request=GetMap&layers={layers}&bbox={miny},{minx},{maxy},{maxx}&width={image_width}&height={image_height}&srs=EPSG:4326&styles=&format=image/png"
-    print(url)
+
     request = requests.get(url, stream=True)
     if request.status_code == 200:
-        image = Image.open(BytesIO(request.content))
+        try:
+            image = Image.open(BytesIO(request.content))
+        except Exception as e:
+            raise RuntimeError(
+                f"Error during image request from DWD servers: {url}"
+            ) from e
         if dark_mode:
             new_image_data = []
             for item in image.getdata():  # type: ignore
@@ -202,6 +207,8 @@ def get_map(
             image.putdata(new_image_data)
         image = draw_marker(image, ImageBoundaries(minx, maxx, miny, maxy), markers)
         return image
+    else:
+        raise ConnectionError(f"Error during image request from DWD servers: {url}")
 
 
 class ImageLoop:
@@ -321,14 +328,18 @@ class ImageLoop:
         layers = (
             f"{','.join(special_layers)},{map_layers},{','.join(other_layers)}".lstrip(
                 ","
-            )
+            ).rstrip(",")
         )
         url = f"https://maps.dwd.de/geoserver/dwd/wms?service=WMS&version=1.3.0&request=GetMap&layers={layers}&bbox={self._miny},{self._minx},{self._maxy},{self._maxx}&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')}"
-        print(url)
         request = requests.get(url, stream=True)
         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))
+            raise ConnectionError(f"Error during image request from DWD servers: {url}")
+        try:
+            image = Image.open(BytesIO(request.content))
+        except Exception as e:
+            raise RuntimeError(
+                f"Error during image request from DWD servers: {url}"
+            ) from e
         if self.dark_mode:
             new_image_data = []
             for item in image.getdata():  # type: ignore

{simple_dwd_weatherforecast-3.0.0 → simple_dwd_weatherforecast-3.0.2/simple_dwd_weatherforecast.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: simple_dwd_weatherforecast
-Version: 3.0.0
+Version: 3.0.2
 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