mirror of
https://github.com/home-assistant/core.git
synced 2025-07-16 01:37:08 +00:00
Replace not is_metric
with is IMPERIAL_SYSTEM
(#80266)
This commit is contained in:
parent
f502f8c931
commit
4769ec8c76
@ -37,6 +37,7 @@ from homeassistant.helpers.event import async_track_time_interval
|
|||||||
from homeassistant.helpers.typing import ConfigType, DiscoveryInfoType
|
from homeassistant.helpers.typing import ConfigType, DiscoveryInfoType
|
||||||
from homeassistant.util import location
|
from homeassistant.util import location
|
||||||
from homeassistant.util.unit_conversion import DistanceConverter
|
from homeassistant.util.unit_conversion import DistanceConverter
|
||||||
|
from homeassistant.util.unit_system import IMPERIAL_SYSTEM
|
||||||
|
|
||||||
_LOGGER = logging.getLogger(__name__)
|
_LOGGER = logging.getLogger(__name__)
|
||||||
|
|
||||||
@ -170,7 +171,7 @@ async def async_setup_platform(
|
|||||||
stations_list = set(config.get(CONF_STATIONS_LIST, []))
|
stations_list = set(config.get(CONF_STATIONS_LIST, []))
|
||||||
radius = config.get(CONF_RADIUS, 0)
|
radius = config.get(CONF_RADIUS, 0)
|
||||||
name = config[CONF_NAME]
|
name = config[CONF_NAME]
|
||||||
if not hass.config.units.is_metric:
|
if hass.config.units is IMPERIAL_SYSTEM:
|
||||||
radius = DistanceConverter.convert(radius, LENGTH_FEET, LENGTH_METERS)
|
radius = DistanceConverter.convert(radius, LENGTH_FEET, LENGTH_METERS)
|
||||||
|
|
||||||
# Create a single instance of CityBikesNetworks.
|
# Create a single instance of CityBikesNetworks.
|
||||||
|
@ -13,6 +13,7 @@ from homeassistant.helpers.entity_platform import AddEntitiesCallback
|
|||||||
from homeassistant.helpers.icon import icon_for_battery_level
|
from homeassistant.helpers.icon import icon_for_battery_level
|
||||||
from homeassistant.helpers.typing import ConfigType, DiscoveryInfoType
|
from homeassistant.helpers.typing import ConfigType, DiscoveryInfoType
|
||||||
from homeassistant.util.unit_conversion import DistanceConverter
|
from homeassistant.util.unit_conversion import DistanceConverter
|
||||||
|
from homeassistant.util.unit_system import IMPERIAL_SYSTEM
|
||||||
|
|
||||||
from . import LeafEntity
|
from . import LeafEntity
|
||||||
from .const import (
|
from .const import (
|
||||||
@ -122,7 +123,7 @@ class LeafRangeSensor(LeafEntity, SensorEntity):
|
|||||||
if ret is None:
|
if ret is None:
|
||||||
return None
|
return None
|
||||||
|
|
||||||
if not self.car.hass.config.units.is_metric or self.car.force_miles:
|
if self.car.hass.config.units is IMPERIAL_SYSTEM or self.car.force_miles:
|
||||||
ret = DistanceConverter.convert(ret, LENGTH_KILOMETERS, LENGTH_MILES)
|
ret = DistanceConverter.convert(ret, LENGTH_KILOMETERS, LENGTH_MILES)
|
||||||
|
|
||||||
return round(ret)
|
return round(ret)
|
||||||
@ -130,7 +131,7 @@ class LeafRangeSensor(LeafEntity, SensorEntity):
|
|||||||
@property
|
@property
|
||||||
def native_unit_of_measurement(self) -> str:
|
def native_unit_of_measurement(self) -> str:
|
||||||
"""Battery range unit."""
|
"""Battery range unit."""
|
||||||
if not self.car.hass.config.units.is_metric or self.car.force_miles:
|
if self.car.hass.config.units is IMPERIAL_SYSTEM or self.car.force_miles:
|
||||||
return LENGTH_MILES
|
return LENGTH_MILES
|
||||||
return LENGTH_KILOMETERS
|
return LENGTH_KILOMETERS
|
||||||
|
|
||||||
|
Loading…
x
Reference in New Issue
Block a user