simple-dwd-weatherforecast 3.0.1__py3-none-any.whl → 3.0.3__py3-none-any.whl

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,20 +195,10 @@ 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:
+        raise ConnectionError(f"Error during image request from DWD servers: {url}")
 
 
 class ImageLoop:
@@ -328,28 +320,19 @@ 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("Error during image request from DWD servers")
+            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
-                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.1.dist-info → simple_dwd_weatherforecast-3.0.3.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: simple_dwd_weatherforecast
-Version: 3.0.1
+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.1.dist-info → simple_dwd_weatherforecast-3.0.3.dist-info}/RECORD

@@ -1,9 +1,9 @@
 simple_dwd_weatherforecast/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 simple_dwd_weatherforecast/dwdforecast.py,sha256=uZRWMN9RIPvC9r47JAdw_AiP9V9M2rQxh_pOsVF15Sw,39094
-simple_dwd_weatherforecast/dwdmap.py,sha256=wy-WC5JOWeNoqex-A80pvKWo_DyO61_y8E4zvmQ0iLg,14429
+simple_dwd_weatherforecast/dwdmap.py,sha256=I_C0MPK7RlbtNGOpxGl5Oy4rm-XEB_gIbLunV0y76HI,13691
 simple_dwd_weatherforecast/stations.json,sha256=1u8qc2CT_rVy49SAlOicGixzHln6Y0FXevuFAz2maBw,838948
 simple_dwd_weatherforecast/uv_stations.json,sha256=ADenYo-aR6qbf0UFkfYr72kkFzL9HyUKe4VQ23POGF8,2292
-simple_dwd_weatherforecast-3.0.1.dist-info/licenses/LICENCE,sha256=27UG7gteqvSWuZlsbIq2_OAbh7VyifGGl-1zpuUoBcw,1072
+simple_dwd_weatherforecast-3.0.3.dist-info/licenses/LICENCE,sha256=27UG7gteqvSWuZlsbIq2_OAbh7VyifGGl-1zpuUoBcw,1072
 tests/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 tests/dummy_data.py,sha256=qapeQxjh8kURf5b-9h4gUdJaqQJQDVdqfMtS2g5JReY,103406
 tests/dummy_data_full.py,sha256=3HRGAQBq4xPYs4jLzoLV_UAe1CXFzOsVBOouDL_5RHw,104062
@@ -36,7 +36,7 @@ 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-3.0.1.dist-info/METADATA,sha256=4pReGRzr-gEcDD3F78H144vI3aq6vVmmm3BZOFV9gCw,12869
-simple_dwd_weatherforecast-3.0.1.dist-info/WHEEL,sha256=CmyFI0kx5cdEMTLiONQRbGQwjIoR1aIYB7eCAQ4KPJ0,91
-simple_dwd_weatherforecast-3.0.1.dist-info/top_level.txt,sha256=iyEobUh14Tzitx39Oi8qm0NhBrnZovl_dNKtvLUkLEM,33
-simple_dwd_weatherforecast-3.0.1.dist-info/RECORD,,
+simple_dwd_weatherforecast-3.0.3.dist-info/METADATA,sha256=kDbBjTJiY0xUAJnDea87paaLvhAaX3UAmC_du1w0w3U,12869
+simple_dwd_weatherforecast-3.0.3.dist-info/WHEEL,sha256=DnLRTWE75wApRYVsjgc6wsVswC54sMSJhAEd4xhDpBk,91
+simple_dwd_weatherforecast-3.0.3.dist-info/top_level.txt,sha256=iyEobUh14Tzitx39Oi8qm0NhBrnZovl_dNKtvLUkLEM,33
+simple_dwd_weatherforecast-3.0.3.dist-info/RECORD,,

{simple_dwd_weatherforecast-3.0.1.dist-info → simple_dwd_weatherforecast-3.0.3.dist-info}/WHEEL

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