env-canada 0.11.1__py3-none-any.whl → 0.11.3__py3-none-any.whl

env_canada/constants.py

@@ -1 +1 @@
-USER_AGENT = "env_canada/0.11.1"
+USER_AGENT = "env_canada/0.11.3"

env_canada/ec_aqhi.py

@@ -9,9 +9,11 @@ from lxml import etree as et
 
 from .constants import USER_AGENT
 
-AQHI_SITE_LIST_URL = "https://dd.weather.gc.ca/air_quality/doc/AQHI_XML_File_List.xml"
-AQHI_OBSERVATION_URL = "https://dd.weather.gc.ca/air_quality/aqhi/{}/observation/realtime/xml/AQ_OBS_{}_CURRENT.xml"
-AQHI_FORECAST_URL = "https://dd.weather.gc.ca/air_quality/aqhi/{}/forecast/realtime/xml/AQ_FCST_{}_CURRENT.xml"
+AQHI_SITE_LIST_URL = (
+    "https://dd.weather.gc.ca/today/air_quality/doc/AQHI_XML_File_List.xml"
+)
+AQHI_OBSERVATION_URL = "https://dd.weather.gc.ca/today/air_quality/aqhi/{}/observation/realtime/xml/AQ_OBS_{}_CURRENT.xml"
+AQHI_FORECAST_URL = "https://dd.weather.gc.ca/today/air_quality/aqhi/{}/forecast/realtime/xml/AQ_FCST_{}_CURRENT.xml"
 
 CLIENT_TIMEOUT = ClientTimeout(10)
 

env_canada/ec_hydro.py

@@ -8,8 +8,10 @@ from geopy import distance
 
 from .constants import USER_AGENT
 
-SITE_LIST_URL = "https://dd.weather.gc.ca/hydrometric/doc/hydrometric_StationList.csv"
-READINGS_URL = "https://dd.weather.gc.ca/hydrometric/csv/{prov}/hourly/{prov}_{station}_hourly_hydrometric.csv"
+SITE_LIST_URL = (
+    "https://dd.weather.gc.ca/today/hydrometric/doc/hydrometric_StationList.csv"
+)
+READINGS_URL = "https://dd.weather.gc.ca/today/hydrometric/csv/{prov}/hourly/{prov}_{station}_hourly_hydrometric.csv"
 
 
 __all__ = ["ECHydro"]

env_canada/ec_map.py

@@ -168,15 +168,20 @@ class ECMap:
         self._font = None
         self.timestamp = None
 
+    def _get_cache_prefix(self):
+        """Generate a location-specific cache prefix based on bounding box."""
+        return f"{self.bbox[0]:.3f},{self.bbox[1]:.3f},{self.bbox[2]:.3f},{self.bbox[3]:.3f}"
+
     async def _get_basemap(self):
         """Fetch the background map image."""
-        if base_bytes := Cache.get("basemap"):
+        basemap_cache_key = f"{self._get_cache_prefix()}-basemap"
+        if base_bytes := Cache.get(basemap_cache_key):
             return base_bytes
 
         basemap_params.update(self.map_params)
         try:
             base_bytes = await _get_resource(basemap_url, basemap_params)
-            return Cache.add("basemap", base_bytes, timedelta(days=7))
+            return Cache.add(basemap_cache_key, base_bytes, timedelta(days=7))
         except ClientConnectorError as e:
             LOG.warning("Map from %s could not be retrieved: %s", basemap_url, e)
             return None
@@ -220,7 +225,7 @@ class ECMap:
     async def _get_legend(self):
         """Fetch legend image for the layer."""
 
-        legend_cache_key = f"legend-{self.layer}"
+        legend_cache_key = f"{self._get_cache_prefix()}-legend-{self.layer}"
         if legend := Cache.get(legend_cache_key):
             return legend
 
@@ -269,7 +274,7 @@ class ECMap:
     async def _get_layer_image(self, frame_time):
         """Fetch image for the layer at a specific time."""
         time = frame_time.strftime("%Y-%m-%dT%H:%M:00Z")
