simple-dwd-weatherforecast 2.0.33__tar.gz → 2.1.0__tar.gz

{simple_dwd_weatherforecast-2.0.33/simple_dwd_weatherforecast.egg-info → simple_dwd_weatherforecast-2.1.0}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: simple_dwd_weatherforecast
-Version: 2.0.33
+Version: 2.1.0
 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
@@ -198,13 +198,50 @@ class WeatherBackgroundMapType(Enum):
     GEMEINDEN = "dwd:Warngebiete_Gemeinden"
     SATELLIT = "dwd:bluemarble"
 
-def get_from_location(longitude, latitude, radius_km, map_type: WeatherMapType, background_type: WeatherBackgroundMapType, optional integer image_width, optional integer image_height) #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) #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 string save_to_filename) #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 string save_to_filename) #Returns map as pillow image
 ```
 
+
+### Image loop
+
+There is also the possibility to retrieve multiple images as a loop. This can be done by the class ImageLoop.
+
+
+#### Usage example
+```python
+from simple_dwd_weatherforecast import dwdmap
+
+maploop = dwdmap.ImageLoop(
+    dwdmap.germany_boundaries.minx,
+    dwdmap.germany_boundaries.miny,
+    dwdmap.germany_boundaries.maxx,
+    dwdmap.germany_boundaries.maxy,
+    dwdmap.WeatherMapType.NIEDERSCHLAGSRADAR,
+    dwdmap.WeatherBackgroundMapType.BUNDESLAENDER,
+    steps=5,
+)
+
+for image in enumerate(maploop._images):
+    image[1].save(f"image{image[0]}.png")
+
+```
+
+#### Available methods
+
+```python
+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) -> ImageLoop
+
+get_images() -> Iterable[ImageFile.ImageFile] # Returns the image loop
+
+update() # Updates the loop to the most recent files
+
+```
+
 ## Help and Contribution
 
 Feel free to open an issue if you find one and I will do my best to help you. If you want to contribute, your help is appreciated! If you want to add a new feature, add a pull request first so we can chat about the details.

{simple_dwd_weatherforecast-2.0.33 → simple_dwd_weatherforecast-2.1.0}/README.md

@@ -181,13 +181,50 @@ class WeatherBackgroundMapType(Enum):
     GEMEINDEN = "dwd:Warngebiete_Gemeinden"
     SATELLIT = "dwd:bluemarble"
 
-def get_from_location(longitude, latitude, radius_km, map_type: WeatherMapType, background_type: WeatherBackgroundMapType, optional integer image_width, optional integer image_height) #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) #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 string save_to_filename) #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 string save_to_filename) #Returns map as pillow image
 ```
 
+
+### Image loop
+
+There is also the possibility to retrieve multiple images as a loop. This can be done by the class ImageLoop.
+
+
+#### Usage example
+```python
+from simple_dwd_weatherforecast import dwdmap
+
+maploop = dwdmap.ImageLoop(
+    dwdmap.germany_boundaries.minx,
+    dwdmap.germany_boundaries.miny,
+    dwdmap.germany_boundaries.maxx,
+    dwdmap.germany_boundaries.maxy,
+    dwdmap.WeatherMapType.NIEDERSCHLAGSRADAR,
+    dwdmap.WeatherBackgroundMapType.BUNDESLAENDER,
+    steps=5,
+)
+
+for image in enumerate(maploop._images):
+    image[1].save(f"image{image[0]}.png")
+
+```
+
+#### Available methods
+
+```python
+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) -> ImageLoop
+
+get_images() -> Iterable[ImageFile.ImageFile] # Returns the image loop
+
+update() # Updates the loop to the most recent files
+
+```
+
 ## Help and Contribution
 
 Feel free to open an issue if you find one and I will do my best to help you. If you want to contribute, your help is appreciated! If you want to add a new feature, add a pull request first so we can chat about the details.

{simple_dwd_weatherforecast-2.0.33 → simple_dwd_weatherforecast-2.1.0}/setup.py

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

{simple_dwd_weatherforecast-2.0.33 → simple_dwd_weatherforecast-2.1.0}/simple_dwd_weatherforecast/dwdforecast.py

