simple-dwd-weatherforecast 2.1.5__py3-none-any.whl → 2.1.7__py3-none-any.whl

simple_dwd_weatherforecast/dwdforecast.py

@@ -954,16 +954,13 @@ class Weather:
             print(f"Error in download_latest_kml: {type(error)} args: {error.args}")
 
     def get_chunks(self, url):
-        def zipped_chunks(url):
-            # Iterable that yields the bytes of a zip file
-            with httpx.stream(
-                "GET",
-                url,
-            ) as r:
-                self.etags[url] = r.headers["etag"]  # type: ignore
-                yield from r.iter_bytes(chunk_size=171072)
-
-        return stream_unzip(zipped_chunks(url))
+        # Iterable that yields the bytes of a zip file
+        with httpx.stream(
+            "GET",
+            url,
+        ) as r:
+            self.etags[url] = r.headers["etag"]  # type: ignore
+            yield from r.iter_bytes(chunk_size=65536)
 
     def download_large_kml(self, stationid):
         placemark = b""
@@ -977,40 +974,42 @@ class Weather:
         if r.status_code == 304:
             return
 
-        for file_name, file_size, unzipped_chunks in self.get_chunks(url):
-            chunk1 = b""
-            chunk2 = b""
-            first_chunk = None
+        for file_name, file_size, unzipped_chunks in stream_unzip(self.get_chunks(url)):
+            header = b""
+            placemark = b""
 
-            save_next = False
-            save_next_next = False
+            found_header = False
+            found_stationid = False
             stop = False
             # unzipped_chunks must be iterated to completion or UnfinishedIterationError will be raised
             for chunk in unzipped_chunks:
                 if stop:
                     continue
-                if not first_chunk:
-                    first_chunk = chunk
-                if save_next_next:
-                    placemark = chunk1 + chunk2 + chunk
-                    save_next_next = False
-                    stop = True
-                if save_next:
-                    chunk2 = chunk
-                    save_next_next = True
-                    save_next = False
+
+                if not found_header:
+                    header += chunk
+                    if "<kml:Placemark>".encode() in chunk:
+                        found_header = True
+
+                if found_stationid:
+                    placemark += chunk
+                    if "</kml:Placemark>\n".encode() in chunk:
+                        stop = True
 
                 if f"<kml:name>{stationid}</kml:name>".encode() in chunk:
-                    chunk1 = chunk
-                    save_next = True
+                    placemark = chunk
+                    found_stationid = True
 
-            if not chunk1:
+            if not placemark:
                 raise BufferError("Station not found")
-            if first_chunk:
+            if header and placemark:
                 start = placemark.find(b"<kml:Placemark>\n")
