CalvinBackup/iD
1
0
Fork 0
mirror of https://github.com/FoggedLens/iD.git synced 2026-05-20 15:34:49 +02:00
Code Issues Packages Projects Releases Wiki Activity

Attempt to make crossing/crosswalk less confusing

Browse Source 
re: https://lists.openstreetmap.org/pipermail/hot/2015-June/009578.html
This commit is contained in:
Bryan Housel
2015-06-30 23:24:04 -04:00
parent 58cb66f472
commit 4a480f63bb
12 changed files with 41 additions and 36 deletions
Download Patch File Download Diff File Expand all files Collapse all files
data/presets.yaml
+13 -13
View File
@@ -1934,13 +1934,13 @@ en:
terms: "<translate with synonyms or related terms for 'Entrance/Exit', separated by commas>"
footway/crossing:
# 'highway=footway, footway=crossing'
name: Crossing
terms: "<translate with synonyms or related terms for 'Crossing', separated by commas>"
name: Street Crossing
terms: "<translate with synonyms or related terms for 'Street Crossing', separated by commas>"
footway/crosswalk:
# 'highway=footway, footway=crossing, crossing=zebra'
name: Crosswalk
name: Pedestrian Crosswalk
# 'terms: zebra crossing'
terms: "<translate with synonyms or related terms for 'Crosswalk', separated by commas>"
terms: "<translate with synonyms or related terms for 'Pedestrian Crosswalk', separated by commas>"
footway/sidewalk:
# 'highway=footway, footway=sidewalk'
name: Sidewalk
@@ -2003,13 +2003,13 @@ en:
terms: "<translate with synonyms or related terms for 'Indoor Corridor', separated by commas>"
highway/crossing:
# highway=crossing
name: Crossing
terms: "<translate with synonyms or related terms for 'Crossing', separated by commas>"
name: Street Crossing
terms: "<translate with synonyms or related terms for 'Street Crossing', separated by commas>"
highway/crosswalk:
# 'highway=crossing, crossing=zebra'
name: Crosswalk
name: Pedestrian Crosswalk
# 'terms: zebra crossing'
terms: "<translate with synonyms or related terms for 'Crosswalk', separated by commas>"
terms: "<translate with synonyms or related terms for 'Pedestrian Crosswalk', separated by commas>"
highway/cycleway:
# highway=cycleway
name: Cycle Path
@@ -2048,8 +2048,8 @@ en:
terms: "<translate with synonyms or related terms for 'Path', separated by commas>"
highway/pedestrian:
# highway=pedestrian
name: Pedestrian
terms: "<translate with synonyms or related terms for 'Pedestrian', separated by commas>"
name: Pedestrian Street
terms: "<translate with synonyms or related terms for 'Pedestrian Street', separated by commas>"
highway/primary:
# highway=primary
name: Primary Road
@@ -2833,9 +2833,9 @@ en:
terms: "<translate with synonyms or related terms for 'Railway Halt', separated by commas>"
railway/level_crossing:
# railway=level_crossing
name: Level Crossing
# 'terms: crossing,railroad crossing,railway crossing,grade crossing,road through railroad,train crossing'
terms: "<translate with synonyms or related terms for 'Level Crossing', separated by commas>"
name: Railway Crossing
# 'terms: crossing,railroad crossing,level crossing,grade crossing,road through railroad,train crossing'
terms: "<translate with synonyms or related terms for 'Railway Crossing', separated by commas>"
railway/monorail:
# railway=monorail
name: Monorail
data/presets/categories.json
+1
View File
@@ -48,6 +48,7 @@
"name": "Path",
"icon": "category-path",
"members": [
"highway/pedestrian",
"highway/footway",
"highway/cycleway",
"highway/bridleway",
data/presets/categories/path.json
+2 -1
View File
@@ -3,10 +3,11 @@
"name": "Path",
"icon": "category-path",
"members": [
"highway/pedestrian",
"highway/footway",
"highway/cycleway",
"highway/bridleway",
"highway/path",
"highway/steps"
]
}
}
data/presets/defaults.json
+1
View File
@@ -32,6 +32,7 @@
],
"vertex": [
"highway/crosswalk",
"highway/crossing",
"railway/level_crossing",
"highway/traffic_signals",
"highway/turning_circle",
data/presets/presets.json
+8 -7
View File
@@ -3645,9 +3645,10 @@
"footway": "crossing"
},
"terms": [],
"name": "Crossing"
"name": "Street Crossing"
},
"footway/crosswalk": {
"icon": "highway-footway",
"fields": [
"crossing",
"access",
@@ -3666,7 +3667,7 @@
"terms": [
"zebra crossing"
],
"name": "Crosswalk"
"name": "Pedestrian Crosswalk"
},
"footway/sidewalk": {
"fields": [
@@ -3884,7 +3885,7 @@
"highway": "crossing"
},
"terms": [],
"name": "Crossing"
"name": "Street Crossing"
},
"highway/crosswalk": {
"fields": [
@@ -3902,7 +3903,7 @@
"terms": [
"zebra crossing"
],
"name": "Crosswalk"
"name": "Pedestrian Crosswalk"
},
"highway/cycleway": {
"icon": "highway-cycleway",
@@ -4091,7 +4092,7 @@
"highway": "pedestrian"
},
"terms": [],
"name": "Pedestrian"
"name": "Pedestrian Street"
},
"highway/primary": {
"icon": "highway-primary",
@@ -6939,12 +6940,12 @@
"terms": [
"crossing",
"railroad crossing",
"railway crossing",
"level crossing",
"grade crossing",
"road through railroad",
"train crossing"
],
"name": "Level Crossing"
"name": "Railway Crossing"
},
"railway/monorail": {
"icon": "railway-monorail",
data/presets/presets/footway/crossing.json
+1 -1
View File
@@ -14,5 +14,5 @@
"footway": "crossing"
},
"terms": [],
"name": "Crossing"
"name": "Street Crossing"
}
data/presets/presets/footway/crosswalk.json
+2 -1
View File
@@ -1,4 +1,5 @@
{
"icon": "highway-footway",
"fields": [
"crossing",
"access",
@@ -17,5 +18,5 @@
"terms": [
"zebra crossing"
],
"name": "Crosswalk"
"name": "Pedestrian Crosswalk"
}
data/presets/presets/highway/crossing.json
+1 -1
View File
@@ -11,5 +11,5 @@
"highway": "crossing"
},
"terms": [],
"name": "Crossing"
"name": "Street Crossing"
}
data/presets/presets/highway/crosswalk.json
+1 -1
View File
@@ -14,5 +14,5 @@
"terms": [
"zebra crossing"
],
"name": "Crosswalk"
"name": "Pedestrian Crosswalk"
}
data/presets/presets/highway/pedestrian.json
+1 -1
View File
@@ -16,5 +16,5 @@
"highway": "pedestrian"
},
"terms": [],
"name": "Pedestrian"
"name": "Pedestrian Street"
}
data/presets/presets/railway/level_crossing.json
+3 -3
View File
@@ -9,10 +9,10 @@
"terms": [
"crossing",
"railroad crossing",
"railway crossing",
"level crossing",
"grade crossing",
"road through railroad",
"train crossing"
],
"name": "Level Crossing"
}
"name": "Railway Crossing"
}
dist/locales/en.json
Vendored
+7 -7
View File
@@ -2256,11 +2256,11 @@
"terms": ""
},
"footway/crossing": {
"name": "Crossing",
"name": "Street Crossing",
"terms": ""
},
"footway/crosswalk": {
"name": "Crosswalk",
"name": "Pedestrian Crosswalk",
"terms": "zebra crossing"
},
"footway/sidewalk": {
@@ -2320,11 +2320,11 @@
"terms": "indoor"
},
"highway/crossing": {
"name": "Crossing",
"name": "Street Crossing",
"terms": ""
},
"highway/crosswalk": {
"name": "Crosswalk",
"name": "Pedestrian Crosswalk",
"terms": "zebra crossing"
},
"highway/cycleway": {
@@ -2360,7 +2360,7 @@
"terms": "hike,hiking,trackway,trail,walk"
},
"highway/pedestrian": {
"name": "Pedestrian",
"name": "Pedestrian Street",
"terms": ""
},
"highway/primary": {
@@ -3096,8 +3096,8 @@
"terms": "break,interrupt,rest,wait,interruption"
},
"railway/level_crossing": {
"name": "Level Crossing",
"terms": "crossing,railroad crossing,railway crossing,grade crossing,road through railroad,train crossing"
"name": "Railway Crossing",
"terms": "crossing,railroad crossing,level crossing,grade crossing,road through railroad,train crossing"
},
"railway/monorail": {
"name": "Monorail",