@@ -298,13 +298,15 @@ class Weather:
         return (
             self.strip_to_day(
                 arrow.get(
-                    list(self.forecast_data.keys())[0], "YYYY-MM-DDTHH:mm:ss.SSSZ"  # type: ignore
+                    list(self.forecast_data.keys())[0],  # type: ignore
+                    "YYYY-MM-DDTHH:mm:ss.SSSZ",  # type: ignore
                 ).datetime
             )
             <= self.strip_to_day(timestamp)
             <= self.strip_to_day(
                 arrow.get(
-                    list(self.forecast_data.keys())[-1], "YYYY-MM-DDTHH:mm:ss.SSSZ"  # type: ignore
+                    list(self.forecast_data.keys())[-1],  # type: ignore
+                    "YYYY-MM-DDTHH:mm:ss.SSSZ",  # type: ignore
                 ).datetime
             )
         )
@@ -358,7 +360,7 @@ class Weather:
     def get_daily_condition(self, timestamp: datetime, shouldUpdate=True):
         if shouldUpdate:
             self.update()
-        if self.is_in_timerange(timestamp):
+        if self.is_in_timerange_day(timestamp):
             return self.get_condition(self.get_day_values(timestamp))
         return None
 
@@ -609,7 +611,8 @@ class Weather:
         "timestamp has to be checked prior to be in timerange"
         result = []
         first_entry_date = arrow.get(
-            next(iter(self.forecast_data)), "YYYY-MM-DDTHH:mm:ss.SSSZ"  # type: ignore
+            next(iter(self.forecast_data)),  # type: ignore
+            "YYYY-MM-DDTHH:mm:ss.SSSZ",  # type: ignore
         ).datetime  # type: ignore
         if timestamp.day != first_entry_date.day:
             time_step = self.strip_to_day(timestamp)

simple_dwd_weatherforecast-2.1.0/simple_dwd_weatherforecast/dwdmap.py

