Black
This commit is contained in:
1 parent
da05dfe708
commit
4de97abc3a
2676 files changed
+163166
-140084
No files matched your search
@@ -7,8 +7,13 @@ from homeassistant.core import callback
|
||||
from homeassistant.loader import bind_hass
|
||||
import homeassistant.helpers.config_validation as cv
|
||||
from homeassistant.const import (
|
||||
CONF_NAME, CONF_LATITUDE, CONF_LONGITUDE, CONF_ICON, CONF_RADIUS,
|
||||
EVENT_CORE_CONFIG_UPDATE)
|
||||
CONF_NAME,
|
||||
CONF_LATITUDE,
|
||||
CONF_LONGITUDE,
|
||||
CONF_ICON,
|
||||
CONF_RADIUS,
|
||||
EVENT_CORE_CONFIG_UPDATE,
|
||||
)
|
||||
from homeassistant.helpers import config_per_platform
|
||||
from homeassistant.helpers.entity import async_generate_entity_id
|
||||
from homeassistant.util import slugify
|
||||
@@ -22,25 +27,28 @@ from .zone import Zone
|
||||
|
||||
_LOGGER = logging.getLogger(__name__)
|
||||
|
||||
DEFAULT_NAME = 'Unnamed zone'
|
||||
DEFAULT_NAME = "Unnamed zone"
|
||||
DEFAULT_PASSIVE = False
|
||||
DEFAULT_RADIUS = 100
|
||||
|
||||
ENTITY_ID_FORMAT = 'zone.{}'
|
||||
ENTITY_ID_FORMAT = "zone.{}"
|
||||
ENTITY_ID_HOME = ENTITY_ID_FORMAT.format(HOME_ZONE)
|
||||
|
||||
ICON_HOME = 'mdi:home'
|
||||
ICON_IMPORT = 'mdi:import'
|
||||
ICON_HOME = "mdi:home"
|
||||
ICON_IMPORT = "mdi:import"
|
||||
|
||||
# The config that zone accepts is the same as if it has platforms.
|
||||
PLATFORM_SCHEMA = vol.Schema({
|
||||
vol.Optional(CONF_NAME, default=DEFAULT_NAME): cv.string,
|
||||
vol.Required(CONF_LATITUDE): cv.latitude,
|
||||
vol.Required(CONF_LONGITUDE): cv.longitude,
|
||||
vol.Optional(CONF_RADIUS, default=DEFAULT_RADIUS): vol.Coerce(float),
|
||||
vol.Optional(CONF_PASSIVE, default=DEFAULT_PASSIVE): cv.boolean,
|
||||
vol.Optional(CONF_ICON): cv.icon,
|
||||
}, extra=vol.ALLOW_EXTRA)
|
||||
PLATFORM_SCHEMA = vol.Schema(
|
||||
{
|
||||
vol.Optional(CONF_NAME, default=DEFAULT_NAME): cv.string,
|
||||
vol.Required(CONF_LATITUDE): cv.latitude,
|
||||
vol.Required(CONF_LONGITUDE): cv.longitude,
|
||||
vol.Optional(CONF_RADIUS, default=DEFAULT_RADIUS): vol.Coerce(float),
|
||||
vol.Optional(CONF_PASSIVE, default=DEFAULT_PASSIVE): cv.boolean,
|
||||
vol.Optional(CONF_ICON): cv.icon,
|
||||
},
|
||||
extra=vol.ALLOW_EXTRA,
|
||||
)
|
||||
|
||||
|
||||
@bind_hass
|
||||
@@ -50,8 +58,10 @@ def async_active_zone(hass, latitude, longitude, radius=0):
|
||||
This method must be run in the event loop.
|
||||
"""
|
||||
# Sort entity IDs so that we are deterministic if equal distance to 2 zones
|
||||
zones = (hass.states.get(entity_id) for entity_id
|
||||
in sorted(hass.states.async_entity_ids(DOMAIN)))
|
||||
zones = (
|
||||
hass.states.get(entity_id)
|
||||
for entity_id in sorted(hass.states.async_entity_ids(DOMAIN))
|
||||
)
|
||||
|
||||
min_dist = None
|
||||
closest = None
|
||||
@@ -61,14 +71,18 @@ def async_active_zone(hass, latitude, longitude, radius=0):
|
||||
continue
|
||||
|
||||
zone_dist = distance(
|
||||
latitude, longitude,
|
||||
zone.attributes[ATTR_LATITUDE], zone.attributes[ATTR_LONGITUDE])
|
||||
latitude,
|
||||
longitude,
|
||||
zone.attributes[ATTR_LATITUDE],
|
||||
zone.attributes[ATTR_LONGITUDE],
|
||||
)
|
||||
|
||||
within_zone = zone_dist - radius < zone.attributes[ATTR_RADIUS]
|
||||
closer_zone = closest is None or zone_dist < min_dist
|
||||
smaller_zone = (zone_dist == min_dist and
|
||||
zone.attributes[ATTR_RADIUS] <
|
||||
closest.attributes[ATTR_RADIUS])
|
||||
smaller_zone = (
|
||||
zone_dist == min_dist
|
||||
and zone.attributes[ATTR_RADIUS] < closest.attributes[ATTR_RADIUS]
|
||||
)
|
||||
|
||||
if within_zone and (closer_zone or smaller_zone):
|
||||
min_dist = zone_dist
|
||||
@@ -84,20 +98,33 @@ async def async_setup(hass, config):
|
||||
zone_entries = configured_zones(hass)
|
||||
for _, entry in config_per_platform(config, DOMAIN):
|
||||
if slugify(entry[CONF_NAME]) not in zone_entries:
|
||||
zone = Zone(hass, entry[CONF_NAME], entry[CONF_LATITUDE],
|
||||
entry[CONF_LONGITUDE], entry.get(CONF_RADIUS),
|
||||
entry.get(CONF_ICON), entry.get(CONF_PASSIVE))
|
||||
zone = Zone(
|
||||
hass,
|
||||
entry[CONF_NAME],
|
||||
entry[CONF_LATITUDE],
|
||||
entry[CONF_LONGITUDE],
|
||||
entry.get(CONF_RADIUS),
|
||||
entry.get(CONF_ICON),
|
||||
entry.get(CONF_PASSIVE),
|
||||
)
|
||||
zone.entity_id = async_generate_entity_id(
|
||||
ENTITY_ID_FORMAT, entry[CONF_NAME], entities)
|
||||
ENTITY_ID_FORMAT, entry[CONF_NAME], entities
|
||||
)
|
||||
hass.async_create_task(zone.async_update_ha_state())
|
||||
entities.add(zone.entity_id)
|
||||
|
||||
if ENTITY_ID_HOME in entities or HOME_ZONE in zone_entries:
|
||||
return True
|
||||
|
||||
zone = Zone(hass, hass.config.location_name,
|
||||
hass.config.latitude, hass.config.longitude,
|
||||
DEFAULT_RADIUS, ICON_HOME, False)
|
||||
zone = Zone(
|
||||
hass,
|
||||
hass.config.location_name,
|
||||
hass.config.latitude,
|
||||
hass.config.longitude,
|
||||
DEFAULT_RADIUS,
|
||||
ICON_HOME,
|
||||
False,
|
||||
)
|
||||
zone.entity_id = ENTITY_ID_HOME
|
||||
hass.async_create_task(zone.async_update_ha_state())
|
||||
|
||||
@@ -118,11 +145,16 @@ async def async_setup_entry(hass, config_entry):
|
||||
"""Set up zone as config entry."""
|
||||
entry = config_entry.data
|
||||
name = entry[CONF_NAME]
|
||||
zone = Zone(hass, name, entry[CONF_LATITUDE], entry[CONF_LONGITUDE],
|
||||
entry.get(CONF_RADIUS, DEFAULT_RADIUS), entry.get(CONF_ICON),
|
||||
entry.get(CONF_PASSIVE, DEFAULT_PASSIVE))
|
||||
zone.entity_id = async_generate_entity_id(
|
||||
ENTITY_ID_FORMAT, name, None, hass)
|
||||
zone = Zone(
|
||||
hass,
|
||||
name,
|
||||
entry[CONF_LATITUDE],
|
||||
entry[CONF_LONGITUDE],
|
||||
entry.get(CONF_RADIUS, DEFAULT_RADIUS),
|
||||
entry.get(CONF_ICON),
|
||||
entry.get(CONF_PASSIVE, DEFAULT_PASSIVE),
|
||||
)
|
||||
zone.entity_id = async_generate_entity_id(ENTITY_ID_FORMAT, name, None, hass)
|
||||
hass.async_create_task(zone.async_update_ha_state())
|
||||
hass.data[DOMAIN][slugify(name)] = zone
|
||||
return True
|
||||
|
||||
Reference in new issue
Block a user