env-canada 0.11.0__py3-none-any.whl → 0.11.2__py3-none-any.whl

env_canada/constants.py

@@ -1 +1 @@
-USER_AGENT = "env_canada/0.11.0"
+USER_AGENT = "env_canada/0.11.2"

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

@@ -240,7 +240,7 @@ def validate_station(station):
         raise vol.Invalid(
             'Station ID must be of the form "XX/s0000###", "s0000###" or 1-3 digits'
         )
-    return station[-3:]
+    return station
 
 
 def _parse_timestamp(time_str: str | None) -> datetime | None:
@@ -385,10 +385,13 @@ class ECWeather:
         self.hourly_forecasts = []
         self.forecast_time = ""
         self.site_list = []
+        self._station_resolved = False
+        self._station_tuple = (
+            None  # Internal storage for (province_code, station_number)
+        )
 
         if "station_id" in kwargs and kwargs["station_id"] is not None:
-            # Station ID will be converted to tuple (province_code, station_number) during update()
-            self.station_id = kwargs["station_id"]  # Store raw input temporarily
+            self.station_id = kwargs["station_id"]  # Keep as string for external API
             self.lat = None
             self.lon = None
         else:
@@ -413,43 +416,57 @@ class ECWeather:
         self.metadata.cache_returned_on_update = 0
         raise ECWeatherUpdateFailed(msg) from err
 
+    async def _resolve_station(self) -> None:
+        """Resolve station ID and coordinates (one-time initialization)."""
+        if self._station_resolved:
+            return
+
+        if not self.site_list:
+            self.site_list = await get_ec_sites()
+
+        if self.station_id:
+            # Convert raw station input to tuple (province_code, station_number)
+            station_number = self.station_id[-3:]
+            province_code = find_province_for_station(self.site_list, station_number)
+            if province_code is None:
+                raise ec_exc.UnknownStationId
+            self._station_tuple = (province_code, station_number)
+
+            # Find lat/lon for the station
+            for site in self.site_list:
+                if (
+                    site["Codes"] == f"s0000{self._station_tuple[1].zfill(3)}"
+                    and site["Province Codes"] == self._station_tuple[0]
+                ):
+                    self.lat = site["Latitude"]
+                    self.lon = site["Longitude"]
+                    break
+            if not self.lat:
+                raise ec_exc.UnknownStationId
+        else:
+            self._station_tuple = closest_site(self.site_list, self.lat, self.lon)
+            if not self._station_tuple:
+                raise ec_exc.UnknownStationId
+            # Set station_id to string format for external API
+            self.station_id = (
+                f"{self._station_tuple[0]}/s0000{self._station_tuple[1].zfill(3)}"
+            )
+
+        self._station_resolved = True
+
+    @property
+    def station_tuple(self):
+        """Return station ID as a tuple (province_code, station_number) for internal use."""
+        return self._station_tuple
+
     async def update(self) -> None:
         """Get the latest data from Environment Canada."""
 
         # Clear error at start, any error that is handled will set it
         self.metadata.last_update_error = ""
 
-        # Determine station ID or coordinates if not provided
-        if not self.site_list:
-            self.site_list = await get_ec_sites()
-            if self.station_id:
-                # Convert raw station input to tuple (province_code, station_number)
-                if isinstance(self.station_id, str):
-                    station_number = (
-                        self.station_id
-                    )  # Already normalized by validate_station
-                    province_code = find_province_for_station(
-                        self.site_list, station_number
-                    )
-                    if province_code is None:
-                        raise ec_exc.UnknownStationId
-                    self.station_id = (province_code, station_number)
-
-                # Find lat/lon for the station
-                for site in self.site_list:
-                    if (
-                        site["Codes"] == f"s0000{self.station_id[1].zfill(3)}"
-                        and site["Province Codes"] == self.station_id[0]
-                    ):
-                        self.lat = site["Latitude"]
-                        self.lon = site["Longitude"]
-                        break
-                if not self.lat:
-                    raise ec_exc.UnknownStationId
-            else:
-                self.station_id = closest_site(self.site_list, self.lat, self.lon)
-                if not self.station_id:
-                    raise ec_exc.UnknownStationId
+        # Resolve station ID and coordinates if not already done
+        await self._resolve_station()
 
         LOG.debug(
             "update(): station %s lat %f lon %f", self.station_id, self.lat, self.lon
@@ -460,7 +477,10 @@ class ECWeather:
             async with ClientSession(raise_for_status=True) as session:
                 # Discover the URL for the most recent weather file
                 weather_url = await discover_weather_file_url(
-                    session, self.station_id[0], self.station_id[1], self.language
+                    session,
+                    self._station_tuple[0],
+                    self._station_tuple[1],
+                    self.language,
                 )
                 LOG.debug("Using weather URL: %s", weather_url)
 

{env_canada-0.11.0.dist-info → env_canada-0.11.2.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: env_canada
-Version: 0.11.0
+Version: 0.11.2
 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>

{env_canada-0.11.0.dist-info → env_canada-0.11.2.dist-info}/RECORD

@@ -1,17 +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=YkWAwWu2M6izF61EYMWanH5S-3crC0PV2Wo5mgt5aOg,33
+env_canada/constants.py,sha256=pB3ld_VBSAL8c6LAUF0U2VgKhhkOmP7U6T5kLJvo938,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_map.py,sha256=HIyCZ8j9EbuLX3-YhvMKjYPiE2AH_behL6IaOXjXpaQ,15564
 env_canada/ec_radar.py,sha256=dKZqWJyb66R2EJzAy4K7pii7vPK9FxDKmuW9vA1ADbw,3330
-env_canada/ec_weather.py,sha256=ztMYx8jnmGqUQiUrqGFkiag7B3Xb0uhqo5g5j57bevI,22948
-env_canada-0.11.0.dist-info/licenses/LICENSE,sha256=BkgGIGgy9sv-OsI7mRi9dIQ3Su0m4IbjpZlfxv8oBbM,1073
-env_canada-0.11.0.dist-info/METADATA,sha256=KwVr43s8m3N3zOmCuzmThL1kiQUOPQfV-wZibXfJEZs,13678
-env_canada-0.11.0.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
-env_canada-0.11.0.dist-info/top_level.txt,sha256=fw7Pcl9ULBXYvqnAdyBdmwPXW8GSRFmhO0sLZWVfOCc,11
-env_canada-0.11.0.dist-info/RECORD,,
+env_canada/ec_weather.py,sha256=pFcVKBbYKLj01ocjZmy8RiQaf7YVSQOo4id_BbZ7gds,23421
+env_canada-0.11.2.dist-info/licenses/LICENSE,sha256=BkgGIGgy9sv-OsI7mRi9dIQ3Su0m4IbjpZlfxv8oBbM,1073
+env_canada-0.11.2.dist-info/METADATA,sha256=uWS4H6dImil9koOPvBxkdSJKut2gmOzsqLwjIyE2sOc,13678
+env_canada-0.11.2.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
+env_canada-0.11.2.dist-info/top_level.txt,sha256=fw7Pcl9ULBXYvqnAdyBdmwPXW8GSRFmhO0sLZWVfOCc,11
+env_canada-0.11.2.dist-info/RECORD,,