Merge pull request #62 from anand-p-r/bugs/reported_issues

Bugs + reported issues
anand-p-r · Oct 23, 2022 · 6f9f9a3 · 6f9f9a3
2 parents 8d69738 + 7df6eca
commit 6f9f9a3
Show file tree

Hide file tree

Showing 3 changed files with 31 additions and 22 deletions.
diff --git a/manifest.json b/manifest.json
@@ -1,10 +1,10 @@
 {
   "domain": "fmi",
-  "version": "0.4.9",
+  "version": "0.5.0",
   "name": "Finnish Meteorological Institute",
   "documentation": "https://www.home-assistant.io/integrations/fmi/",
   "requirements": [
-    "fmi-weather-client==0.1.1",
+    "fmi-weather-client==0.1.2",
     "geopy>=2.1.0"
   ],
   "dependencies": [],

diff --git a/sensor.py b/sensor.py
@@ -14,6 +14,10 @@
     PERCENTAGE
 )
 
+from homeassistant.components.sensor import (
+    SensorStateClass
+)
+
 from homeassistant.const import CONF_NAME
 from homeassistant.helpers.update_coordinator import CoordinatorEntity
 
@@ -393,6 +397,11 @@ def unit_of_measurement(self):
         """Return the unit of measurement of this entity, if any."""
         return self._unit_of_measurement
 
+    @property
+    def state_class(self):
+        """Return the state class."""
+        return SensorStateClass.MEASUREMENT
+
     @property
     def icon(self):
         """Icon to use in the frontend, if any."""

diff --git a/weather.py b/weather.py
@@ -3,14 +3,14 @@
 
 from homeassistant.components.weather import (
     ATTR_FORECAST_CONDITION,
-    ATTR_FORECAST_PRECIPITATION,
-    ATTR_FORECAST_TEMP,
+    ATTR_FORECAST_NATIVE_PRECIPITATION,
+    ATTR_FORECAST_NATIVE_TEMP,
     ATTR_FORECAST_TIME,
     ATTR_FORECAST_WIND_BEARING,
-    ATTR_FORECAST_WIND_SPEED,
+    ATTR_FORECAST_NATIVE_WIND_SPEED,
     ATTR_WEATHER_HUMIDITY,
     ATTR_WEATHER_PRESSURE,
-    ATTR_FORECAST_TEMP_LOW,
+    ATTR_FORECAST_NATIVE_TEMP_LOW,
     WeatherEntity,
 )
 
@@ -108,15 +108,15 @@ def available(self):
         return self._fmi.current is not None
 
     @property
-    def temperature(self):
+    def native_temperature(self):
         """Return the temperature."""
         if self._fmi is None:
             return None
 
         return self._fmi.current.data.temperature.value
 
     @property
-    def temperature_unit(self):
+    def native_temperature_unit(self):
         """Return the unit of measurement."""
         if self._fmi is None:
             return None
@@ -132,15 +132,15 @@ def humidity(self):
         return self._fmi.current.data.humidity.value
 
     @property
-    def precipitation(self):
+    def native_precipitation(self):
         """Return the humidity."""
         if self._fmi is None:
             return None
 
         return self._fmi.current.data.precipitation_amount.value
 
     @property
-    def wind_speed(self):
+    def native_wind_speed(self):
         """Return the wind speed."""
         if self._fmi is None:
             return None
@@ -158,7 +158,7 @@ def wind_bearing(self):
         return self._fmi.current.data.wind_direction.value
 
     @property
-    def pressure(self):
+    def native_pressure(self):
         """Return the pressure."""
         if self._fmi is None:
             return None
@@ -197,20 +197,20 @@ def forecast(self):
                             ATTR_FORECAST_CONDITION: get_weather_symbol(
                                 forecast.symbol.value
                             ),
-                            ATTR_FORECAST_TEMP: forecast.temperature.value,
-                            ATTR_FORECAST_TEMP_LOW: forecast.temperature.value,
-                            ATTR_FORECAST_PRECIPITATION: forecast.precipitation_amount.value,
-                            ATTR_FORECAST_WIND_SPEED: forecast.wind_speed.value,
+                            ATTR_FORECAST_NATIVE_TEMP: forecast.temperature.value,
+                            ATTR_FORECAST_NATIVE_TEMP_LOW: forecast.temperature.value,
+                            ATTR_FORECAST_NATIVE_PRECIPITATION: forecast.precipitation_amount.value,
+                            ATTR_FORECAST_NATIVE_WIND_SPEED: forecast.wind_speed.value,
                             ATTR_FORECAST_WIND_BEARING: forecast.wind_direction.value,
                             ATTR_WEATHER_PRESSURE: forecast.pressure.value,
                             ATTR_WEATHER_HUMIDITY: forecast.humidity.value,
                         }
                     )
                 else:
-                    if data[-1][ATTR_FORECAST_TEMP] < forecast.temperature.value:
-                        data[-1][ATTR_FORECAST_TEMP] = forecast.temperature.value
-                    if data[-1][ATTR_FORECAST_TEMP_LOW] > forecast.temperature.value:
-                        data[-1][ATTR_FORECAST_TEMP_LOW] = forecast.temperature.value
+                    if data[-1][ATTR_FORECAST_NATIVE_TEMP] < forecast.temperature.value:
+                        data[-1][ATTR_FORECAST_NATIVE_TEMP] = forecast.temperature.value
+                    if data[-1][ATTR_FORECAST_NATIVE_TEMP_LOW] > forecast.temperature.value:
+                        data[-1][ATTR_FORECAST_NATIVE_TEMP_LOW] = forecast.temperature.value
         else:
             data = []
             for forecast in self._fmi.forecast.forecasts:
@@ -221,9 +221,9 @@ def forecast(self):
                         ATTR_FORECAST_CONDITION: get_weather_symbol(
                             forecast.symbol.value
                         ),
-                        ATTR_FORECAST_TEMP: forecast.temperature.value,
-                        ATTR_FORECAST_PRECIPITATION: forecast.precipitation_amount.value,
-                        ATTR_FORECAST_WIND_SPEED: forecast.wind_speed.value,
+                        ATTR_FORECAST_NATIVE_TEMP: forecast.temperature.value,
+                        ATTR_FORECAST_NATIVE_PRECIPITATION: forecast.precipitation_amount.value,
+                        ATTR_FORECAST_NATIVE_WIND_SPEED: forecast.wind_speed.value,
                         ATTR_FORECAST_WIND_BEARING: forecast.wind_direction.value,
                         ATTR_WEATHER_PRESSURE: forecast.pressure.value,
                         ATTR_WEATHER_HUMIDITY: forecast.humidity.value,