CalvinBackup/iD
1
0
Fork 0
mirror of https://github.com/FoggedLens/iD.git synced 2026-05-18 14:45:12 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #2686 from ebrelsford/cycleway-preset

Browse Source 
Add cycleway preset field for highways with bike lanes
This commit is contained in:
Bryan Housel
2015-06-15 21:35:03 -04:00
parent be1e3738f1 95b1eb6cce
commit fda8146972
21 changed files with 329 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files
data/presets.yaml
+37
View File
@@ -251,6 +251,43 @@ en:
cuisine:
# 'cuisine=*'
label: Cuisine
cycleway:
# 'cycleway:left=*, cycleway:right=*'
label: Bike Lanes
options:
# lane=yes
lane:
description: A bike lane separated from auto traffic by a painted line
title: Standard bike lane
# none=yes
none:
description: No bike lane
title: None
# opposite=yes
opposite:
description: A bike lane that travels in both directions on a one-way street
title: Contraflow bike lane
# opposite_lane=yes
opposite_lane:
description: A bike lane that travels in the opposite direction of traffic
title: Opposite bike lane
# share_busway=yes
share_busway:
description: A bike lane shared with a bus lane
title: Bike lane shared with bus
# shared_lane=yes
shared_lane:
description: A bike lane with no separation from auto traffic
title: Shared bike lane
# track=yes
track:
description: A bike lane separated from traffic by a physical barrier
title: Bike track
# cycleway field placeholder
placeholder: none
types:
'cycleway:left': Left side
'cycleway:right': Right side
delivery:
# 'delivery=*'
label: Delivery
data/presets/fields.json
+48
View File
@@ -321,6 +321,54 @@
"type": "combo",
"label": "Cuisine"
},
"cycleway": {
"keys": [
"cycleway:left",
"cycleway:right"
],
"reference": {
"key": "cycleway"
},
"type": "cycleway",
"label": "Bike Lanes",
"placeholder": "none",
"strings": {
"types": {
"cycleway:left": "Left side",
"cycleway:right": "Right side"
},
"options": {
"none": {
"title": "None",
"description": "No bike lane"
},
"lane": {
"title": "Standard bike lane",
"description": "A bike lane separated from auto traffic by a painted line"
},
"shared_lane": {
"title": "Shared bike lane",
"description": "A bike lane with no separation from auto traffic"
},
"track": {
"title": "Bike track",
"description": "A bike lane separated from traffic by a physical barrier"
},
"share_busway": {
"title": "Bike lane shared with bus",
"description": "A bike lane shared with a bus lane"
},
"opposite_lane": {
"title": "Opposite bike lane",
"description": "A bike lane that travels in the opposite direction of traffic"
},
"opposite": {
"title": "Contraflow bike lane",
"description": "A bike lane that travels in both directions on a one-way street"
}
}
}
},
"delivery": {
"key": "delivery",
"type": "check",
data/presets/fields/cycleway.json
+43
View File
@@ -0,0 +1,43 @@
{
"keys": ["cycleway:left", "cycleway:right"],
"reference": {"key": "cycleway"},
"type": "cycleway",
"label": "Bike Lanes",
"placeholder": "none",
"strings": {
"types": {
"cycleway:left": "Left side",
"cycleway:right": "Right side"
},
"options": {
"none": {
"title": "None",
"description": "No bike lane"
},
"lane": {
"title": "Standard bike lane",
"description": "A bike lane separated from auto traffic by a painted line"
},
"shared_lane": {
"title": "Shared bike lane",
"description": "A bike lane with no separation from auto traffic"
},
"track": {
"title": "Bike track",
"description": "A bike lane separated from traffic by a physical barrier"
},
"share_busway": {
"title": "Bike lane shared with bus",
"description": "A bike lane shared with a bus lane"
},
"opposite_lane": {
"title": "Opposite bike lane",
"description": "A bike lane that travels in the opposite direction of traffic"
},
"opposite": {
"title": "Contraflow bike lane",
"description": "A bike lane that travels in both directions on a one-way street"
}
}
}
}
data/presets/presets.json
+20 -10
View File
@@ -3938,7 +3938,8 @@
"maxspeed",
"structure",
"access",
"surface"
"surface",
"cycleway"
],
"geometry": [
"line"
@@ -4081,7 +4082,8 @@
"access",
"lanes",
"surface",
"ref"
"ref",
"cycleway"
],
"geometry": [
"line"
@@ -4100,7 +4102,8 @@
"structure",
"access",
"surface",
"ref"
"ref",
"cycleway"
],
"geometry": [
"line"
@@ -4147,7 +4150,8 @@
"maxspeed",
"structure",
"access",
"surface"
"surface",
"cycleway"
],
"geometry": [
"line"
@@ -4199,7 +4203,8 @@
"access",
"lanes",
"surface",
"ref"
"ref",
"cycleway"
],
"geometry": [
"line"
@@ -4218,7 +4223,8 @@
"structure",
"access",
"surface",
"ref"
"ref",
"cycleway"
],
"geometry": [
"line"
@@ -4241,7 +4247,8 @@
"maxspeed",
"structure",
"access",
"surface"
"surface",
"cycleway"
],
"geometry": [
"line"
@@ -4411,7 +4418,8 @@
"access",
"lanes",
"surface",
"ref"
"ref",
"cycleway"
],
"geometry": [
"line"
@@ -4430,7 +4438,8 @@
"structure",
"access",
"surface",
"ref"
"ref",
"cycleway"
],
"geometry": [
"line"
@@ -4548,7 +4557,8 @@
"maxspeed",
"structure",
"access",
"surface"
"surface",
"cycleway"
],
"geometry": [
"line"
data/presets/presets/highway/living_street.json
+2 -1
View File
@@ -5,7 +5,8 @@
"maxspeed",
"structure",
"access",
"surface"
"surface",
"cycleway"
],
"geometry": [
"line"
data/presets/presets/highway/primary.json
+3 -2
View File
@@ -7,7 +7,8 @@
"access",
"lanes",
"surface",
"ref"
"ref",
"cycleway"
],
"geometry": [
"line"
@@ -17,4 +18,4 @@
},
"terms": [],
"name": "Primary Road"
}
}
data/presets/presets/highway/primary_link.json
+2 -1
View File
@@ -6,7 +6,8 @@
"structure",
"access",
"surface",
"ref"
"ref",
"cycleway"
],
"geometry": [
"line"
data/presets/presets/highway/residential.json
+3 -2
View File
@@ -5,7 +5,8 @@
"maxspeed",
"structure",
"access",
"surface"
"surface",
"cycleway"
],
"geometry": [
"line"
@@ -15,4 +16,4 @@
},
"terms": [],
"name": "Residential Road"
}
}
data/presets/presets/highway/secondary.json
+3 -2
View File
@@ -7,7 +7,8 @@
"access",
"lanes",
"surface",
"ref"
"ref",
"cycleway"
],
"geometry": [
"line"
@@ -17,4 +18,4 @@
},
"terms": [],
"name": "Secondary Road"
}
}
data/presets/presets/highway/secondary_link.json
+2 -1
View File
@@ -6,7 +6,8 @@
"structure",
"access",
"surface",
"ref"
"ref",
"cycleway"
],
"geometry": [
"line"
data/presets/presets/highway/service.json
+3 -2
View File
@@ -6,7 +6,8 @@
"maxspeed",
"structure",
"access",
"surface"
"surface",
"cycleway"
],
"geometry": [
"line"
@@ -16,4 +17,4 @@
},
"terms": [],
"name": "Service Road"
}
}
data/presets/presets/highway/tertiary.json
+3 -2
View File
@@ -7,7 +7,8 @@
"access",
"lanes",
"surface",
"ref"
"ref",
"cycleway"
],
"geometry": [
"line"
@@ -17,4 +18,4 @@
},
"terms": [],
"name": "Tertiary Road"
}
}
data/presets/presets/highway/tertiary_link.json
+2 -1
View File
@@ -6,7 +6,8 @@
"structure",
"access",
"surface",
"ref"
"ref",
"cycleway"
],
"geometry": [
"line"
data/presets/presets/highway/unclassified.json
+3 -2
View File
@@ -5,7 +5,8 @@
"maxspeed",
"structure",
"access",
"surface"
"surface",
"cycleway"
],
"geometry": [
"line"
@@ -15,4 +16,4 @@
},
"terms": [],
"name": "Unclassified Road"
}
}
data/presets/schema/field.json
+1
View File
@@ -52,6 +52,7 @@
"address",
"check",
"combo",
"cycleway",
"defaultcheck",
"text",
"maxspeed",