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.

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

Geo Location -> Geolocation #8086

Merged
merged 2 commits into from
Jan 7, 2019
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions source/_components/demo.markdown
Original file line number Diff line number Diff line change
Expand Up @@ -17,14 +17,14 @@ The `demo` platform allows you to use components which are providing a demo of t

Available demo platforms:

- [Air Pollutants]((/components/air_pollutants/) (`air_pollutants`)
- [Air Pollutants](/components/air_pollutants/) (`air_pollutants`)
- [Alarm control panel](/components/alarm_control_panel/) (`alarm_control_panel`)
- [Binary sensor](/components/binary_sensor/) (`binary_sensor`)
- [Camera](/components/camera/) (`camera`)
- [Climate](/components/climate/) (`climate`)
- [Cover](/components/cover/) (`cover`)
- [Fan](/components/fan/) (`fan`)
- [Geo Location](/components/geo_location/) (`geo_location`)
- [Geolocation](/components/geo_location/) (`geo_location`)
- [Image Processing](/components/image_processing/) (`image_processing`)
- [Light](/components/light/) (`light`)
- [Lock](/components/lock/) (`lock`)
Expand Down
2 changes: 1 addition & 1 deletion source/_components/geo_location.geo_json_events.markdown
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ comments: false
sharing: true
footer: true
logo: geo_location.png
ha_category: Geo Location
ha_category: Geolocation
ha_iot_class: "Cloud Polling"
ha_release: "0.79"
---
Expand Down
14 changes: 7 additions & 7 deletions source/_components/geo_location.markdown
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
---
layout: page
title: "Geo Location"
description: "Instructions on how to integrate geo location aware platforms into Home Assistant."
title: "Geolocation"
description: "Instructions on how to integrate geolocation aware platforms into Home Assistant."
date: 2018-08-27 08:00
sidebar: true
comments: false
Expand All @@ -11,13 +11,13 @@ logo: geo_location.png
ha_release: "0.78"
---

Geo Location aware entities are typically related to events in the real world in the vicinity of Home Assistant's location, like for example weather events, bush fires or earthquakes.
Geolocation aware entities are typically related to events in the real world in the vicinity of Home Assistant's location, like for example weather events, bush fires or earthquakes.

Entities can have associated geo location coordinates (latitude and longitude) so that they are displayed on the map. The distance from the entity's coordinates to Home Assistant's location can be used for filtering.
Entities can have associated geolocation coordinates (latitude and longitude) so that they are displayed on the map. The distance from the entity's coordinates to Home Assistant's location can be used for filtering.

## {% linkable_title Geo Location trigger %}
## {% linkable_title Geolocation trigger %}

The [Geo Location trigger](/docs/automation/trigger/#geo-location-trigger) can be used in automations triggered by Geo Location entities appearing in or disappearing from zones. The following value must be used as `source` of the trigger depending on which platform is managing the entities:
The [Geolocation trigger](/docs/automation/trigger/#geolocation-trigger) can be used in automations triggered by Geolocation entities appearing in or disappearing from zones. The following value must be used as `source` of the trigger depending on which platform is managing the entities:

| Platform | Source |
|---------------------------------------------------|-------------------------------|
Expand All @@ -27,7 +27,7 @@ The [Geo Location trigger](/docs/automation/trigger/#geo-location-trigger) can b

Conditions can be used to further filter entities, for example by inspecting their state attributes.

## {% linkable_title Geo Location notification example %}
## {% linkable_title Geolocation notification example %}

The following example automation creates a notification on the screen when a fire classified as 'Bush Fire' is reported within a predefined bush fire alert zone:

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ comments: false
sharing: true
footer: true
logo: nsw-rural-fire-service.png
ha_category: Geo Location
ha_category: Geolocation
ha_iot_class: "Cloud Polling"
ha_release: "0.81"
---
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ comments: false
sharing: true
footer: true
logo: us-geological-survey.png
ha_category: Geo Location
ha_category: Geolocation
ha_iot_class: "Cloud Polling"
ha_release: 0.84
---
Expand Down
6 changes: 3 additions & 3 deletions source/_docs/automation/trigger.markdown
Original file line number Diff line number Diff line change
Expand Up @@ -220,10 +220,10 @@ automation:
event: enter # or "leave"
```

### {% linkable_title Geo Location trigger %}
### {% linkable_title Geolocation trigger %}

Geo Location triggers can trigger when an entity is appearing in or disappearing from a zone. Entities that are created by a [Geo Location](/components/geo_location/) platform support reporting GPS coordinates.
Because entities are generated and removed by these platforms automatically, the entity id normally cannot be predicted. Instead, this trigger requires the definition of a `source` which is directly linked to one of the Geo Location platforms.
Geolocation triggers can trigger when an entity is appearing in or disappearing from a zone. Entities that are created by a [Geolocation](/components/geo_location/) platform support reporting GPS coordinates.
Because entities are generated and removed by these platforms automatically, the entity id normally cannot be predicted. Instead, this trigger requires the definition of a `source` which is directly linked to one of the Geolocation platforms.

```yaml
automation:
Expand Down
2 changes: 1 addition & 1 deletion source/_lovelace/map.markdown
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ entities:
type: list
geo_location_sources:
required: true
description: List of geolocation sources. All current entities with that source will be displayed on the map. See [Geo Location](/components/geo_location/) platform for valid sources. Either this or the `entities` configuration option is required.
description: List of geolocation sources. All current entities with that source will be displayed on the map. See [Geolocation](/components/geo_location/) platform for valid sources. Either this or the `entities` configuration option is required.
type: list
title:
required: false
Expand Down