Volvo on call: Optional use of Scandinavian miles. Also add average fuel consumption property (#11051)

homeassistant/components/sensor/volvooncall.py

@@ -6,8 +6,10 @@ https://home-assistant.io/components/sensor.volvooncall/
 
 """
 import logging
+from math import floor
 
-from homeassistant.components.volvooncall import VolvoEntity, RESOURCES
+from homeassistant.components.volvooncall import (
+    VolvoEntity, RESOURCES, CONF_SCANDINAVIAN_MILES)
 
 _LOGGER = logging.getLogger(__name__)
 
@@ -26,14 +28,37 @@ class VolvoSensor(VolvoEntity):
     def state(self):
         """Return the state of the sensor."""
         val = getattr(self.vehicle, self._attribute)
+
+        if val is None:
+            return val
+
         if self._attribute == 'odometer':
-            return round(val / 1000)  # km
-        return val
+            val /= 1000  # m -> km
+
+        if 'mil' in self.unit_of_measurement:
+            val /= 10  # km -> mil
+
+        if self._attribute == 'average_fuel_consumption':
+            val /= 10  # L/1000km -> L/100km
+            if 'mil' in self.unit_of_measurement:
+                return round(val, 2)
+            else:
+                return round(val, 1)
+        elif self._attribute == 'distance_to_empty':
+            return int(floor(val))
+        else:
+            return int(round(val))
 
     @property
     def unit_of_measurement(self):
         """Return the unit of measurement."""
-        return RESOURCES[self._attribute][3]
+        unit = RESOURCES[self._attribute][3]
+        if self._state.config[CONF_SCANDINAVIAN_MILES] and 'km' in unit:
+            if self._attribute == 'average_fuel_consumption':
+                return 'L/mil'
+            else:
+                return unit.replace('km', 'mil')
+        return unit
 
     @property
     def icon(self):