From 443ee3bb6266cd1010790abaa5435a9cf25c6a44 Mon Sep 17 00:00:00 2001 From: Quincy Morgan Date: Thu, 18 Apr 2019 16:38:16 -0700 Subject: [PATCH] Add fallback preset for the "emergency" tag and a combo field to set the type --- data/presets.yaml | 6 ++++++ data/presets/fields.json | 1 + data/presets/fields/emergency_combo.json | 5 +++++ data/presets/presets.json | 13 +++++++------ data/presets/presets/_emergency.json | 17 +++++++++++++++++ data/presets/presets/emergency/_designated.json | 1 + .../presets/presets/emergency/_destination.json | 1 + data/presets/presets/emergency/_no.json | 1 + data/presets/presets/emergency/_official.json | 1 + data/presets/presets/emergency/_private.json | 1 + data/presets/presets/emergency/_yes.json | 1 + data/taginfo.json | 2 +- dist/locales/en.json | 7 +++++++ 13 files changed, 50 insertions(+), 7 deletions(-) create mode 100644 data/presets/fields/emergency_combo.json create mode 100644 data/presets/presets/_emergency.json diff --git a/data/presets.yaml b/data/presets.yaml index 8f8204770..cb3b86b57 100644 --- a/data/presets.yaml +++ b/data/presets.yaml @@ -647,6 +647,9 @@ en: emergency: # emergency=* label: Emergency + emergency_combo: + # emergency=* + label: Type enforcement: # enforcement=* label: Type @@ -3923,6 +3926,9 @@ en: embankment: # embankment=yes name: Embankment + emergency: + # emergency=* + name: Emergency Feature emergency/ambulance_station: # emergency=ambulance_station name: Ambulance Station diff --git a/data/presets/fields.json b/data/presets/fields.json index 34edfb010..10c665f33 100644 --- a/data/presets/fields.json +++ b/data/presets/fields.json @@ -114,6 +114,7 @@ "email": {"key": "email", "type": "email", "placeholder": "example@example.com", "label": "Email"}, "embankment": {"key": "embankment", "type": "typeCombo", "label": "Type", "placeholder": "Default"}, "embassy": {"key": "embassy", "type": "combo", "label": "Type"}, + "emergency_combo": {"key": "emergency", "type": "combo", "label": "Type"}, "emergency": {"key": "emergency", "type": "check", "label": "Emergency"}, "enforcement": {"key": "enforcement", "type": "combo", "label": "Type"}, "entrance": {"key": "entrance", "type": "typeCombo", "label": "Type"}, diff --git a/data/presets/fields/emergency_combo.json b/data/presets/fields/emergency_combo.json new file mode 100644 index 000000000..02f7f9371 --- /dev/null +++ b/data/presets/fields/emergency_combo.json @@ -0,0 +1,5 @@ +{ + "key": "emergency", + "type": "combo", + "label": "Type" +} diff --git a/data/presets/presets.json b/data/presets/presets.json index 1893bbfca..8cab4aa3e 100644 --- a/data/presets/presets.json +++ b/data/presets/presets.json @@ -7,6 +7,7 @@ "boundary": {"fields": ["boundary"], "geometry": ["line"], "tags": {"boundary": "*"}, "searchable": false, "name": "Boundary"}, "building_point": {"icon": "maki-home", "fields": ["{building}"], "moreFields": ["{building}"], "geometry": ["point"], "tags": {"building": "*"}, "matchScore": 0.6, "searchable": false, "terms": [], "name": "Building"}, "embankment": {"geometry": ["line"], "tags": {"embankment": "yes"}, "name": "Embankment", "matchScore": 0.2, "searchable": false}, + "emergency": {"fields": ["emergency_combo"], "geometry": ["point", "vertex", "line", "area"], "tags": {"emergency": "*"}, "searchable": false, "matchScore": 0.005, "name": "Emergency Feature"}, "highway": {"fields": ["name", "highway"], "geometry": ["point", "vertex", "line", "area"], "tags": {"highway": "*"}, "searchable": false, "name": "Highway"}, "indoor": {"fields": ["level", "indoor_type"], "geometry": ["point", "vertex", "line", "area"], "tags": {"indoor": "*"}, "matchScore": 0.8, "searchable": false, "name": "Indoor Feature"}, "landuse": {"fields": ["name", "landuse"], "geometry": ["area"], "tags": {"landuse": "*"}, "matchScore": 0.9, "searchable": false, "name": "Land Use"}, @@ -382,12 +383,12 @@ "craft/watchmaker": {"icon": "maki-watch", "geometry": ["point", "area"], "tags": {"craft": "watchmaker"}, "name": "Watchmaker"}, "craft/window_construction": {"icon": "temaki-window", "geometry": ["point", "area"], "terms": ["glass"], "tags": {"craft": "window_construction"}, "name": "Window Construction"}, "craft/winery": {"icon": "maki-alcohol-shop", "geometry": ["point", "area"], "tags": {"craft": "winery"}, "name": "Winery"}, - "emergency/designated": {"fields": [], "geometry": ["line"], "tags": {"emergency": "designated"}, "terms": [], "name": "Emergency Access Designated", "searchable": false, "matchScore": 0.01}, - "emergency/destination": {"fields": [], "geometry": ["line"], "tags": {"emergency": "destination"}, "terms": [], "name": "Emergency Access Destination", "searchable": false, "matchScore": 0.01}, - "emergency/no": {"fields": [], "geometry": ["line"], "tags": {"emergency": "no"}, "terms": [], "name": "Emergency Access No", "searchable": false, "matchScore": 0.01}, - "emergency/official": {"fields": [], "geometry": ["line"], "tags": {"emergency": "official"}, "terms": [], "name": "Emergency Access Official", "searchable": false, "matchScore": 0.01}, - "emergency/private": {"fields": [], "geometry": ["line"], "tags": {"emergency": "private"}, "terms": [], "name": "Emergency Access Private", "searchable": false, "matchScore": 0.01}, - "emergency/yes": {"fields": [], "geometry": ["line"], "tags": {"emergency": "yes"}, "terms": [], "name": "Emergency Access Yes", "searchable": false, "matchScore": 0.01}, + "emergency/designated": {"fields": ["emergency_combo"], "geometry": ["line"], "tags": {"emergency": "designated"}, "terms": [], "name": "Emergency Access Designated", "searchable": false, "matchScore": 0.01}, + "emergency/destination": {"fields": ["emergency_combo"], "geometry": ["line"], "tags": {"emergency": "destination"}, "terms": [], "name": "Emergency Access Destination", "searchable": false, "matchScore": 0.01}, + "emergency/no": {"fields": ["emergency_combo"], "geometry": ["line"], "tags": {"emergency": "no"}, "terms": [], "name": "Emergency Access No", "searchable": false, "matchScore": 0.01}, + "emergency/official": {"fields": ["emergency_combo"], "geometry": ["line"], "tags": {"emergency": "official"}, "terms": [], "name": "Emergency Access Official", "searchable": false, "matchScore": 0.01}, + "emergency/private": {"fields": ["emergency_combo"], "geometry": ["line"], "tags": {"emergency": "private"}, "terms": [], "name": "Emergency Access Private", "searchable": false, "matchScore": 0.01}, + "emergency/yes": {"fields": ["emergency_combo"], "geometry": ["line"], "tags": {"emergency": "yes"}, "terms": [], "name": "Emergency Access Yes", "searchable": false, "matchScore": 0.01}, "emergency/ambulance_station": {"icon": "fas-ambulance", "fields": ["name", "operator", "building_area", "address"], "moreFields": ["website", "phone", "email", "fax", "wheelchair"], "geometry": ["point", "area"], "terms": ["EMS", "EMT", "rescue"], "tags": {"emergency": "ambulance_station"}, "name": "Ambulance Station"}, "emergency/defibrillator": {"icon": "maki-defibrillator", "fields": ["indoor", "ref", "operator"], "geometry": ["point", "vertex"], "terms": ["AED"], "tags": {"emergency": "defibrillator"}, "name": "Defibrillator"}, "emergency/fire_alarm": {"icon": "fas-bell", "fields": ["indoor", "ref", "operator"], "geometry": ["point", "vertex"], "tags": {"emergency": "fire_alarm_box"}, "name": "Fire Alarm Call Box"}, diff --git a/data/presets/presets/_emergency.json b/data/presets/presets/_emergency.json new file mode 100644 index 000000000..41161e162 --- /dev/null +++ b/data/presets/presets/_emergency.json @@ -0,0 +1,17 @@ +{ + "fields": [ + "emergency_combo" + ], + "geometry": [ + "point", + "vertex", + "line", + "area" + ], + "tags": { + "emergency": "*" + }, + "searchable": false, + "matchScore": 0.005, + "name": "Emergency Feature" +} diff --git a/data/presets/presets/emergency/_designated.json b/data/presets/presets/emergency/_designated.json index 9ce30ef82..28b86c1aa 100644 --- a/data/presets/presets/emergency/_designated.json +++ b/data/presets/presets/emergency/_designated.json @@ -1,5 +1,6 @@ { "fields": [ + "emergency_combo" ], "geometry": [ "line" diff --git a/data/presets/presets/emergency/_destination.json b/data/presets/presets/emergency/_destination.json index 309ddfa4f..af124075c 100644 --- a/data/presets/presets/emergency/_destination.json +++ b/data/presets/presets/emergency/_destination.json @@ -1,5 +1,6 @@ { "fields": [ + "emergency_combo" ], "geometry": [ "line" diff --git a/data/presets/presets/emergency/_no.json b/data/presets/presets/emergency/_no.json index 84b4cd915..44966f3e8 100644 --- a/data/presets/presets/emergency/_no.json +++ b/data/presets/presets/emergency/_no.json @@ -1,5 +1,6 @@ { "fields": [ + "emergency_combo" ], "geometry": [ "line" diff --git a/data/presets/presets/emergency/_official.json b/data/presets/presets/emergency/_official.json index 2f0deb192..bb719e297 100644 --- a/data/presets/presets/emergency/_official.json +++ b/data/presets/presets/emergency/_official.json @@ -1,5 +1,6 @@ { "fields": [ + "emergency_combo" ], "geometry": [ "line" diff --git a/data/presets/presets/emergency/_private.json b/data/presets/presets/emergency/_private.json index abbf15ce1..76f82c5b1 100644 --- a/data/presets/presets/emergency/_private.json +++ b/data/presets/presets/emergency/_private.json @@ -1,5 +1,6 @@ { "fields": [ + "emergency_combo" ], "geometry": [ "line" diff --git a/data/presets/presets/emergency/_yes.json b/data/presets/presets/emergency/_yes.json index be4e376c3..bef9b31e5 100644 --- a/data/presets/presets/emergency/_yes.json +++ b/data/presets/presets/emergency/_yes.json @@ -1,5 +1,6 @@ { "fields": [ + "emergency_combo" ], "geometry": [ "line" diff --git a/data/taginfo.json b/data/taginfo.json index 772750e48..6487aeb85 100644 --- a/data/taginfo.json +++ b/data/taginfo.json @@ -10,6 +10,7 @@ {"key": "boundary", "description": "🄿 Boundary (unsearchable), 🄵 Type", "object_types": ["way"]}, {"key": "building", "description": "🄿 Building (unsearchable), 🄿 Building, 🄵 Building", "object_types": ["node"], "icon_url": "https://raw.githubusercontent.com/mapbox/maki/master/icons/home-15.svg?sanitize=true"}, {"key": "embankment", "value": "yes", "description": "🄿 Embankment (unsearchable)", "object_types": ["way"]}, + {"key": "emergency", "description": "🄿 Emergency Feature (unsearchable), 🄵 Type, 🄵 Emergency", "object_types": ["node", "way", "area"]}, {"key": "highway", "description": "🄿 Highway (unsearchable), 🄵 Type", "object_types": ["node", "way", "area"]}, {"key": "indoor", "description": "🄿 Indoor Feature (unsearchable), 🄵 Type, 🄵 Indoor", "object_types": ["node", "way", "area"]}, {"key": "landuse", "description": "🄿 Land Use (unsearchable), 🄵 Type", "object_types": ["area"]}, @@ -1297,7 +1298,6 @@ {"key": "email", "description": "🄵 Email"}, {"key": "embankment", "description": "🄵 Type, 🄵 Structure"}, {"key": "embassy", "description": "🄵 Type"}, - {"key": "emergency", "description": "🄵 Emergency"}, {"key": "enforcement", "description": "🄵 Type"}, {"key": "except", "description": "🄵 Exceptions"}, {"key": "faces", "description": "🄵 Faces"}, diff --git a/dist/locales/en.json b/dist/locales/en.json index 74d421ab8..7011b5598 100644 --- a/dist/locales/en.json +++ b/dist/locales/en.json @@ -2746,6 +2746,9 @@ "embassy": { "label": "Type" }, + "emergency_combo": { + "label": "Type" + }, "emergency": { "label": "Emergency" }, @@ -4114,6 +4117,10 @@ "name": "Embankment", "terms": "" }, + "emergency": { + "name": "Emergency Feature", + "terms": "" + }, "highway": { "name": "Highway", "terms": ""