simple-dwd-weatherforecast 2.1.13__tar.gz → 2.1.15__tar.gz

{simple_dwd_weatherforecast-2.1.13/simple_dwd_weatherforecast.egg-info → simple_dwd_weatherforecast-2.1.15}/PKG-INFO

@@ -1,6 +1,6 @@
-Metadata-Version: 2.1
+Metadata-Version: 2.2
 Name: simple_dwd_weatherforecast
-Version: 2.1.13
+Version: 2.1.15
 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
@@ -17,6 +17,14 @@ Requires-Dist: arrow
 Requires-Dist: stream-inflate==0.0.41
 Requires-Dist: stream-unzip==0.0.98
 Requires-Dist: httpx
+Dynamic: author
+Dynamic: classifier
+Dynamic: description
+Dynamic: description-content-type
+Dynamic: home-page
+Dynamic: requires-dist
+Dynamic: requires-python
+Dynamic: summary
 
 # Simple DWD weather forecast
 
@@ -208,7 +216,7 @@ class MarkerShape(Enum):
     CIRCLE = "circle"
     SQUARE = "square"
     CROSS = "cross"
-    
+
 class Marker(
         latitude: float,
         longitude: float,
@@ -218,11 +226,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]) #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]) #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]) #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
 ```
 
 
@@ -254,7 +262,7 @@ for image in enumerate(maploop._images):
 
 ```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, markers: list[Marker] = []) -> ImageLoop
+        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.13 → simple_dwd_weatherforecast-2.1.15}/README.md

@@ -188,7 +188,7 @@ class MarkerShape(Enum):
     CIRCLE = "circle"
     SQUARE = "square"
     CROSS = "cross"
-    
+
 class Marker(
         latitude: float,
         longitude: float,
@@ -198,11 +198,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]) #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]) #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]) #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
 ```
 
 
@@ -234,7 +234,7 @@ for image in enumerate(maploop._images):
 
 ```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, markers: list[Marker] = []) -> ImageLoop
+        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.13 → simple_dwd_weatherforecast-2.1.15}/setup.py

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

{simple_dwd_weatherforecast-2.1.13 → simple_dwd_weatherforecast-2.1.15}/simple_dwd_weatherforecast/dwdforecast.py

@@ -757,9 +757,13 @@ class Weather:
         return issue_time_new
 
     def parse_station_name(self, tree):
