mirror of
https://github.com/home-assistant/core
synced 2024-07-27 18:58:57 +02:00
Use local UNIT constants in here_travel_time (#80324)
* Use local UNIT constants in here_travel_time * Fix test
This commit is contained in:
parent
7d56ae772e
commit
4c3097a157
@ -14,7 +14,6 @@ from homeassistant.const import (
|
|||||||
CONF_API_KEY,
|
CONF_API_KEY,
|
||||||
CONF_MODE,
|
CONF_MODE,
|
||||||
CONF_UNIT_SYSTEM,
|
CONF_UNIT_SYSTEM,
|
||||||
CONF_UNIT_SYSTEM_IMPERIAL,
|
|
||||||
LENGTH_METERS,
|
LENGTH_METERS,
|
||||||
LENGTH_MILES,
|
LENGTH_MILES,
|
||||||
Platform,
|
Platform,
|
||||||
@ -45,6 +44,7 @@ from .const import (
|
|||||||
CONF_ROUTE_MODE,
|
CONF_ROUTE_MODE,
|
||||||
DEFAULT_SCAN_INTERVAL,
|
DEFAULT_SCAN_INTERVAL,
|
||||||
DOMAIN,
|
DOMAIN,
|
||||||
|
IMPERIAL_UNITS,
|
||||||
NO_ROUTE_ERROR_MESSAGE,
|
NO_ROUTE_ERROR_MESSAGE,
|
||||||
TRAFFIC_MODE_ENABLED,
|
TRAFFIC_MODE_ENABLED,
|
||||||
TRAVEL_MODES_VEHICLE,
|
TRAVEL_MODES_VEHICLE,
|
||||||
@ -178,7 +178,7 @@ class HereTravelTimeDataUpdateCoordinator(DataUpdateCoordinator):
|
|||||||
traffic_time: float = summary["baseTime"]
|
traffic_time: float = summary["baseTime"]
|
||||||
if self.config.travel_mode in TRAVEL_MODES_VEHICLE:
|
if self.config.travel_mode in TRAVEL_MODES_VEHICLE:
|
||||||
traffic_time = summary["trafficTime"]
|
traffic_time = summary["trafficTime"]
|
||||||
if self.config.units == CONF_UNIT_SYSTEM_IMPERIAL:
|
if self.config.units == IMPERIAL_UNITS:
|
||||||
# Convert to miles.
|
# Convert to miles.
|
||||||
distance = DistanceConverter.convert(
|
distance = DistanceConverter.convert(
|
||||||
distance, LENGTH_METERS, LENGTH_MILES
|
distance, LENGTH_METERS, LENGTH_MILES
|
||||||
|
@ -15,8 +15,6 @@ from homeassistant.const import (
|
|||||||
CONF_MODE,
|
CONF_MODE,
|
||||||
CONF_NAME,
|
CONF_NAME,
|
||||||
CONF_UNIT_SYSTEM,
|
CONF_UNIT_SYSTEM,
|
||||||
CONF_UNIT_SYSTEM_IMPERIAL,
|
|
||||||
CONF_UNIT_SYSTEM_METRIC,
|
|
||||||
)
|
)
|
||||||
from homeassistant.core import HomeAssistant, callback
|
from homeassistant.core import HomeAssistant, callback
|
||||||
from homeassistant.data_entry_flow import FlowResult
|
from homeassistant.data_entry_flow import FlowResult
|
||||||
@ -43,6 +41,8 @@ from .const import (
|
|||||||
CONF_TRAFFIC_MODE,
|
CONF_TRAFFIC_MODE,
|
||||||
DEFAULT_NAME,
|
DEFAULT_NAME,
|
||||||
DOMAIN,
|
DOMAIN,
|
||||||
|
IMPERIAL_UNITS,
|
||||||
|
METRIC_UNITS,
|
||||||
ROUTE_MODE_FASTEST,
|
ROUTE_MODE_FASTEST,
|
||||||
ROUTE_MODES,
|
ROUTE_MODES,
|
||||||
TRAFFIC_MODE_ENABLED,
|
TRAFFIC_MODE_ENABLED,
|
||||||
@ -96,10 +96,10 @@ def default_options(hass: HomeAssistant) -> dict[str, str | None]:
|
|||||||
CONF_ROUTE_MODE: ROUTE_MODE_FASTEST,
|
CONF_ROUTE_MODE: ROUTE_MODE_FASTEST,
|
||||||
CONF_ARRIVAL_TIME: None,
|
CONF_ARRIVAL_TIME: None,
|
||||||
CONF_DEPARTURE_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:
|
if hass.config.units is IMPERIAL_SYSTEM:
|
||||||
default[CONF_UNIT_SYSTEM] = CONF_UNIT_SYSTEM_IMPERIAL
|
default[CONF_UNIT_SYSTEM] = IMPERIAL_UNITS
|
||||||
return default
|
return default
|
||||||
|
|
||||||
|
|
||||||
|
@ -1,10 +1,4 @@
|
|||||||
"""Constants for the HERE Travel Time integration."""
|
"""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"
|
DOMAIN = "here_travel_time"
|
||||||
DEFAULT_SCAN_INTERVAL = 300
|
DEFAULT_SCAN_INTERVAL = 300
|
||||||
|
|
||||||
@ -65,14 +59,16 @@ ICONS = {
|
|||||||
TRAVEL_MODE_TRUCK: ICON_TRUCK,
|
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_DURATION = "duration"
|
||||||
ATTR_DISTANCE = "distance"
|
ATTR_DISTANCE = "distance"
|
||||||
ATTR_ORIGIN = "origin"
|
ATTR_ORIGIN = "origin"
|
||||||
ATTR_DESTINATION = "destination"
|
ATTR_DESTINATION = "destination"
|
||||||
|
|
||||||
ATTR_UNIT_SYSTEM = CONF_UNIT_SYSTEM
|
ATTR_UNIT_SYSTEM = "unit_system"
|
||||||
ATTR_TRAFFIC_MODE = CONF_TRAFFIC_MODE
|
ATTR_TRAFFIC_MODE = CONF_TRAFFIC_MODE
|
||||||
|
|
||||||
ATTR_DURATION_IN_TRAFFIC = "duration_in_traffic"
|
ATTR_DURATION_IN_TRAFFIC = "duration_in_traffic"
|
||||||
|
@ -17,7 +17,6 @@ from homeassistant.const import (
|
|||||||
ATTR_LONGITUDE,
|
ATTR_LONGITUDE,
|
||||||
CONF_MODE,
|
CONF_MODE,
|
||||||
CONF_NAME,
|
CONF_NAME,
|
||||||
CONF_UNIT_SYSTEM_IMPERIAL,
|
|
||||||
LENGTH_KILOMETERS,
|
LENGTH_KILOMETERS,
|
||||||
LENGTH_MILES,
|
LENGTH_MILES,
|
||||||
TIME_MINUTES,
|
TIME_MINUTES,
|
||||||
@ -41,6 +40,7 @@ from .const import (
|
|||||||
DOMAIN,
|
DOMAIN,
|
||||||
ICON_CAR,
|
ICON_CAR,
|
||||||
ICONS,
|
ICONS,
|
||||||
|
IMPERIAL_UNITS,
|
||||||
)
|
)
|
||||||
|
|
||||||
SCAN_INTERVAL = timedelta(minutes=5)
|
SCAN_INTERVAL = timedelta(minutes=5)
|
||||||
@ -216,6 +216,6 @@ class DistanceSensor(HERETravelTimeSensor):
|
|||||||
@property
|
@property
|
||||||
def native_unit_of_measurement(self) -> str | None:
|
def native_unit_of_measurement(self) -> str | None:
|
||||||
"""Return the unit of measurement of the sensor."""
|
"""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_MILES
|
||||||
return LENGTH_KILOMETERS
|
return LENGTH_KILOMETERS
|
||||||
|
@ -16,7 +16,6 @@ from homeassistant.components.here_travel_time.const import (
|
|||||||
CONF_ORIGIN_LATITUDE,
|
CONF_ORIGIN_LATITUDE,
|
||||||
CONF_ORIGIN_LONGITUDE,
|
CONF_ORIGIN_LONGITUDE,
|
||||||
CONF_ROUTE_MODE,
|
CONF_ROUTE_MODE,
|
||||||
CONF_UNIT_SYSTEM,
|
|
||||||
DOMAIN,
|
DOMAIN,
|
||||||
ICON_BICYCLE,
|
ICON_BICYCLE,
|
||||||
ICON_CAR,
|
ICON_CAR,
|
||||||
@ -41,6 +40,7 @@ from homeassistant.const import (
|
|||||||
CONF_API_KEY,
|
CONF_API_KEY,
|
||||||
CONF_MODE,
|
CONF_MODE,
|
||||||
CONF_NAME,
|
CONF_NAME,
|
||||||
|
CONF_UNIT_SYSTEM,
|
||||||
EVENT_HOMEASSISTANT_START,
|
EVENT_HOMEASSISTANT_START,
|
||||||
LENGTH_KILOMETERS,
|
LENGTH_KILOMETERS,
|
||||||
LENGTH_MILES,
|
LENGTH_MILES,
|
||||||
|
Loading…
Reference in New Issue
Block a user