Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Added resolve_state to template distance function #17290

Merged
merged 1 commit into from Oct 10, 2018
Merged

Added resolve_state to template distance function #17290

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
29 changes: 18 additions & 11 deletions homeassistant/helpers/template.py
View file
Open in desktop
Expand Up @@ -367,18 +367,9 @@ def distance(self, *args):

while to_process:
value = to_process.pop(0)
point_state = self._resolve_state(value)

if isinstance(value, State):
latitude = value.attributes.get(ATTR_LATITUDE)
longitude = value.attributes.get(ATTR_LONGITUDE)

if latitude is None or longitude is None:
_LOGGER.warning(
"Distance:State does not contains a location: %s",
value)
return None

else:
if point_state is None:
# We expect this and next value to be lat&lng
if not to_process:
_LOGGER.warning(
Expand All @@ -395,6 +386,22 @@ def distance(self, *args):
"longitude: %s, %s", value, value_2)
return None

else:
if not loc_helper.has_location(point_state):
_LOGGER.warning(
"distance:State does not contain valid location: %s",
point_state)
return None

latitude = point_state.attributes.get(ATTR_LATITUDE)
longitude = point_state.attributes.get(ATTR_LONGITUDE)

if latitude is None or longitude is None:
_LOGGER.warning(
"Distance:State does not contains a location: %s",
value)
return None

locations.append((latitude, longitude))

if len(locations) == 1:
Expand Down
26 changes: 26 additions & 0 deletions tests/helpers/test_template.py
View file
Open in desktop
Expand Up @@ -682,6 +682,32 @@ def test_distance_function_return_None_if_invalid_coord(self):
'None',
tpl.render())

def test_distance_function_with_2_entity_ids(self):
"""Test distance function with 2 entity ids."""
self.hass.states.set('test.object', 'happy', {
'latitude': 32.87336,
'longitude': -117.22943,
})
self.hass.states.set('test.object_2', 'happy', {
'latitude': self.hass.config.latitude,
'longitude': self.hass.config.longitude,
})
tpl = template.Template(
'{{ distance("test.object", "test.object_2") | round }}',
self.hass)
self.assertEqual('187', tpl.render())

def test_distance_function_with_1_entity_1_coord(self):
"""Test distance function with 1 entity_id and 1 coord."""
self.hass.states.set('test.object', 'happy', {
'latitude': self.hass.config.latitude,
'longitude': self.hass.config.longitude,
})
tpl = template.Template(
'{{ distance("test.object", "32.87336", "-117.22943") | round }}',
self.hass)
self.assertEqual('187', tpl.render())

def test_closest_function_home_vs_domain(self):
"""Test closest function home vs domain."""
self.hass.states.set('test_domain.object', 'happy', {
Expand Down