-        return tree.xpath(
+        parsed_name = tree.xpath(
             "./kml:Document/kml:Placemark/kml:description", namespaces=self.namespaces
-        )[0].text
+        )
+        if len(parsed_name) == 0:
+            return None
+        else:
+            return parsed_name[0].text
 
     def parse_timesteps(self, tree):
         return [

{simple_dwd_weatherforecast-2.1.13 → simple_dwd_weatherforecast-2.1.15}/simple_dwd_weatherforecast/dwdmap.py

@@ -9,7 +9,8 @@ from datetime import datetime, timedelta, timezone
 
 
 class WeatherMapType(Enum):
-    NIEDERSCHLAGSRADAR = "dwd:Niederschlagsradar,dwd:NCEW_EU"
+    NIEDERSCHLAGSRADAR = "dwd:Niederschlagsradar"
+    BLITZSCHLAG = "dwd:NCEW_EU"
     MAXTEMP = "dwd:GefuehlteTempMax"
     UVINDEX = "dwd:UVI_CS"
     POLLENFLUG = "dwd:Pollenflug"
@@ -89,6 +90,7 @@ def get_from_location(
     image_width=520,
     image_height=580,
     markers: list[Marker] = [],
+    dark_mode: bool = False,
 ):
     if radius_km <= 0:
         raise ValueError("Radius must be greater than 0")
@@ -107,6 +109,7 @@ def get_from_location(
         image_width,
         image_height,
         markers,
+        dark_mode,
     )
 
 
@@ -116,6 +119,7 @@ def get_germany(
     image_width=520,
     image_height=580,
     markers: list[Marker] = [],
+    dark_mode: bool = False,
 ):
     return get_map(
         germany_boundaries.minx,
@@ -127,6 +131,7 @@ def get_germany(
         image_width,
         image_height,
         markers,
+        dark_mode,
     )
 
 
@@ -140,6 +145,7 @@ def get_map(
     image_width=520,
     image_height=580,
     markers: list[Marker] = [],
+    dark_mode: bool = False,
 ):
     if image_width > 1200 or image_height > 1400:
         raise ValueError(
@@ -153,10 +159,20 @@ def get_map(
         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.0&request=GetMap&layers={layers}&bbox={minx},{miny},{maxx},{maxy}&width={image_width}&height={image_height}&srs=EPSG:4326&styles=&format=image/png"
+    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"
     request = requests.get(url, stream=True)
     if request.status_code == 200:
         image = Image.open(BytesIO(request.content))
+        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((0, 0, 0))
+                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
 
@@ -186,6 +202,7 @@ class ImageLoop:
         image_width: int = 520,
         image_height: int = 580,
         markers: list[Marker] = [],
+        dark_mode: bool = False,
     ):
         if image_width > 1200 or image_height > 1400:
             raise ValueError(
@@ -203,6 +220,7 @@ class ImageLoop:
         self._image_width = image_width
         self._image_height = image_height
         self.markers = markers
+        self.dark_mode = dark_mode
         self._images = deque([], steps)
 
         self._full_reload()
@@ -220,7 +238,13 @@ class ImageLoop:
 
         while now > self._last_update:
             self._last_update += timedelta(minutes=5)
-            self._images.append(self._get_image(self._last_update))
+            # Lightning in the NCEW_EU layer is only available in the last 5 minutes
+            self._images.append(
+                self._get_image(
+                    self._last_update,
+                    with_lightning=(now - self._last_update) < timedelta(minutes=5),
+                )
+            )
 
     def update(self):
         now = get_time_last_5_min(datetime.now(timezone.utc))
@@ -232,25 +256,43 @@ class ImageLoop:
         else:
             while now > self._last_update:
                 self._last_update += timedelta(minutes=5)
-                self._images.append(self._get_image(self._last_update))
+                self._images.append(
+                    self._get_image(self._last_update, with_lightning=True)
+                )
 
     def _get_image(
         self,
         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
+        if with_lightning:
+            layer += ",dwd:NCEW_EU"
         if self._background_type in [
             WeatherBackgroundMapType.SATELLIT,
             WeatherBackgroundMapType.KREISE,
             WeatherBackgroundMapType.GEMEINDEN,
         ]:
-            layers = f"{self._background_type.value}, {self._map_type.value}"
+            layers = f"{self._background_type.value}, {layer}"
         else:
-            layers = f"{self._map_type.value}, {self._background_type.value}"
-        url = f"https://maps.dwd.de/geoserver/dwd/wms?service=WMS&version=1.1.0&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")}"
+            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')}"
         request = requests.get(url, stream=True)
-        if request.status_code != 200:
+        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))
+        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((0, 0, 0))
+                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-2.1.13 → simple_dwd_weatherforecast-2.1.15/simple_dwd_weatherforecast.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
-Metadata-Version: 2.1
+Metadata-Version: 2.2
 Name: simple_dwd_weatherforecast
-Version: 2.1.13
+Version: 2.1.15
 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
@@ -17,6 +17,14 @@ Requires-Dist: arrow
 Requires-Dist: stream-inflate==0.0.41
 Requires-Dist: stream-unzip==0.0.98
 Requires-Dist: httpx
+Dynamic: author
+Dynamic: classifier
+Dynamic: description
+Dynamic: description-content-type
+Dynamic: home-page
+Dynamic: requires-dist
+Dynamic: requires-python
+Dynamic: summary
 
 # Simple DWD weather forecast
 
@@ -208,7 +216,7 @@ class MarkerShape(Enum):
     CIRCLE = "circle"
     SQUARE = "square"
     CROSS = "cross"
-    
+
 class Marker(
         latitude: float,
         longitude: float,
@@ -218,11 +226,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]) #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]) #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]) #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
 ```
 
 
@@ -254,7 +262,7 @@ for image in enumerate(maploop._images):
 
 ```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, markers: list[Marker] = []) -> ImageLoop
+        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