simple-dwd-weatherforecast 2.0.25__py3-none-any.whl → 2.0.27__py3-none-any.whl

simple_dwd_weatherforecast/dwdforecast.py

@@ -16,6 +16,11 @@ with importlib.resources.files("simple_dwd_weatherforecast").joinpath(
 ).open("r", encoding="utf-8") as file:
     stations = json.load(file)
 
+with importlib.resources.files("simple_dwd_weatherforecast").joinpath(
+    "uv_stations.json"
+).open("r", encoding="utf-8") as file:
+    uv_stations = json.load(file)
+
 
 def load_station_id(station_id: str):
     if station_id in stations:
@@ -200,7 +205,7 @@ class Weather:
         "MV": "dwph",  # Mecklenburg-Vorpommern
     }
 
-    uv_index_stations = {
+    uv_index_stations_reference_names = {
         "Weinbiet": "Weinbiet",
         "Hamburg": "Hamburg Innenstadt",
         "Seehausen": "Seehausen",
@@ -247,7 +252,6 @@ class Weather:
         if self.station:
             self.station_id = station_id
             self.region = get_region(station_id)
-            self.download_uv_index()
             self.nearest_uv_index_station = self.get_nearest_station_id_with_uv()
         else:
             raise ValueError("Not a valid station_id")
@@ -255,7 +259,7 @@ class Weather:
     def get_nearest_station_id_with_uv(self):
         nearest_distance = float("inf")
         nearest_station_id = None
-        for station in self.uv_reports.items():
+        for station in uv_stations.items():
             distance = get_distance(
                 self.station["lat"],
                 self.station["lon"],
@@ -265,9 +269,7 @@ class Weather:
 
             if distance < nearest_distance:
                 nearest_distance = distance
-                nearest_station_id = get_station_by_name(
-                    self.uv_index_stations[station[1]["city"]]
-                )
+                nearest_station_id = station[0]
 
         return nearest_station_id
 
@@ -399,6 +401,14 @@ class Weather:
             print("no report for this station available. Have you updated first?")
 
     def get_uv_index(self, days_from_today: int) -> int:
+        if not self.uv_reports:
+            self.update(
+                force_hourly=False,
+                with_forecast=False,
+                with_measurements=False,
+                with_report=False,
+                with_uv=True,
+            )
         if days_from_today < 0 or days_from_today > 2:
             print("days_from_today must be between 0 and 2")
             return None
@@ -408,7 +418,7 @@ class Weather:
             day = "tomorrow"
         elif days_from_today == 2:
             day = "dayafter_to"
-        return self.uv_reports[self.nearest_uv_index_station[0]]["forecast"][day]
+        return self.uv_reports[self.nearest_uv_index_station]["forecast"][day]
 
     def get_timeframe_max(
         self,
@@ -607,6 +617,7 @@ class Weather:
         with_forecast=True,
         with_measurements=False,
         with_report=False,
+        with_uv=True,
     ):
         if with_measurements and self.has_measurement(self.station_id):
             self.download_latest_report()
@@ -620,6 +631,8 @@ class Weather:
             or force_hourly
         ):
             self.download_latest_kml(self.station_id, force_hourly)
+        if with_uv:
+            self.download_uv_index()
 
     def get_weather_type(self, kmlTree, weatherDataType: WeatherDataType):
         """Parses the kml-File to the requested value and returns the items as array"""
@@ -849,8 +862,10 @@ class Weather:
         uv_reports = json.loads(request.text)["content"]
         # Match with existing stations
         for uv_report in uv_reports:
-            station = get_station_by_name(self.uv_index_stations[uv_report["city"]])
-            uv_report.update({"lat": station[1]["lat"], "lon": station[1]["lon"]})
+            station = get_station_by_name(
+                self.uv_index_stations_reference_names[uv_report["city"]]
+            )
+            # uv_report.update({"lat": station[1]["lat"], "lon": station[1]["lon"]})
             self.uv_reports[station[0]] = uv_report
 
     def download_weather_report(self, region_code):

simple_dwd_weatherforecast/dwdmap.py

@@ -21,8 +21,9 @@ class WeatherBackgroundMapType(Enum):
     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, filename="map.png"):
+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:
@@ -30,12 +31,12 @@ 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)))
-    get_map(latitude-radius, longitude-radius, latitude+radius, longitude+radius, map_type, background_type, image_width, image_height, filename)
+    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, image_width=520, image_height=580, filename="map.png"):
-    get_map(4.4, 46.4, 16.1, 55.6, map_type, WeatherBackgroundMapType.BUNDESLAENDER, image_width, image_height, filename)
+def get_germany(map_type: WeatherMapType, image_width=520, image_height=580):
+    return get_map(4.4, 46.4, 16.1, 55.6, map_type, WeatherBackgroundMapType.BUNDESLAENDER, image_width, image_height)
 