-
+                if start == -1:
+                    raise BufferError(
+                        "Error during stream parsing of station {}".format(stationid)
+                    )
                 result = (
-                    first_chunk[: first_chunk.find(b"<kml:Placemark>")]
+                    header[: header.find(b"<kml:Placemark>")]
                     + placemark[
                         start : placemark.find(b"</kml:Placemark>\n", start) + 17
                     ]

simple_dwd_weatherforecast/dwdmap.py

@@ -2,7 +2,7 @@ from typing import Iterable
 import requests
 import math
 from io import BytesIO
-from PIL import Image, ImageFile
+from PIL import Image, ImageFile, ImageDraw
 from enum import Enum
 from collections import deque
 from datetime import datetime, timedelta, timezone
@@ -35,6 +35,51 @@ class germany_boundaries:
     maxy = 55.6
 
 
+class MarkerShape(Enum):
+    CIRCLE = "circle"
+    SQUARE = "square"
+    CROSS = "cross"
+
+
+class Marker:
+    def __init__(
+        self,
+        latitude: float,
+        longitude: float,
+        shape: MarkerShape,
+        size: int,
+        colorRGB: tuple[int, int, int],
+        width: int = 0,
+    ):
+        if (
+            latitude is None
+            or longitude is None
+            or shape is None
+            or size is None
+            or colorRGB is None
+        ):
+            raise ValueError("All values have to be defined")
+        self.latitude = latitude
+        self.longitude = longitude
+        self.shape = shape
+        self.size = size
+        self.colorRGB = colorRGB
+        self.width = width
+
+
+class ImageBoundaries:
+    minX: float
+    maxX: float
+    minY: float
+    maxY: float
+
+    def __init__(self, minX: float, maxX: float, minY: float, maxY: float) -> None:
+        self.minX = minX
+        self.maxX = maxX
+        self.minY = minY
+        self.maxY = maxY
+
+
 def get_from_location(
     longitude,
     latitude,
@@ -43,6 +88,7 @@ def get_from_location(
     background_type: WeatherBackgroundMapType = WeatherBackgroundMapType.BUNDESLAENDER,
     image_width=520,
     image_height=580,
+    markers: list[Marker] = [],
 ):
     if radius_km <= 0:
         raise ValueError("Radius must be greater than 0")
@@ -60,6 +106,7 @@ def get_from_location(
         background_type,
         image_width,
         image_height,
+        markers,
     )
 
 
@@ -68,6 +115,7 @@ def get_germany(
     background_type: WeatherBackgroundMapType = WeatherBackgroundMapType.BUNDESLAENDER,
     image_width=520,
     image_height=580,
+    markers: list[Marker] = [],
 ):
     return get_map(
         germany_boundaries.minx,
@@ -78,6 +126,7 @@ def get_germany(
         background_type,
         image_width,
         image_height,
+        markers,
     )
 
 
@@ -90,6 +139,7 @@ def get_map(
     background_type: WeatherBackgroundMapType,
     image_width=520,
     image_height=580,
+    markers: list[Marker] = [],
 ):
     if image_width > 1200 or image_height > 1400:
         raise ValueError(
@@ -107,6 +157,7 @@ def get_map(
     request = requests.get(url, stream=True)
     if request.status_code == 200:
         image = Image.open(BytesIO(request.content))
+        image = draw_marker(image, ImageBoundaries(minx, maxx, miny, maxy), markers)
         return image
 
 
@@ -134,6 +185,7 @@ class ImageLoop:
         steps: int = 6,
         image_width: int = 520,
         image_height: int = 580,
+        markers: list[Marker] = [],
     ):
         if image_width > 1200 or image_height > 1400:
             raise ValueError(
@@ -150,7 +202,7 @@ class ImageLoop:
         self._steps = steps
         self._image_width = image_width
         self._image_height = image_height
-
+        self.markers = markers
         self._images = deque([], steps)
 
         self._full_reload()
@@ -182,7 +234,10 @@ class ImageLoop:
                 self._last_update += timedelta(minutes=5)
                 self._images.append(self._get_image(self._last_update))
 
-    def _get_image(self, date: datetime) -> ImageFile.ImageFile:
+    def _get_image(
+        self,
+        date: datetime,
+    ) -> ImageFile.ImageFile:
         if self._background_type in [
             WeatherBackgroundMapType.SATELLIT,
             WeatherBackgroundMapType.KREISE,
@@ -195,9 +250,95 @@ class ImageLoop:
         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))
+        image = Image.open(BytesIO(request.content))
+        image = draw_marker(
+            image,
+            ImageBoundaries(self._minx, self._maxx, self._miny, self._maxy),
+            self.markers,
+        )
+        return image
 
 
 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)
+
+
+def draw_marker(
+    image: ImageFile.ImageFile,
+    image_bounderies: ImageBoundaries,
+    marker_list: list[Marker],
+):
+    draw = ImageDraw.ImageDraw(image)
+    for marker in marker_list:
+        if (
+            marker.longitude < image_bounderies.minX
+            or marker.longitude > image_bounderies.maxX
+            or marker.latitude < image_bounderies.minY
+            or marker.latitude > image_bounderies.maxY
+        ):
+            raise ValueError("Marker location out of boundaries")
+        location_relative_to_image = (
+            (
+                (marker.longitude - image_bounderies.minX)
+                / (image_bounderies.maxX - image_bounderies.minX)
+            )
+            * image.width,
+            (
+                (marker.latitude - image_bounderies.minY)
+                / (image_bounderies.maxY - image_bounderies.minY)
+            )
+            * image.height,
+        )
+        if marker.shape == MarkerShape.CIRCLE:
+            draw.circle(
+                location_relative_to_image,
+                round(marker.size / 2, 0),
+                fill=marker.colorRGB,
+            )
+        elif marker.shape == MarkerShape.CROSS:
+            size = round(marker.size / 2, 0)
+            draw.line(
+                [
+                    (
+                        location_relative_to_image[0] - size,
+                        location_relative_to_image[1],
+                    ),
+                    (
+                        location_relative_to_image[0] + size,
+                        location_relative_to_image[1],
+                    ),
+                ],
+                marker.colorRGB,
+                marker.width,
+            )
+            draw.line(
+                [
+                    (
+                        location_relative_to_image[0],
+                        location_relative_to_image[1] - size,
+                    ),
+                    (
+                        location_relative_to_image[0],
+                        location_relative_to_image[1] + size,
+                    ),
+                ],
+                marker.colorRGB,
+                marker.width,
+            )
+        elif marker.shape == MarkerShape.SQUARE:
+            size = round(marker.size / 2, 0)
+            draw.rectangle(
+                [
+                    (
+                        location_relative_to_image[0] - size,
+                        location_relative_to_image[1] - size,
+                    ),
+                    (
+                        location_relative_to_image[0] + size,
+                        location_relative_to_image[1] + size,
+                    ),
+                ],
+                marker.colorRGB,
+            )
+    return image

{simple_dwd_weatherforecast-2.1.5.dist-info → simple_dwd_weatherforecast-2.1.7.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: simple_dwd_weatherforecast
-Version: 2.1.5
+Version: 2.1.7
 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
@@ -14,6 +14,7 @@ Requires-Dist: lxml
 Requires-Dist: requests
 Requires-Dist: Pillow
 Requires-Dist: arrow
+Requires-Dist: stream-inflate==0.0.14
 Requires-Dist: stream-unzip
 Requires-Dist: httpx
 
@@ -203,11 +204,25 @@ class WeatherBackgroundMapType(Enum):
     GEMEINDEN = "dwd:Warngebiete_Gemeinden"
     SATELLIT = "dwd:bluemarble"
 
-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
+class MarkerShape(Enum):
+    CIRCLE = "circle"
+    SQUARE = "square"
+    CROSS = "cross"
+    
+class Marker(
+        latitude: float,
+        longitude: float,
+        shape: MarkerShape,
+        size: int,
+        colorRGB: tuple[int, int, int],
+        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_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_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
 ```
 
 
@@ -239,7 +254,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) -> ImageLoop
+        steps: int = 6, image_width: int = 520,image_height: int = 580, markers: list[Marker] = []) -> ImageLoop
 
 get_images() -> Iterable[ImageFile.ImageFile] # Returns the image loop
 

{simple_dwd_weatherforecast-2.1.5.dist-info → simple_dwd_weatherforecast-2.1.7.dist-info}/RECORD

@@ -1,6 +1,6 @@
 simple_dwd_weatherforecast/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-simple_dwd_weatherforecast/dwdforecast.py,sha256=klhL-Bd8u3Ybsq5JQTifMwlV67dF3foRTMGMfwVj5oE,38828
-simple_dwd_weatherforecast/dwdmap.py,sha256=cPCcL1u5qeIEDLBcL0qOH0-7dPIi3mge4-PUqfZlRQc,6737
+simple_dwd_weatherforecast/dwdforecast.py,sha256=wYg7XC9_5rb-ITdjoT-bLaBc_AGqii8d6eNEfdbfXtY,38863
+simple_dwd_weatherforecast/dwdmap.py,sha256=tyFkEkCTUF3StNExiwwtEHsmXdZ3hbpKnpngskTAkyM,10932
 simple_dwd_weatherforecast/stations.json,sha256=1u8qc2CT_rVy49SAlOicGixzHln6Y0FXevuFAz2maBw,838948
 simple_dwd_weatherforecast/uv_stations.json,sha256=ADenYo-aR6qbf0UFkfYr72kkFzL9HyUKe4VQ23POGF8,2292
 tests/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
@@ -26,7 +26,7 @@ tests/test_is_in_timerange.py,sha256=3y88L3N73NxSTJ-_edx6OCnxHWKJWWFma98gjZvJDGg
 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_parsekml.py,sha256=mpje7FoMIz566BLW-Fr_69cxLyS7w4qvrSOIlxVYoUU,1625
+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
 tests/test_station.py,sha256=Zjx-q0yxKVxVI_L1yB_bqY5pjZPoa1L94uC8Gx6shdY,1026
@@ -35,8 +35,8 @@ 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.5.dist-info/LICENCE,sha256=27UG7gteqvSWuZlsbIq2_OAbh7VyifGGl-1zpuUoBcw,1072
-simple_dwd_weatherforecast-2.1.5.dist-info/METADATA,sha256=YAtr_r5aouZhkOGqfPYqbILWGKQIrZRAxORt0tUOc0s,12177
-simple_dwd_weatherforecast-2.1.5.dist-info/WHEEL,sha256=GV9aMThwP_4oNCtvEC2ec3qUYutgWeAzklro_0m4WJQ,91
-simple_dwd_weatherforecast-2.1.5.dist-info/top_level.txt,sha256=iyEobUh14Tzitx39Oi8qm0NhBrnZovl_dNKtvLUkLEM,33
-simple_dwd_weatherforecast-2.1.5.dist-info/RECORD,,
+simple_dwd_weatherforecast-2.1.7.dist-info/LICENCE,sha256=27UG7gteqvSWuZlsbIq2_OAbh7VyifGGl-1zpuUoBcw,1072
+simple_dwd_weatherforecast-2.1.7.dist-info/METADATA,sha256=vLLlK6IieXvuXQM7C4tVDIunqx0GZwa-azB_7Qdh0_4,12548
+simple_dwd_weatherforecast-2.1.7.dist-info/WHEEL,sha256=GV9aMThwP_4oNCtvEC2ec3qUYutgWeAzklro_0m4WJQ,91
+simple_dwd_weatherforecast-2.1.7.dist-info/top_level.txt,sha256=iyEobUh14Tzitx39Oi8qm0NhBrnZovl_dNKtvLUkLEM,33
+simple_dwd_weatherforecast-2.1.7.dist-info/RECORD,,

tests/test_parsekml.py

@@ -23,27 +23,24 @@ class KMLParseTestCase(unittest.TestCase):
             )
 
 
-def helper():
-    result = []
-    read_size = 131072
+def helper(file):
     # Iterable that yields the bytes of a zip file
-    with open("development/MOSMIX_L_2023100809_stripped.kml", "rb") as kml:
-        content = kml.read(read_size)
+    with open(file, "rb") as kml:
+        content = kml.read()
         while len(content) > 0:
-            result.append(content)
-            content = kml.read(read_size)
-    return zip([0], [0], [result])
+            yield content
+            content = kml.read()
 
 
 class KMLParseFullTestCase(unittest.TestCase):
-    FILE_NAME = "development/MOSMIX_L_2023100809_stripped.kml"
+    FILE_NAME = "development/MOSMIX_L_2023100809_stripped.kmz"
 
     def setUp(self):
         self.dwd_weather = dwdforecast.Weather("L511")
 
     @patch(
         "simple_dwd_weatherforecast.dwdforecast.Weather.get_chunks",
-        return_value=helper(),
+        return_value=helper(FILE_NAME),
     )
     def test_parse_kml(self, _):
         self.dwd_weather.download_latest_kml(