CalvinBackup/iD
1
0
Fork 0
mirror of https://github.com/FoggedLens/iD.git synced 2026-05-19 06:58:32 +02:00
Code Issues Packages Projects Releases Wiki Activity

Switch crossing presets to "marked"/"unmarked", retain "zebra" as unsearchable

Browse Source
This commit is contained in:
Bryan Housel
2018-10-02 17:01:04 -04:00
parent 27f31433c6
commit 1ffca3ce85
23 changed files with 356 additions and 144 deletions
Download Patch File Download Diff File Expand all files Collapse all files
data/intro_graph.json
+34 -34
View File
@@ -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"
}
data/presets.yaml
+48 -35
View File
@@ -3534,25 +3534,31 @@ en:
name: Indoor Corridor
# 'terms: gallery,hall,hallway,indoor,passage,passageway'
terms: '<translate with synonyms or related terms for ''Indoor Corridor'', separated by commas>'
highway/crossing:
highway/crossing/marked:
# 'highway=crossing, crossing=marked'
name: Marked Crosswalk
# 'terms: zebra crossing,marked crossing,crosswalk'
terms: '<translate with synonyms or related terms for ''Marked Crosswalk'', separated by commas>'
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: '<translate with synonyms or related terms for ''Marked Crosswalk (Raised)'', separated by commas>'
highway/crossing/unmarked:
# highway=crossing
name: Street Crossing
terms: '<translate with synonyms or related terms for ''Street Crossing'', separated by commas>'
highway/crossing-raised:
name: Unmarked Crossing
terms: '<translate with synonyms or related terms for ''Unmarked Crossing'', separated by commas>'
highway/crossing/unmarked-raised:
# 'highway=crossing, traffic_calming=table'
name: Raised Street Crossing
name: Unmarked Crossing (Raised)
# 'terms: flat top,hump,speed,slow'
terms: '<translate with synonyms or related terms for ''Raised Street Crossing'', separated by commas>'
highway/crosswalk:
terms: '<translate with synonyms or related terms for ''Unmarked Crossing (Raised)'', separated by commas>'
highway/crossing/zebra:
# 'highway=crossing, crossing=zebra'
name: Pedestrian Crosswalk
# 'terms: zebra crossing'
terms: '<translate with synonyms or related terms for ''Pedestrian Crosswalk'', separated by commas>'
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: '<translate with synonyms or related terms for ''Raised Pedestrian Crosswalk'', separated by commas>'
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: '<translate with synonyms or related terms for ''Foot Path'', separated by commas>'
highway/footway/conveying/moving-walkway:
highway/footway/conveying:
# 'highway=footway, conveying=*'
name: Moving Walkway
# 'terms: moving sidewalk,autwalk,skywalk,travolator,travelator,travellator,conveyor'
terms: '<translate with synonyms or related terms for ''Moving Walkway'', separated by commas>'
highway/footway/crossing:
# 'highway=footway, footway=crossing'
name: Street Crossing
terms: '<translate with synonyms or related terms for ''Street Crossing'', separated by commas>'
highway/footway/crossing-raised:
# 'highway=footway, footway=crossing, traffic_calming=table'
name: Raised Street Crossing
# 'terms: flat top,hump,speed,slow'
terms: '<translate with synonyms or related terms for ''Raised Street Crossing'', separated by commas>'
highway/footway/crosswalk:
# 'highway=footway, footway=crossing, crossing=zebra'
name: Pedestrian Crosswalk
# 'terms: zebra crossing'
terms: '<translate with synonyms or related terms for ''Pedestrian Crosswalk'', separated by commas>'
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: '<translate with synonyms or related terms for ''Raised Pedestrian Crosswalk'', separated by commas>'
highway/footway/marked:
# 'highway=footway, footway=crossing, crossing=marked'
name: Marked Crosswalk
# 'terms: zebra crossing,marked crossing,crosswalk'
terms: '<translate with synonyms or related terms for ''Marked Crosswalk'', separated by commas>'
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: '<translate with synonyms or related terms for ''Marked Crosswalk (Raised)'', separated by commas>'
highway/footway/sidewalk:
# 'highway=footway, footway=sidewalk'
name: Sidewalk
# 'terms: pavement,sidepath'
terms: '<translate with synonyms or related terms for ''Sidewalk'', separated by commas>'
highway/footway/unmarked:
# 'highway=footway, footway=crossing'
name: Unmarked Crossing
terms: '<translate with synonyms or related terms for ''Unmarked Crossing'', separated by commas>'
highway/footway/unmarked-raised:
# 'highway=footway, footway=crossing, traffic_calming=table'
name: Unmarked Crossing (Raised)
# 'terms: flat top,hump,speed,slow'
terms: '<translate with synonyms or related terms for ''Unmarked Crossing (Raised)'', separated by commas>'
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: '<translate with synonyms or related terms for ''Steps'', separated by commas>'
highway/steps/conveying/escalator:
highway/steps/conveying:
# 'highway=steps, conveying=*'
name: Escalator
# 'terms: moving staircase,moving stairway,people mover'
data/presets/categories.json
+1 -1
View File
@@ -100,7 +100,7 @@
"geometry": "line",
"name": "Path Features",
"members": [
"highway/footway/crosswalk",
"highway/footway/marked",
"highway/footway/sidewalk",
"highway/steps",
"highway/path",
data/presets/categories/path.json
+1 -1
View File
@@ -3,7 +3,7 @@
"geometry": "line",
"name": "Path Features",
"members": [
"highway/footway/crosswalk",
"highway/footway/marked",
"highway/footway/sidewalk",
"highway/steps",
"highway/path",
data/presets/defaults.json
+2 -2
View File
@@ -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",
data/presets/presets.json
+15 -11
View File
@@ -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"},
data/presets/presets/highway/crosswalk-raised.json → data/presets/presets/highway/crossing/_zebra-raised.json
+4 -1
View File
@@ -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
}
data/presets/presets/highway/crosswalk.json → data/presets/presets/highway/crossing/_zebra.json
+5 -2
View File
@@ -17,7 +17,10 @@
"value": "crossing"
},
"terms": [
"zebra crossing"
"zebra crossing",
"marked crossing",
"crosswalk"
],
"name": "Pedestrian Crosswalk"
"name": "Marked Crosswalk",
"searchable": false
}
data/presets/presets/highway/crossing-raised.json → data/presets/presets/highway/crossing/marked-raised.json
+6 -1
View File
@@ -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)"
}
data/presets/presets/highway/crossing/marked.json
+25
View File
@@ -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"
}
data/presets/presets/highway/crossing/unmarked-raised.json
+35
View File
@@ -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)"
}
data/presets/presets/highway/crossing.json → data/presets/presets/highway/crossing/unmarked.json
+9 -1
View File
@@ -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"
}
data/presets/presets/highway/footway/crosswalk-raised.json → data/presets/presets/highway/footway/_zebra-raised.json
+4 -1
View File
@@ -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
}
data/presets/presets/highway/footway/crosswalk.json → data/presets/presets/highway/footway/_zebra.json
+5 -2
View File
@@ -20,7 +20,10 @@
"value": "crossing"
},
"terms": [
"zebra crossing"
"zebra crossing",
"marked crossing",
"crosswalk"
],
"name": "Pedestrian Crosswalk"
"name": "Marked Crosswalk",
"searchable": false
}
data/presets/presets/highway/footway/crossing-raised.json → data/presets/presets/highway/footway/marked-raised.json
+6 -1
View File
@@ -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)"
}
data/presets/presets/highway/footway/crossing.json → data/presets/presets/highway/footway/marked.json
+9 -3
View File
@@ -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"
}
data/presets/presets/highway/footway/sidewalk.json
+4 -1
View File
@@ -18,6 +18,9 @@
"key": "footway",
"value": "sidewalk"
},
"terms": [],
"terms": [
"pavement",
"sidepath"
],
"name": "Sidewalk"
}
data/presets/presets/highway/footway/unmarked-raised.json
+40
View File
@@ -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)"
}
data/presets/presets/highway/footway/unmarked.json
+32
View File
@@ -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"
}
data/taginfo.json
+23 -15
View File
@@ -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",
dist/locales/en.json
Vendored
+44 -28
View File
@@ -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"
},
test/spec/actions/merge_nodes.js
+2 -2
View File
@@ -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');
});
test/spec/core/difference.js
+2 -2
View File
@@ -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);