From 4dcff294c9494b7c01a7446711da1c37bfc770e6 Mon Sep 17 00:00:00 2001 From: michaeldavie Date: Sat, 23 May 2020 16:25:00 -0400 Subject: [PATCH] Update environment_canada camera (#36010) * Bump env_canada to 0.0.38 * Fix timestamp type --- .../components/environment_canada/camera.py | 17 ++++++----------- .../components/environment_canada/manifest.json | 2 +- requirements_all.txt | 2 +- 3 files changed, 8 insertions(+), 13 deletions(-) diff --git a/homeassistant/components/environment_canada/camera.py b/homeassistant/components/environment_canada/camera.py index d51b69f5713..c0565988c65 100644 --- a/homeassistant/components/environment_canada/camera.py +++ b/homeassistant/components/environment_canada/camera.py @@ -17,8 +17,6 @@ from homeassistant.util import Throttle _LOGGER = logging.getLogger(__name__) -ATTR_STATION = "station" -ATTR_LOCATION = "location" ATTR_UPDATED = "updated" CONF_ATTRIBUTION = "Data provided by Environment Canada" @@ -50,7 +48,9 @@ def setup_platform(hass, config, add_devices, discovery_info=None): else: lat = config.get(CONF_LATITUDE, hass.config.latitude) lon = config.get(CONF_LONGITUDE, hass.config.longitude) - radar_object = ECRadar(coordinates=(lat, lon)) + radar_object = ECRadar( + coordinates=(lat, lon), precip_type=config.get(CONF_PRECIP_TYPE) + ) add_devices([ECCamera(radar_object, config.get(CONF_NAME))], True) @@ -78,17 +78,12 @@ class ECCamera(Camera): """Return the name of the camera.""" if self.camera_name is not None: return self.camera_name - return " ".join([self.radar_object.station_name, "Radar"]) + return "Environment Canada Radar" @property def device_state_attributes(self): """Return the state attributes of the device.""" - attr = { - ATTR_ATTRIBUTION: CONF_ATTRIBUTION, - ATTR_LOCATION: self.radar_object.station_name, - ATTR_STATION: self.radar_object.station_code, - ATTR_UPDATED: self.timestamp, - } + attr = {ATTR_ATTRIBUTION: CONF_ATTRIBUTION, ATTR_UPDATED: self.timestamp} return attr @@ -99,4 +94,4 @@ class ECCamera(Camera): self.image = self.radar_object.get_loop() else: self.image = self.radar_object.get_latest_frame() - self.timestamp = self.radar_object.timestamp.isoformat() + self.timestamp = self.radar_object.timestamp diff --git a/homeassistant/components/environment_canada/manifest.json b/homeassistant/components/environment_canada/manifest.json index bdc38e90c0c..1fd4d19e370 100644 --- a/homeassistant/components/environment_canada/manifest.json +++ b/homeassistant/components/environment_canada/manifest.json @@ -2,6 +2,6 @@ "domain": "environment_canada", "name": "Environment Canada", "documentation": "https://www.home-assistant.io/integrations/environment_canada", - "requirements": ["env_canada==0.0.35"], + "requirements": ["env_canada==0.0.38"], "codeowners": ["@michaeldavie"] } diff --git a/requirements_all.txt b/requirements_all.txt index 84988162762..a00aeeaac73 100644 --- a/requirements_all.txt +++ b/requirements_all.txt @@ -532,7 +532,7 @@ enocean==0.50 enturclient==0.2.1 # homeassistant.components.environment_canada -env_canada==0.0.35 +env_canada==0.0.38 # homeassistant.components.envirophat # envirophat==0.0.6