jeans/core
jeans/core
1
0
Fork 0
mirror of https://github.com/home-assistant/core.git synced 2025-07-24 21:57:51 +00:00
Code Issues Packages Projects Releases Wiki Activity

Improve OWM Precipitation sensors (#47945)

Browse Source
This commit is contained in:
Hans Kröner 2021-03-17 17:39:47 +01:00 committed by GitHub
parent e55702d635
commit 86d3baa34e
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 32 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -47,6 +47,7 @@ CONFIG_FLOW_VERSION = 2
ENTRY_NAME = "name" ENTRY_NAME = "name"
ENTRY_WEATHER_COORDINATOR = "weather_coordinator" ENTRY_WEATHER_COORDINATOR = "weather_coordinator"
ATTR_API_PRECIPITATION = "precipitation" ATTR_API_PRECIPITATION = "precipitation"
ATTR_API_PRECIPITATION_KIND = "precipitation_kind"
ATTR_API_DATETIME = "datetime" ATTR_API_DATETIME = "datetime"
ATTR_API_DEW_POINT = "dew_point" ATTR_API_DEW_POINT = "dew_point"
ATTR_API_WEATHER = "weather" ATTR_API_WEATHER = "weather"
@ -94,6 +95,7 @@ MONITORED_CONDITIONS = [
ATTR_API_CLOUDS, ATTR_API_CLOUDS,
ATTR_API_RAIN, ATTR_API_RAIN,
ATTR_API_SNOW, ATTR_API_SNOW,
ATTR_API_PRECIPITATION_KIND,
ATTR_API_UV_INDEX, ATTR_API_UV_INDEX,
ATTR_API_CONDITION, ATTR_API_CONDITION,
ATTR_API_WEATHER_CODE, ATTR_API_WEATHER_CODE,
@ -225,6 +227,7 @@ WEATHER_SENSOR_TYPES = {
ATTR_API_CLOUDS: {SENSOR_NAME: "Cloud coverage", SENSOR_UNIT: PERCENTAGE}, ATTR_API_CLOUDS: {SENSOR_NAME: "Cloud coverage", SENSOR_UNIT: PERCENTAGE},
ATTR_API_RAIN: {SENSOR_NAME: "Rain", SENSOR_UNIT: LENGTH_MILLIMETERS}, ATTR_API_RAIN: {SENSOR_NAME: "Rain", SENSOR_UNIT: LENGTH_MILLIMETERS},
ATTR_API_SNOW: {SENSOR_NAME: "Snow", SENSOR_UNIT: LENGTH_MILLIMETERS}, ATTR_API_SNOW: {SENSOR_NAME: "Snow", SENSOR_UNIT: LENGTH_MILLIMETERS},
ATTR_API_PRECIPITATION_KIND: {SENSOR_NAME: "Precipitation kind"},
ATTR_API_UV_INDEX: { ATTR_API_UV_INDEX: {
SENSOR_NAME: "UV Index", SENSOR_NAME: "UV Index",
SENSOR_UNIT: UV_INDEX, SENSOR_UNIT: UV_INDEX,
@ -234,7 +237,10 @@ WEATHER_SENSOR_TYPES = {
} }
FORECAST_SENSOR_TYPES = { FORECAST_SENSOR_TYPES = {
ATTR_FORECAST_CONDITION: {SENSOR_NAME: "Condition"}, ATTR_FORECAST_CONDITION: {SENSOR_NAME: "Condition"},
ATTR_FORECAST_PRECIPITATION: {SENSOR_NAME: "Precipitation"}, ATTR_FORECAST_PRECIPITATION: {
SENSOR_NAME: "Precipitation",
SENSOR_UNIT: LENGTH_MILLIMETERS,
},
ATTR_FORECAST_PRECIPITATION_PROBABILITY: { ATTR_FORECAST_PRECIPITATION_PROBABILITY: {
SENSOR_NAME: "Precipitation probability", SENSOR_NAME: "Precipitation probability",
SENSOR_UNIT: PERCENTAGE, SENSOR_UNIT: PERCENTAGE,

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

@ -29,6 +29,7 @@ from .const import (
ATTR_API_FEELS_LIKE_TEMPERATURE, ATTR_API_FEELS_LIKE_TEMPERATURE,
ATTR_API_FORECAST, ATTR_API_FORECAST,
ATTR_API_HUMIDITY, ATTR_API_HUMIDITY,
ATTR_API_PRECIPITATION_KIND,
ATTR_API_PRESSURE, ATTR_API_PRESSURE,
ATTR_API_RAIN, ATTR_API_RAIN,
ATTR_API_SNOW, ATTR_API_SNOW,
@ -129,6 +130,9 @@ class WeatherUpdateCoordinator(DataUpdateCoordinator):
ATTR_API_CLOUDS: current_weather.clouds, ATTR_API_CLOUDS: current_weather.clouds,
ATTR_API_RAIN: self._get_rain(current_weather.rain), ATTR_API_RAIN: self._get_rain(current_weather.rain),
ATTR_API_SNOW: self._get_snow(current_weather.snow), ATTR_API_SNOW: self._get_snow(current_weather.snow),
ATTR_API_PRECIPITATION_KIND: self._calc_precipitation_kind(
current_weather.rain, current_weather.snow
),
ATTR_API_WEATHER: current_weather.detailed_status, ATTR_API_WEATHER: current_weather.detailed_status,
ATTR_API_CONDITION: self._get_condition(current_weather.weather_code), ATTR_API_CONDITION: self._get_condition(current_weather.weather_code),
ATTR_API_UV_INDEX: current_weather.uvi, ATTR_API_UV_INDEX: current_weather.uvi,
@ -178,36 +182,45 @@ class WeatherUpdateCoordinator(DataUpdateCoordinator):
def _get_rain(rain): def _get_rain(rain):
"""Get rain data from weather data.""" """Get rain data from weather data."""
if "all" in rain: if "all" in rain:
return round(rain["all"], 0) return round(rain["all"], 2)
if "1h" in rain: if "1h" in rain:
return round(rain["1h"], 0) return round(rain["1h"], 2)
return "not raining" return 0
@staticmethod @staticmethod
def _get_snow(snow): def _get_snow(snow):
"""Get snow data from weather data.""" """Get snow data from weather data."""
if snow: if snow:
if "all" in snow: if "all" in snow:
return round(snow["all"], 0) return round(snow["all"], 2)
if "1h" in snow: if "1h" in snow:
return round(snow["1h"], 0) return round(snow["1h"], 2)
return "not snowing" return 0
return "not snowing"
@staticmethod @staticmethod
def _calc_precipitation(rain, snow): def _calc_precipitation(rain, snow):
"""Calculate the precipitation.""" """Calculate the precipitation."""
rain_value = 0 rain_value = 0
if WeatherUpdateCoordinator._get_rain(rain) != "not raining": if WeatherUpdateCoordinator._get_rain(rain) != 0:
rain_value = WeatherUpdateCoordinator._get_rain(rain) rain_value = WeatherUpdateCoordinator._get_rain(rain)
snow_value = 0 snow_value = 0
if WeatherUpdateCoordinator._get_snow(snow) != "not snowing": if WeatherUpdateCoordinator._get_snow(snow) != 0:
snow_value = WeatherUpdateCoordinator._get_snow(snow) snow_value = WeatherUpdateCoordinator._get_snow(snow)
if round(rain_value + snow_value, 1) == 0: return round(rain_value + snow_value, 2)
return None
return round(rain_value + snow_value, 1) @staticmethod
def _calc_precipitation_kind(rain, snow):
"""Determine the precipitation kind."""
if WeatherUpdateCoordinator._get_rain(rain) != 0:
if WeatherUpdateCoordinator._get_snow(snow) != 0:
return "Snow and Rain"
return "Rain"
if WeatherUpdateCoordinator._get_snow(snow) != 0:
return "Snow"
return "None"
def _get_condition(self, weather_code, timestamp=None): def _get_condition(self, weather_code, timestamp=None):
"""Get weather condition from weather data.""" """Get weather condition from weather data."""