-        layer_cache_key = f"layer-{self.layer}-{time}"
+        layer_cache_key = f"{self._get_cache_prefix()}-layer-{self.layer}-{time}"
 
         if img := Cache.get(layer_cache_key):
             return img
@@ -362,11 +367,13 @@ class ECMap:
             composite.save(img_byte_arr, format="PNG")
 
             return Cache.add(
-                f"composite-{time}", img_byte_arr.getvalue(), timedelta(minutes=200)
+                f"{self._get_cache_prefix()}-composite-{time}",
+                img_byte_arr.getvalue(),
+                timedelta(minutes=200),
             )
 
         time = frame_time.strftime("%Y-%m-%dT%H:%M:00Z")
-        cache_key = f"composite-{time}"
+        cache_key = f"{self._get_cache_prefix()}-composite-{time}"
 
         if img := Cache.get(cache_key):
             return img

env_canada/ec_weather.py

@@ -21,9 +21,11 @@ from lxml.etree import _Element
 from . import ec_exc
 from .constants import USER_AGENT
 
-SITE_LIST_URL = "https://dd.weather.gc.ca/citypage_weather/docs/site_list_en.csv"
+SITE_LIST_URL = (
+    "https://dd.weather.gc.ca/today/citypage_weather/docs/site_list_towns_en.csv"
+)
 
-WEATHER_BASE_URL = "https://dd.weather.gc.ca/citypage_weather/{province}/{hour}/"
+WEATHER_BASE_URL = "https://dd.weather.gc.ca/today/citypage_weather/{province}/{hour}/"
 
 CLIENT_TIMEOUT = ClientTimeout(10)
 

