From 86d3baa34e4c296f112b4bbc9540f4b0461379aa Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Hans=20Kr=C3=B6ner?= <hans.kroner@gmail.com>
Date: Wed, 17 Mar 2021 17:39:47 +0100
Subject: [PATCH] Improve OWM Precipitation sensors (#47945)

---
 .../components/openweathermap/const.py        |  8 +++-
 .../weather_update_coordinator.py             | 37 +++++++++++++------
 2 files changed, 32 insertions(+), 13 deletions(-)

diff --git a/homeassistant/components/openweathermap/const.py b/homeassistant/components/openweathermap/const.py
index 4ab61b486f1..36d38ff4688 100644
--- a/homeassistant/components/openweathermap/const.py
+++ b/homeassistant/components/openweathermap/const.py
@@ -47,6 +47,7 @@ CONFIG_FLOW_VERSION = 2
 ENTRY_NAME = "name"
 ENTRY_WEATHER_COORDINATOR = "weather_coordinator"
 ATTR_API_PRECIPITATION = "precipitation"
+ATTR_API_PRECIPITATION_KIND = "precipitation_kind"
 ATTR_API_DATETIME = "datetime"
 ATTR_API_DEW_POINT = "dew_point"
 ATTR_API_WEATHER = "weather"
@@ -94,6 +95,7 @@ MONITORED_CONDITIONS = [
     ATTR_API_CLOUDS,
     ATTR_API_RAIN,
     ATTR_API_SNOW,
+    ATTR_API_PRECIPITATION_KIND,
     ATTR_API_UV_INDEX,
     ATTR_API_CONDITION,
     ATTR_API_WEATHER_CODE,
@@ -225,6 +227,7 @@ WEATHER_SENSOR_TYPES = {
     ATTR_API_CLOUDS: {SENSOR_NAME: "Cloud coverage", SENSOR_UNIT: PERCENTAGE},
     ATTR_API_RAIN: {SENSOR_NAME: "Rain", 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: {
         SENSOR_NAME: "UV Index",
         SENSOR_UNIT: UV_INDEX,
@@ -234,7 +237,10 @@ WEATHER_SENSOR_TYPES = {
 }
 FORECAST_SENSOR_TYPES = {
     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: {
         SENSOR_NAME: "Precipitation probability",
         SENSOR_UNIT: PERCENTAGE,
diff --git a/homeassistant/components/openweathermap/weather_update_coordinator.py b/homeassistant/components/openweathermap/weather_update_coordinator.py
index 26ada47bef6..51e475eb754 100644
--- a/homeassistant/components/openweathermap/weather_update_coordinator.py
+++ b/homeassistant/components/openweathermap/weather_update_coordinator.py
@@ -29,6 +29,7 @@ from .const import (
     ATTR_API_FEELS_LIKE_TEMPERATURE,
     ATTR_API_FORECAST,
     ATTR_API_HUMIDITY,
+    ATTR_API_PRECIPITATION_KIND,
     ATTR_API_PRESSURE,
     ATTR_API_RAIN,
     ATTR_API_SNOW,
@@ -129,6 +130,9 @@ class WeatherUpdateCoordinator(DataUpdateCoordinator):
             ATTR_API_CLOUDS: current_weather.clouds,
             ATTR_API_RAIN: self._get_rain(current_weather.rain),
             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_CONDITION: self._get_condition(current_weather.weather_code),
             ATTR_API_UV_INDEX: current_weather.uvi,
@@ -178,36 +182,45 @@ class WeatherUpdateCoordinator(DataUpdateCoordinator):
     def _get_rain(rain):
         """Get rain data from weather data."""
         if "all" in rain:
-            return round(rain["all"], 0)
+            return round(rain["all"], 2)
         if "1h" in rain:
-            return round(rain["1h"], 0)
-        return "not raining"
+            return round(rain["1h"], 2)
+        return 0
 
     @staticmethod
     def _get_snow(snow):
         """Get snow data from weather data."""
         if snow:
             if "all" in snow:
-                return round(snow["all"], 0)
+                return round(snow["all"], 2)
             if "1h" in snow:
-                return round(snow["1h"], 0)
-            return "not snowing"
-        return "not snowing"
+                return round(snow["1h"], 2)
+        return 0
 
     @staticmethod
     def _calc_precipitation(rain, snow):
         """Calculate the precipitation."""
         rain_value = 0
-        if WeatherUpdateCoordinator._get_rain(rain) != "not raining":
+        if WeatherUpdateCoordinator._get_rain(rain) != 0:
             rain_value = WeatherUpdateCoordinator._get_rain(rain)
 
         snow_value = 0
-        if WeatherUpdateCoordinator._get_snow(snow) != "not snowing":
+        if WeatherUpdateCoordinator._get_snow(snow) != 0:
             snow_value = WeatherUpdateCoordinator._get_snow(snow)
 
-        if round(rain_value + snow_value, 1) == 0:
-            return None
-        return round(rain_value + snow_value, 1)
+        return round(rain_value + snow_value, 2)
+
+    @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):
         """Get weather condition from weather data."""