Use local UNIT constants in here_travel_time (#80324)

* Use local UNIT constants in here_travel_time

* Fix test
This commit is contained in:
epenet 2022-10-14 15:16:03 +02:00 committed by GitHub
parent 7d56ae772e
commit 4c3097a157
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
5 changed files with 13 additions and 17 deletions

View File

@ -14,7 +14,6 @@ from homeassistant.const import (
CONF_API_KEY,
CONF_MODE,
CONF_UNIT_SYSTEM,
CONF_UNIT_SYSTEM_IMPERIAL,
LENGTH_METERS,
LENGTH_MILES,
Platform,
@ -45,6 +44,7 @@ from .const import (
CONF_ROUTE_MODE,
DEFAULT_SCAN_INTERVAL,
DOMAIN,
IMPERIAL_UNITS,
NO_ROUTE_ERROR_MESSAGE,
TRAFFIC_MODE_ENABLED,
TRAVEL_MODES_VEHICLE,
@ -178,7 +178,7 @@ class HereTravelTimeDataUpdateCoordinator(DataUpdateCoordinator):
traffic_time: float = summary["baseTime"]
if self.config.travel_mode in TRAVEL_MODES_VEHICLE:
traffic_time = summary["trafficTime"]
if self.config.units == CONF_UNIT_SYSTEM_IMPERIAL:
if self.config.units == IMPERIAL_UNITS:
# Convert to miles.
distance = DistanceConverter.convert(
distance, LENGTH_METERS, LENGTH_MILES

View File

@ -15,8 +15,6 @@ from homeassistant.const import (
CONF_MODE,
CONF_NAME,
CONF_UNIT_SYSTEM,
CONF_UNIT_SYSTEM_IMPERIAL,
CONF_UNIT_SYSTEM_METRIC,
)
from homeassistant.core import HomeAssistant, callback
from homeassistant.data_entry_flow import FlowResult
@ -43,6 +41,8 @@ from .const import (
CONF_TRAFFIC_MODE,
DEFAULT_NAME,
DOMAIN,
IMPERIAL_UNITS,
METRIC_UNITS,
ROUTE_MODE_FASTEST,
ROUTE_MODES,
TRAFFIC_MODE_ENABLED,
@ -96,10 +96,10 @@ def default_options(hass: HomeAssistant) -> dict[str, str | None]:
CONF_ROUTE_MODE: ROUTE_MODE_FASTEST,
CONF_ARRIVAL_TIME: None,
CONF_DEPARTURE_TIME: None,
CONF_UNIT_SYSTEM: CONF_UNIT_SYSTEM_METRIC,
CONF_UNIT_SYSTEM: METRIC_UNITS,
}
if hass.config.units is IMPERIAL_SYSTEM:
default[CONF_UNIT_SYSTEM] = CONF_UNIT_SYSTEM_IMPERIAL
default[CONF_UNIT_SYSTEM] = IMPERIAL_UNITS
return default

View File

@ -1,10 +1,4 @@
"""Constants for the HERE Travel Time integration."""
from homeassistant.const import (
CONF_UNIT_SYSTEM,
CONF_UNIT_SYSTEM_IMPERIAL,
CONF_UNIT_SYSTEM_METRIC,
)
DOMAIN = "here_travel_time"
DEFAULT_SCAN_INTERVAL = 300
@ -65,14 +59,16 @@ ICONS = {
TRAVEL_MODE_TRUCK: ICON_TRUCK,
}
UNITS = [CONF_UNIT_SYSTEM_METRIC, CONF_UNIT_SYSTEM_IMPERIAL]
IMPERIAL_UNITS = "imperial"
METRIC_UNITS = "metric"
UNITS = [METRIC_UNITS, IMPERIAL_UNITS]
ATTR_DURATION = "duration"
ATTR_DISTANCE = "distance"
ATTR_ORIGIN = "origin"
ATTR_DESTINATION = "destination"
ATTR_UNIT_SYSTEM = CONF_UNIT_SYSTEM
ATTR_UNIT_SYSTEM = "unit_system"
ATTR_TRAFFIC_MODE = CONF_TRAFFIC_MODE
ATTR_DURATION_IN_TRAFFIC = "duration_in_traffic"

View File

@ -17,7 +17,6 @@ from homeassistant.const import (
ATTR_LONGITUDE,
CONF_MODE,
CONF_NAME,
CONF_UNIT_SYSTEM_IMPERIAL,
LENGTH_KILOMETERS,
LENGTH_MILES,
TIME_MINUTES,
@ -41,6 +40,7 @@ from .const import (
DOMAIN,
ICON_CAR,
ICONS,
IMPERIAL_UNITS,
)
SCAN_INTERVAL = timedelta(minutes=5)
@ -216,6 +216,6 @@ class DistanceSensor(HERETravelTimeSensor):
@property
def native_unit_of_measurement(self) -> str | None:
"""Return the unit of measurement of the sensor."""
if self.coordinator.config.units == CONF_UNIT_SYSTEM_IMPERIAL:
if self.coordinator.config.units == IMPERIAL_UNITS:
return LENGTH_MILES
return LENGTH_KILOMETERS

View File

@ -16,7 +16,6 @@ from homeassistant.components.here_travel_time.const import (
CONF_ORIGIN_LATITUDE,
CONF_ORIGIN_LONGITUDE,
CONF_ROUTE_MODE,
CONF_UNIT_SYSTEM,
DOMAIN,
ICON_BICYCLE,
ICON_CAR,
@ -41,6 +40,7 @@ from homeassistant.const import (
CONF_API_KEY,
CONF_MODE,
CONF_NAME,
CONF_UNIT_SYSTEM,
EVENT_HOMEASSISTANT_START,
LENGTH_KILOMETERS,
LENGTH_MILES,