@@ -0,0 +1,182 @@
+from typing import Iterable
+import requests
+import math
+from io import BytesIO
+from PIL import Image, ImageFile
+from enum import Enum
+from collections import deque
+from datetime import datetime, timedelta, timezone
+
+
+class WeatherMapType(Enum):
+    NIEDERSCHLAGSRADAR = "dwd:Niederschlagsradar,dwd:NCEW_EU"
+    MAXTEMP = "dwd:GefuehlteTempMax"
+    UVINDEX = "dwd:UVI_CS"
+    POLLENFLUG = "dwd:Pollenflug"
+    SATELLITE_RGB = "dwd:Satellite_meteosat_1km_euat_rgb_day_hrv_and_night_ir108_3h"
+    SATELLITE_IR = "dwd:Satellite_worldmosaic_3km_world_ir108_3h"
+    WARNUNGEN_GEMEINDEN = "dwd:Warnungen_Gemeinden"
+    WARNUNGEN_KREISE = "dwd:Warnungen_Landkreise"
+
+
+class WeatherBackgroundMapType(Enum):
+    LAENDER = "dwd:Laender"
+    BUNDESLAENDER = "dwd:Warngebiete_Bundeslaender"
+    KREISE = "dwd:Warngebiete_Kreise"
+    GEMEINDEN = "dwd:Warngebiete_Gemeinden"
+    SATELLIT = "dwd:bluemarble"
+    GEWAESSER = "dwd:Gewaesser"
+
+
+class germany_boundaries:
+    minx = 4.4
+    miny = 46.4
+    maxx = 16.1
+    maxy = 55.6
+
+
+def get_from_location(
+    longitude,
+    latitude,
+    radius_km,
+    map_type: WeatherMapType,
+    background_type: WeatherBackgroundMapType = WeatherBackgroundMapType.BUNDESLAENDER,
+    image_width=520,
+    image_height=580,
+):
+    if radius_km <= 0:
+        raise ValueError("Radius must be greater than 0")
+    if latitude < -90 or latitude > 90:
+        raise ValueError("Latitude must be between -90 and 90")
+    if longitude < -180 or longitude > 180:
+        raise ValueError("Longitude must be between -180 and 180")
+    radius = math.fabs(radius_km / (111.3 * math.cos(latitude)))
+    return get_map(
+        latitude - radius,
+        longitude - radius,
+        latitude + radius,
+        longitude + radius,
+        map_type,
+        background_type,
+        image_width,
+        image_height,
+    )
+
+
+def get_germany(
+    map_type: WeatherMapType,
+    background_type: WeatherBackgroundMapType = WeatherBackgroundMapType.BUNDESLAENDER,
+    image_width=520,
+    image_height=580,
+):
+    return get_map(
+        germany_boundaries.minx,
+        germany_boundaries.miny,
+        germany_boundaries.maxx,
+        germany_boundaries.maxy,
+        map_type,
+        background_type,
+        image_width,
+        image_height,
+    )
+
+
+def get_map(
+    minx,
+    miny,
+    maxx,
+    maxy,
+    map_type: WeatherMapType,
+    background_type: WeatherBackgroundMapType,
+    image_width=520,
+    image_height=580,
+):
+    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."
+        )
+    url = f"https://maps.dwd.de/geoserver/dwd/wms?service=WMS&version=1.1.0&request=GetMap&layers={map_type.value},{background_type.value}&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))
+        return image
+
+
+class ImageLoop:
+    _last_update: datetime
+    _images: deque[ImageFile.ImageFile]
+
+    _minx: float
+    _miny: float
+    _maxx: float
+    _maxy: float
+    _map_type: WeatherMapType
+    _background_type: WeatherBackgroundMapType
+    _image_width: int
+    _image_height: int
+
+    def __init__(
+        self,
+        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,
+    ):
+        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."
+            )
+        self._minx = minx
+        self._miny = miny
+        self._maxx = maxx
+        self._maxy = maxy
+        self._map_type = map_type
+        self._background_type = background_type
+        self._steps = steps
+        self._image_width = image_width
+        self._image_height = image_height
+
+        self._images = deque([], steps)
+
+        self._full_reload()
+
+    def get_images(self) -> Iterable[ImageFile.ImageFile]:
+        return self._images
+
+    def _full_reload(self):
+        self._images.clear()
+        now = get_time_last_5_min(datetime.now(timezone.utc))
+        self._last_update = now - timedelta(minutes=5) * self._steps
+
+        while now > self._last_update:
+            self._last_update += timedelta(minutes=5)
+            self._images.append(self._get_image(self._last_update))
+
+    def update(self):
+        now = get_time_last_5_min(datetime.now(timezone.utc))
+
+        # If last update is older than the buffer can hold, reload the whole buffer
+        if now - self._last_update > self._steps * timedelta(minutes=5):
+            self._full_reload()
+        # Update the buffer and fetch only the new images
+        else:
+            while now > self._last_update:
+                self._last_update += timedelta(minutes=5)
+                self._images.append(self._get_image(self._last_update))
+
+    def _get_image(self, date: datetime) -> ImageFile.ImageFile:
+        url = f"https://maps.dwd.de/geoserver/dwd/wms?service=WMS&version=1.1.0&request=GetMap&layers={self._map_type.value},{self._background_type.value}&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:
+            raise ConnectionError("Error during image request from DWD servers")
+        return Image.open(BytesIO(request.content))
+
+
+def get_time_last_5_min(date: datetime) -> datetime:
+    minute = math.floor(date.minute / 5) * 5
+    return date.replace(minute=minute, second=0, microsecond=0)

