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

simple_dwd_weatherforecast/dwdmap.py

@@ -23,7 +23,7 @@ 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, 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:
@@ -31,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.")
 
@@ -44,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-2.0.26.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.26
+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
@@ -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.26.dist-info → simple_dwd_weatherforecast-2.0.27.dist-info}/RECORD

@@ -1,6 +1,6 @@
 simple_dwd_weatherforecast/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 simple_dwd_weatherforecast/dwdforecast.py,sha256=2yhMV4qXs8MllvL6vDXHGV20TX5811IrkjL7FnpR6Wg,33831
-simple_dwd_weatherforecast/dwdmap.py,sha256=4a0whj9YNlFxjci0Hndl3tQnlri1TAQClFwI7Vr5nqU,2489
+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
@@ -34,8 +34,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.26.dist-info/LICENCE,sha256=27UG7gteqvSWuZlsbIq2_OAbh7VyifGGl-1zpuUoBcw,1072
-simple_dwd_weatherforecast-2.0.26.dist-info/METADATA,sha256=Ogle1C4s_gYTyIm2Q2YkemHRmqPlZsH79C_89aaiobQ,10727
-simple_dwd_weatherforecast-2.0.26.dist-info/WHEEL,sha256=oiQVh_5PnQM0E3gPdiz09WCNmwiHDMaGer_elqB3coM,92
-simple_dwd_weatherforecast-2.0.26.dist-info/top_level.txt,sha256=iyEobUh14Tzitx39Oi8qm0NhBrnZovl_dNKtvLUkLEM,33
-simple_dwd_weatherforecast-2.0.26.dist-info/RECORD,,
+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,,