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

simple_dwd_weatherforecast/dwdmap.py

@@ -9,7 +9,7 @@ from datetime import datetime, timedelta, timezone
 
 
 class WeatherMapType(Enum):
-    NIEDERSCHLAGSRADAR = "dwd:Niederschlagsradar"
+    NIEDERSCHLAGSRADAR = "dwd:Radar_rv_product_1x1km_ger"
     BLITZSCHLAG = "dwd:NCEW_EU"
     MAXTEMP = "dwd:GefuehlteTempMax"
     UVINDEX = "dwd:UVI_CS"
@@ -85,8 +85,10 @@ def get_from_location(
     longitude,
     latitude,
     radius_km,
-    map_type: WeatherMapType,
-    background_type: WeatherBackgroundMapType = WeatherBackgroundMapType.BUNDESLAENDER,
+    map_types: list[WeatherMapType],
+    background_types: list[WeatherBackgroundMapType] = [
+        WeatherBackgroundMapType.BUNDESLAENDER
+    ],
     image_width=520,
     image_height=580,
     markers: list[Marker] = [],
@@ -104,8 +106,8 @@ def get_from_location(
         latitude - radius,
         longitude + radius,
         latitude + radius,
-        map_type,
-        background_type,
+        map_types,
+        background_types,
         image_width,
         image_height,
         markers,
@@ -114,8 +116,10 @@ def get_from_location(
 
 
 def get_germany(
-    map_type: WeatherMapType,
-    background_type: WeatherBackgroundMapType = WeatherBackgroundMapType.BUNDESLAENDER,
+    map_types: list[WeatherMapType],
+    background_types: list[WeatherBackgroundMapType] = [
+        WeatherBackgroundMapType.BUNDESLAENDER
+    ],
     image_width=520,
     image_height=580,
     markers: list[Marker] = [],
@@ -126,8 +130,8 @@ def get_germany(
         germany_boundaries.miny,
         germany_boundaries.maxx,
         germany_boundaries.maxy,
-        map_type,
-        background_type,
+        map_types,
+        background_types,
         image_width,
         image_height,
         markers,
@@ -140,8 +144,8 @@ def get_map(
     miny,
     maxx,
     maxy,
-    map_type: WeatherMapType,
-    background_type: WeatherBackgroundMapType,
+    map_types: list[WeatherMapType],
+    background_types: list[WeatherBackgroundMapType],
     image_width=520,
     image_height=580,
     markers: list[Marker] = [],
@@ -151,18 +155,44 @@ def get_map(
         raise ValueError(
             "Width and height must not exceed 1200 and 1400 respectively. Please be kind to the DWD servers."
         )
-    if background_type in [
-        WeatherBackgroundMapType.SATELLIT,
-        WeatherBackgroundMapType.KREISE,
-        WeatherBackgroundMapType.GEMEINDEN,
-    ]:
-        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.1&request=GetMap&layers={layers}&bbox={minx},{miny},{maxx},{maxy}&width={image_width}&height={image_height}&srs=EPSG:4326&styles=&format=image/png"
+    # Separate special layers and others for background types
+    special_layers = [
+        layer.value
+        for layer in background_types
+        if layer
+        in [
+            WeatherBackgroundMapType.SATELLIT,
+            WeatherBackgroundMapType.KREISE,
+            WeatherBackgroundMapType.GEMEINDEN,
+        ]
+    ]
+    other_layers = [
+        layer.value
+        for layer in background_types
+        if layer
+        not in [
+            WeatherBackgroundMapType.SATELLIT,
+            WeatherBackgroundMapType.KREISE,
+            WeatherBackgroundMapType.GEMEINDEN,
+        ]
+    ]
+    # Combine map types into a single string
+    map_layers = ",".join(map_type.value for map_type in map_types)
+    # 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"
+
     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
@@ -187,8 +217,8 @@ class ImageLoop:
     _miny: float
     _maxx: float
     _maxy: float
-    _map_type: WeatherMapType
-    _background_type: WeatherBackgroundMapType
+    _map_types: list[WeatherMapType]
+    _background_types: list[WeatherBackgroundMapType]
     _image_width: int
     _image_height: int
 
@@ -198,14 +228,16 @@ class ImageLoop:
         miny: float,
         maxx: float,
         maxy: float,
-        map_type: WeatherMapType,
-        background_type: WeatherBackgroundMapType,
+        map_types: list[WeatherMapType],
+        background_types: list[WeatherBackgroundMapType],
         steps: int = 6,
         image_width: int = 520,
         image_height: int = 580,
         markers: list[Marker] = [],
         dark_mode: bool = False,
     ):
+        if WeatherMapType.NIEDERSCHLAGSRADAR not in map_types:
+            raise ValueError("Only NIEDERSCHLAGSRADAR is supported in a loop")
         if image_width > 1200 or image_height > 1400:
             raise ValueError(
                 "Width and height must not exceed 1200 and 1400 respectively. Please be kind to the DWD servers."
@@ -214,10 +246,8 @@ class ImageLoop:
         self._miny = miny
         self._maxx = maxx
         self._maxy = maxy
-        if map_type != WeatherMapType.NIEDERSCHLAGSRADAR:
-            raise ValueError("Only NIEDERSCHLAGSRADAR is supported in a loop")
-        self._map_type = map_type
-        self._background_type = background_type
+        self._map_types = map_types
+        self._background_types = background_types
         self._steps = steps
         self._image_width = image_width
         self._image_height = image_height
@@ -267,24 +297,47 @@ class ImageLoop:
         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
+        # Combine map types into a single string
+        map_layers = ",".join(map_type.value for map_type in self._map_types)
         if with_lightning:
-            layer += ",dwd:NCEW_EU"
-        if self._background_type in [
-            WeatherBackgroundMapType.SATELLIT,
-            WeatherBackgroundMapType.KREISE,
-            WeatherBackgroundMapType.GEMEINDEN,
-        ]:
-            layers = f"{self._background_type.value}, {layer}"
-        else:
-            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')}"
+            map_layers += ",dwd:NCEW_EU"
+        # Separate special layers and others for background types
+        special_layers = [
+            layer.value
+            for layer in self._background_types
+            if layer
+            in [
+                WeatherBackgroundMapType.SATELLIT,
+                WeatherBackgroundMapType.KREISE,
+                WeatherBackgroundMapType.GEMEINDEN,
+            ]
+        ]
+        other_layers = [
+            layer.value
+            for layer in self._background_types
+            if layer
+            not in [
+                WeatherBackgroundMapType.SATELLIT,
+                WeatherBackgroundMapType.KREISE,
+                WeatherBackgroundMapType.GEMEINDEN,
+            ]
+        ]
+        # 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={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')}"
         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))
+        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-2.1.17.dist-info → simple_dwd_weatherforecast-3.0.1.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: simple_dwd_weatherforecast
-Version: 2.1.17
+Version: 3.0.1
 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
@@ -227,11 +227,11 @@ class Marker(
         width: int = 0,
     )
 
-get_from_location(longitude, latitude, radius_km, map_type: WeatherMapType, background_type: WeatherBackgroundMapType, optional integer image_width, optional integer image_height, optional markers: list[Marker], optional bool dark_mode) #Returns map as pillow image with given radius from coordinates
+get_from_location(longitude, latitude, radius_km, map_type: [WeatherMapType], background_type: [WeatherBackgroundMapType], optional integer image_width, optional integer image_height, optional markers: list[Marker], optional bool dark_mode) #Returns map as pillow image with given radius from coordinates
 
-get_germany(map_type: WeatherMapType, optional WeatherBackgroundMapType background_type, optional integer image_width, optional integer image_height, optional markers: list[Marker], optional bool dark_mode) #Returns map as pillow image of whole germany
+get_germany(map_type: [WeatherMapType], optional [WeatherBackgroundMapType] background_type, optional integer image_width, optional integer image_height, optional markers: list[Marker], optional bool dark_mode) #Returns map as pillow image of whole germany
 
-get_map(minx,miny,maxx,maxy, map_type: WeatherMapType, background_type: WeatherBackgroundMapType, optional integer image_width, optional integer image_height, optional markers: list[Marker], optional bool dark_mode) #Returns map as pillow image
+get_map(minx,miny,maxx,maxy, map_type: [WeatherMapType], background_type: [WeatherBackgroundMapType], optional integer image_width, optional integer image_height, optional markers: list[Marker], optional bool dark_mode) #Returns map as pillow image
 ```
 
 
@@ -249,8 +249,8 @@ maploop = dwdmap.ImageLoop(
     dwdmap.germany_boundaries.miny,
     dwdmap.germany_boundaries.maxx,
     dwdmap.germany_boundaries.maxy,
-    dwdmap.WeatherMapType.NIEDERSCHLAGSRADAR,
-    dwdmap.WeatherBackgroundMapType.BUNDESLAENDER,
+    [dwdmap.WeatherMapType.NIEDERSCHLAGSRADAR],
+    [dwdmap.WeatherBackgroundMapType.BUNDESLAENDER],
     steps=5,
 )
 
@@ -262,7 +262,7 @@ for image in enumerate(maploop._images):
 #### Available methods
 
 ```python
-ImageLoop(minx: float, miny: float, maxx: float, maxy: float, map_type: WeatherMapType, background_type: WeatherBackgroundMapType,
+ImageLoop(minx: float, miny: float, maxx: float, maxy: float, map_type: [WeatherMapType], background_type: [WeatherBackgroundMapType],
         steps: int = 6, image_width: int = 520,image_height: int = 580, markers: list[Marker] = [], optional bool dark_mode) -> ImageLoop
 
 get_images() -> Iterable[ImageFile.ImageFile] # Returns the image loop

{simple_dwd_weatherforecast-2.1.17.dist-info → simple_dwd_weatherforecast-3.0.1.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=H7W5_J91IbFbx9s8OZxvoNsJxc3mKITBZVU8EldMjjI,12720
+simple_dwd_weatherforecast/dwdmap.py,sha256=wy-WC5JOWeNoqex-A80pvKWo_DyO61_y8E4zvmQ0iLg,14429
 simple_dwd_weatherforecast/stations.json,sha256=1u8qc2CT_rVy49SAlOicGixzHln6Y0FXevuFAz2maBw,838948
 simple_dwd_weatherforecast/uv_stations.json,sha256=ADenYo-aR6qbf0UFkfYr72kkFzL9HyUKe4VQ23POGF8,2292
-simple_dwd_weatherforecast-2.1.17.dist-info/licenses/LICENCE,sha256=27UG7gteqvSWuZlsbIq2_OAbh7VyifGGl-1zpuUoBcw,1072
+simple_dwd_weatherforecast-3.0.1.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
@@ -26,7 +26,7 @@ tests/test_get_timeframe_values.py,sha256=D9NJ98sZykLKAW1eZgLFuy0FMb4f_jUCtr4clz
 tests/test_is_in_timerange.py,sha256=3y88L3N73NxSTJ-_edx6OCnxHWKJWWFma98gjZvJDGg,1338
 tests/test_is_valid_timeframe.py,sha256=mXjeu3lUyixiBUEljirTf6qDM_FZFQGWa-Rk0NBMUDU,891
 tests/test_location_tools.py,sha256=wto_XzVnARJQ-Qc83YAn0ahfMBSaOHpfzqAeKRDsNm8,1208
-tests/test_map.py,sha256=uKxNjMXLFT3pczZKLqkfPK5xaVfmql-r5L9VPgCbS3Q,5671
+tests/test_map.py,sha256=X4zFmnoE7YzT6UudE0TtFmsBwhlrRP5C1p8K70_0yTg,5701
 tests/test_parsekml.py,sha256=aG98x3B409CqxKBIq50yf3_LxPROnI4CAhdKfp350uQ,1495
 tests/test_region.py,sha256=ReUB9Cy9roBemkpEkTjZZav-Mu3Ha7ADOAfa9J-gi80,877
 tests/test_reported_weather.py,sha256=ULg4ogZRxus01p2rdxiSFL75AisqtcvnLDOc7uJMBH0,767
@@ -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-2.1.17.dist-info/METADATA,sha256=aMMWbvdYlkKr0QNj5gsD_mRNufHZrjXOizxF20TtiHU,12850
-simple_dwd_weatherforecast-2.1.17.dist-info/WHEEL,sha256=1tXe9gY0PYatrMPMDd6jXqjfpz_B-Wqm32CPfRC58XU,91
-simple_dwd_weatherforecast-2.1.17.dist-info/top_level.txt,sha256=iyEobUh14Tzitx39Oi8qm0NhBrnZovl_dNKtvLUkLEM,33
-simple_dwd_weatherforecast-2.1.17.dist-info/RECORD,,
+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-2.1.17.dist-info → simple_dwd_weatherforecast-3.0.1.dist-info}/WHEEL

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

tests/test_map.py

@@ -38,8 +38,8 @@ class MapTestCase(unittest.TestCase):
                 46.4,
                 16.1,
                 55.6,
-                dwdmap.WeatherMapType.NIEDERSCHLAGSRADAR,
-                dwdmap.WeatherBackgroundMapType.BUNDESLAENDER,
+                [dwdmap.WeatherMapType.NIEDERSCHLAGSRADAR],
+                [dwdmap.WeatherBackgroundMapType.BUNDESLAENDER],
                 1300,
                 1700,
             )
@@ -53,8 +53,8 @@ class ImageLoopTestCase(unittest.TestCase):
             0.2,
             0.3,
             0.4,
-            dwdmap.WeatherMapType.NIEDERSCHLAGSRADAR,
-            dwdmap.WeatherBackgroundMapType.BUNDESLAENDER,
+            [dwdmap.WeatherMapType.NIEDERSCHLAGSRADAR],
+            [dwdmap.WeatherBackgroundMapType.BUNDESLAENDER],
             1,
         )
         self.assertEqual(
@@ -74,12 +74,12 @@ class ImageLoopTestCase(unittest.TestCase):
             0.4,
         )
         self.assertEqual(
-            maploop._map_type,
-            dwdmap.WeatherMapType.NIEDERSCHLAGSRADAR,
+            maploop._map_types,
+            [dwdmap.WeatherMapType.NIEDERSCHLAGSRADAR],
         )
         self.assertEqual(
-            maploop._background_type,
-            dwdmap.WeatherBackgroundMapType.BUNDESLAENDER,
+            maploop._background_types,
+            [dwdmap.WeatherBackgroundMapType.BUNDESLAENDER],
         )
         mock_function.assert_called_once()
 
@@ -90,8 +90,8 @@ class ImageLoopTestCase(unittest.TestCase):
             0.2,
             0.3,
             0.4,
-            dwdmap.WeatherMapType.NIEDERSCHLAGSRADAR,
-            dwdmap.WeatherBackgroundMapType.BUNDESLAENDER,
+            [dwdmap.WeatherMapType.NIEDERSCHLAGSRADAR],
+            [dwdmap.WeatherBackgroundMapType.BUNDESLAENDER],
             5,
         )
         self.assertEqual(mock_function.call_count, 5)
@@ -103,8 +103,8 @@ class ImageLoopTestCase(unittest.TestCase):
             0.2,
             0.3,
             0.4,
-            dwdmap.WeatherMapType.NIEDERSCHLAGSRADAR,
-            dwdmap.WeatherBackgroundMapType.BUNDESLAENDER,
+            [dwdmap.WeatherMapType.NIEDERSCHLAGSRADAR],
+            [dwdmap.WeatherBackgroundMapType.BUNDESLAENDER],
             10,
         )
         self.assertEqual(mock_function.call_count, 10)
@@ -116,8 +116,8 @@ class ImageLoopTestCase(unittest.TestCase):
             0.2,
             0.3,
             0.4,
-            dwdmap.WeatherMapType.NIEDERSCHLAGSRADAR,
-            dwdmap.WeatherBackgroundMapType.BUNDESLAENDER,
+            [dwdmap.WeatherMapType.NIEDERSCHLAGSRADAR],
+            [dwdmap.WeatherBackgroundMapType.BUNDESLAENDER],
             5,
         )
         maploop._last_update = datetime(year=2024, month=9, day=4, hour=5, minute=50)
@@ -130,8 +130,8 @@ class ImageLoopTestCase(unittest.TestCase):
             0.2,
             0.3,
             0.4,
-            dwdmap.WeatherMapType.NIEDERSCHLAGSRADAR,
-            dwdmap.WeatherBackgroundMapType.BUNDESLAENDER,
+            [dwdmap.WeatherMapType.NIEDERSCHLAGSRADAR],
+            [dwdmap.WeatherBackgroundMapType.BUNDESLAENDER],
             5,
         )
         now = dwdmap.get_time_last_5_min(datetime.now(timezone.utc))