From a60c182078833e6397e4a194af51779a207db154 Mon Sep 17 00:00:00 2001 From: Quincy Morgan Date: Fri, 10 Jan 2020 12:23:26 -0500 Subject: [PATCH] Add derived data and update changelog for #7237 --- CHANGELOG.md | 3 +++ data/presets.yaml | 5 +++++ data/presets/presets.json | 1 + data/taginfo.json | 1 + dist/locales/en.json | 4 ++++ 5 files changed, 14 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 0d2ad9f6a..4c6950870 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -89,6 +89,7 @@ _Breaking changes, which may affect downstream projects or sites that embed iD, #### :rocket: Presets * Add Door Shop preset ([#7192], thanks [@hikemaniac]) +* Add Emergency Landing Site preset ([#7237], thanks [@andrewharvey]) * Add Historic Building preset ([#7219]) * Add Swing Gate preset ([#7208]) * Add Tidal Channel preset ([#7232]) @@ -116,6 +117,7 @@ _Breaking changes, which may affect downstream projects or sites that embed iD, * Show the Website field by default on Restaurants ([#7226]) * Show the Hours field by default on Pharmacy Counters ([#7220]) +[#7237]: https://github.com/openstreetmap/iD/issues/7237 [#7234]: https://github.com/openstreetmap/iD/issues/7234 [#7192]: https://github.com/openstreetmap/iD/issues/7192 [#7219]: https://github.com/openstreetmap/iD/issues/7219 @@ -138,6 +140,7 @@ _Breaking changes, which may affect downstream projects or sites that embed iD, [#7220]: https://github.com/openstreetmap/iD/issues/7220 [@hikemaniac]: https://github.com/hikemaniac +[@andrewharvey]: https://github.com/andrewharvey # 2.17.0 ##### 2019-Dec-23 diff --git a/data/presets.yaml b/data/presets.yaml index a412bb9e6..c40089716 100644 --- a/data/presets.yaml +++ b/data/presets.yaml @@ -4706,6 +4706,11 @@ en: name: First Aid Kit # 'terms: bandage,first aid,med,med kit,medic*,medkit' terms: '' + emergency/landing_site: + # emergency=landing_site + name: Emergency Landing Site + # 'terms: helicopter,helipad,heliport' + terms: '' emergency/life_ring: # emergency=life_ring name: Life Ring diff --git a/data/presets/presets.json b/data/presets/presets.json index 4d3767f6e..2c13671df 100644 --- a/data/presets/presets.json +++ b/data/presets/presets.json @@ -452,6 +452,7 @@ "emergency/fire_hose": {"icon": "fas-tape", "fields": ["indoor", "ref", "operator"], "moreFields": ["level"], "geometry": ["point", "vertex"], "tags": {"emergency": "fire_hose"}, "name": "Fire Hose"}, "emergency/fire_hydrant": {"icon": "temaki-fire_hydrant", "fields": ["ref", "fire_hydrant/type", "colour", "water_source", "couplings"], "moreFields": ["fire_hydrant/diameter", "fire_hydrant/pressure", "level", "survey/date", "water_volume"], "geometry": ["point", "vertex"], "terms": ["fire plug", "fire water well", "hydrant"], "tags": {"emergency": "fire_hydrant"}, "name": "Fire Hydrant"}, "emergency/first_aid_kit": {"icon": "fas-medkit", "fields": ["indoor", "ref", "operator"], "moreFields": ["level"], "geometry": ["point", "vertex"], "terms": ["bandage", "first aid", "med", "med kit", "medic*", "medkit"], "tags": {"emergency": "first_aid_kit"}, "name": "First Aid Kit"}, + "emergency/landing_site": {"icon": "maki-heliport", "fields": ["name", "operator", "surface"], "geometry": ["point", "area"], "terms": ["helicopter", "helipad", "heliport"], "tags": {"emergency": "landing_site"}, "name": "Emergency Landing Site"}, "emergency/life_ring": {"icon": "fas-life-ring", "fields": ["ref", "operator"], "geometry": ["point", "vertex"], "terms": ["life buoy", "kisby ring", "kisbie ring", "perry buoy"], "tags": {"emergency": "life_ring"}, "name": "Life Ring"}, "emergency/lifeguard": {"icon": "fas-life-ring", "fields": ["ref", "operator", "building_area", "opening_hours"], "geometry": ["point", "area"], "terms": ["CPR", "rescue"], "tags": {"emergency": "lifeguard"}, "name": "Lifeguard"}, "emergency/phone": {"icon": "maki-emergency-phone", "fields": ["ref", "operator", "covered", "indoor", "booth"], "moreFields": ["level"], "geometry": ["point", "vertex"], "tags": {"emergency": "phone"}, "name": "Emergency Phone"}, diff --git a/data/taginfo.json b/data/taginfo.json index f03361ee2..a7a9f494c 100644 --- a/data/taginfo.json +++ b/data/taginfo.json @@ -447,6 +447,7 @@ {"key": "emergency", "value": "fire_hose", "description": "🄿 Fire Hose", "object_types": ["node"], "icon_url": "https://cdn.jsdelivr.net/gh/openstreetmap/iD@master/svg/fontawesome/fas-tape.svg"}, {"key": "emergency", "value": "fire_hydrant", "description": "🄿 Fire Hydrant", "object_types": ["node"], "icon_url": "https://cdn.jsdelivr.net/gh/ideditor/temaki/icons/fire_hydrant.svg"}, {"key": "emergency", "value": "first_aid_kit", "description": "🄿 First Aid Kit", "object_types": ["node"], "icon_url": "https://cdn.jsdelivr.net/gh/openstreetmap/iD@master/svg/fontawesome/fas-medkit.svg"}, + {"key": "emergency", "value": "landing_site", "description": "🄿 Emergency Landing Site", "object_types": ["node", "area"], "icon_url": "https://cdn.jsdelivr.net/gh/mapbox/maki/icons/heliport-15.svg"}, {"key": "emergency", "value": "life_ring", "description": "🄿 Life Ring", "object_types": ["node"], "icon_url": "https://cdn.jsdelivr.net/gh/openstreetmap/iD@master/svg/fontawesome/fas-life-ring.svg"}, {"key": "emergency", "value": "lifeguard", "description": "🄿 Lifeguard", "object_types": ["node", "area"], "icon_url": "https://cdn.jsdelivr.net/gh/openstreetmap/iD@master/svg/fontawesome/fas-life-ring.svg"}, {"key": "emergency", "value": "phone", "description": "🄿 Emergency Phone", "object_types": ["node"], "icon_url": "https://cdn.jsdelivr.net/gh/mapbox/maki/icons/emergency-phone-15.svg"}, diff --git a/dist/locales/en.json b/dist/locales/en.json index dba8a77d3..409bb5d90 100644 --- a/dist/locales/en.json +++ b/dist/locales/en.json @@ -6633,6 +6633,10 @@ "name": "First Aid Kit", "terms": "bandage,first aid,med,med kit,medic*,medkit" }, + "emergency/landing_site": { + "name": "Emergency Landing Site", + "terms": "helicopter,helipad,heliport" + }, "emergency/life_ring": { "name": "Life Ring", "terms": "life buoy,kisby ring,kisbie ring,perry buoy"