jeans/core
jeans/core
1
0
Fork 0
mirror of https://github.com/home-assistant/core.git synced 2025-07-17 18:27:09 +00:00
Code Issues Packages Projects Releases Wiki Activity

Report correct weather condition at night for OpenWeatherMap (#42982)

Browse Source
This commit is contained in:
springstan 2020-11-30 09:32:06 +01:00 committed by GitHub
parent 945a0a9f7e
commit f221bfae52
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 20 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
homeassistant/components/openweathermap/const.py
View File

@ -149,6 +149,7 @@ LANGUAGES = [
"zh_tw", "zh_tw",
"zu", "zu",
] ]
WEATHER_CODE_SUNNY_OR_CLEAR_NIGHT = 800
CONDITION_CLASSES = { CONDITION_CLASSES = {
ATTR_CONDITION_CLOUDY: [803, 804], ATTR_CONDITION_CLOUDY: [803, 804],
ATTR_CONDITION_FOG: [701, 741], ATTR_CONDITION_FOG: [701, 741],
@ -160,7 +161,7 @@ CONDITION_CLASSES = {
ATTR_CONDITION_RAINY: [300, 301, 302, 310, 311, 312, 313, 500, 501, 520, 521], ATTR_CONDITION_RAINY: [300, 301, 302, 310, 311, 312, 313, 500, 501, 520, 521],
ATTR_CONDITION_SNOWY: [600, 601, 602, 611, 612, 620, 621, 622], ATTR_CONDITION_SNOWY: [600, 601, 602, 611, 612, 620, 621, 622],
ATTR_CONDITION_SNOWY_RAINY: [511, 615, 616], ATTR_CONDITION_SNOWY_RAINY: [511, 615, 616],
ATTR_CONDITION_SUNNY: [800], ATTR_CONDITION_SUNNY: [WEATHER_CODE_SUNNY_OR_CLEAR_NIGHT],
ATTR_CONDITION_WINDY: [905, 951, 952, 953, 954, 955, 956, 957], ATTR_CONDITION_WINDY: [905, 951, 952, 953, 954, 955, 956, 957],
ATTR_CONDITION_WINDY_VARIANT: [958, 959, 960, 961], ATTR_CONDITION_WINDY_VARIANT: [958, 959, 960, 961],
ATTR_CONDITION_EXCEPTIONAL: [ ATTR_CONDITION_EXCEPTIONAL: [

21
homeassistant/components/openweathermap/weather_update_coordinator.py
View File

@ -6,6 +6,8 @@ import async_timeout
from pyowm.commons.exceptions import APIRequestError, UnauthorizedError from pyowm.commons.exceptions import APIRequestError, UnauthorizedError
from homeassistant.components.weather import ( from homeassistant.components.weather import (
ATTR_CONDITION_CLEAR_NIGHT,
ATTR_CONDITION_SUNNY,
ATTR_FORECAST_CONDITION, ATTR_FORECAST_CONDITION,
ATTR_FORECAST_PRECIPITATION, ATTR_FORECAST_PRECIPITATION,
ATTR_FORECAST_TEMP, ATTR_FORECAST_TEMP,
@ -14,7 +16,9 @@ from homeassistant.components.weather import (
ATTR_FORECAST_WIND_BEARING, ATTR_FORECAST_WIND_BEARING,
ATTR_FORECAST_WIND_SPEED, ATTR_FORECAST_WIND_SPEED,
) )
from homeassistant.helpers import sun
from homeassistant.helpers.update_coordinator import DataUpdateCoordinator, UpdateFailed from homeassistant.helpers.update_coordinator import DataUpdateCoordinator, UpdateFailed
from homeassistant.util import dt
from .const import ( from .const import (
ATTR_API_CLOUDS, ATTR_API_CLOUDS,
@ -35,6 +39,7 @@ from .const import (
FORECAST_MODE_HOURLY, FORECAST_MODE_HOURLY,
FORECAST_MODE_ONECALL_DAILY, FORECAST_MODE_ONECALL_DAILY,
FORECAST_MODE_ONECALL_HOURLY, FORECAST_MODE_ONECALL_HOURLY,
WEATHER_CODE_SUNNY_OR_CLEAR_NIGHT,
) )
_LOGGER = logging.getLogger(__name__) _LOGGER = logging.getLogger(__name__)
@ -139,7 +144,9 @@ class WeatherUpdateCoordinator(DataUpdateCoordinator):
), ),
ATTR_FORECAST_WIND_SPEED: entry.wind().get("speed"), ATTR_FORECAST_WIND_SPEED: entry.wind().get("speed"),
ATTR_FORECAST_WIND_BEARING: entry.wind().get("deg"), ATTR_FORECAST_WIND_BEARING: entry.wind().get("deg"),
ATTR_FORECAST_CONDITION: self._get_condition(entry.weather_code), ATTR_FORECAST_CONDITION: self._get_condition(
entry.weather_code, entry.reference_time("unix")
),
} }
temperature_dict = entry.temperature("celsius") temperature_dict = entry.temperature("celsius")
@ -186,9 +193,17 @@ class WeatherUpdateCoordinator(DataUpdateCoordinator):
return None return None
return round(rain_value + snow_value, 1) return round(rain_value + snow_value, 1)
@staticmethod def _get_condition(self, weather_code, timestamp=None):
def _get_condition(weather_code):
"""Get weather condition from weather data.""" """Get weather condition from weather data."""
if weather_code == WEATHER_CODE_SUNNY_OR_CLEAR_NIGHT:
if timestamp:
timestamp = dt.utc_from_timestamp(timestamp)
if sun.is_up(self.hass, timestamp):
return ATTR_CONDITION_SUNNY
return ATTR_CONDITION_CLEAR_NIGHT
return [k for k, v in CONDITION_CLASSES.items() if weather_code in v][0] return [k for k, v in CONDITION_CLASSES.items() if weather_code in v][0]