simple-dwd-weatherforecast 2.0.31__py3-none-any.whl → 2.0.32__py3-none-any.whl

simple_dwd_weatherforecast/dwdforecast.py

@@ -546,6 +546,15 @@ class Weather:
             )
         return None
 
+    def get_daily_avg(
+        self, weatherDataType: WeatherDataType, timestamp: datetime, shouldUpdate=True
+    ):
+        if shouldUpdate:
+            self.update()
+        if self.is_in_timerange(timestamp):
+            return self.get_avg(self.get_day_values(timestamp), weatherDataType)
+        return None
+
     def get_avg(_, weather_data, weatherDataType):
         value_sum = 0.0
         count = len(weather_data)
@@ -586,20 +595,16 @@ class Weather:
                 time_step += timedelta(hours=1)
         else:
             time_step = first_entry_date
-            endtime = (
-                datetime(
-                    time_step.year,
-                    time_step.month,
-                    time_step.day,
-                    0,
-                    0,
-                    0,
-                    0,
-                    timezone.utc,
-                )
-                + timedelta(days=1)
-                + timedelta(hours=-1)
-            )
+            endtime = datetime(
+                time_step.year,
+                time_step.month,
+                time_step.day,
+                0,
+                0,
+                0,
+                0,
+                timezone.utc,
+            ) + timedelta(days=1)
             timediff = endtime - time_step
             for _ in range(round(timediff.total_seconds() / 3600)):
                 result.append(self.forecast_data[self.strip_to_hour_str(time_step)])

simple_dwd_weatherforecast/dwdmap.py

@@ -15,6 +15,7 @@ class WeatherMapType(Enum):
     WARNUNGEN_GEMEINDEN = "dwd:Warnungen_Gemeinden"
     WARNUNGEN_KREISE = "dwd:Warnungen_Landkreise"
 
+
 class WeatherBackgroundMapType(Enum):
     LAENDER = "dwd:Laender"
     BUNDESLAENDER = "dwd:Warngebiete_Bundeslaender"
@@ -23,7 +24,16 @@ class WeatherBackgroundMapType(Enum):
     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):
+
+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:
@@ -31,17 +41,46 @@ def get_from_location(longitude, latitude, radius_km, map_type: WeatherMapType,
     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)
+    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_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):
+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.")
+        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={background_type.value},{map_type.value}&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.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
+        return image

