From 5960d1cea2cefa4c1db7a0fee73d019d73da08a1 Mon Sep 17 00:00:00 2001 From: Quincy Morgan Date: Tue, 28 Apr 2020 11:26:51 -0700 Subject: [PATCH] Add type field to highway=construction preset (close #7519) Rename Road Closed preset to Closed Road and add search terms --- data/presets.yaml | 6 +++--- data/presets/presets.json | 2 +- data/presets/presets/highway/construction.json | 9 ++++++--- data/taginfo.json | 2 +- dist/locales/en.json | 4 ++-- 5 files changed, 13 insertions(+), 10 deletions(-) diff --git a/data/presets.yaml b/data/presets.yaml index 0ad0ba05c..85ae2a1fe 100644 --- a/data/presets.yaml +++ b/data/presets.yaml @@ -5032,9 +5032,9 @@ en: name: Bus Stop highway/construction: # 'highway=construction, access=no' - name: Road Closed - # 'terms: closed,closure,construction' - terms: '' + name: Closed Road + # 'terms: closure,construction,road closed,road work,roadwork' + terms: '' highway/corridor: # highway=corridor name: Indoor Corridor diff --git a/data/presets/presets.json b/data/presets/presets.json index d7e8371a0..703038e1c 100644 --- a/data/presets/presets.json +++ b/data/presets/presets.json @@ -496,7 +496,7 @@ "highway/crossing": {"fields": ["crossing"], "geometry": ["vertex"], "tags": {"highway": "crossing"}, "searchable": false, "matchScore": 0.95, "name": "Crossing"}, "highway/bridleway": {"fields": ["name", "surface", "width", "structure", "access", "incline", "horse_scale"], "moreFields": ["covered", "dog", "lit", "maxweight_bridge", "smoothness", "stroller", "wheelchair"], "icon": "maki-horse-riding", "geometry": ["line"], "tags": {"highway": "bridleway"}, "terms": ["bridleway", "equestrian", "horse", "trail"], "name": "Bridle Path"}, "highway/bus_guideway": {"icon": "temaki-bus_guided", "fields": ["name", "operator", "oneway", "structure", "covered"], "moreFields": ["trolley_wire", "width"], "geometry": ["line"], "tags": {"highway": "bus_guideway"}, "addTags": {"highway": "bus_guideway", "access": "no", "bus": "designated"}, "terms": [], "name": "Bus Guideway"}, - "highway/construction": {"icon": "maki-barrier", "fields": ["name", "opening_date", "check_date", "note", "oneway", "structure", "access"], "geometry": ["line"], "tags": {"highway": "construction", "access": "no"}, "terms": ["closed", "closure", "construction"], "name": "Road Closed"}, + "highway/construction": {"icon": "maki-barrier", "fields": ["name", "construction", "opening_date", "check_date", "note", "oneway", "structure", "access"], "geometry": ["line"], "tags": {"highway": "construction", "access": "no"}, "terms": ["closure", "construction", "road closed", "road work", "roadwork"], "name": "Closed Road"}, "highway/corridor": {"icon": "temaki-pedestrian_walled", "fields": ["name", "width", "level", "access_simple", "wheelchair"], "moreFields": ["covered", "indoor", "maxheight", "stroller"], "geometry": ["line"], "tags": {"highway": "corridor"}, "addTags": {"highway": "corridor", "indoor": "yes"}, "terms": ["gallery", "hall", "hallway", "indoor", "passage", "passageway"], "name": "Indoor Corridor"}, "highway/crossing/zebra-raised": {"icon": "temaki-pedestrian_crosswalk", "fields": ["crossing", "tactile_paving", "crossing/island"], "geometry": ["vertex"], "tags": {"highway": "crossing", "crossing": "zebra", "traffic_calming": "table"}, "reference": {"key": "traffic_calming", "value": "table"}, "name": "Marked Crosswalk (Raised)", "searchable": false}, "highway/crossing/zebra": {"icon": "temaki-pedestrian_crosswalk", "fields": ["crossing", "tactile_paving", "crossing/island"], "geometry": ["vertex"], "tags": {"highway": "crossing", "crossing": "zebra"}, "reference": {"key": "highway", "value": "crossing"}, "name": "Marked Crosswalk", "searchable": false}, diff --git a/data/presets/presets/highway/construction.json b/data/presets/presets/highway/construction.json index b09d47185..a1b730955 100644 --- a/data/presets/presets/highway/construction.json +++ b/data/presets/presets/highway/construction.json @@ -2,6 +2,7 @@ "icon": "maki-barrier", "fields": [ "name", + "construction", "opening_date", "check_date", "note", @@ -17,9 +18,11 @@ "access": "no" }, "terms": [ - "closed", "closure", - "construction" + "construction", + "road closed", + "road work", + "roadwork" ], - "name": "Road Closed" + "name": "Closed Road" } diff --git a/data/taginfo.json b/data/taginfo.json index 42dd7c532..3b760b870 100644 --- a/data/taginfo.json +++ b/data/taginfo.json @@ -492,7 +492,7 @@ {"key": "highway", "value": "crossing", "description": "🄿 Crossing (unsearchable)", "object_types": ["node"]}, {"key": "highway", "value": "bridleway", "description": "🄿 Bridle Path", "object_types": ["way"], "icon_url": "https://cdn.jsdelivr.net/gh/mapbox/maki/icons/horse-riding-15.svg"}, {"key": "highway", "value": "bus_guideway", "description": "🄿 Bus Guideway", "object_types": ["way"], "icon_url": "https://cdn.jsdelivr.net/gh/ideditor/temaki/icons/bus_guided.svg"}, - {"key": "access", "value": "no", "description": "🄿 Road Closed, 🄵 Allowed Access", "object_types": ["way"], "icon_url": "https://cdn.jsdelivr.net/gh/mapbox/maki/icons/barrier-15.svg"}, + {"key": "access", "value": "no", "description": "🄿 Closed Road, 🄵 Allowed Access", "object_types": ["way"], "icon_url": "https://cdn.jsdelivr.net/gh/mapbox/maki/icons/barrier-15.svg"}, {"key": "highway", "value": "corridor", "description": "🄿 Indoor Corridor", "object_types": ["way"], "icon_url": "https://cdn.jsdelivr.net/gh/ideditor/temaki/icons/pedestrian_walled.svg"}, {"key": "traffic_calming", "value": "table", "description": "🄿 Marked Crosswalk (Raised) (unsearchable), 🄿 Marked Crosswalk (Raised), 🄿 Unmarked Crossing (Raised), 🄿 Speed Table", "object_types": ["node"], "icon_url": "https://cdn.jsdelivr.net/gh/ideditor/temaki/icons/pedestrian_crosswalk.svg"}, {"key": "crossing", "value": "zebra", "description": "🄿 Marked Crosswalk (unsearchable)", "object_types": ["node"], "icon_url": "https://cdn.jsdelivr.net/gh/ideditor/temaki/icons/pedestrian_crosswalk.svg"}, diff --git a/dist/locales/en.json b/dist/locales/en.json index c59b9ace1..01547ea70 100644 --- a/dist/locales/en.json +++ b/dist/locales/en.json @@ -6922,8 +6922,8 @@ "terms": "" }, "highway/construction": { - "name": "Road Closed", - "terms": "closed,closure,construction" + "name": "Closed Road", + "terms": "closure,construction,road closed,road work,roadwork" }, "highway/corridor": { "name": "Indoor Corridor",