From 1ffca3ce85d630539c7ebb11454a91770bd76536 Mon Sep 17 00:00:00 2001 From: Bryan Housel Date: Tue, 2 Oct 2018 17:01:04 -0400 Subject: [PATCH] Switch crossing presets to "marked"/"unmarked", retain "zebra" as unsearchable --- data/intro_graph.json | 68 +++++++-------- data/presets.yaml | 83 +++++++++++-------- data/presets/categories.json | 2 +- data/presets/categories/path.json | 2 +- data/presets/defaults.json | 4 +- data/presets/presets.json | 26 +++--- .../_zebra-raised.json} | 5 +- .../{crosswalk.json => crossing/_zebra.json} | 7 +- .../marked-raised.json} | 7 +- .../presets/highway/crossing/marked.json | 25 ++++++ .../highway/crossing/unmarked-raised.json | 35 ++++++++ .../{crossing.json => crossing/unmarked.json} | 10 ++- ...osswalk-raised.json => _zebra-raised.json} | 5 +- .../footway/{crosswalk.json => _zebra.json} | 7 +- ...rossing-raised.json => marked-raised.json} | 7 +- .../footway/{crossing.json => marked.json} | 12 ++- .../presets/highway/footway/sidewalk.json | 5 +- .../highway/footway/unmarked-raised.json | 40 +++++++++ .../presets/highway/footway/unmarked.json | 32 +++++++ data/taginfo.json | 38 +++++---- dist/locales/en.json | 72 +++++++++------- test/spec/actions/merge_nodes.js | 4 +- test/spec/core/difference.js | 4 +- 23 files changed, 356 insertions(+), 144 deletions(-) rename data/presets/presets/highway/{crosswalk-raised.json => crossing/_zebra-raised.json} (80%) rename data/presets/presets/highway/{crosswalk.json => crossing/_zebra.json} (72%) rename data/presets/presets/highway/{crossing-raised.json => crossing/marked-raised.json} (68%) create mode 100644 data/presets/presets/highway/crossing/marked.json create mode 100644 data/presets/presets/highway/crossing/unmarked-raised.json rename data/presets/presets/highway/{crossing.json => crossing/unmarked.json} (57%) rename data/presets/presets/highway/footway/{crosswalk-raised.json => _zebra-raised.json} (82%) rename data/presets/presets/highway/footway/{crosswalk.json => _zebra.json} (76%) rename data/presets/presets/highway/footway/{crossing-raised.json => marked-raised.json} (71%) rename data/presets/presets/highway/footway/{crossing.json => marked.json} (57%) create mode 100644 data/presets/presets/highway/footway/unmarked-raised.json create mode 100644 data/presets/presets/highway/footway/unmarked.json diff --git a/data/intro_graph.json b/data/intro_graph.json index 51fce20fa..1a6132042 100644 --- a/data/intro_graph.json +++ b/data/intro_graph.json @@ -209,7 +209,7 @@ "id": "n1026", "loc": [-85.634762, 41.946056], "tags": { - "crossing": "zebra", + "crossing": "marked", "highway": "crossing" } }, @@ -221,7 +221,7 @@ "id": "n1028", "loc": [-85.634622, 41.946175], "tags": { - "crossing": "zebra", + "crossing": "marked", "highway": "crossing" } }, @@ -6503,7 +6503,7 @@ "id": "n2411", "loc": [-85.63456, 41.945731], "tags": { - "crossing": "zebra", + "crossing": "marked", "highway": "crossing" } }, @@ -8823,7 +8823,7 @@ "id": "n293", "loc": [-85.635816, 41.942673], "tags": { - "crossing": "zebra", + "crossing": "marked", "highway": "crossing" } }, @@ -9484,7 +9484,7 @@ "id": "n308", "loc": [-85.63577, 41.940183], "tags": { - "crossing": "zebra", + "crossing": "marked", "highway": "crossing" } }, @@ -11846,7 +11846,7 @@ "id": "n363", "loc": [-85.632915, 41.943981], "tags": { - "crossing": "zebra", + "crossing": "marked", "highway": "crossing" } }, @@ -11894,7 +11894,7 @@ "id": "n364", "loc": [-85.632724, 41.943969], "tags": { - "crossing": "zebra", + "crossing": "marked", "highway": "crossing" } }, @@ -11986,7 +11986,7 @@ "id": "n366", "loc": [-85.632684, 41.944109], "tags": { - "crossing": "zebra", + "crossing": "marked", "highway": "crossing" } }, @@ -12078,7 +12078,7 @@ "id": "n368", "loc": [-85.63287, 41.944135], "tags": { - "crossing": "zebra", + "crossing": "marked", "highway": "crossing" } }, @@ -15592,7 +15592,7 @@ "id": "n4463", "loc": [-85.620103, 41.950884], "tags": { - "crossing": "zebra", + "crossing": "marked", "highway": "crossing" } }, @@ -16955,7 +16955,7 @@ "id": "n4686", "loc": [-85.635883, 41.94012], "tags": { - "crossing": "zebra", + "crossing": "marked", "highway": "crossing" } }, @@ -16967,7 +16967,7 @@ "id": "n4688", "loc": [-85.635768, 41.940051], "tags": { - "crossing": "zebra", + "crossing": "marked", "highway": "crossing" } }, @@ -16983,7 +16983,7 @@ "id": "n4690", "loc": [-85.635661, 41.940107], "tags": { - "crossing": "zebra", + "crossing": "marked", "highway": "crossing" } }, @@ -19230,7 +19230,7 @@ "id": "n602", "loc": [-85.637038, 41.942543], "tags": { - "crossing": "zebra", + "crossing": "marked", "highway": "crossing" } }, @@ -19762,7 +19762,7 @@ "id": "n720", "loc": [-85.634363, 41.945548], "tags": { - "crossing": "zebra", + "crossing": "marked", "highway": "crossing" } }, @@ -19790,7 +19790,7 @@ "id": "n726", "loc": [-85.633568, 41.944829], "tags": { - "crossing": "zebra", + "crossing": "marked", "highway": "crossing" } }, @@ -19814,7 +19814,7 @@ "id": "n730", "loc": [-85.634344, 41.945699], "tags": { - "crossing": "zebra", + "crossing": "marked", "highway": "crossing" } }, @@ -21430,7 +21430,7 @@ "id": "w129", "nodes": ["n309", "n602", "n603"], "tags": { - "crossing": "zebra", + "crossing": "marked", "footway": "crossing", "highway": "footway" } @@ -21694,7 +21694,7 @@ "id": "w159", "nodes": ["n714", "n720", "n721"], "tags": { - "crossing": "zebra", + "crossing": "marked", "footway": "crossing", "highway": "footway" } @@ -21718,7 +21718,7 @@ "id": "w161", "nodes": ["n713", "n726", "n722"], "tags": { - "crossing": "zebra", + "crossing": "marked", "footway": "crossing", "highway": "footway" } @@ -21727,7 +21727,7 @@ "id": "w162", "nodes": ["n727", "n2411", "n728"], "tags": { - "crossing": "zebra", + "crossing": "marked", "footway": "crossing", "highway": "footway" } @@ -21736,7 +21736,7 @@ "id": "w163", "nodes": ["n729", "n730", "n731"], "tags": { - "crossing": "zebra", + "crossing": "marked", "footway": "crossing", "highway": "footway" } @@ -22211,7 +22211,7 @@ "id": "w219", "nodes": ["n719", "n1026", "n1027"], "tags": { - "crossing": "zebra", + "crossing": "marked", "footway": "crossing", "highway": "footway" } @@ -22227,7 +22227,7 @@ "id": "w220", "nodes": ["n1027", "n1028", "n1019"], "tags": { - "crossing": "zebra", + "crossing": "marked", "footway": "crossing", "highway": "footway" } @@ -26143,7 +26143,7 @@ "id": "w58", "nodes": ["n240", "n293", "n294"], "tags": { - "crossing": "zebra", + "crossing": "marked", "footway": "crossing", "highway": "footway" } @@ -26329,7 +26329,7 @@ "id": "w60", "nodes": ["n239", "n308", "n307"], "tags": { - "crossing": "zebra", + "crossing": "marked", "footway": "crossing", "highway": "footway" } @@ -28338,7 +28338,7 @@ "id": "w770", "nodes": ["n4462", "n4463", "n4464"], "tags": { - "crossing": "zebra", + "crossing": "marked", "footway": "crossing", "highway": "footway" } @@ -28505,7 +28505,7 @@ "id": "w79", "nodes": ["n362", "n363", "n334"], "tags": { - "crossing": "zebra", + "crossing": "marked", "footway": "crossing", "highway": "footway" } @@ -28601,7 +28601,7 @@ "id": "w80", "nodes": ["n334", "n364", "n365"], "tags": { - "crossing": "zebra", + "crossing": "marked", "footway": "crossing", "highway": "footway" } @@ -28685,7 +28685,7 @@ "id": "w81", "nodes": ["n365", "n366", "n367"], "tags": { - "crossing": "zebra", + "crossing": "marked", "footway": "crossing", "highway": "footway" } @@ -28738,7 +28738,7 @@ "id": "w816", "nodes": ["n239", "n4686", "n4687"], "tags": { - "crossing": "zebra", + "crossing": "marked", "footway": "crossing", "highway": "footway" } @@ -28747,7 +28747,7 @@ "id": "w817", "nodes": ["n4687", "n4688", "n4689"], "tags": { - "crossing": "zebra", + "crossing": "marked", "footway": "crossing", "highway": "footway" } @@ -28756,7 +28756,7 @@ "id": "w818", "nodes": ["n4689", "n4690", "n307"], "tags": { - "crossing": "zebra", + "crossing": "marked", "footway": "crossing", "highway": "footway" } @@ -28772,7 +28772,7 @@ "id": "w82", "nodes": ["n724", "n368", "n369"], "tags": { - "crossing": "zebra", + "crossing": "marked", "footway": "crossing", "highway": "footway" } diff --git a/data/presets.yaml b/data/presets.yaml index 5f767b231..baa149787 100644 --- a/data/presets.yaml +++ b/data/presets.yaml @@ -3534,25 +3534,31 @@ en: name: Indoor Corridor # 'terms: gallery,hall,hallway,indoor,passage,passageway' terms: '' - highway/crossing: + highway/crossing/marked: + # 'highway=crossing, crossing=marked' + name: Marked Crosswalk + # 'terms: zebra crossing,marked crossing,crosswalk' + terms: '' + highway/crossing/marked-raised: + # 'highway=crossing, crossing=marked, traffic_calming=table' + name: Marked Crosswalk (Raised) + # 'terms: zebra crossing,marked crossing,crosswalk,flat top,hump,speed,slow' + terms: '' + highway/crossing/unmarked: # highway=crossing - name: Street Crossing - terms: '' - highway/crossing-raised: + name: Unmarked Crossing + terms: '' + highway/crossing/unmarked-raised: # 'highway=crossing, traffic_calming=table' - name: Raised Street Crossing + name: Unmarked Crossing (Raised) # 'terms: flat top,hump,speed,slow' - terms: '' - highway/crosswalk: + terms: '' + highway/crossing/zebra: # 'highway=crossing, crossing=zebra' - name: Pedestrian Crosswalk - # 'terms: zebra crossing' - terms: '' - highway/crosswalk-raised: + name: Marked Crosswalk + highway/crossing/zebra-raised: # 'highway=crossing, crossing=zebra, traffic_calming=table' - name: Raised Pedestrian Crosswalk - # 'terms: zebra crossing,flat top,hump,speed,slow' - terms: '' + name: Marked Crosswalk (Raised) highway/cycleway: # highway=cycleway name: Cycle Path @@ -3568,34 +3574,41 @@ en: name: Foot Path # 'terms: hike,hiking,trackway,trail,walk' terms: '' - highway/footway/conveying/moving-walkway: + highway/footway/conveying: # 'highway=footway, conveying=*' name: Moving Walkway # 'terms: moving sidewalk,autwalk,skywalk,travolator,travelator,travellator,conveyor' terms: '' - highway/footway/crossing: - # 'highway=footway, footway=crossing' - name: Street Crossing - terms: '' - highway/footway/crossing-raised: - # 'highway=footway, footway=crossing, traffic_calming=table' - name: Raised Street Crossing - # 'terms: flat top,hump,speed,slow' - terms: '' - highway/footway/crosswalk: - # 'highway=footway, footway=crossing, crossing=zebra' - name: Pedestrian Crosswalk - # 'terms: zebra crossing' - terms: '' - highway/footway/crosswalk-raised: - # 'highway=footway, footway=crossing, crossing=zebra, traffic_calming=table' - name: Raised Pedestrian Crosswalk - # 'terms: zebra crossing,flat top,hump,speed,slow' - terms: '' + highway/footway/marked: + # 'highway=footway, footway=crossing, crossing=marked' + name: Marked Crosswalk + # 'terms: zebra crossing,marked crossing,crosswalk' + terms: '' + highway/footway/marked-raised: + # 'highway=footway, footway=crossing, crossing=marked, traffic_calming=table' + name: Marked Crosswalk (Raised) + # 'terms: zebra crossing,marked crossing,crosswalk,flat top,hump,speed,slow' + terms: '' highway/footway/sidewalk: # 'highway=footway, footway=sidewalk' name: Sidewalk + # 'terms: pavement,sidepath' terms: '' + highway/footway/unmarked: + # 'highway=footway, footway=crossing' + name: Unmarked Crossing + terms: '' + highway/footway/unmarked-raised: + # 'highway=footway, footway=crossing, traffic_calming=table' + name: Unmarked Crossing (Raised) + # 'terms: flat top,hump,speed,slow' + terms: '' + highway/footway/zebra: + # 'highway=footway, footway=crossing, crossing=zebra' + name: Marked Crosswalk + highway/footway/zebra-raised: + # 'highway=footway, footway=crossing, crossing=zebra, traffic_calming=table' + name: Marked Crosswalk (Raised) highway/give_way: # highway=give_way name: Yield Sign @@ -3728,7 +3741,7 @@ en: name: Steps # 'terms: stairs,staircase' terms: '' - highway/steps/conveying/escalator: + highway/steps/conveying: # 'highway=steps, conveying=*' name: Escalator # 'terms: moving staircase,moving stairway,people mover' diff --git a/data/presets/categories.json b/data/presets/categories.json index 7a3c8bce9..af19ba230 100644 --- a/data/presets/categories.json +++ b/data/presets/categories.json @@ -100,7 +100,7 @@ "geometry": "line", "name": "Path Features", "members": [ - "highway/footway/crosswalk", + "highway/footway/marked", "highway/footway/sidewalk", "highway/steps", "highway/path", diff --git a/data/presets/categories/path.json b/data/presets/categories/path.json index 3bc83a9a1..275e726f3 100644 --- a/data/presets/categories/path.json +++ b/data/presets/categories/path.json @@ -3,7 +3,7 @@ "geometry": "line", "name": "Path Features", "members": [ - "highway/footway/crosswalk", + "highway/footway/marked", "highway/footway/sidewalk", "highway/steps", "highway/path", diff --git a/data/presets/defaults.json b/data/presets/defaults.json index 6feaec2eb..b0c9e52ef 100644 --- a/data/presets/defaults.json +++ b/data/presets/defaults.json @@ -36,8 +36,8 @@ "point" ], "vertex": [ - "highway/crosswalk", - "highway/crossing", + "highway/crossing/marked", + "highway/crossing/unmarked", "railway/level_crossing", "highway/traffic_signals", "highway/turning_circle", diff --git a/data/presets/presets.json b/data/presets/presets.json index b041c56ae..c3196ce4e 100644 --- a/data/presets/presets.json +++ b/data/presets/presets.json @@ -366,19 +366,23 @@ "highway/bridleway": {"fields": ["name", "surface", "width", "structure", "access"], "icon": "iD-highway-bridleway", "geometry": ["line"], "tags": {"highway": "bridleway"}, "terms": ["bridleway", "equestrian", "horse", "trail"], "name": "Bridle Path"}, "highway/bus_guideway": {"icon": "iD-highway-bus-guideway", "fields": ["name", "operator", "oneway"], "geometry": ["line"], "tags": {"highway": "bus_guideway"}, "addTags": {"highway": "bus_guideway", "access": "no", "bus": "designated"}, "removeTags": {"highway": "bus_guideway", "access": "no", "bus": "designated"}, "terms": [], "name": "Bus Guideway"}, "highway/corridor": {"icon": "iD-highway-footway", "fields": ["name", "width", "level", "access_simple"], "geometry": ["line"], "tags": {"highway": "corridor"}, "terms": ["gallery", "hall", "hallway", "indoor", "passage", "passageway"], "name": "Indoor Corridor"}, - "highway/crossing-raised": {"fields": ["crossing", "kerb", "tactile_paving"], "geometry": ["vertex"], "tags": {"highway": "crossing", "traffic_calming": "table"}, "reference": {"key": "traffic_calming", "value": "table"}, "terms": ["flat top", "hump", "speed", "slow"], "name": "Raised Street Crossing"}, - "highway/crossing": {"fields": ["crossing", "kerb", "tactile_paving"], "geometry": ["vertex"], "tags": {"highway": "crossing"}, "reference": {"key": "highway", "value": "crossing"}, "terms": [], "name": "Street Crossing"}, - "highway/crosswalk-raised": {"icon": "temaki-pedestrian", "fields": ["crossing", "kerb", "tactile_paving"], "geometry": ["vertex"], "tags": {"highway": "crossing", "crossing": "zebra", "traffic_calming": "table"}, "reference": {"key": "traffic_calming", "value": "table"}, "terms": ["zebra crossing", "flat top", "hump", "speed", "slow"], "name": "Raised Pedestrian Crosswalk"}, - "highway/crosswalk": {"icon": "temaki-pedestrian", "fields": ["crossing", "kerb", "tactile_paving"], "geometry": ["vertex"], "tags": {"highway": "crossing", "crossing": "zebra"}, "reference": {"key": "highway", "value": "crossing"}, "terms": ["zebra crossing"], "name": "Pedestrian Crosswalk"}, + "highway/crossing/zebra-raised": {"icon": "temaki-pedestrian", "fields": ["crossing", "kerb", "tactile_paving"], "geometry": ["vertex"], "tags": {"highway": "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/crossing/zebra": {"icon": "temaki-pedestrian", "fields": ["crossing", "kerb", "tactile_paving"], "geometry": ["vertex"], "tags": {"highway": "crossing", "crossing": "zebra"}, "reference": {"key": "highway", "value": "crossing"}, "terms": ["zebra crossing", "marked crossing", "crosswalk"], "name": "Marked Crosswalk", "searchable": false}, + "highway/crossing/marked-raised": {"icon": "temaki-pedestrian", "fields": ["crossing", "kerb", "tactile_paving"], "geometry": ["vertex"], "tags": {"highway": "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/crossing/marked": {"icon": "temaki-pedestrian", "fields": ["crossing", "kerb", "tactile_paving"], "geometry": ["vertex"], "tags": {"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"], "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": [], "name": "Unmarked Crossing"}, "highway/cycleway": {"icon": "iD-highway-cycleway", "fields": ["name", "oneway", "surface", "lit", "width", "structure", "access"], "geometry": ["line"], "tags": {"highway": "cycleway"}, "terms": ["bike"], "name": "Cycle Path"}, "highway/elevator": {"icon": "temaki-elevator", "fields": ["access_simple", "opening_hours", "maxweight", "ref"], "geometry": ["vertex"], "tags": {"highway": "elevator"}, "terms": ["lift"], "name": "Elevator"}, "highway/footway": {"icon": "iD-highway-footway", "fields": ["name", "surface", "lit", "width", "structure", "access"], "geometry": ["line"], "terms": ["hike", "hiking", "trackway", "trail", "walk"], "tags": {"highway": "footway"}, "name": "Foot Path"}, - "highway/footway/conveying/moving-walkway": {"icon": "iD-highway-footway", "fields": ["name", "conveying", "access_simple", "lit", "width"], "geometry": ["line"], "terms": ["moving sidewalk", "autwalk", "skywalk", "travolator", "travelator", "travellator", "conveyor"], "tags": {"highway": "footway", "conveying": "*"}, "name": "Moving Walkway"}, - "highway/footway/crossing-raised": {"fields": ["crossing", "access", "surface", "kerb", "tactile_paving"], "geometry": ["line"], "tags": {"highway": "footway", "footway": "crossing", "traffic_calming": "table"}, "reference": {"key": "traffic_calming", "value": "table"}, "terms": ["flat top", "hump", "speed", "slow"], "name": "Raised Street Crossing"}, - "highway/footway/crossing": {"fields": ["crossing", "access", "surface", "kerb", "tactile_paving"], "geometry": ["line"], "tags": {"highway": "footway", "footway": "crossing"}, "reference": {"key": "footway", "value": "crossing"}, "terms": [], "name": "Street Crossing"}, - "highway/footway/crosswalk-raised": {"icon": "iD-highway-footway", "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", "flat top", "hump", "speed", "slow"], "name": "Raised Pedestrian Crosswalk"}, - "highway/footway/crosswalk": {"icon": "iD-highway-footway", "fields": ["crossing", "access", "surface", "kerb", "tactile_paving"], "geometry": ["line"], "tags": {"highway": "footway", "footway": "crossing", "crossing": "zebra"}, "reference": {"key": "footway", "value": "crossing"}, "terms": ["zebra crossing"], "name": "Pedestrian Crosswalk"}, - "highway/footway/sidewalk": {"icon": "iD-highway-footway", "fields": ["surface", "lit", "width", "structure", "access"], "geometry": ["line"], "tags": {"highway": "footway", "footway": "sidewalk"}, "reference": {"key": "footway", "value": "sidewalk"}, "terms": [], "name": "Sidewalk"}, + "highway/footway/zebra-raised": {"icon": "iD-highway-footway", "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": "iD-highway-footway", "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": "iD-highway-footway", "fields": ["name", "conveying", "access_simple", "lit", "width"], "geometry": ["line"], "terms": ["moving sidewalk", "autwalk", "skywalk", "travolator", "travelator", "travellator", "conveyor"], "tags": {"highway": "footway", "conveying": "*"}, "name": "Moving Walkway"}, + "highway/footway/marked-raised": {"icon": "iD-highway-footway", "fields": ["crossing", "access", "surface", "kerb", "tactile_paving"], "geometry": ["line"], "tags": {"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": "iD-highway-footway", "fields": ["crossing", "access", "surface", "kerb", "tactile_paving"], "geometry": ["line"], "tags": {"highway": "footway", "footway": "crossing", "crossing": "marked"}, "reference": {"key": "footway", "value": "crossing"}, "terms": ["zebra crossing", "marked crossing", "crosswalk"], "name": "Marked Crosswalk"}, + "highway/footway/sidewalk": {"icon": "iD-highway-footway", "fields": ["surface", "lit", "width", "structure", "access"], "geometry": ["line"], "tags": {"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": {"highway": "footway", "footway": "crossing", "traffic_calming": "table"}, "reference": {"key": "traffic_calming", "value": "table"}, "terms": ["flat top", "hump", "speed", "slow"], "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": {"highway": "footway", "footway": "crossing"}, "reference": {"key": "footway", "value": "crossing"}, "terms": [], "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", "maxheight", "access", "cycleway"], "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"}, @@ -407,7 +411,7 @@ "highway/services": {"icon": "maki-car", "fields": ["name"], "geometry": ["point", "vertex", "area"], "tags": {"highway": "services"}, "terms": ["services", "travel plaza", "service station"], "name": "Service Area"}, "highway/speed_camera": {"icon": "maki-attraction", "geometry": ["point", "vertex"], "fields": ["direction", "ref"], "tags": {"highway": "speed_camera"}, "terms": [], "name": "Speed Camera"}, "highway/steps": {"icon": "iD-highway-steps", "fields": ["surface", "lit", "width", "incline_steps", "handrail", "step_count"], "geometry": ["line"], "tags": {"highway": "steps"}, "terms": ["stairs", "staircase"], "name": "Steps"}, - "highway/steps/conveying/escalator": {"icon": "maki-entrance", "fields": ["name", "incline_steps", "conveying", "access_simple", "lit", "width", "handrail", "step_count"], "geometry": ["line"], "terms": ["moving staircase", "moving stairway", "people mover"], "tags": {"highway": "steps", "conveying": "*"}, "name": "Escalator"}, + "highway/steps/conveying": {"icon": "maki-entrance", "fields": ["name", "incline_steps", "conveying", "access_simple", "lit", "width", "handrail", "step_count"], "geometry": ["line"], "terms": ["moving staircase", "moving stairway", "people mover"], "tags": {"highway": "steps", "conveying": "*"}, "name": "Escalator"}, "highway/stop": {"icon": "temaki-stop", "fields": ["stop", "direction_vertex"], "geometry": ["vertex"], "tags": {"highway": "stop"}, "terms": ["stop", "halt", "sign"], "name": "Stop Sign"}, "highway/street_lamp": {"icon": "temaki-bulb", "geometry": ["point", "vertex"], "tags": {"highway": "street_lamp"}, "fields": ["lamp_type", "direction", "ref"], "terms": ["streetlight", "street light", "lamp", "light", "gaslight"], "name": "Street Lamp"}, "highway/tertiary_link": {"icon": "iD-highway-tertiary-link", "fields": ["name", "oneway", "maxspeed", "maxspeed/advisory", "lanes", "surface", "structure", "maxheight", "ref_road_number", "cycleway", "access"], "geometry": ["line"], "tags": {"highway": "tertiary_link"}, "terms": ["on ramp", "off ramp", "ramp", "road", "street"], "name": "Tertiary Link"}, diff --git a/data/presets/presets/highway/crosswalk-raised.json b/data/presets/presets/highway/crossing/_zebra-raised.json similarity index 80% rename from data/presets/presets/highway/crosswalk-raised.json rename to data/presets/presets/highway/crossing/_zebra-raised.json index 452d61a6c..3b47aa2b4 100644 --- a/data/presets/presets/highway/crosswalk-raised.json +++ b/data/presets/presets/highway/crossing/_zebra-raised.json @@ -19,10 +19,13 @@ }, "terms": [ "zebra crossing", + "marked crossing", + "crosswalk", "flat top", "hump", "speed", "slow" ], - "name": "Raised Pedestrian Crosswalk" + "name": "Marked Crosswalk (Raised)", + "searchable": false } diff --git a/data/presets/presets/highway/crosswalk.json b/data/presets/presets/highway/crossing/_zebra.json similarity index 72% rename from data/presets/presets/highway/crosswalk.json rename to data/presets/presets/highway/crossing/_zebra.json index f59394d4d..dfbee0997 100644 --- a/data/presets/presets/highway/crosswalk.json +++ b/data/presets/presets/highway/crossing/_zebra.json @@ -17,7 +17,10 @@ "value": "crossing" }, "terms": [ - "zebra crossing" + "zebra crossing", + "marked crossing", + "crosswalk" ], - "name": "Pedestrian Crosswalk" + "name": "Marked Crosswalk", + "searchable": false } diff --git a/data/presets/presets/highway/crossing-raised.json b/data/presets/presets/highway/crossing/marked-raised.json similarity index 68% rename from data/presets/presets/highway/crossing-raised.json rename to data/presets/presets/highway/crossing/marked-raised.json index 1b57fa04e..76316a821 100644 --- a/data/presets/presets/highway/crossing-raised.json +++ b/data/presets/presets/highway/crossing/marked-raised.json @@ -1,4 +1,5 @@ { + "icon": "temaki-pedestrian", "fields": [ "crossing", "kerb", @@ -9,6 +10,7 @@ ], "tags": { "highway": "crossing", + "crossing": "marked", "traffic_calming": "table" }, "reference": { @@ -16,10 +18,13 @@ "value": "table" }, "terms": [ + "zebra crossing", + "marked crossing", + "crosswalk", "flat top", "hump", "speed", "slow" ], - "name": "Raised Street Crossing" + "name": "Marked Crosswalk (Raised)" } diff --git a/data/presets/presets/highway/crossing/marked.json b/data/presets/presets/highway/crossing/marked.json new file mode 100644 index 000000000..a61b71302 --- /dev/null +++ b/data/presets/presets/highway/crossing/marked.json @@ -0,0 +1,25 @@ +{ + "icon": "temaki-pedestrian", + "fields": [ + "crossing", + "kerb", + "tactile_paving" + ], + "geometry": [ + "vertex" + ], + "tags": { + "highway": "crossing", + "crossing": "marked" + }, + "reference": { + "key": "highway", + "value": "crossing" + }, + "terms": [ + "zebra crossing", + "marked crossing", + "crosswalk" + ], + "name": "Marked Crosswalk" +} diff --git a/data/presets/presets/highway/crossing/unmarked-raised.json b/data/presets/presets/highway/crossing/unmarked-raised.json new file mode 100644 index 000000000..9783c1c08 --- /dev/null +++ b/data/presets/presets/highway/crossing/unmarked-raised.json @@ -0,0 +1,35 @@ +{ + "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" + ], + "name": "Unmarked Crossing (Raised)" +} diff --git a/data/presets/presets/highway/crossing.json b/data/presets/presets/highway/crossing/unmarked.json similarity index 57% rename from data/presets/presets/highway/crossing.json rename to data/presets/presets/highway/crossing/unmarked.json index 08c81d23e..54dd7df43 100644 --- a/data/presets/presets/highway/crossing.json +++ b/data/presets/presets/highway/crossing/unmarked.json @@ -7,6 +7,14 @@ "geometry": [ "vertex" ], + "addTags": { + "highway": "crossing", + "crossing": "unmarked" + }, + "removeTags": { + "highway": "crossing", + "crossing": "unmarked" + }, "tags": { "highway": "crossing" }, @@ -15,5 +23,5 @@ "value": "crossing" }, "terms": [], - "name": "Street Crossing" + "name": "Unmarked Crossing" } diff --git a/data/presets/presets/highway/footway/crosswalk-raised.json b/data/presets/presets/highway/footway/_zebra-raised.json similarity index 82% rename from data/presets/presets/highway/footway/crosswalk-raised.json rename to data/presets/presets/highway/footway/_zebra-raised.json index f4da4f255..f6e173680 100644 --- a/data/presets/presets/highway/footway/crosswalk-raised.json +++ b/data/presets/presets/highway/footway/_zebra-raised.json @@ -22,10 +22,13 @@ }, "terms": [ "zebra crossing", + "marked crossing", + "crosswalk", "flat top", "hump", "speed", "slow" ], - "name": "Raised Pedestrian Crosswalk" + "name": "Marked Crosswalk (Raised)", + "searchable": false } diff --git a/data/presets/presets/highway/footway/crosswalk.json b/data/presets/presets/highway/footway/_zebra.json similarity index 76% rename from data/presets/presets/highway/footway/crosswalk.json rename to data/presets/presets/highway/footway/_zebra.json index a73153777..646800847 100644 --- a/data/presets/presets/highway/footway/crosswalk.json +++ b/data/presets/presets/highway/footway/_zebra.json @@ -20,7 +20,10 @@ "value": "crossing" }, "terms": [ - "zebra crossing" + "zebra crossing", + "marked crossing", + "crosswalk" ], - "name": "Pedestrian Crosswalk" + "name": "Marked Crosswalk", + "searchable": false } diff --git a/data/presets/presets/highway/footway/crossing-raised.json b/data/presets/presets/highway/footway/marked-raised.json similarity index 71% rename from data/presets/presets/highway/footway/crossing-raised.json rename to data/presets/presets/highway/footway/marked-raised.json index 0ed1a2b50..d23d080f7 100644 --- a/data/presets/presets/highway/footway/crossing-raised.json +++ b/data/presets/presets/highway/footway/marked-raised.json @@ -1,4 +1,5 @@ { + "icon": "iD-highway-footway", "fields": [ "crossing", "access", @@ -12,6 +13,7 @@ "tags": { "highway": "footway", "footway": "crossing", + "crossing": "marked", "traffic_calming": "table" }, "reference": { @@ -19,10 +21,13 @@ "value": "table" }, "terms": [ + "zebra crossing", + "marked crossing", + "crosswalk", "flat top", "hump", "speed", "slow" ], - "name": "Raised Street Crossing" + "name": "Marked Crosswalk (Raised)" } diff --git a/data/presets/presets/highway/footway/crossing.json b/data/presets/presets/highway/footway/marked.json similarity index 57% rename from data/presets/presets/highway/footway/crossing.json rename to data/presets/presets/highway/footway/marked.json index 293e22af8..71e8e499e 100644 --- a/data/presets/presets/highway/footway/crossing.json +++ b/data/presets/presets/highway/footway/marked.json @@ -1,4 +1,5 @@ { + "icon": "iD-highway-footway", "fields": [ "crossing", "access", @@ -11,12 +12,17 @@ ], "tags": { "highway": "footway", - "footway": "crossing" + "footway": "crossing", + "crossing": "marked" }, "reference": { "key": "footway", "value": "crossing" }, - "terms": [], - "name": "Street Crossing" + "terms": [ + "zebra crossing", + "marked crossing", + "crosswalk" + ], + "name": "Marked Crosswalk" } diff --git a/data/presets/presets/highway/footway/sidewalk.json b/data/presets/presets/highway/footway/sidewalk.json index ed2074fab..48390743e 100644 --- a/data/presets/presets/highway/footway/sidewalk.json +++ b/data/presets/presets/highway/footway/sidewalk.json @@ -18,6 +18,9 @@ "key": "footway", "value": "sidewalk" }, - "terms": [], + "terms": [ + "pavement", + "sidepath" + ], "name": "Sidewalk" } diff --git a/data/presets/presets/highway/footway/unmarked-raised.json b/data/presets/presets/highway/footway/unmarked-raised.json new file mode 100644 index 000000000..03ad8db78 --- /dev/null +++ b/data/presets/presets/highway/footway/unmarked-raised.json @@ -0,0 +1,40 @@ +{ + "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": { + "highway": "footway", + "footway": "crossing", + "traffic_calming": "table" + }, + "reference": { + "key": "traffic_calming", + "value": "table" + }, + "terms": [ + "flat top", + "hump", + "speed", + "slow" + ], + "name": "Unmarked Crossing (Raised)" +} diff --git a/data/presets/presets/highway/footway/unmarked.json b/data/presets/presets/highway/footway/unmarked.json new file mode 100644 index 000000000..c60797fa2 --- /dev/null +++ b/data/presets/presets/highway/footway/unmarked.json @@ -0,0 +1,32 @@ +{ + "fields": [ + "crossing", + "access", + "surface", + "kerb", + "tactile_paving" + ], + "geometry": [ + "line" + ], + "addTags": { + "highway": "footway", + "footway": "crossing", + "crossing": "unmarked" + }, + "removeTags": { + "highway": "footway", + "footway": "crossing", + "crossing": "unmarked" + }, + "tags": { + "highway": "footway", + "footway": "crossing" + }, + "reference": { + "key": "footway", + "value": "crossing" + }, + "terms": [], + "name": "Unmarked Crossing" +} diff --git a/data/taginfo.json b/data/taginfo.json index 9713915ed..2b116be2f 100644 --- a/data/taginfo.json +++ b/data/taginfo.json @@ -2487,22 +2487,30 @@ { "key": "traffic_calming", "value": "table", - "description": "Raised Street Crossing, Raised Pedestrian Crosswalk, Speed Table", - "object_types": ["node"] - }, - { - "key": "highway", - "value": "crossing", - "description": "Street Crossing", - "object_types": ["node"] + "description": "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": "Pedestrian Crosswalk", + "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", + "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", @@ -2530,12 +2538,6 @@ "object_types": ["way"], "icon_url": "https://raw.githubusercontent.com/openstreetmap/iD/master/svg/iD-sprite/presets/highway-footway.svg?sanitize=true" }, - { - "key": "footway", - "value": "crossing", - "description": "Street Crossing", - "object_types": ["way"] - }, { "key": "footway", "value": "sidewalk", @@ -2543,6 +2545,12 @@ "object_types": ["way"], "icon_url": "https://raw.githubusercontent.com/openstreetmap/iD/master/svg/iD-sprite/presets/highway-footway.svg?sanitize=true" }, + { + "key": "footway", + "value": "crossing", + "description": "Unmarked Crossing", + "object_types": ["way"] + }, { "key": "highway", "value": "give_way", diff --git a/dist/locales/en.json b/dist/locales/en.json index 79538ab8a..7f15d4e44 100644 --- a/dist/locales/en.json +++ b/dist/locales/en.json @@ -4534,22 +4534,30 @@ "name": "Indoor Corridor", "terms": "gallery,hall,hallway,indoor,passage,passageway" }, - "highway/crossing-raised": { - "name": "Raised Street Crossing", + "highway/crossing/zebra-raised": { + "name": "Marked Crosswalk (Raised)", + "terms": "zebra crossing,marked crossing,crosswalk,flat top,hump,speed,slow" + }, + "highway/crossing/zebra": { + "name": "Marked Crosswalk", + "terms": "zebra crossing,marked crossing,crosswalk" + }, + "highway/crossing/marked-raised": { + "name": "Marked Crosswalk (Raised)", + "terms": "zebra crossing,marked crossing,crosswalk,flat top,hump,speed,slow" + }, + "highway/crossing/marked": { + "name": "Marked Crosswalk", + "terms": "zebra crossing,marked crossing,crosswalk" + }, + "highway/crossing/unmarked-raised": { + "name": "Unmarked Crossing (Raised)", "terms": "flat top,hump,speed,slow" }, - "highway/crossing": { - "name": "Street Crossing", + "highway/crossing/unmarked": { + "name": "Unmarked Crossing", "terms": "" }, - "highway/crosswalk-raised": { - "name": "Raised Pedestrian Crosswalk", - "terms": "zebra crossing,flat top,hump,speed,slow" - }, - "highway/crosswalk": { - "name": "Pedestrian Crosswalk", - "terms": "zebra crossing" - }, "highway/cycleway": { "name": "Cycle Path", "terms": "bike" @@ -4562,28 +4570,36 @@ "name": "Foot Path", "terms": "hike,hiking,trackway,trail,walk" }, - "highway/footway/conveying/moving-walkway": { + "highway/footway/zebra-raised": { + "name": "Marked Crosswalk (Raised)", + "terms": "zebra crossing,marked crossing,crosswalk,flat top,hump,speed,slow" + }, + "highway/footway/zebra": { + "name": "Marked Crosswalk", + "terms": "zebra crossing,marked crossing,crosswalk" + }, + "highway/footway/conveying": { "name": "Moving Walkway", "terms": "moving sidewalk,autwalk,skywalk,travolator,travelator,travellator,conveyor" }, - "highway/footway/crossing-raised": { - "name": "Raised Street Crossing", - "terms": "flat top,hump,speed,slow" + "highway/footway/marked-raised": { + "name": "Marked Crosswalk (Raised)", + "terms": "zebra crossing,marked crossing,crosswalk,flat top,hump,speed,slow" }, - "highway/footway/crossing": { - "name": "Street Crossing", - "terms": "" - }, - "highway/footway/crosswalk-raised": { - "name": "Raised Pedestrian Crosswalk", - "terms": "zebra crossing,flat top,hump,speed,slow" - }, - "highway/footway/crosswalk": { - "name": "Pedestrian Crosswalk", - "terms": "zebra crossing" + "highway/footway/marked": { + "name": "Marked Crosswalk", + "terms": "zebra crossing,marked crossing,crosswalk" }, "highway/footway/sidewalk": { "name": "Sidewalk", + "terms": "pavement,sidepath" + }, + "highway/footway/unmarked-raised": { + "name": "Unmarked Crossing (Raised)", + "terms": "flat top,hump,speed,slow" + }, + "highway/footway/unmarked": { + "name": "Unmarked Crossing", "terms": "" }, "highway/give_way": { @@ -4698,7 +4714,7 @@ "name": "Steps", "terms": "stairs,staircase" }, - "highway/steps/conveying/escalator": { + "highway/steps/conveying": { "name": "Escalator", "terms": "moving staircase,moving stairway,people mover" }, diff --git a/test/spec/actions/merge_nodes.js b/test/spec/actions/merge_nodes.js index 5bde52beb..8d6c5460a 100644 --- a/test/spec/actions/merge_nodes.js +++ b/test/spec/actions/merge_nodes.js @@ -60,14 +60,14 @@ describe('iD.actionMergeNodes', function () { it('merges two isolated nodes, merging tags, and averaging loc of both interesting nodes', function() { var graph = iD.coreGraph([ iD.osmNode({ id: 'a', loc: [0, -2], tags: { highway: 'traffic_signals' } }), - iD.osmNode({ id: 'b', loc: [0, 2], tags: { crossing: 'zebra' } }) + iD.osmNode({ id: 'b', loc: [0, 2], tags: { crossing: 'marked' } }) ]); graph = iD.actionMergeNodes(['a', 'b'])(graph); expect(graph.hasEntity('a')).to.be.undefined; var survivor = graph.hasEntity('b'); - expect(survivor.tags).to.eql({ highway: 'traffic_signals', crossing: 'zebra' }, 'merge all tags'); + expect(survivor.tags).to.eql({ highway: 'traffic_signals', crossing: 'marked' }, 'merge all tags'); expect(survivor.loc).to.eql([0, 0], 'average loc of both interesting nodes'); }); diff --git a/test/spec/core/difference.js b/test/spec/core/difference.js index b3829127d..623387e5c 100644 --- a/test/spec/core/difference.js +++ b/test/spec/core/difference.js @@ -153,7 +153,7 @@ describe('iD.Difference', function () { describe('#summary', function () { var base = iD.Graph([ - iD.Node({id: 'a', tags: {crossing: 'zebra'}}), + iD.Node({id: 'a', tags: {crossing: 'marked'}}), iD.Node({id: 'b'}), iD.Node({id: 'v'}), iD.Way({id: '-', nodes: ['a', 'b']}) @@ -315,7 +315,7 @@ describe('iD.Difference', function () { }); it('reports a vertex as created when it has tags', function() { - var vertex = iD.Node({id: 'c', tags: {crossing: 'zebra'}}), + var vertex = iD.Node({id: 'c', tags: {crossing: 'marked'}}), way = base.entity('-').addNode('c'), head = base.replace(way).replace(vertex), diff = iD.Difference(base, head);