From 6f40902f39c79b418034ae81a554bf0b986d2a01 Mon Sep 17 00:00:00 2001 From: Quincy Morgan Date: Tue, 19 Mar 2019 14:11:03 -0400 Subject: [PATCH] Add Marked and Unmarked Cycleway Crossing presets (close #6065) --- data/deprecated.json | 4 ++ data/presets.yaml | 16 ++++++-- data/presets/presets.json | 12 +++--- data/presets/presets/highway/cycleway.json | 4 +- .../highway/cycleway/crossing/marked.json | 39 +++++++++++++++++++ .../highway/cycleway/crossing/unmarked.json | 38 ++++++++++++++++++ .../highway/footway/marked-raised.json | 1 + .../presets/highway/footway/marked.json | 1 + .../highway/footway/unmarked-raised.json | 8 ++-- .../presets/highway/footway/unmarked.json | 6 +-- data/taginfo.json | 3 +- dist/locales/en.json | 10 ++++- 12 files changed, 124 insertions(+), 18 deletions(-) create mode 100644 data/presets/presets/highway/cycleway/crossing/marked.json create mode 100644 data/presets/presets/highway/cycleway/crossing/unmarked.json diff --git a/data/deprecated.json b/data/deprecated.json index 56516f2d1..07eedbc89 100644 --- a/data/deprecated.json +++ b/data/deprecated.json @@ -148,6 +148,10 @@ "old": {"footway": "both"}, "replace": {"sidewalk": "both"} }, + { + "old": {"footway": "crossing", "highway": "cycleway"}, + "replace": {"cycleway": "crossing", "highway": "cycleway"} + }, { "old": {"footway": "left"}, "replace": {"sidewalk": "left"} diff --git a/data/presets.yaml b/data/presets.yaml index 6cb3c0d2b..f8eb0a825 100644 --- a/data/presets.yaml +++ b/data/presets.yaml @@ -4032,8 +4032,18 @@ en: highway/cycleway: # highway=cycleway name: Cycle Path - # 'terms: bike' + # 'terms: bike path,bicyle path' terms: '' + highway/cycleway/crossing/marked: + # 'cycleway=crossing, crossing=marked' + name: Marked Cycle Crossing + # 'terms: cycle crosswalk,cycle path crossing,cycleway crossing,bicycle crossing,bike crossing' + terms: '' + highway/cycleway/crossing/unmarked: + # cycleway=crossing + name: Unmarked Cycle Crossing + # 'terms: cycle path crossing,cycleway crossing,bicycle crossing,bike crossing' + terms: '' highway/elevator: # highway=elevator name: Elevator @@ -4050,12 +4060,12 @@ en: # 'terms: moving sidewalk,autwalk,skywalk,travolator,travelator,travellator,conveyor' terms: '' highway/footway/marked: - # crossing=marked + # 'footway=crossing, crossing=marked' name: Marked Crosswalk # 'terms: zebra crossing,marked crossing,crosswalk' terms: '' highway/footway/marked-raised: - # 'crossing=marked, traffic_calming=table' + # 'footway=crossing, crossing=marked, traffic_calming=table' name: Marked Crosswalk (Raised) # 'terms: zebra crossing,marked crossing,crosswalk,flat top,hump,speed,slow' terms: '' diff --git a/data/presets/presets.json b/data/presets/presets.json index b5f1bfdda..e77b9eba6 100644 --- a/data/presets/presets.json +++ b/data/presets/presets.json @@ -424,17 +424,19 @@ "highway/crossing/marked": {"icon": "temaki-pedestrian", "fields": ["crossing", "kerb", "tactile_paving"], "geometry": ["vertex"], "tags": {"crossing": "marked"}, "addTags": {"highway": "crossing", "crossing": "marked"}, "removeTags": {"highway": "crossing", "crossing": "marked"}, "reference": {"key": "highway", "value": "crossing"}, "terms": ["zebra crossing", "marked crossing", "crosswalk"], "name": "Marked Crosswalk"}, "highway/crossing/unmarked-raised": {"fields": ["crossing", "kerb", "tactile_paving"], "geometry": ["vertex"], "addTags": {"highway": "crossing", "crossing": "unmarked", "traffic_calming": "table"}, "removeTags": {"highway": "crossing", "crossing": "unmarked", "traffic_calming": "table"}, "tags": {"highway": "crossing", "traffic_calming": "table"}, "reference": {"key": "traffic_calming", "value": "table"}, "terms": ["flat top", "hump", "speed", "slow"], "matchScore": 0.95, "name": "Unmarked Crossing (Raised)"}, "highway/crossing/unmarked": {"fields": ["crossing", "kerb", "tactile_paving"], "geometry": ["vertex"], "addTags": {"highway": "crossing", "crossing": "unmarked"}, "removeTags": {"highway": "crossing", "crossing": "unmarked"}, "tags": {"highway": "crossing"}, "reference": {"key": "highway", "value": "crossing"}, "terms": [], "matchScore": 0.95, "name": "Unmarked Crossing"}, - "highway/cycleway": {"icon": "maki-bicycle", "fields": ["name", "oneway", "surface", "width", "structure", "access", "incline"], "moreFields": ["wheelchair", "lit", "smoothness", "maxspeed", "covered", "dog"], "geometry": ["line"], "tags": {"highway": "cycleway"}, "terms": ["bike"], "name": "Cycle Path"}, + "highway/cycleway": {"icon": "maki-bicycle", "fields": ["name", "oneway", "surface", "width", "structure", "access", "incline"], "moreFields": ["wheelchair", "lit", "smoothness", "maxspeed", "covered", "dog"], "geometry": ["line"], "tags": {"highway": "cycleway"}, "terms": ["bike path", "bicyle path"], "matchScore": 0.9, "name": "Cycle Path"}, + "highway/cycleway/crossing/marked": {"icon": "maki-bicycle", "fields": ["crossing", "access", "surface", "kerb", "tactile_paving"], "geometry": ["line"], "tags": {"cycleway": "crossing", "crossing": "marked"}, "addTags": {"highway": "cycleway", "cycleway": "crossing", "crossing": "marked"}, "removeTags": {"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": "maki-bicycle", "fields": ["crossing", "access", "surface", "kerb", "tactile_paving"], "geometry": ["line"], "tags": {"cycleway": "crossing"}, "addTags": {"highway": "cycleway", "cycleway": "crossing", "crossing": "unmarked"}, "removeTags": {"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": ["access_simple", "opening_hours", "maxweight", "ref", "wheelchair"], "moreFields": ["maxheight"], "geometry": ["vertex"], "tags": {"highway": "elevator"}, "terms": ["lift"], "name": "Elevator"}, "highway/footway": {"icon": "temaki-pedestrian", "fields": ["name", "surface", "width", "structure", "access", "incline"], "moreFields": ["wheelchair", "lit", "smoothness", "covered", "dog"], "geometry": ["line"], "terms": ["hike", "hiking", "promenade", "trackway", "trail", "walk"], "tags": {"highway": "footway"}, "matchScore": 0.9, "name": "Foot Path"}, "highway/footway/zebra-raised": {"icon": "temaki-pedestrian", "fields": ["crossing", "access", "surface", "kerb", "tactile_paving"], "geometry": ["line"], "tags": {"highway": "footway", "footway": "crossing", "crossing": "zebra", "traffic_calming": "table"}, "reference": {"key": "traffic_calming", "value": "table"}, "terms": ["zebra crossing", "marked crossing", "crosswalk", "flat top", "hump", "speed", "slow"], "name": "Marked Crosswalk (Raised)", "searchable": false}, "highway/footway/zebra": {"icon": "temaki-pedestrian", "fields": ["crossing", "access", "surface", "kerb", "tactile_paving"], "geometry": ["line"], "tags": {"highway": "footway", "footway": "crossing", "crossing": "zebra"}, "reference": {"key": "footway", "value": "crossing"}, "terms": ["zebra crossing", "marked crossing", "crosswalk"], "name": "Marked Crosswalk", "searchable": false}, "highway/footway/conveying": {"icon": "temaki-pedestrian", "fields": ["name", "conveying", "access_simple", "lit", "width", "wheelchair"], "geometry": ["line"], "terms": ["moving sidewalk", "autwalk", "skywalk", "travolator", "travelator", "travellator", "conveyor"], "tags": {"highway": "footway", "conveying": "*"}, "name": "Moving Walkway"}, - "highway/footway/marked-raised": {"icon": "temaki-pedestrian", "fields": ["crossing", "access", "surface", "kerb", "tactile_paving"], "geometry": ["line"], "tags": {"crossing": "marked", "traffic_calming": "table"}, "addTags": {"highway": "footway", "footway": "crossing", "crossing": "marked", "traffic_calming": "table"}, "removeTags": {"highway": "footway", "footway": "crossing", "crossing": "marked", "traffic_calming": "table"}, "reference": {"key": "traffic_calming", "value": "table"}, "terms": ["zebra crossing", "marked crossing", "crosswalk", "flat top", "hump", "speed", "slow"], "name": "Marked Crosswalk (Raised)"}, - "highway/footway/marked": {"icon": "temaki-pedestrian", "fields": ["crossing", "access", "surface", "kerb", "tactile_paving"], "geometry": ["line"], "tags": {"crossing": "marked"}, "addTags": {"highway": "footway", "footway": "crossing", "crossing": "marked"}, "removeTags": {"highway": "footway", "footway": "crossing", "crossing": "marked"}, "reference": {"key": "footway", "value": "crossing"}, "terms": ["zebra crossing", "marked crossing", "crosswalk"], "name": "Marked Crosswalk"}, + "highway/footway/marked-raised": {"icon": "temaki-pedestrian", "fields": ["crossing", "access", "surface", "kerb", "tactile_paving"], "geometry": ["line"], "tags": {"footway": "crossing", "crossing": "marked", "traffic_calming": "table"}, "addTags": {"highway": "footway", "footway": "crossing", "crossing": "marked", "traffic_calming": "table"}, "removeTags": {"highway": "footway", "footway": "crossing", "crossing": "marked", "traffic_calming": "table"}, "reference": {"key": "traffic_calming", "value": "table"}, "terms": ["zebra crossing", "marked crossing", "crosswalk", "flat top", "hump", "speed", "slow"], "name": "Marked Crosswalk (Raised)"}, + "highway/footway/marked": {"icon": "temaki-pedestrian", "fields": ["crossing", "access", "surface", "kerb", "tactile_paving"], "geometry": ["line"], "tags": {"footway": "crossing", "crossing": "marked"}, "addTags": {"highway": "footway", "footway": "crossing", "crossing": "marked"}, "removeTags": {"highway": "footway", "footway": "crossing", "crossing": "marked"}, "reference": {"key": "footway", "value": "crossing"}, "terms": ["zebra crossing", "marked crossing", "crosswalk"], "name": "Marked Crosswalk"}, "highway/footway/sidewalk": {"icon": "temaki-pedestrian", "geometry": ["line"], "tags": {"footway": "sidewalk"}, "addTags": {"highway": "footway", "footway": "sidewalk"}, "removeTags": {"highway": "footway", "footway": "sidewalk"}, "reference": {"key": "footway", "value": "sidewalk"}, "terms": ["pavement", "sidepath"], "name": "Sidewalk"}, - "highway/footway/unmarked-raised": {"fields": ["crossing", "access", "surface", "kerb", "tactile_paving"], "geometry": ["line"], "addTags": {"highway": "footway", "footway": "crossing", "crossing": "unmarked", "traffic_calming": "table"}, "removeTags": {"highway": "footway", "footway": "crossing", "crossing": "unmarked", "traffic_calming": "table"}, "tags": {"footway": "crossing", "traffic_calming": "table"}, "reference": {"key": "traffic_calming", "value": "table"}, "terms": ["flat top", "hump", "speed", "slow"], "matchScore": 0.95, "name": "Unmarked Crossing (Raised)"}, - "highway/footway/unmarked": {"fields": ["crossing", "access", "surface", "kerb", "tactile_paving"], "geometry": ["line"], "addTags": {"highway": "footway", "footway": "crossing", "crossing": "unmarked"}, "removeTags": {"highway": "footway", "footway": "crossing", "crossing": "unmarked"}, "tags": {"footway": "crossing"}, "reference": {"key": "footway", "value": "crossing"}, "terms": [], "matchScore": 0.95, "name": "Unmarked Crossing"}, + "highway/footway/unmarked-raised": {"fields": ["crossing", "access", "surface", "kerb", "tactile_paving"], "geometry": ["line"], "tags": {"footway": "crossing", "traffic_calming": "table"}, "addTags": {"highway": "footway", "footway": "crossing", "crossing": "unmarked", "traffic_calming": "table"}, "removeTags": {"highway": "footway", "footway": "crossing", "crossing": "unmarked", "traffic_calming": "table"}, "reference": {"key": "traffic_calming", "value": "table"}, "terms": ["flat top", "hump", "speed", "slow"], "matchScore": 0.95, "name": "Unmarked Crossing (Raised)"}, + "highway/footway/unmarked": {"fields": ["crossing", "access", "surface", "kerb", "tactile_paving"], "geometry": ["line"], "tags": {"footway": "crossing"}, "addTags": {"highway": "footway", "footway": "crossing", "crossing": "unmarked"}, "removeTags": {"highway": "footway", "footway": "crossing", "crossing": "unmarked"}, "reference": {"key": "footway", "value": "crossing"}, "terms": [], "matchScore": 0.95, "name": "Unmarked Crossing"}, "highway/give_way": {"icon": "temaki-yield", "fields": ["direction_vertex"], "geometry": ["vertex"], "tags": {"highway": "give_way"}, "terms": ["give way", "yield", "sign"], "name": "Yield Sign"}, "highway/living_street": {"icon": "iD-highway-living-street", "fields": ["name", "oneway", "maxspeed", "lanes", "surface", "structure", "access"], "moreFields": ["cycleway", "maxheight", "covered", "junction_line", "lit", "smoothness", "oneway/bicycle"], "geometry": ["line"], "tags": {"highway": "living_street"}, "name": "Living Street"}, "highway/milestone": {"icon": "temaki-milestone", "geometry": ["point", "vertex"], "fields": ["distance", "direction_vertex"], "tags": {"highway": "milestone"}, "terms": ["milestone", "marker"], "name": "Highway Milestone"}, diff --git a/data/presets/presets/highway/cycleway.json b/data/presets/presets/highway/cycleway.json index 273aa6df6..17ac29364 100644 --- a/data/presets/presets/highway/cycleway.json +++ b/data/presets/presets/highway/cycleway.json @@ -24,7 +24,9 @@ "highway": "cycleway" }, "terms": [ - "bike" + "bike path", + "bicyle path" ], + "matchScore": 0.9, "name": "Cycle Path" } diff --git a/data/presets/presets/highway/cycleway/crossing/marked.json b/data/presets/presets/highway/cycleway/crossing/marked.json new file mode 100644 index 000000000..162ce1e36 --- /dev/null +++ b/data/presets/presets/highway/cycleway/crossing/marked.json @@ -0,0 +1,39 @@ +{ + "icon": "maki-bicycle", + "fields": [ + "crossing", + "access", + "surface", + "kerb", + "tactile_paving" + ], + "geometry": [ + "line" + ], + "tags": { + "cycleway": "crossing", + "crossing": "marked" + }, + "addTags": { + "highway": "cycleway", + "cycleway": "crossing", + "crossing": "marked" + }, + "removeTags": { + "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" +} diff --git a/data/presets/presets/highway/cycleway/crossing/unmarked.json b/data/presets/presets/highway/cycleway/crossing/unmarked.json new file mode 100644 index 000000000..8961b9096 --- /dev/null +++ b/data/presets/presets/highway/cycleway/crossing/unmarked.json @@ -0,0 +1,38 @@ +{ + "icon": "maki-bicycle", + "fields": [ + "crossing", + "access", + "surface", + "kerb", + "tactile_paving" + ], + "geometry": [ + "line" + ], + "tags": { + "cycleway": "crossing" + }, + "addTags": { + "highway": "cycleway", + "cycleway": "crossing", + "crossing": "unmarked" + }, + "removeTags": { + "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" +} diff --git a/data/presets/presets/highway/footway/marked-raised.json b/data/presets/presets/highway/footway/marked-raised.json index 97b7b8609..0cbb86c90 100644 --- a/data/presets/presets/highway/footway/marked-raised.json +++ b/data/presets/presets/highway/footway/marked-raised.json @@ -11,6 +11,7 @@ "line" ], "tags": { + "footway": "crossing", "crossing": "marked", "traffic_calming": "table" }, diff --git a/data/presets/presets/highway/footway/marked.json b/data/presets/presets/highway/footway/marked.json index babbf35d5..f21c12a9a 100644 --- a/data/presets/presets/highway/footway/marked.json +++ b/data/presets/presets/highway/footway/marked.json @@ -11,6 +11,7 @@ "line" ], "tags": { + "footway": "crossing", "crossing": "marked" }, "addTags": { diff --git a/data/presets/presets/highway/footway/unmarked-raised.json b/data/presets/presets/highway/footway/unmarked-raised.json index d89f9bf09..87f828e49 100644 --- a/data/presets/presets/highway/footway/unmarked-raised.json +++ b/data/presets/presets/highway/footway/unmarked-raised.json @@ -9,6 +9,10 @@ "geometry": [ "line" ], + "tags": { + "footway": "crossing", + "traffic_calming": "table" + }, "addTags": { "highway": "footway", "footway": "crossing", @@ -21,10 +25,6 @@ "crossing": "unmarked", "traffic_calming": "table" }, - "tags": { - "footway": "crossing", - "traffic_calming": "table" - }, "reference": { "key": "traffic_calming", "value": "table" diff --git a/data/presets/presets/highway/footway/unmarked.json b/data/presets/presets/highway/footway/unmarked.json index e4457d2a8..97bf270d1 100644 --- a/data/presets/presets/highway/footway/unmarked.json +++ b/data/presets/presets/highway/footway/unmarked.json @@ -9,6 +9,9 @@ "geometry": [ "line" ], + "tags": { + "footway": "crossing" + }, "addTags": { "highway": "footway", "footway": "crossing", @@ -19,9 +22,6 @@ "footway": "crossing", "crossing": "unmarked" }, - "tags": { - "footway": "crossing" - }, "reference": { "key": "footway", "value": "crossing" diff --git a/data/taginfo.json b/data/taginfo.json index d55ca7d81..114faf017 100644 --- a/data/taginfo.json +++ b/data/taginfo.json @@ -411,9 +411,10 @@ {"key": "highway", "value": "corridor", "description": "🄿 Indoor Corridor", "object_types": ["way"], "icon_url": "https://raw.githubusercontent.com/bhousel/temaki/master/icons/pedestrian.svg?sanitize=true"}, {"key": "traffic_calming", "value": "table", "description": "🄿 Marked Crosswalk (Raised) (unsearchable), 🄿 Marked Crosswalk (Raised), 🄿 Unmarked Crossing (Raised), 🄿 Speed Table", "object_types": ["node"], "icon_url": "https://raw.githubusercontent.com/bhousel/temaki/master/icons/pedestrian.svg?sanitize=true"}, {"key": "crossing", "value": "zebra", "description": "🄿 Marked Crosswalk (unsearchable)", "object_types": ["node"], "icon_url": "https://raw.githubusercontent.com/bhousel/temaki/master/icons/pedestrian.svg?sanitize=true"}, - {"key": "crossing", "value": "marked", "description": "🄿 Marked Crosswalk", "object_types": ["node"], "icon_url": "https://raw.githubusercontent.com/bhousel/temaki/master/icons/pedestrian.svg?sanitize=true"}, + {"key": "crossing", "value": "marked", "description": "🄿 Marked Crosswalk, 🄿 Marked Cycle Crossing", "object_types": ["node"], "icon_url": "https://raw.githubusercontent.com/bhousel/temaki/master/icons/pedestrian.svg?sanitize=true"}, {"key": "highway", "value": "crossing", "description": "🄿 Unmarked Crossing", "object_types": ["node"]}, {"key": "highway", "value": "cycleway", "description": "🄿 Cycle Path", "object_types": ["way"], "icon_url": "https://raw.githubusercontent.com/mapbox/maki/master/icons/bicycle-15.svg?sanitize=true"}, + {"key": "cycleway", "value": "crossing", "description": "🄿 Unmarked Cycle Crossing", "object_types": ["way"], "icon_url": "https://raw.githubusercontent.com/mapbox/maki/master/icons/bicycle-15.svg?sanitize=true"}, {"key": "highway", "value": "elevator", "description": "🄿 Elevator", "object_types": ["node"], "icon_url": "https://raw.githubusercontent.com/bhousel/temaki/master/icons/elevator.svg?sanitize=true"}, {"key": "highway", "value": "footway", "description": "🄿 Foot Path", "object_types": ["way"], "icon_url": "https://raw.githubusercontent.com/bhousel/temaki/master/icons/pedestrian.svg?sanitize=true"}, {"key": "conveying", "description": "🄿 Moving Walkway, 🄿 Escalator", "object_types": ["way"], "icon_url": "https://raw.githubusercontent.com/bhousel/temaki/master/icons/pedestrian.svg?sanitize=true"}, diff --git a/dist/locales/en.json b/dist/locales/en.json index 25bd33cf5..4e3e920ff 100644 --- a/dist/locales/en.json +++ b/dist/locales/en.json @@ -5636,7 +5636,15 @@ }, "highway/cycleway": { "name": "Cycle Path", - "terms": "bike" + "terms": "bike path,bicyle path" + }, + "highway/cycleway/crossing/marked": { + "name": "Marked Cycle Crossing", + "terms": "cycle crosswalk,cycle path crossing,cycleway crossing,bicycle crossing,bike crossing" + }, + "highway/cycleway/crossing/unmarked": { + "name": "Unmarked Cycle Crossing", + "terms": "cycle path crossing,cycleway crossing,bicycle crossing,bike crossing" }, "highway/elevator": { "name": "Elevator",