-def get_map(minx,miny,maxx,maxy, map_type: WeatherMapType, background_type: WeatherBackgroundMapType, image_width=520, image_height=580, filename="map.png"):
+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.")
 
@@ -43,4 +44,4 @@ def get_map(minx,miny,maxx,maxy, map_type: WeatherMapType, background_type: Weat
     request = requests.get(url, stream=True)
     if request.status_code == 200:
         image = Image.open(BytesIO(request.content))
-        image.save(filename)
+        return image

simple_dwd_weatherforecast/uv_stations.json

@@ -0,0 +1 @@
+{"10616": {"city": "Hahn", "lat": 49.95, "lon": 7.267}, "P0332": {"city": "Marienleuchte", "lat": 54.467, "lon": 11.167}, "10865": {"city": "München", "lat": 48.167, "lon": 11.533}, "10739": {"city": "Stuttgart", "lat": 48.833, "lon": 9.2}, "10487": {"city": "Dresden", "lat": 51.05, "lon": 13.733}, "10791": {"city": "Großer Arber", "lat": 49.117, "lon": 13.133}, "P0489": {"city": "Hamburg", "lat": 53.55, "lon": 9.983}, "10361": {"city": "Magdeburg", "lat": 52.117, "lon": 11.583}, "10438": {"city": "Kassel", "lat": 51.3, "lon": 9.45}, "10268": {"city": "Waren", "lat": 53.517, "lon": 12.667}, "10929": {"city": "Konstanz", "lat": 47.683, "lon": 9.183}, "10724": {"city": "Weinbiet", "lat": 49.383, "lon": 8.117}, "10427": {"city": "Kahler Asten", "lat": 51.183, "lon": 8.483}, "10637": {"city": "Frankfurt/Main", "lat": 50.05, "lon": 8.6}, "10961": {"city": "Zugspitze", "lat": 47.417, "lon": 10.983}, "10020": {"city": "List auf Sylt", "lat": 55.017, "lon": 8.417}, "P0175": {"city": "Rostock", "lat": 54.083, "lon": 12.133}, "10317": {"city": "Osnabrück", "lat": 52.25, "lon": 8.05}, "10224": {"city": "Bremen", "lat": 53.05, "lon": 8.8}, "10261": {"city": "Seehausen", "lat": 52.883, "lon": 11.733}, "10046": {"city": "Kiel", "lat": 54.383, "lon": 10.15}, "10519": {"city": "Bonn", "lat": 50.733, "lon": 7.183}, "10280": {"city": "Neubrandenburg", "lat": 53.55, "lon": 13.2}, "10763": {"city": "Nürnberg", "lat": 49.5, "lon": 11.05}, "P0150": {"city": "Sankt Peter-Ording", "lat": 54.317, "lon": 8.683}, "10454": {"city": "Wernigerode", "lat": 51.85, "lon": 10.767}, "10113": {"city": "Norderney", "lat": 53.717, "lon": 7.15}, "10803": {"city": "Freiburg", "lat": 48.017, "lon": 7.833}, "10471": {"city": "Leipzig", "lat": 51.317, "lon": 12.417}, "10655": {"city": "Würzburg", "lat": 49.767, "lon": 9.967}, "10776": {"city": "Regensburg", "lat": 49.033, "lon": 12.1}, "10389": {"city": "Berlin", "lat": 52.517, "lon": 13.417}, "10555": {"city": "Weimar", "lat": 50.983, "lon": 11.317}, "10338": {"city": "Hannover", "lat": 52.467, "lon": 9.683}, "10496": {"city": "Cottbus", "lat": 51.783, "lon": 14.317}, "10838": {"city": "Ulm", "lat": 48.383, "lon": 9.95}, "10091": {"city": "Arkona", "lat": 54.683, "lon": 13.433}, "10400": {"city": "Düsseldorf", "lat": 51.3, "lon": 6.767}}

{simple_dwd_weatherforecast-2.0.25.dist-info → simple_dwd_weatherforecast-2.0.27.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: simple_dwd_weatherforecast
-Version: 2.0.25
+Version: 2.0.27
 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
@@ -139,7 +139,7 @@ class Weather:
 
     get_uv_index(int day_from_today (values: 0-2)) # Returns the UV index for the nearest station available for today, tomorrow or the day after tomorrow
 
-    update(self, optional bool force_hourly (default: False), optional bool with_forecast (default: True), optional bool with_measurements (default: False), optional bool with_report (default: False)) # Updates the weather data
+    update(self, optional bool force_hourly (default: False), optional bool with_forecast (default: True), optional bool with_measurements (default: False), optional bool with_report (default: False), optional bool with_uv (default: True)) # Updates the weather data
 ```
 
 #### Advanced Usage
@@ -166,9 +166,13 @@ You can download weather maps from the DWD GeoServer with this package. There ar
 ```python
 from simple_dwd_weatherforecast import dwdmap
 
-dwdmap.get_from_location(51.272, 8.84, radius_km=100, map_type=dwdmap.WeatherMapType.NIEDERSCHLAGSRADAR, background_type=dwdmap.WeatherBackgroundMapType.BUNDESLAENDER, file_name="map.png")
+image = dwdmap.get_from_location(51.272, 8.84, radius_km=100, map_type=dwdmap.WeatherMapType.NIEDERSCHLAGSRADAR, background_type=dwdmap.WeatherBackgroundMapType.BUNDESLAENDER)
 
-dwdmap.get_germany(map_type=dwdmap.WeatherMapType.UVINDEX, width=520, height=580, filename="germany.png")
+image.save("niederschlag.png")
+
+image = dwdmap.get_germany(map_type=dwdmap.WeatherMapType.UVINDEX, image_width=520, image_height=580)
+
+image.save("uvindex.png")
 ```
 
 #### Available methods
@@ -192,11 +196,11 @@ 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, optional string filename (default:"map.png")) #Saves map with given radius from coordinates
+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_germany(map_type: WeatherMapType, optional integer image_width, optional integer image_height, optional string filename (default:"map.png")) #Saves map of whole germany
+get_germany(map_type: WeatherMapType, 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 filename (default:"map.png")) #Map retrieval
+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
 ```
 
 ## Help and Contribution

{simple_dwd_weatherforecast-2.0.25.dist-info → simple_dwd_weatherforecast-2.0.27.dist-info}/RECORD

@@ -1,7 +1,8 @@
 simple_dwd_weatherforecast/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-simple_dwd_weatherforecast/dwdforecast.py,sha256=acKkPxFMAY0krmopfFYsge_KkX7CkBikDXQazDkmuH0,33405
-simple_dwd_weatherforecast/dwdmap.py,sha256=lf9TtO9Hs70tVnAUrAEDc42GdAkCSfMK5B0HQn1inJk,2457
+simple_dwd_weatherforecast/dwdforecast.py,sha256=2yhMV4qXs8MllvL6vDXHGV20TX5811IrkjL7FnpR6Wg,33831
+simple_dwd_weatherforecast/dwdmap.py,sha256=eU-z0PVeUZsSI-rFvLd8fdISHqmLxJtb0WNaeBCBQJc,2415
 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
@@ -32,9 +33,9 @@ tests/test_stationsfile.py,sha256=slRH5N4Gznr6tkN2oMFWJbVCw3Xrma7Hvzn1lG5E-Qg,14
 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=yAVxWjwvcnfxot4rbiSf7fa7ygb8dvEBXKXUULwjh7c,805
-simple_dwd_weatherforecast-2.0.25.dist-info/LICENCE,sha256=27UG7gteqvSWuZlsbIq2_OAbh7VyifGGl-1zpuUoBcw,1072
-simple_dwd_weatherforecast-2.0.25.dist-info/METADATA,sha256=KZT7t9zLUo2LUVDtvnXaaubWZjdI5Nip7PaklOqjipI,10688
-simple_dwd_weatherforecast-2.0.25.dist-info/WHEEL,sha256=oiQVh_5PnQM0E3gPdiz09WCNmwiHDMaGer_elqB3coM,92
-simple_dwd_weatherforecast-2.0.25.dist-info/top_level.txt,sha256=iyEobUh14Tzitx39Oi8qm0NhBrnZovl_dNKtvLUkLEM,33
-simple_dwd_weatherforecast-2.0.25.dist-info/RECORD,,
+tests/test_weather.py,sha256=U4FkTtqLcLs8k-xy6YKNM_4HVscITymURCEIUShk6iE,802
+simple_dwd_weatherforecast-2.0.27.dist-info/LICENCE,sha256=27UG7gteqvSWuZlsbIq2_OAbh7VyifGGl-1zpuUoBcw,1072
+simple_dwd_weatherforecast-2.0.27.dist-info/METADATA,sha256=Lo77AVfx7TRXyPIVMiHxvon5ZFuPZVeU5YN_ymGrDBc,10749
+simple_dwd_weatherforecast-2.0.27.dist-info/WHEEL,sha256=oiQVh_5PnQM0E3gPdiz09WCNmwiHDMaGer_elqB3coM,92
+simple_dwd_weatherforecast-2.0.27.dist-info/top_level.txt,sha256=iyEobUh14Tzitx39Oi8qm0NhBrnZovl_dNKtvLUkLEM,33
+simple_dwd_weatherforecast-2.0.27.dist-info/RECORD,,

tests/test_weather.py

@@ -22,4 +22,4 @@ class WeatherInit(unittest.TestCase):
             dwdforecast.Weather()
 
     def test_uv_index(self):
-        self.assertEqual(self.dwd_weather.nearest_uv_index_station[0], "10637")
+        self.assertEqual(self.dwd_weather.nearest_uv_index_station, "10637")