From 2b5d93ee0d83e4318d66c4a2bb44d7ab6d9f688b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?No=C3=A9mie?= Date: Mon, 24 Aug 2020 21:19:38 +0200 Subject: [PATCH 1/2] Update AED preset [#deficoeur](https://wiki.openstreetmap.org/wiki/FR:Project_of_the_month/Defibrillateurs) --- data/presets.yaml | 3 + data/presets/fields.json | 1 + .../fields/defibrillator_location.json | 5 ++ data/presets/presets.json | 2 +- .../presets/emergency/defibrillator.json | 7 ++- data/taginfo.json | 1 + dist/locales/en.json | 57 ++++++------------- 7 files changed, 33 insertions(+), 43 deletions(-) create mode 100644 data/presets/fields/defibrillator_location.json diff --git a/data/presets.yaml b/data/presets.yaml index c4d91cf5c..dc1e87873 100644 --- a/data/presets.yaml +++ b/data/presets.yaml @@ -630,6 +630,9 @@ en: date: # date=* label: Date + defibrillator_location: + # 'defibrillator:location=*' + label: Precise location of the defibrillator delivery: # delivery=* label: Delivery diff --git a/data/presets/fields.json b/data/presets/fields.json index 8c1c654dc..1cc8528d8 100644 --- a/data/presets/fields.json +++ b/data/presets/fields.json @@ -108,6 +108,7 @@ "cycleway": {"keys": ["cycleway", "cycleway:left", "cycleway:right"], "reference": {"key": "cycleway"}, "type": "cycleway", "label": "Bike Lanes", "placeholder": "none", "strings": {"types": {"cycleway:left": "Left side", "cycleway:right": "Right side"}, "options": {"none": {"title": "None", "description": "No bike lane"}, "lane": {"title": "Standard bike lane", "description": "A bike lane separated from auto traffic by a painted line"}, "shared_lane": {"title": "Shared bike lane", "description": "A bike lane with no separation from auto traffic"}, "track": {"title": "Bike track", "description": "A bike lane separated from traffic by a physical barrier"}, "share_busway": {"title": "Bike lane shared with bus", "description": "A bike lane shared with a bus lane"}, "opposite_lane": {"title": "Opposite bike lane", "description": "A bike lane that travels in the opposite direction of traffic"}, "opposite": {"title": "Contraflow bike lane", "description": "A bike lane that travels in both directions on a one-way street"}}}}, "dance/style": {"key": "dance:style", "type": "semiCombo", "label": "Dance Styles"}, "date": {"key": "date", "type": "check", "label": "Date"}, + "defibrillator_location": {"key": "defibrillator:location", "type": "textarea", "label": "Precise location of the defibrillator"}, "delivery": {"key": "delivery", "type": "check", "label": "Delivery"}, "denomination": {"key": "denomination", "type": "combo", "label": "Denomination", "prerequisiteTag": {"key": "religion", "valueNot": "none"}}, "denotation": {"key": "denotation", "type": "combo", "label": "Denotation"}, diff --git a/data/presets/fields/defibrillator_location.json b/data/presets/fields/defibrillator_location.json new file mode 100644 index 000000000..5a6086e3c --- /dev/null +++ b/data/presets/fields/defibrillator_location.json @@ -0,0 +1,5 @@ +{ + "key": "defibrillator:location", + "type": "textarea", + "label": "Precise location of the defibrillator" +} diff --git a/data/presets/presets.json b/data/presets/presets.json index a310ae9d1..cc8d093e1 100644 --- a/data/presets/presets.json +++ b/data/presets/presets.json @@ -456,7 +456,7 @@ "emergency/private": {"fields": ["emergency_combo"], "geometry": ["line"], "tags": {"emergency": "private"}, "name": "Emergency Access Private", "searchable": false, "matchScore": 0.01}, "emergency/yes": {"fields": ["emergency_combo"], "geometry": ["line"], "tags": {"emergency": "yes"}, "name": "Emergency Access Yes", "searchable": false, "matchScore": 0.01}, "emergency/ambulance_station": {"icon": "fas-ambulance", "fields": ["name", "operator", "building_area", "address"], "moreFields": ["email", "fax", "gnis/feature_id", "phone", "website", "wheelchair"], "geometry": ["point", "area"], "terms": ["EMS", "EMT", "rescue"], "tags": {"emergency": "ambulance_station"}, "name": "Ambulance Station"}, - "emergency/defibrillator": {"icon": "maki-defibrillator", "fields": ["indoor", "ref", "operator"], "moreFields": ["level"], "geometry": ["point", "vertex"], "terms": ["AED"], "tags": {"emergency": "defibrillator"}, "name": "Defibrillator"}, + "emergency/defibrillator": {"icon": "maki-defibrillator", "fields": ["indoor", "ref", "operator", "defibrillator_location"], "moreFields": ["level", "opening_hours", "access_simple"], "geometry": ["point", "vertex"], "terms": ["AED"], "tags": {"emergency": "defibrillator"}, "name": "Defibrillator"}, "emergency/fire_alarm": {"icon": "fas-bell", "fields": ["indoor", "ref", "operator"], "moreFields": ["level"], "geometry": ["point", "vertex"], "tags": {"emergency": "fire_alarm_box"}, "name": "Fire Alarm Call Box"}, "emergency/fire_extinguisher": {"icon": "fas-fire-extinguisher", "fields": ["indoor", "ref", "operator"], "moreFields": ["level"], "geometry": ["point", "vertex"], "tags": {"emergency": "fire_extinguisher"}, "name": "Fire Extinguisher"}, "emergency/fire_hose": {"icon": "fas-tape", "fields": ["indoor", "ref", "operator"], "moreFields": ["level"], "geometry": ["point", "vertex"], "tags": {"emergency": "fire_hose"}, "name": "Fire Hose"}, diff --git a/data/presets/presets/emergency/defibrillator.json b/data/presets/presets/emergency/defibrillator.json index f3cae15de..74d6b74f7 100644 --- a/data/presets/presets/emergency/defibrillator.json +++ b/data/presets/presets/emergency/defibrillator.json @@ -3,10 +3,13 @@ "fields": [ "indoor", "ref", - "operator" + "operator", + "defibrillator_location" ], "moreFields": [ - "level" + "level", + "opening_hours", + "access_simple" ], "geometry": [ "point", diff --git a/data/taginfo.json b/data/taginfo.json index cfac27e1a..607c7b1d2 100644 --- a/data/taginfo.json +++ b/data/taginfo.json @@ -1460,6 +1460,7 @@ {"key": "cycleway:right", "value": "opposite", "description": "🄵 Bike Lanes"}, {"key": "dance:style", "description": "🄵 Dance Styles"}, {"key": "date", "description": "🄵 Date"}, + {"key": "defibrillator:location", "description": "🄵 Precise location of the defibrillator"}, {"key": "delivery", "description": "🄵 Delivery"}, {"key": "denomination", "description": "🄵 Denomination"}, {"key": "denotation", "description": "🄵 Denotation"}, diff --git a/dist/locales/en.json b/dist/locales/en.json index fbffc07f9..531cc35b4 100644 --- a/dist/locales/en.json +++ b/dist/locales/en.json @@ -3304,6 +3304,9 @@ "date": { "label": "Date" }, + "defibrillator_location": { + "label": "Precise location of the defibrillator" + }, "delivery": { "label": "Delivery", "terms": "" @@ -10711,6 +10714,20 @@ "description": "Annotation overlay provided by basemap.at.", "name": "basemap.at Overlay" }, + "basemap.at-surface": { + "attribution": { + "text": "basemap.at" + }, + "description": "Surface layer provided by basemap.at.", + "name": "basemap.at Surface" + }, + "basemap.at-terrain": { + "attribution": { + "text": "basemap.at" + }, + "description": "Terrain layer provided by basemap.at.", + "name": "basemap.at Terrain" + }, "eufar-balaton": { "attribution": { "text": "EUFAR Balaton ortofotó 2010" @@ -10732,13 +10749,6 @@ "description": "The city map is an overview map that describes Gothenburg. It contains general information about land, communications, hydrography, buildings, address numbers and street names, administrative division and other orientation text.", "name": "Gothenburg City map" }, - "gothenburg-ortho": { - "attribution": { - "text": "© Gothenburg municipality, CC0" - }, - "description": "Orthophoto for Gothenburg municipality", - "name": "Gothenburg Orthophoto" - }, "gsi.go.jp_airphoto": { "attribution": { "text": "GSI Japan" @@ -10836,27 +10846,6 @@ }, "name": "OpenPT Map (overlay)" }, - "openrailwaymap": { - "attribution": { - "text": "Rendering: OpenRailwayMap, © Map data OpenStreetMap contributors" - }, - "description": "Overlay imagery showing railway infrastructure based on OpenStreetMap data", - "name": "OpenRailwayMap" - }, - "openrailwaymap-maxspeeds": { - "attribution": { - "text": "Rendering: OpenRailwayMap, © Map data OpenStreetMap contributors" - }, - "description": "Overlay imagery showing railway speed limits based on OpenStreetMap data", - "name": "OpenRailwayMap Maxspeeds" - }, - "openrailwaymap-signalling": { - "attribution": { - "text": "Rendering: OpenRailwayMap, © Map data OpenStreetMap contributors" - }, - "description": "Overlay imagery showing railway signals based on OpenStreetMap data", - "name": "OpenRailwayMap Signalling" - }, "osm-gps": { "attribution": { "text": "© OpenStreetMap contributors" @@ -10927,12 +10916,6 @@ }, "name": "Thunderforest Landscape" }, - "tf-outdoors": { - "attribution": { - "text": "Maps © Thunderforest, Data © OpenStreetMap contributors" - }, - "name": "Thunderforest Outdoors" - }, "trafikverket-baninfo": { "attribution": { "text": "© Trafikverket, CC0" @@ -10975,12 +10958,6 @@ "description": "Swedish NVDB road network with several options for map layers", "name": "Trafikverket Road Network options" }, - "wroclaw-orto2018": { - "attribution": { - "text": "Urząd Miasta Wrocław" - }, - "name": "Wrocław: Orthophotomap 2018 (aerial image)" - }, "Maxar-Premium": { "name": "Maxar Premium Imagery (Beta)", "attribution": { From c01120620a55edd4c2b879ee97a20f8217719652 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?No=C3=A9mie?= Date: Thu, 3 Sep 2020 09:07:51 +0200 Subject: [PATCH 2/2] fixes after review --- data/presets.yaml | 4 ++-- data/presets/fields.json | 2 +- .../location.json} | 2 +- data/presets/presets.json | 2 +- data/presets/presets/emergency/defibrillator.json | 2 +- data/taginfo.json | 2 +- dist/locales/en.json | 4 ++-- 7 files changed, 9 insertions(+), 9 deletions(-) rename data/presets/fields/{defibrillator_location.json => defibrillator/location.json} (55%) diff --git a/data/presets.yaml b/data/presets.yaml index dc1e87873..bc45a870b 100644 --- a/data/presets.yaml +++ b/data/presets.yaml @@ -630,9 +630,9 @@ en: date: # date=* label: Date - defibrillator_location: + defibrillator/location: # 'defibrillator:location=*' - label: Precise location of the defibrillator + label: Location Description delivery: # delivery=* label: Delivery diff --git a/data/presets/fields.json b/data/presets/fields.json index 1cc8528d8..61b697162 100644 --- a/data/presets/fields.json +++ b/data/presets/fields.json @@ -108,7 +108,7 @@ "cycleway": {"keys": ["cycleway", "cycleway:left", "cycleway:right"], "reference": {"key": "cycleway"}, "type": "cycleway", "label": "Bike Lanes", "placeholder": "none", "strings": {"types": {"cycleway:left": "Left side", "cycleway:right": "Right side"}, "options": {"none": {"title": "None", "description": "No bike lane"}, "lane": {"title": "Standard bike lane", "description": "A bike lane separated from auto traffic by a painted line"}, "shared_lane": {"title": "Shared bike lane", "description": "A bike lane with no separation from auto traffic"}, "track": {"title": "Bike track", "description": "A bike lane separated from traffic by a physical barrier"}, "share_busway": {"title": "Bike lane shared with bus", "description": "A bike lane shared with a bus lane"}, "opposite_lane": {"title": "Opposite bike lane", "description": "A bike lane that travels in the opposite direction of traffic"}, "opposite": {"title": "Contraflow bike lane", "description": "A bike lane that travels in both directions on a one-way street"}}}}, "dance/style": {"key": "dance:style", "type": "semiCombo", "label": "Dance Styles"}, "date": {"key": "date", "type": "check", "label": "Date"}, - "defibrillator_location": {"key": "defibrillator:location", "type": "textarea", "label": "Precise location of the defibrillator"}, + "defibrillator/location": {"key": "defibrillator:location", "type": "textarea", "label": "Location Description"}, "delivery": {"key": "delivery", "type": "check", "label": "Delivery"}, "denomination": {"key": "denomination", "type": "combo", "label": "Denomination", "prerequisiteTag": {"key": "religion", "valueNot": "none"}}, "denotation": {"key": "denotation", "type": "combo", "label": "Denotation"}, diff --git a/data/presets/fields/defibrillator_location.json b/data/presets/fields/defibrillator/location.json similarity index 55% rename from data/presets/fields/defibrillator_location.json rename to data/presets/fields/defibrillator/location.json index 5a6086e3c..a04347396 100644 --- a/data/presets/fields/defibrillator_location.json +++ b/data/presets/fields/defibrillator/location.json @@ -1,5 +1,5 @@ { "key": "defibrillator:location", "type": "textarea", - "label": "Precise location of the defibrillator" + "label": "Location Description" } diff --git a/data/presets/presets.json b/data/presets/presets.json index cc8d093e1..9538a9db1 100644 --- a/data/presets/presets.json +++ b/data/presets/presets.json @@ -456,7 +456,7 @@ "emergency/private": {"fields": ["emergency_combo"], "geometry": ["line"], "tags": {"emergency": "private"}, "name": "Emergency Access Private", "searchable": false, "matchScore": 0.01}, "emergency/yes": {"fields": ["emergency_combo"], "geometry": ["line"], "tags": {"emergency": "yes"}, "name": "Emergency Access Yes", "searchable": false, "matchScore": 0.01}, "emergency/ambulance_station": {"icon": "fas-ambulance", "fields": ["name", "operator", "building_area", "address"], "moreFields": ["email", "fax", "gnis/feature_id", "phone", "website", "wheelchair"], "geometry": ["point", "area"], "terms": ["EMS", "EMT", "rescue"], "tags": {"emergency": "ambulance_station"}, "name": "Ambulance Station"}, - "emergency/defibrillator": {"icon": "maki-defibrillator", "fields": ["indoor", "ref", "operator", "defibrillator_location"], "moreFields": ["level", "opening_hours", "access_simple"], "geometry": ["point", "vertex"], "terms": ["AED"], "tags": {"emergency": "defibrillator"}, "name": "Defibrillator"}, + "emergency/defibrillator": {"icon": "maki-defibrillator", "fields": ["indoor", "ref", "operator", "defibrillator/location"], "moreFields": ["level", "opening_hours", "access_simple"], "geometry": ["point", "vertex"], "terms": ["AED"], "tags": {"emergency": "defibrillator"}, "name": "Defibrillator"}, "emergency/fire_alarm": {"icon": "fas-bell", "fields": ["indoor", "ref", "operator"], "moreFields": ["level"], "geometry": ["point", "vertex"], "tags": {"emergency": "fire_alarm_box"}, "name": "Fire Alarm Call Box"}, "emergency/fire_extinguisher": {"icon": "fas-fire-extinguisher", "fields": ["indoor", "ref", "operator"], "moreFields": ["level"], "geometry": ["point", "vertex"], "tags": {"emergency": "fire_extinguisher"}, "name": "Fire Extinguisher"}, "emergency/fire_hose": {"icon": "fas-tape", "fields": ["indoor", "ref", "operator"], "moreFields": ["level"], "geometry": ["point", "vertex"], "tags": {"emergency": "fire_hose"}, "name": "Fire Hose"}, diff --git a/data/presets/presets/emergency/defibrillator.json b/data/presets/presets/emergency/defibrillator.json index 74d6b74f7..a3c3303a1 100644 --- a/data/presets/presets/emergency/defibrillator.json +++ b/data/presets/presets/emergency/defibrillator.json @@ -4,7 +4,7 @@ "indoor", "ref", "operator", - "defibrillator_location" + "defibrillator/location" ], "moreFields": [ "level", diff --git a/data/taginfo.json b/data/taginfo.json index 607c7b1d2..2813111ad 100644 --- a/data/taginfo.json +++ b/data/taginfo.json @@ -1460,7 +1460,7 @@ {"key": "cycleway:right", "value": "opposite", "description": "🄵 Bike Lanes"}, {"key": "dance:style", "description": "🄵 Dance Styles"}, {"key": "date", "description": "🄵 Date"}, - {"key": "defibrillator:location", "description": "🄵 Precise location of the defibrillator"}, + {"key": "defibrillator:location", "description": "🄵 Location Description"}, {"key": "delivery", "description": "🄵 Delivery"}, {"key": "denomination", "description": "🄵 Denomination"}, {"key": "denotation", "description": "🄵 Denotation"}, diff --git a/dist/locales/en.json b/dist/locales/en.json index 531cc35b4..b75928e3f 100644 --- a/dist/locales/en.json +++ b/dist/locales/en.json @@ -3304,8 +3304,8 @@ "date": { "label": "Date" }, - "defibrillator_location": { - "label": "Precise location of the defibrillator" + "defibrillator/location": { + "label": "Location Description" }, "delivery": { "label": "Delivery",