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

Add maxheight field and add it to many highway presets

Browse Source 
(closes #3605)
This commit is contained in:
Bryan Housel
2016-11-21 11:11:13 -05:00
parent 6e86c235b1
commit 90210f4932
25 changed files with 120 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files
data/presets.yaml
+5
View File
@@ -598,6 +598,11 @@ en:
map_type:
# map_type=*
label: Type
maxheight:
# maxheight=*
label: Max Height
# maxheight field placeholder
placeholder: '4, 4.5, 5, 14''0", 14''6", 15''0"'
maxspeed:
# maxspeed=*
label: Speed Limit
data/presets/fields.json
+7
View File
@@ -831,6 +831,13 @@
"type": "typeCombo",
"label": "Type"
},
"maxheight": {
"key": "maxheight",
"type": "combo",
"label": "Max Height",
"placeholder": "4, 4.5, 5, 14'0\", 14'6\", 15'0\"",
"snake_case": false
},
"maxspeed": {
"key": "maxspeed",
"type": "maxspeed",
data/presets/fields/maxheight.json
+7
View File
@@ -0,0 +1,7 @@
{
"key": "maxheight",
"type": "combo",
"label": "Max Height",
"placeholder": "4, 4.5, 5, 14'0\", 14'6\", 15'0\"",
"snake_case": false
}
data/presets/presets.json
+45 -7
View File
@@ -4857,7 +4857,9 @@
"maxspeed",
"structure",
"access",
"lanes",
"surface",
"maxheight",
"cycleway"
],
"geometry": [
@@ -4900,7 +4902,9 @@
"maxspeed",
"structure",
"access",
"lanes",
"surface",
"maxheight",
"ref"
],
"geometry": [
@@ -4933,6 +4937,7 @@
"access",
"lanes",
"surface",
"maxheight",
"ref"
],
"geometry": [
@@ -5001,7 +5006,9 @@
"maxspeed",
"structure",
"access",
"lanes",
"surface",
"maxheight",
"ref",
"cycleway"
],
@@ -5027,6 +5034,7 @@
"access",
"lanes",
"surface",
"maxheight",
"ref",
"cycleway"
],
@@ -5071,7 +5079,9 @@
"maxspeed",
"structure",
"access",
"lanes",
"surface",
"maxheight",
"cycleway"
],
"geometry": [
@@ -5104,7 +5114,9 @@
"maxspeed",
"structure",
"access",
"surface"
"lanes",
"surface",
"maxheight"
],
"geometry": [
"line"
@@ -5122,7 +5134,9 @@
"maxspeed",
"structure",
"access",
"lanes",
"surface",
"maxheight",
"ref",
"cycleway"
],
@@ -5148,6 +5162,7 @@
"access",
"lanes",
"surface",
"maxheight",
"ref",
"cycleway"
],
@@ -5169,7 +5184,7 @@
"structure",
"access",
"surface",
"cycleway"
"maxheight"
],
"geometry": [
"line"
@@ -5184,8 +5199,11 @@
"icon": "highway-service",
"fields": [
"oneway",
"maxspeed",
"structure",
"access",
"surface"
"surface",
"maxheight"
],
"geometry": [
"line"
@@ -5200,8 +5218,11 @@
"icon": "highway-service",
"fields": [
"oneway",
"maxspeed",
"structure",
"access",
"surface"
"surface",
"maxheight"
],
"geometry": [
"line"
@@ -5216,8 +5237,11 @@
"icon": "highway-service",
"fields": [
"oneway",
"maxspeed",
"structure",
"access",
"surface"
"surface",
"maxheight"
],
"geometry": [
"line"
@@ -5232,8 +5256,11 @@
"icon": "highway-service",
"fields": [
"oneway",
"maxspeed",
"structure",
"access",
"surface"
"surface",
"maxheight"
],
"geometry": [
"line"
@@ -5248,8 +5275,11 @@
"icon": "highway-service",
"fields": [
"oneway",
"maxspeed",
"structure",
"access",
"surface"
"surface",
"maxheight"
],
"geometry": [
"line"
@@ -5343,7 +5373,9 @@
"maxspeed",
"structure",
"access",
"lanes",
"surface",
"maxheight",
"ref",
"cycleway"
],
@@ -5369,6 +5401,7 @@
"access",
"lanes",
"surface",
"maxheight",
"ref",
"cycleway"
],
@@ -5469,7 +5502,9 @@
"maxspeed",
"structure",
"access",
"lanes",
"surface",
"maxheight",
"ref"
],
"geometry": [
@@ -5494,6 +5529,7 @@
"access",
"lanes",
"surface",
"maxheight",
"ref"
],
"geometry": [
@@ -5538,7 +5574,9 @@
"maxspeed",
"structure",
"access",
"lanes",
"surface",
"maxheight",
"cycleway"
],
"geometry": [
data/presets/presets/highway/living_street.json
+2
View File
@@ -5,7 +5,9 @@
"maxspeed",
"structure",
"access",
"lanes",
"surface",
"maxheight",
"cycleway"
],
"geometry": [
data/presets/presets/highway/motorway.json
+1
View File
@@ -7,6 +7,7 @@
"access",
"lanes",
"surface",
"maxheight",
"ref"
],
"geometry": [
data/presets/presets/highway/motorway_link.json
+2
View File
@@ -5,7 +5,9 @@
"maxspeed",
"structure",
"access",
"lanes",
"surface",
"maxheight",
"ref"
],
"geometry": [
data/presets/presets/highway/primary.json
+1
View File
@@ -7,6 +7,7 @@
"access",
"lanes",
"surface",
"maxheight",
"ref",
"cycleway"
],
data/presets/presets/highway/primary_link.json
+2
View File
@@ -5,7 +5,9 @@
"maxspeed",
"structure",
"access",
"lanes",
"surface",
"maxheight",
"ref",
"cycleway"
],
data/presets/presets/highway/residential.json
+2
View File
@@ -5,7 +5,9 @@
"maxspeed",
"structure",
"access",
"lanes",
"surface",
"maxheight",
"cycleway"
],
"geometry": [
data/presets/presets/highway/road.json
+4 -2
View File
@@ -5,7 +5,9 @@
"maxspeed",
"structure",
"access",
"surface"
"lanes",
"surface",
"maxheight"
],
"geometry": [
"line"
@@ -15,4 +17,4 @@
},
"terms": [],
"name": "Unknown Road"
}
}
data/presets/presets/highway/secondary.json
+1
View File
@@ -7,6 +7,7 @@
"access",
"lanes",
"surface",
"maxheight",
"ref",
"cycleway"
],
data/presets/presets/highway/secondary_link.json
+2
View File
@@ -5,7 +5,9 @@
"maxspeed",
"structure",
"access",
"lanes",
"surface",
"maxheight",
"ref",
"cycleway"
],
data/presets/presets/highway/service.json
+1 -1
View File
@@ -7,7 +7,7 @@
"structure",
"access",
"surface",
"cycleway"
"maxheight"
],
"geometry": [
"line"
data/presets/presets/highway/service/alley.json
+5 -2
View File
@@ -2,8 +2,11 @@
"icon": "highway-service",
"fields": [
"oneway",
"maxspeed",
"structure",
"access",
"surface"
"surface",
"maxheight"
],
"geometry": [
"line"
@@ -13,4 +16,4 @@
"service": "alley"
},
"name": "Alley"
}
}
data/presets/presets/highway/service/drive-through.json
+5 -2
View File
@@ -2,8 +2,11 @@
"icon": "highway-service",
"fields": [
"oneway",
"maxspeed",
"structure",
"access",
"surface"
"surface",
"maxheight"
],
"geometry": [
"line"
@@ -13,4 +16,4 @@
"service": "drive-through"
},
"name": "Drive-Through"
}
}
data/presets/presets/highway/service/driveway.json
+5 -2
View File
@@ -2,8 +2,11 @@
"icon": "highway-service",
"fields": [
"oneway",
"maxspeed",
"structure",
"access",
"surface"
"surface",
"maxheight"
],
"geometry": [
"line"
@@ -13,4 +16,4 @@
"service": "driveway"
},
"name": "Driveway"
}
}
data/presets/presets/highway/service/emergency_access.json
+5 -2
View File
@@ -2,8 +2,11 @@
"icon": "highway-service",
"fields": [
"oneway",
"maxspeed",
"structure",
"access",
"surface"
"surface",
"maxheight"
],
"geometry": [
"line"
@@ -13,4 +16,4 @@
"service": "emergency_access"
},
"name": "Emergency Access"
}
}
data/presets/presets/highway/service/parking_aisle.json
+5 -2
View File
@@ -2,8 +2,11 @@
"icon": "highway-service",
"fields": [
"oneway",
"maxspeed",
"structure",
"access",
"surface"
"surface",
"maxheight"
],
"geometry": [
"line"
@@ -13,4 +16,4 @@
"service": "parking_aisle"
},
"name": "Parking Aisle"
}
}
data/presets/presets/highway/tertiary.json
+1
View File
@@ -7,6 +7,7 @@
"access",
"lanes",
"surface",
"maxheight",
"ref",
"cycleway"
],
data/presets/presets/highway/tertiary_link.json
+2
View File
@@ -5,7 +5,9 @@
"maxspeed",
"structure",
"access",
"lanes",
"surface",
"maxheight",
"ref",
"cycleway"
],
data/presets/presets/highway/trunk.json
+2 -1
View File
@@ -7,6 +7,7 @@
"access",
"lanes",
"surface",
"maxheight",
"ref"
],
"geometry": [
@@ -17,4 +18,4 @@
},
"terms": [],
"name": "Trunk Road"
}
}
data/presets/presets/highway/trunk_link.json
+2
View File
@@ -5,7 +5,9 @@
"maxspeed",
"structure",
"access",
"lanes",
"surface",
"maxheight",
"ref"
],
"geometry": [
data/presets/presets/highway/unclassified.json
+2
View File
@@ -5,7 +5,9 @@
"maxspeed",
"structure",
"access",
"lanes",
"surface",
"maxheight",
"cycleway"
],
"geometry": [
dist/locales/en.json
Vendored
+4
View File
@@ -1163,6 +1163,10 @@
"map_type": {
"label": "Type"
},
"maxheight": {
"label": "Max Height",
"placeholder": "4, 4.5, 5, 14'0\", 14'6\", 15'0\""
},
"maxspeed": {
"label": "Speed Limit",
"placeholder": "40, 50, 60..."