Met weather, refactor and add forecast

homeassistant/components/weather/met.py

@@ -16,59 +16,16 @@
 from homeassistant.helpers.aiohttp_client import async_get_clientsession
 from homeassistant.helpers.event import (async_track_utc_time_change,
                                          async_call_later)
-from homeassistant.util import dt as dt_util
+import homeassistant.util.dt as dt_util
 
-REQUIREMENTS = ['pyMetno==0.2.0']
+REQUIREMENTS = ['pyMetno==0.3.0']
 
 _LOGGER = logging.getLogger(__name__)
 
 CONF_ATTRIBUTION = "Weather forecast from met.no, delivered " \
                    "by the Norwegian Meteorological Institute."
 DEFAULT_NAME = "Met.no"
 
-# https://api.met.no/weatherapi/weathericon/_/documentation/#___top
-CONDITIONS = {1: 'sunny',
-              2: 'partlycloudy',
-              3: 'partlycloudy',
-              4: 'cloudy',
-              5: 'rainy',
-              6: 'lightning-rainy',
-              7: 'snowy-rainy',
-              8: 'snowy',
-              9: 'rainy',
-              10: 'rainy',
-              11: 'lightning-rainy',
-              12: 'snowy-rainy',
-              13: 'snowy',
-              14: 'snowy',
-              15: 'fog',
-              20: 'lightning-rainy',
-              21: 'lightning-rainy',
-              22: 'lightning-rainy',
-              23: 'lightning-rainy',
-              24: 'lightning-rainy',
-              25: 'lightning-rainy',
-              26: 'lightning-rainy',
-              27: 'lightning-rainy',
-              28: 'lightning-rainy',
-              29: 'lightning-rainy',
-              30: 'lightning-rainy',
-              31: 'lightning-rainy',
-              32: 'lightning-rainy',
-              33: 'lightning-rainy',
-              34: 'lightning-rainy',
-              40: 'rainy',
-              41: 'rainy',
-              42: 'snowy-rainy',
-              43: 'snowy-rainy',
-              44: 'snowy',
-              45: 'snowy',
-              46: 'rainy',
-              47: 'snowy-rainy',
-              48: 'snowy-rainy',
-              49: 'snowy',
-              50: 'snowy',
-              }
 URL = 'https://aa015h6buqvih86i1.api.met.no/weatherapi/locationforecast/1.9/'
 
 PLATFORM_SCHEMA = PLATFORM_SCHEMA.extend({
@@ -113,12 +70,8 @@ def __init__(self, name, coordinates, clientsession):
                                                   clientsession,
                                                   URL
                                                   )
-        self._temperature = None
-        self._condition = None
-        self._pressure = None
-        self._humidity = None
-        self._wind_speed = None
-        self._wind_bearing = None
+        self._current_weather_data = {}
+        self._forecast_data = None
 
     async def async_added_to_hass(self):
         """Start fetching data."""
@@ -145,38 +98,9 @@ def should_poll(self):
 
     async def _update(self, *_):
         """Get the latest data from Met.no."""
-        import metno
-        if self._weather_data is None:
-            return
-
-        now = dt_util.utcnow()
-
-        ordered_entries = []
-        for time_entry in self._weather_data.data['product']['time']:
-            valid_from = dt_util.parse_datetime(time_entry['@from'])
-            valid_to = dt_util.parse_datetime(time_entry['@to'])
-
-            if now >= valid_to:
-                # Has already passed. Never select this.
-                continue
-
-            average_dist = (abs((valid_to - now).total_seconds()) +
-                            abs((valid_from - now).total_seconds()))
-
-            ordered_entries.append((average_dist, time_entry))
-
-        if not ordered_entries:
-            return
-        ordered_entries.sort(key=lambda item: item[0])
-
-        self._temperature = metno.get_forecast('temperature', ordered_entries)
-        self._condition = CONDITIONS.get(metno.get_forecast('symbol',
-                                                            ordered_entries))
-        self._pressure = metno.get_forecast('pressure', ordered_entries)
-        self._humidity = metno.get_forecast('humidity', ordered_entries)
-        self._wind_speed = metno.get_forecast('windSpeed', ordered_entries)
-        self._wind_bearing = metno.get_forecast('windDirection',
-                                                ordered_entries)
+        self._current_weather_data = self._weather_data.get_current_weather()
+        time_zone = dt_util.DEFAULT_TIME_ZONE
+        self._forecast_data = self._weather_data.get_forecast(time_zone)
         self.async_schedule_update_ha_state()
 
     @property
@@ -187,12 +111,12 @@ def name(self):
     @property
     def condition(self):
         """Return the current condition."""
-        return self._condition
+        return self._current_weather_data.get('condition')
 
     @property
     def temperature(self):
         """Return the temperature."""
-        return self._temperature
+        return self._current_weather_data.get('temperature')
 
     @property
     def temperature_unit(self):
@@ -202,24 +126,29 @@ def temperature_unit(self):
     @property
     def pressure(self):
         """Return the pressure."""
-        return self._pressure
+        return self._current_weather_data.get('pressure')
 
     @property
     def humidity(self):
         """Return the humidity."""
-        return self._humidity
+        return self._current_weather_data.get('humidity')
 
     @property
     def wind_speed(self):
         """Return the wind speed."""
-        return self._wind_speed
+        return self._current_weather_data.get('wind_speed')
 
     @property
     def wind_bearing(self):
         """Return the wind direction."""
-        return self._wind_bearing
+        return self._current_weather_data.get('wind_bearing')
 
     @property
     def attribution(self):
         """Return the attribution."""
         return CONF_ATTRIBUTION
+
+    @property
+    def forecast(self):
+        """Return the forecast array."""
+        return self._forecast_data

requirements_all.txt

@@ -755,7 +755,7 @@ pyCEC==0.4.13
 pyHS100==0.3.3
 
 # homeassistant.components.weather.met
-pyMetno==0.2.0
+pyMetno==0.3.0
 
 # homeassistant.components.rfxtrx
 pyRFXtrx==0.23