{simple_dwd_weatherforecast-2.0.33 → simple_dwd_weatherforecast-2.1.0/simple_dwd_weatherforecast.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: simple_dwd_weatherforecast
-Version: 2.0.33
+Version: 2.1.0
 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
@@ -198,13 +198,50 @@ class WeatherBackgroundMapType(Enum):
     GEMEINDEN = "dwd:Warngebiete_Gemeinden"
     SATELLIT = "dwd:bluemarble"
 
-def get_from_location(longitude, latitude, radius_km, map_type: WeatherMapType, background_type: WeatherBackgroundMapType, optional integer image_width, optional integer image_height) #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) #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 string save_to_filename) #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 string save_to_filename) #Returns map as pillow image
 ```
 
+
+### Image loop
+
+There is also the possibility to retrieve multiple images as a loop. This can be done by the class ImageLoop.
+
+
+#### Usage example
+```python
+from simple_dwd_weatherforecast import dwdmap
+
+maploop = dwdmap.ImageLoop(
+    dwdmap.germany_boundaries.minx,
+    dwdmap.germany_boundaries.miny,
+    dwdmap.germany_boundaries.maxx,
+    dwdmap.germany_boundaries.maxy,
+    dwdmap.WeatherMapType.NIEDERSCHLAGSRADAR,
+    dwdmap.WeatherBackgroundMapType.BUNDESLAENDER,
+    steps=5,
+)
+
+for image in enumerate(maploop._images):
+    image[1].save(f"image{image[0]}.png")
+
+```
+
+#### Available methods
+
+```python
+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) -> ImageLoop
+
+get_images() -> Iterable[ImageFile.ImageFile] # Returns the image loop
+
+update() # Updates the loop to the most recent files
+
+```
+
 ## Help and Contribution
 
 Feel free to open an issue if you find one and I will do my best to help you. If you want to contribute, your help is appreciated! If you want to add a new feature, add a pull request first so we can chat about the details.

{simple_dwd_weatherforecast-2.0.33 → simple_dwd_weatherforecast-2.1.0}/tests/test_get_daily_condition.py

@@ -49,3 +49,11 @@ class Weather_get_daily_condition(unittest.TestCase):
             self.dwd_weather.get_daily_condition(test_time),
             "cloudy",
         )
+
+    @patch("simple_dwd_weatherforecast.dwdforecast.Weather.update", return_value=None)
+    def test_same_day(self, _):
+        test_time = datetime(2020, 11, 6, 0, 0)
+        self.assertEqual(
+            self.dwd_weather.get_daily_condition(test_time),
+            "sunny",
+        )

simple_dwd_weatherforecast-2.1.0/tests/test_map.py

@@ -0,0 +1,171 @@
+import unittest
+from unittest.mock import patch
+from simple_dwd_weatherforecast import dwdmap
+from datetime import datetime, timedelta, timezone
+
+
+class MapTestCase(unittest.TestCase):
+    def test_prevent_too_large_height(self):
+        with self.assertRaises(ValueError):
+            dwdmap.get_map(
+                4.4,
+                46.4,
+                16.1,
+                55.6,
+                dwdmap.WeatherMapType.NIEDERSCHLAGSRADAR,
+                dwdmap.WeatherBackgroundMapType.BUNDESLAENDER,
+                1300,
+                700,
+            )
+
+    def test_prevent_too_large_width(self):
+        with self.assertRaises(ValueError):
+            dwdmap.get_map(
+                4.4,
+                46.4,
+                16.1,
+                55.6,
+                dwdmap.WeatherMapType.NIEDERSCHLAGSRADAR,
+                dwdmap.WeatherBackgroundMapType.BUNDESLAENDER,
+                300,
+                1700,
+            )
+
+    def test_prevent_too_large(self):
+        with self.assertRaises(ValueError):
+            dwdmap.get_map(
+                4.4,
+                46.4,
+                16.1,
+                55.6,
+                dwdmap.WeatherMapType.NIEDERSCHLAGSRADAR,
+                dwdmap.WeatherBackgroundMapType.BUNDESLAENDER,
+                1300,
+                1700,
+            )
+
+
+class ImageLoopTestCase(unittest.TestCase):
+    @patch("simple_dwd_weatherforecast.dwdmap.ImageLoop._get_image", return_value=None)
+    def test_init(self, mock_function):
+        maploop = dwdmap.ImageLoop(
+            0.1,
+            0.2,
+            0.3,
+            0.4,
+            dwdmap.WeatherMapType.NIEDERSCHLAGSRADAR,
+            dwdmap.WeatherBackgroundMapType.BUNDESLAENDER,
+            1,
+        )
+        self.assertEqual(
+            maploop._minx,
+            0.1,
+        )
+        self.assertEqual(
+            maploop._miny,
+            0.2,
+        )
+        self.assertEqual(
+            maploop._maxx,
+            0.3,
+        )
+        self.assertEqual(
+            maploop._maxy,
+            0.4,
+        )
+        self.assertEqual(
+            maploop._map_type,
+            dwdmap.WeatherMapType.NIEDERSCHLAGSRADAR,
+        )
+        self.assertEqual(
+            maploop._background_type,
+            dwdmap.WeatherBackgroundMapType.BUNDESLAENDER,
+        )
+        mock_function.assert_called_once()
+
+    @patch("simple_dwd_weatherforecast.dwdmap.ImageLoop._get_image", return_value=None)
+    def test_steps1(self, mock_function):
+        _ = dwdmap.ImageLoop(
+            0.1,
+            0.2,
+            0.3,
+            0.4,
+            dwdmap.WeatherMapType.NIEDERSCHLAGSRADAR,
+            dwdmap.WeatherBackgroundMapType.BUNDESLAENDER,
+            5,
+        )
+        self.assertEqual(mock_function.call_count, 5)
+
+    @patch("simple_dwd_weatherforecast.dwdmap.ImageLoop._get_image", return_value=None)
+    def test_steps2(self, mock_function):
+        _ = dwdmap.ImageLoop(
+            0.1,
+            0.2,
+            0.3,
+            0.4,
+            dwdmap.WeatherMapType.NIEDERSCHLAGSRADAR,
+            dwdmap.WeatherBackgroundMapType.BUNDESLAENDER,
+            10,
+        )
+        self.assertEqual(mock_function.call_count, 10)
+
+    @patch("simple_dwd_weatherforecast.dwdmap.ImageLoop._get_image", return_value=None)
+    def test_update_full(self, mock_function):
+        maploop = dwdmap.ImageLoop(
+            0.1,
+            0.2,
+            0.3,
+            0.4,
+            dwdmap.WeatherMapType.NIEDERSCHLAGSRADAR,
+            dwdmap.WeatherBackgroundMapType.BUNDESLAENDER,
+            5,
+        )
+        maploop._last_update = datetime(year=2024, month=9, day=4, hour=5, minute=50)
+        self.assertEqual(mock_function.call_count, 5)
+
+    @patch("simple_dwd_weatherforecast.dwdmap.ImageLoop._get_image", return_value=None)
+    def test_update_part(self, mock_function):
+        maploop = dwdmap.ImageLoop(
+            0.1,
+            0.2,
+            0.3,
+            0.4,
+            dwdmap.WeatherMapType.NIEDERSCHLAGSRADAR,
+            dwdmap.WeatherBackgroundMapType.BUNDESLAENDER,
+            5,
+        )
+        now = dwdmap.get_time_last_5_min(datetime.now(timezone.utc))
+        maploop._last_update = now - timedelta(minutes=15)
+        mock_function.reset_mock()
+        maploop.update()
+        self.assertEqual(mock_function.call_count, 3)
+
+
+class GeneralTestCase(unittest.TestCase):
+    def test_get_time_last_5_min_strip(self):
+        time = datetime(year=2024, month=9, day=4, hour=9, minute=50, second=52)
+        self.assertEqual(
+            dwdmap.get_time_last_5_min(time),
+            datetime(year=2024, month=9, day=4, hour=9, minute=50),
+        )
+
+    def test_get_time_last_5_min_exact(self):
+        time = datetime(year=2024, month=9, day=4, hour=9, minute=50, second=00)
+        self.assertEqual(
+            dwdmap.get_time_last_5_min(time),
+            datetime(year=2024, month=9, day=4, hour=9, minute=50),
+        )
+
+    def test_get_time_last_5_min_between1(self):
+        time = datetime(year=2024, month=9, day=4, hour=9, minute=52, second=00)
+        self.assertEqual(
+            dwdmap.get_time_last_5_min(time),
+            datetime(year=2024, month=9, day=4, hour=9, minute=50),
+        )
+
+    def test_get_time_last_5_min_between2(self):
+        time = datetime(year=2024, month=9, day=4, hour=9, minute=3, second=00)
+        self.assertEqual(
+            dwdmap.get_time_last_5_min(time),
+            datetime(year=2024, month=9, day=4, hour=9, minute=0),
+        )

simple_dwd_weatherforecast-2.0.33/simple_dwd_weatherforecast/dwdmap.py

@@ -1,85 +0,0 @@
-import requests
-import math
-from io import BytesIO
-from PIL import Image
-from enum import Enum
-
-
-class WeatherMapType(Enum):
-    NIEDERSCHLAGSRADAR = "dwd:Niederschlagsradar,dwd:NCEW_EU"
-    MAXTEMP = "dwd:GefuehlteTempMax"
-    UVINDEX = "dwd:UVI_CS"
-    POLLENFLUG = "dwd:Pollenflug"
-    SATELLITE_RGB = "dwd:Satellite_meteosat_1km_euat_rgb_day_hrv_and_night_ir108_3h"
-    SATELLITE_IR = "dwd:Satellite_worldmosaic_3km_world_ir108_3h"
-    WARNUNGEN_GEMEINDEN = "dwd:Warnungen_Gemeinden"
-    WARNUNGEN_KREISE = "dwd:Warnungen_Landkreise"
-
-
-class WeatherBackgroundMapType(Enum):
-    LAENDER = "dwd:Laender"
-    BUNDESLAENDER = "dwd:Warngebiete_Bundeslaender"
-    KREISE = "dwd:Warngebiete_Kreise"
-    GEMEINDEN = "dwd:Warngebiete_Gemeinden"
-    SATELLIT = "dwd:bluemarble"
-    GEWAESSER = "dwd:Gewaesser"
-
-
-def get_from_location(
-    longitude,
-    latitude,
-    radius_km,
-    map_type: WeatherMapType,
-    background_type: WeatherBackgroundMapType = WeatherBackgroundMapType.BUNDESLAENDER,
-    image_width=520,
-    image_height=580,
-):
-    if radius_km <= 0:
-        raise ValueError("Radius must be greater than 0")
-    if latitude < -90 or latitude > 90:
-        raise ValueError("Latitude must be between -90 and 90")
-    if longitude < -180 or longitude > 180:
-        raise ValueError("Longitude must be between -180 and 180")
-    radius = math.fabs(radius_km / (111.3 * math.cos(latitude)))
-    return get_map(
-        latitude - radius,
-        longitude - radius,
-        latitude + radius,
-        longitude + radius,
-        map_type,
-        background_type,
-        image_width,
-        image_height,
-    )
-
-
-def get_germany(
-    map_type: WeatherMapType,
-    background_type: WeatherBackgroundMapType = WeatherBackgroundMapType.BUNDESLAENDER,
-    image_width=520,
-    image_height=580,
-):
-    return get_map(
-        4.4, 46.4, 16.1, 55.6, map_type, background_type, image_width, image_height
-    )
-
-
-def get_map(
-    minx,
-    miny,
-    maxx,
-    maxy,
-    map_type: WeatherMapType,
-    background_type: WeatherBackgroundMapType,
-    image_width=520,
-    image_height=580,
-):
-    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."
-        )
-    url = f"https://maps.dwd.de/geoserver/dwd/wms?service=WMS&version=1.1.0&request=GetMap&layers={map_type.value},{background_type.value}&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))
-        return image

simple_dwd_weatherforecast-2.0.33/tests/test_map.py

@@ -1,16 +0,0 @@
-import unittest
-from simple_dwd_weatherforecast import dwdmap
-
-
-class MapTestCase(unittest.TestCase):
-    def test_prevent_too_large_height(self):
-        with self.assertRaises(ValueError):
-            dwdmap.get_map(4.4, 46.4, 16.1, 55.6, dwdmap.WeatherMapType.NIEDERSCHLAGSRADAR, dwdmap.WeatherBackgroundMapType.BUNDESLAENDER, 1300, 700)
-
-    def test_prevent_too_large_width(self):
-        with self.assertRaises(ValueError):
-            dwdmap.get_map(4.4, 46.4, 16.1, 55.6, dwdmap.WeatherMapType.NIEDERSCHLAGSRADAR, dwdmap.WeatherBackgroundMapType.BUNDESLAENDER, 300, 1700)
-
-    def test_prevent_too_large(self):
-        with self.assertRaises(ValueError):
-            dwdmap.get_map(4.4, 46.4, 16.1, 55.6, dwdmap.WeatherMapType.NIEDERSCHLAGSRADAR, dwdmap.WeatherBackgroundMapType.BUNDESLAENDER, 1300, 1700)