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

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

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

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

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

@@ -182,8 +182,10 @@ def get_map(
     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"
+    bgcolor = "0xFFFFFF"
+    if dark_mode:
+        bgcolor = "0x1C1C1C"
+    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&bgcolor={bgcolor}"
 
     request = requests.get(url, stream=True)
     if request.status_code == 200:
@@ -193,18 +195,6 @@ def get_map(
             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
-                if item[0] == 255 and item[1] == 255 and item[2] == 255:
-                    new_image_data.append((28, 28, 28))
-                elif item[0] == 85 and item[1] == 85 and item[2] == 85:
-                    new_image_data.append((155, 155, 155))
-                else:
-                    new_image_data.append(item)
-
-            # update image data
-            image.putdata(new_image_data)
         image = draw_marker(image, ImageBoundaries(minx, maxx, miny, maxy), markers)
         return image
     else:
@@ -330,7 +320,10 @@ class ImageLoop:
                 ","
             ).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')}"
+        bgcolor = "0xFFFFFF"
+        if self.dark_mode:
+            bgcolor = "0x1C1C1C"
+        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')}&bgcolor={bgcolor}"
         request = requests.get(url, stream=True)
         if request.status_code != 200 or request.headers["content-type"] != "image/png":
             raise ConnectionError(f"Error during image request from DWD servers: {url}")
@@ -340,18 +333,6 @@ class ImageLoop:
             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
-                if item[0] == 255 and item[1] == 255 and item[2] == 255:
-                    new_image_data.append((28, 28, 28))
-                elif item[0] == 85 and item[1] == 85 and item[2] == 85:
-                    new_image_data.append((155, 155, 155))
-                else:
-                    new_image_data.append(item)
-
-            # update image data
-            image.putdata(new_image_data)
         image = draw_marker(
             image,
             ImageBoundaries(self._minx, self._maxx, self._miny, self._maxy),

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

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