From af8f4800e42b6bc378e4f854f6ed625dc7bb0050 Mon Sep 17 00:00:00 2001 From: Quincy Morgan Date: Fri, 20 Dec 2019 15:30:10 -0500 Subject: [PATCH] Sort "Foot Path" and "Cycle Path" above "Cycle & Foot Path" when searching "foot" or "cycle" --- data/presets/presets.json | 12 ++++++------ data/presets/presets/highway/cycleway.json | 1 - .../presets/highway/cycleway/bicycle_foot.json | 2 +- .../presets/highway/cycleway/crossing/marked.json | 1 + .../presets/highway/cycleway/crossing/unmarked.json | 1 + data/presets/presets/highway/footway.json | 1 - data/presets/presets/highway/footway/_crossing.json | 1 - 7 files changed, 9 insertions(+), 10 deletions(-) diff --git a/data/presets/presets.json b/data/presets/presets.json index 61e14c2ab..25151f50a 100644 --- a/data/presets/presets.json +++ b/data/presets/presets.json @@ -496,15 +496,15 @@ "highway/crossing/marked": {"icon": "temaki-pedestrian_crosswalk", "fields": ["crossing", "tactile_paving", "crossing/island"], "geometry": ["vertex"], "tags": {"highway": "crossing", "crossing": "marked"}, "addTags": {"highway": "crossing", "crossing": "marked"}, "reference": {"key": "highway", "value": "crossing"}, "terms": ["zebra crossing", "marked crossing", "crosswalk"], "name": "Marked Crosswalk"}, "highway/crossing/unmarked-raised": {"icon": "temaki-pedestrian", "fields": ["crossing", "tactile_paving", "crossing/island"], "geometry": ["vertex"], "tags": {"highway": "crossing", "crossing": "unmarked", "traffic_calming": "table"}, "reference": {"key": "traffic_calming", "value": "table"}, "terms": ["flat top", "hump", "speed", "slow"], "name": "Unmarked Crossing (Raised)"}, "highway/crossing/unmarked": {"icon": "temaki-pedestrian", "fields": ["crossing", "tactile_paving", "crossing/island"], "geometry": ["vertex"], "tags": {"highway": "crossing", "crossing": "unmarked"}, "addTags": {"highway": "crossing", "crossing": "unmarked"}, "reference": {"key": "crossing", "value": "unmarked"}, "terms": [], "name": "Unmarked Crossing"}, - "highway/cycleway": {"icon": "fas-biking", "fields": ["name", "oneway", "surface", "width", "structure", "access", "incline"], "moreFields": ["covered", "dog", "lit", "maxspeed", "maxweight_bridge", "not/name", "smoothness", "stroller", "wheelchair"], "geometry": ["line"], "tags": {"highway": "cycleway"}, "terms": ["bicyle path", "bike path", "cycling path"], "matchScore": 0.9, "name": "Cycle Path"}, + "highway/cycleway": {"icon": "fas-biking", "fields": ["name", "oneway", "surface", "width", "structure", "access", "incline"], "moreFields": ["covered", "dog", "lit", "maxspeed", "maxweight_bridge", "not/name", "smoothness", "stroller", "wheelchair"], "geometry": ["line"], "tags": {"highway": "cycleway"}, "terms": ["bicyle path", "bike path", "cycling path"], "name": "Cycle Path"}, "highway/cycleway/crossing": {"icon": "temaki-cyclist_crosswalk", "fields": ["crossing", "access", "surface", "tactile_paving", "crossing/island"], "geometry": ["line"], "tags": {"cycleway": "crossing"}, "addTags": {"highway": "cycleway", "cycleway": "crossing"}, "reference": {"key": "cycleway", "value": "crossing"}, "searchable": false, "matchScore": 0.95, "name": "Cycle Crossing"}, - "highway/cycleway/bicycle_foot": {"notCountryCodes": ["fr", "lt", "pl"], "icon": "temaki-pedestrian_and_cyclist", "geometry": ["line"], "tags": {"highway": "cycleway", "foot": "designated"}, "addTags": {"highway": "cycleway", "foot": "designated", "bicycle": "designated"}, "terms": ["bicycle and foot path", "bike and pedestrian path", "green way", "greenway", "mixed-use trail", "multi-use trail", "segregated trail", "rail trail"], "matchScore": 0.95, "name": "Cycle & Foot Path"}, - "highway/cycleway/crossing/marked": {"icon": "temaki-cyclist_crosswalk", "fields": ["crossing", "access", "surface", "tactile_paving", "crossing/island"], "geometry": ["line"], "tags": {"cycleway": "crossing", "crossing": "marked"}, "addTags": {"highway": "cycleway", "cycleway": "crossing", "crossing": "marked"}, "reference": {"key": "cycleway", "value": "crossing"}, "terms": ["cycle crosswalk", "cycle path crossing", "cycleway crossing", "bicycle crossing", "bike crossing"], "name": "Marked Cycle Crossing"}, - "highway/cycleway/crossing/unmarked": {"icon": "fas-biking", "fields": ["crossing", "access", "surface", "tactile_paving", "crossing/island"], "geometry": ["line"], "tags": {"cycleway": "crossing", "crossing": "unmarked"}, "addTags": {"highway": "cycleway", "cycleway": "crossing", "crossing": "unmarked"}, "reference": {"key": "cycleway", "value": "crossing"}, "terms": ["cycle path crossing", "cycleway crossing", "bicycle crossing", "bike crossing"], "name": "Unmarked Cycle Crossing"}, + "highway/cycleway/bicycle_foot": {"notCountryCodes": ["fr", "lt", "pl"], "icon": "temaki-pedestrian_and_cyclist", "geometry": ["line"], "tags": {"highway": "cycleway", "foot": "designated"}, "addTags": {"highway": "cycleway", "foot": "designated", "bicycle": "designated"}, "terms": ["bicycle and foot path", "bike and pedestrian path", "green way", "greenway", "mixed-use trail", "multi-use trail", "segregated trail", "rail trail"], "matchScore": 0.9, "name": "Cycle & Foot Path"}, + "highway/cycleway/crossing/marked": {"icon": "temaki-cyclist_crosswalk", "fields": ["crossing", "access", "surface", "tactile_paving", "crossing/island"], "geometry": ["line"], "tags": {"cycleway": "crossing", "crossing": "marked"}, "addTags": {"highway": "cycleway", "cycleway": "crossing", "crossing": "marked"}, "reference": {"key": "cycleway", "value": "crossing"}, "terms": ["cycle crosswalk", "cycle path crossing", "cycleway crossing", "bicycle crossing", "bike crossing"], "matchScore": 0.95, "name": "Marked Cycle Crossing"}, + "highway/cycleway/crossing/unmarked": {"icon": "fas-biking", "fields": ["crossing", "access", "surface", "tactile_paving", "crossing/island"], "geometry": ["line"], "tags": {"cycleway": "crossing", "crossing": "unmarked"}, "addTags": {"highway": "cycleway", "cycleway": "crossing", "crossing": "unmarked"}, "reference": {"key": "cycleway", "value": "crossing"}, "terms": ["cycle path crossing", "cycleway crossing", "bicycle crossing", "bike crossing"], "matchScore": 0.95, "name": "Unmarked Cycle Crossing"}, "highway/elevator": {"icon": "temaki-elevator", "fields": ["ref", "level_semi", "access_simple", "wheelchair", "maxweight"], "moreFields": ["maxheight", "opening_hours"], "geometry": ["vertex"], "tags": {"highway": "elevator"}, "terms": ["lift"], "name": "Elevator"}, "highway/emergency_bay": {"icon": "maki-car", "geometry": ["vertex"], "tags": {"highway": "emergency_bay"}, "terms": ["Highway Emergency Bay"], "name": "Emergency Stopping Place"}, - "highway/footway": {"icon": "temaki-pedestrian", "fields": ["name", "surface", "width", "structure", "access", "incline"], "moreFields": ["covered", "dog", "lit", "maxweight_bridge", "not/name", "smoothness", "stroller", "tactile_paving", "wheelchair"], "geometry": ["line"], "terms": ["hike", "hiking", "promenade", "trackway", "trail", "walk"], "tags": {"highway": "footway"}, "matchScore": 0.9, "name": "Foot Path"}, - "highway/footway/crossing": {"fields": ["crossing", "access", "surface", "tactile_paving", "crossing/island"], "geometry": ["line"], "tags": {"footway": "crossing"}, "addTags": {"highway": "footway", "footway": "crossing"}, "reference": {"key": "footway", "value": "crossing"}, "matchScore": 0.95, "searchable": false, "name": "Pedestrian Crossing"}, + "highway/footway": {"icon": "temaki-pedestrian", "fields": ["name", "surface", "width", "structure", "access", "incline"], "moreFields": ["covered", "dog", "lit", "maxweight_bridge", "not/name", "smoothness", "stroller", "tactile_paving", "wheelchair"], "geometry": ["line"], "terms": ["hike", "hiking", "promenade", "trackway", "trail", "walk"], "tags": {"highway": "footway"}, "name": "Foot Path"}, + "highway/footway/crossing": {"fields": ["crossing", "access", "surface", "tactile_paving", "crossing/island"], "geometry": ["line"], "tags": {"footway": "crossing"}, "addTags": {"highway": "footway", "footway": "crossing"}, "reference": {"key": "footway", "value": "crossing"}, "searchable": false, "name": "Pedestrian Crossing"}, "highway/footway/zebra-raised": {"icon": "temaki-pedestrian_crosswalk", "fields": ["crossing", "access", "surface", "tactile_paving", "crossing/island"], "geometry": ["line"], "tags": {"highway": "footway", "footway": "crossing", "crossing": "zebra", "traffic_calming": "table"}, "reference": {"key": "traffic_calming", "value": "table"}, "name": "Marked Crosswalk (Raised)", "searchable": false}, "highway/footway/zebra": {"icon": "temaki-pedestrian_crosswalk", "fields": ["crossing", "access", "surface", "tactile_paving", "crossing/island"], "geometry": ["line"], "tags": {"highway": "footway", "footway": "crossing", "crossing": "zebra"}, "reference": {"key": "footway", "value": "crossing"}, "name": "Marked Crosswalk", "searchable": false}, "highway/footway/access_aisle": {"icon": "temaki-striped_way", "fields": ["access_aisle", "width", "surface", "tactile_paving", "access", "wheelchair"], "moreFields": ["covered", "dog", "incline", "lit", "maxweight_bridge", "name", "ref", "smoothness", "stroller", "structure"], "geometry": ["line"], "terms": ["accessible van loading zone", "disabled parking access zone", "handicap parking access zone", "parking lot aisle", "striped zone", "tow zone", "tow-away zone", "towaway zone", "wheelchair aisle"], "tags": {"highway": "footway", "footway": "access_aisle"}, "reference": {"key": "footway", "value": "access_aisle"}, "name": "Access Aisle"}, diff --git a/data/presets/presets/highway/cycleway.json b/data/presets/presets/highway/cycleway.json index 0135da430..46c4cc758 100644 --- a/data/presets/presets/highway/cycleway.json +++ b/data/presets/presets/highway/cycleway.json @@ -31,6 +31,5 @@ "bike path", "cycling path" ], - "matchScore": 0.9, "name": "Cycle Path" } diff --git a/data/presets/presets/highway/cycleway/bicycle_foot.json b/data/presets/presets/highway/cycleway/bicycle_foot.json index 17ce882e7..f273fd565 100644 --- a/data/presets/presets/highway/cycleway/bicycle_foot.json +++ b/data/presets/presets/highway/cycleway/bicycle_foot.json @@ -25,6 +25,6 @@ "segregated trail", "rail trail" ], - "matchScore": 0.95, + "matchScore": 0.9, "name": "Cycle & Foot Path" } diff --git a/data/presets/presets/highway/cycleway/crossing/marked.json b/data/presets/presets/highway/cycleway/crossing/marked.json index 4444814dd..15c697863 100644 --- a/data/presets/presets/highway/cycleway/crossing/marked.json +++ b/data/presets/presets/highway/cycleway/crossing/marked.json @@ -30,5 +30,6 @@ "bicycle crossing", "bike crossing" ], + "matchScore": 0.95, "name": "Marked Cycle Crossing" } diff --git a/data/presets/presets/highway/cycleway/crossing/unmarked.json b/data/presets/presets/highway/cycleway/crossing/unmarked.json index 44289605e..38b256588 100644 --- a/data/presets/presets/highway/cycleway/crossing/unmarked.json +++ b/data/presets/presets/highway/cycleway/crossing/unmarked.json @@ -29,5 +29,6 @@ "bicycle crossing", "bike crossing" ], + "matchScore": 0.95, "name": "Unmarked Cycle Crossing" } diff --git a/data/presets/presets/highway/footway.json b/data/presets/presets/highway/footway.json index 3efc086d1..0844fe211 100644 --- a/data/presets/presets/highway/footway.json +++ b/data/presets/presets/highway/footway.json @@ -33,6 +33,5 @@ "tags": { "highway": "footway" }, - "matchScore": 0.9, "name": "Foot Path" } diff --git a/data/presets/presets/highway/footway/_crossing.json b/data/presets/presets/highway/footway/_crossing.json index 8b1801715..61a3e50f3 100644 --- a/data/presets/presets/highway/footway/_crossing.json +++ b/data/presets/presets/highway/footway/_crossing.json @@ -20,7 +20,6 @@ "key": "footway", "value": "crossing" }, - "matchScore": 0.95, "searchable": false, "name": "Pedestrian Crossing" }