{simple_dwd_weatherforecast-2.0.31.dist-info → simple_dwd_weatherforecast-2.0.32.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: simple_dwd_weatherforecast
-Version: 2.0.31
+Version: 2.0.32
 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
@@ -127,6 +127,8 @@ class Weather:
 
     get_timeframe_sum(weatherDataType: see WeatherDataType, datetime, timeframe: hours after datetime as int, optional bool shouldUpdate) # Returns the sum of that value within the time frame
 
+    get_daily_avg(weatherDataType: see WeatherDataType, datetime, optional bool shouldUpdate) # Returns the daily average of that value
+
     get_timeframe_avg(weatherDataType: see WeatherDataType, datetime, timeframe: hours after datetime as int, optional bool shouldUpdate) # Returns the average of that value within the time frame
 
     get_forecast_condition(datetime, optional bool shouldUpdate) # Result is condition as text

{simple_dwd_weatherforecast-2.0.31.dist-info → simple_dwd_weatherforecast-2.0.32.dist-info}/RECORD

@@ -1,17 +1,18 @@
 simple_dwd_weatherforecast/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-simple_dwd_weatherforecast/dwdforecast.py,sha256=ZTKS32lRedjzNucZHZ0w9bBuzJd3--EibU9wG6Au_M4,35282
-simple_dwd_weatherforecast/dwdmap.py,sha256=bFAZfYjUryZkErJ3aDNRm9ZhNwKGMcy4pEl8TnWJKzA,2476
+simple_dwd_weatherforecast/dwdforecast.py,sha256=45-nCx_amQE0lQH31aSZGYc51Va5AabKGN4OhfAkuPQ,35474
+simple_dwd_weatherforecast/dwdmap.py,sha256=k6TTTMO6Db-qhaZhZwGssmYM5R9GUFcNxg4J8a3_J78,2684
 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
 tests/dummy_data.py,sha256=sF8pXxq8innSpRc4lW0XxGcr34dESSAoBdAf2F2D4AI,63395
 tests/dummy_data_full.py,sha256=IwYoeqVX8cpfn_gE-7arXaWV9btRm_HHqka_LfKqW-E,64053
 tests/dummy_uv.py,sha256=TM1TwvNq_ea4WgIJyYsNAEXZJTx1dXH1ZVrW_LfLBLg,4548
+tests/test_get_daily_avg.py,sha256=ZD4mT7HLjzsFnb0DOLbi4U3sGMOCBSj49WYVbNGN7GQ,1997
 tests/test_get_daily_condition.py,sha256=J_0gg9fejPqESP7Np5wl5kr7wwcm04a-G1Txx4JH02g,2043
 tests/test_get_daily_max.py,sha256=vC873a1Uuw01a61fkvV0XKwTnkxJWkrOycTOSLrOp9Q,1940
 tests/test_get_daily_min.py,sha256=jYgPK-dK7P_QRBe1oNlSSZlnd-BrTDXGt5AfS-sEThw,1944
-tests/test_get_daily_sum.py,sha256=WeOVXl905X-n5gnPuNM6ut-q9VeBM2j2f6heBDol3Ok,1942
-tests/test_get_day_values.py,sha256=zn9GaLnsLA_rvk6pNApmR9ZHD_OsElU01T6oFJiqL7I,28680
+tests/test_get_daily_sum.py,sha256=sViAjOq7IHs057Zr9zz36brZyFbckdasmHk1YluRNBc,1941
+tests/test_get_day_values.py,sha256=iNVGP7roy5R5jGTvJNUHAIefSlXI4NBFnYVsr-WLECs,29348
 tests/test_get_forecast_condition.py,sha256=mawVIJ7xQgH9Xbz_nLnAHNS5Ib-mp-A3zLbkEllw2hw,2904
 tests/test_get_forecast_data.py,sha256=dsKtfGTlQbhB7tteBuB6d_RHEOtM7ikfVWh_Fk-CtyU,3432
 tests/test_get_station_name.py,sha256=58fBETHAgDaTAsAFP9xOcYfipNO-AqUf_n_bMj5FwWc,439
@@ -34,8 +35,8 @@ tests/test_update.py,sha256=JMdlN_lc9Zb58yU4GNrO_sOaKN9pZEx8nt4E2UeKBi0,7254
 tests/test_update_hourly.py,sha256=Zx0e_E2n2Wi1yGMDN6TURzIbk_xVYaMc-7IDK1sC5UY,1668
 tests/test_uv_index.py,sha256=tr6wnOyHlXT1S3yp1oeHc4-Brmc-EMEdM4mtyrdpcHg,579
 tests/test_weather.py,sha256=U4FkTtqLcLs8k-xy6YKNM_4HVscITymURCEIUShk6iE,802
-simple_dwd_weatherforecast-2.0.31.dist-info/LICENCE,sha256=27UG7gteqvSWuZlsbIq2_OAbh7VyifGGl-1zpuUoBcw,1072
-simple_dwd_weatherforecast-2.0.31.dist-info/METADATA,sha256=qVASoG2VqxxpKIKQ7-6m1yYBVL1nQYu7CqBO_7SgdO4,10800
-simple_dwd_weatherforecast-2.0.31.dist-info/WHEEL,sha256=GJ7t_kWBFywbagK5eo9IoUwLW6oyOeTKmQ-9iHFVNxQ,92
-simple_dwd_weatherforecast-2.0.31.dist-info/top_level.txt,sha256=iyEobUh14Tzitx39Oi8qm0NhBrnZovl_dNKtvLUkLEM,33
-simple_dwd_weatherforecast-2.0.31.dist-info/RECORD,,
+simple_dwd_weatherforecast-2.0.32.dist-info/LICENCE,sha256=27UG7gteqvSWuZlsbIq2_OAbh7VyifGGl-1zpuUoBcw,1072
+simple_dwd_weatherforecast-2.0.32.dist-info/METADATA,sha256=o3F9zUnLganqA2_Sue4bhUjktjMePFwFw9YAjDD5lFU,10937
+simple_dwd_weatherforecast-2.0.32.dist-info/WHEEL,sha256=Wyh-_nZ0DJYolHNn1_hMa4lM7uDedD_RGVwbmTjyItk,91
+simple_dwd_weatherforecast-2.0.32.dist-info/top_level.txt,sha256=iyEobUh14Tzitx39Oi8qm0NhBrnZovl_dNKtvLUkLEM,33
+simple_dwd_weatherforecast-2.0.32.dist-info/RECORD,,

{simple_dwd_weatherforecast-2.0.31.dist-info → simple_dwd_weatherforecast-2.0.32.dist-info}/WHEEL

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

tests/test_get_daily_avg.py

@@ -0,0 +1,48 @@
+from simple_dwd_weatherforecast.dwdforecast import WeatherDataType
+import unittest
+from unittest.mock import patch
+from datetime import datetime
+from simple_dwd_weatherforecast import dwdforecast
+from dummy_data import parsed_data
+
+
+class Weather_get_daily_avg(unittest.TestCase):
+    def setUp(self):
+        self.dwd_weather = dwdforecast.Weather("H889")
+        self.dwd_weather.forecast_data = parsed_data
+        self.dwd_weather.station_name = "BAD HOMBURG"
+
+    @patch("simple_dwd_weatherforecast.dwdforecast.Weather.update", return_value=None)
+    def test_shouldupdate(self, mock_update):
+        test_time = datetime(2020, 11, 7, 3, 30)
+        self.dwd_weather.get_daily_avg(WeatherDataType.PRECIPITATION, test_time, True)
+        mock_update.assert_called()
+
+    @patch("simple_dwd_weatherforecast.dwdforecast.Weather.update", return_value=None)
+    def test_shouldupdate_not(self, mock_update):
+        test_time = datetime(2020, 11, 7, 3, 30)
+        self.dwd_weather.get_daily_avg(WeatherDataType.PRECIPITATION, test_time, False)
+        mock_update.assert_not_called()
+
+    def test_not_in_timerange(self):
+        test_time = datetime(2000, 11, 7, 3, 30)
+        self.assertIsNone(
+            self.dwd_weather.get_daily_avg(WeatherDataType.PRECIPITATION, test_time)
+        )
+
+    @patch("simple_dwd_weatherforecast.dwdforecast.Weather.update", return_value=None)
+    def test_precipitation(self, mock_update):
+        test_time = datetime(2020, 11, 6, 12, 0)
+        print(self.dwd_weather.get_day_values(test_time))
+        self.assertEqual(
+            self.dwd_weather.get_daily_avg(WeatherDataType.PRECIPITATION, test_time),
+            1.8,
+        )
+
+    @patch("simple_dwd_weatherforecast.dwdforecast.Weather.update", return_value=None)
+    def test_temperature(self, mock_update):
+        test_time = datetime(2020, 11, 6, 23, 0)
+        self.assertEqual(
+            self.dwd_weather.get_daily_avg(WeatherDataType.TEMPERATURE, test_time),
+            278.09,
+        )

tests/test_get_daily_sum.py

@@ -35,7 +35,7 @@ class Weather_get_daily_sum(unittest.TestCase):
         test_time = datetime(2020, 11, 6, 10, 0)
         self.assertEqual(
             self.dwd_weather.get_daily_sum(WeatherDataType.PRECIPITATION, test_time),
-            27.25,
+            36.01,
         )
 
     @patch("simple_dwd_weatherforecast.dwdforecast.Weather.update", return_value=None)
@@ -43,5 +43,5 @@ class Weather_get_daily_sum(unittest.TestCase):
         test_time = datetime(2020, 11, 6, 10, 0)
         self.assertEqual(
             self.dwd_weather.get_daily_sum(WeatherDataType.TEMPERATURE, test_time),
-            5286.25,
+            5561.8,
         )

tests/test_get_day_values.py

@@ -451,6 +451,7 @@ class Weather_get_day_values(unittest.TestCase):
             self.dwd_weather.get_day_values(test_time),
             test_data,
         )
+        self.assertEqual(len(self.dwd_weather.get_day_values(test_time)), 24)
 
     def test_day_not_last_day(self):
         test_time = datetime(2020, 11, 16, 1, 0)
@@ -1004,8 +1005,27 @@ class Weather_get_day_values(unittest.TestCase):
                 "wwM": 3.0,
                 "humidity": 81.3,
             },
+            {
+                "TTT": 275.55,
+                "Td": 273.45,
+                "condition": "51",
+                "PPPP": 103060.0,
+                "DD": 52.0,
+                "FF": 1.54,
+                "FX1": 3.09,
+                "RR1c": 8.76,
+                "wwP": 2.0,
+                "DRR1": 0.0,
+                "N": 22.0,
+                "VV": 15500.0,
+                "SunD1": 0.0,
+                "Rad1h": None,
+                "wwM": 2.0,
+                "humidity": 86.0,
+            },
         ]
         self.assertEqual(
             self.dwd_weather.get_day_values(test_time),
             test_data,
         )
+        self.assertEqual(len(self.dwd_weather.get_day_values(test_time)), 20)