{env_canada-0.11.1.dist-info → env_canada-0.11.3.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: env_canada
-Version: 0.11.1
+Version: 0.11.3
 Summary: A package to access meteorological data from Environment Canada
 Author-email: Michael Davie <michael.davie@gmail.com>
 Maintainer-email: Michael Davie <michael.davie@gmail.com>
@@ -17,9 +17,7 @@ Description-Content-Type: text/markdown
 License-File: LICENSE
 Requires-Dist: aiohttp>=3.9.0
 Requires-Dist: geopy>=2.3.0
-Requires-Dist: imageio>=2.28.0
 Requires-Dist: lxml>=5.3.0
-Requires-Dist: numpy>=1.22.2
 Requires-Dist: pandas>=2.2.3
 Requires-Dist: Pillow>=10.0.1
 Requires-Dist: python-dateutil>=2.9

env_canada-0.11.3.dist-info/RECORD

@@ -0,0 +1,17 @@
+env_canada/10x20.pbm,sha256=ClKTs2WUmhUhTHAQzPuGwPTICGVBzCvos5l-vHRBE5M,2463
+env_canada/10x20.pil,sha256=Oki6-TD7b0xFtfm6vxCKsmpEpsZ5Jaia_0v_aDz8bfE,5143
+env_canada/__init__.py,sha256=EXzGEHwon-usFzLzuJeISKHlfJdV3DBa0_rR9b_XfvE,405
+env_canada/constants.py,sha256=C9mCx8dS26TjS-XcPBa5Lp1u-Inmjn4OJ8YadKGlreo,33
+env_canada/ec_aqhi.py,sha256=bmgzq__b8ecvPGR_PAlDBa4uyA6OTVllikBVYwOefRc,8106
+env_canada/ec_cache.py,sha256=zb3n79ul7hUTE0IohDfZbRBLY-siOHPjYzWldMbuPVk,798
+env_canada/ec_exc.py,sha256=SBJwzmLf94lTx7KYVLfQYrMXYNYUoIxeVXc-BLkuXoE,67
+env_canada/ec_historical.py,sha256=qMr4RE6vfNiNa_zFolQ0PQGraok8bQtIVjs_o6sJKD4,16276
+env_canada/ec_hydro.py,sha256=HxfUsx43A6KBPdzNQs1-204UVstMXAyrpyj8h2B8Hlc,4909
+env_canada/ec_map.py,sha256=HIyCZ8j9EbuLX3-YhvMKjYPiE2AH_behL6IaOXjXpaQ,15564
+env_canada/ec_radar.py,sha256=dKZqWJyb66R2EJzAy4K7pii7vPK9FxDKmuW9vA1ADbw,3330
+env_canada/ec_weather.py,sha256=IGmQ4rvilxclb76h9Gu44e91uEfzmNTHu9gg9V_OTSs,23447
+env_canada-0.11.3.dist-info/licenses/LICENSE,sha256=BkgGIGgy9sv-OsI7mRi9dIQ3Su0m4IbjpZlfxv8oBbM,1073
+env_canada-0.11.3.dist-info/METADATA,sha256=Mi-V9ltbxYiHuM-9covAq6H3lhAgDbORlxSh6nWYewk,13618
+env_canada-0.11.3.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
+env_canada-0.11.3.dist-info/top_level.txt,sha256=fw7Pcl9ULBXYvqnAdyBdmwPXW8GSRFmhO0sLZWVfOCc,11
+env_canada-0.11.3.dist-info/RECORD,,

env_canada-0.11.1.dist-info/RECORD

@@ -1,17 +0,0 @@
-env_canada/10x20.pbm,sha256=ClKTs2WUmhUhTHAQzPuGwPTICGVBzCvos5l-vHRBE5M,2463
-env_canada/10x20.pil,sha256=Oki6-TD7b0xFtfm6vxCKsmpEpsZ5Jaia_0v_aDz8bfE,5143
-env_canada/__init__.py,sha256=EXzGEHwon-usFzLzuJeISKHlfJdV3DBa0_rR9b_XfvE,405
-env_canada/constants.py,sha256=LIgDz8EI__wlzoI4yz5D9tl-XPoCel8vKk45VON0DIs,33
-env_canada/ec_aqhi.py,sha256=oE52qfk-AKbHdhTSl5RP3vsWL-50eMRCCRVy9RW-pP4,8080
-env_canada/ec_cache.py,sha256=zb3n79ul7hUTE0IohDfZbRBLY-siOHPjYzWldMbuPVk,798
-env_canada/ec_exc.py,sha256=SBJwzmLf94lTx7KYVLfQYrMXYNYUoIxeVXc-BLkuXoE,67
-env_canada/ec_historical.py,sha256=qMr4RE6vfNiNa_zFolQ0PQGraok8bQtIVjs_o6sJKD4,16276
-env_canada/ec_hydro.py,sha256=JoBe-QVV8GEeZXCNFscIs2R_spgkbxCZpLt7tL6-NUI,4889
-env_canada/ec_map.py,sha256=936CN6G9ZAY9zQjuph0Xp4f9OwNnHb6qXMnk6M6bE68,15134
-env_canada/ec_radar.py,sha256=dKZqWJyb66R2EJzAy4K7pii7vPK9FxDKmuW9vA1ADbw,3330
-env_canada/ec_weather.py,sha256=pFcVKBbYKLj01ocjZmy8RiQaf7YVSQOo4id_BbZ7gds,23421
-env_canada-0.11.1.dist-info/licenses/LICENSE,sha256=BkgGIGgy9sv-OsI7mRi9dIQ3Su0m4IbjpZlfxv8oBbM,1073
-env_canada-0.11.1.dist-info/METADATA,sha256=c9TtVd3BBxg1sWEdIW9kQBaceHgBWaHSS52tl4ZYsLI,13678
-env_canada-0.11.1.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
-env_canada-0.11.1.dist-info/top_level.txt,sha256=fw7Pcl9ULBXYvqnAdyBdmwPXW8GSRFmhO0sLZWVfOCc,11
-env_canada-0.11.1.dist-info/RECORD,,