From 90210f49329da552226b4c9457090a38b4b83f1f Mon Sep 17 00:00:00 2001 From: Bryan Housel Date: Mon, 21 Nov 2016 11:11:13 -0500 Subject: [PATCH] Add maxheight field and add it to many highway presets (closes #3605) --- data/presets.yaml | 5 ++ data/presets/fields.json | 7 +++ data/presets/fields/maxheight.json | 7 +++ data/presets/presets.json | 52 ++++++++++++++++--- .../presets/highway/living_street.json | 2 + data/presets/presets/highway/motorway.json | 1 + .../presets/highway/motorway_link.json | 2 + data/presets/presets/highway/primary.json | 1 + .../presets/presets/highway/primary_link.json | 2 + data/presets/presets/highway/residential.json | 2 + data/presets/presets/highway/road.json | 6 ++- data/presets/presets/highway/secondary.json | 1 + .../presets/highway/secondary_link.json | 2 + data/presets/presets/highway/service.json | 2 +- .../presets/highway/service/alley.json | 7 ++- .../highway/service/drive-through.json | 7 ++- .../presets/highway/service/driveway.json | 7 ++- .../highway/service/emergency_access.json | 7 ++- .../highway/service/parking_aisle.json | 7 ++- data/presets/presets/highway/tertiary.json | 1 + .../presets/highway/tertiary_link.json | 2 + data/presets/presets/highway/trunk.json | 3 +- data/presets/presets/highway/trunk_link.json | 2 + .../presets/presets/highway/unclassified.json | 2 + dist/locales/en.json | 4 ++ 25 files changed, 120 insertions(+), 21 deletions(-) create mode 100644 data/presets/fields/maxheight.json diff --git a/data/presets.yaml b/data/presets.yaml index f27da634e..809e26c7d 100644 --- a/data/presets.yaml +++ b/data/presets.yaml @@ -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 diff --git a/data/presets/fields.json b/data/presets/fields.json index a5daf3ee8..f723745d7 100644 --- a/data/presets/fields.json +++ b/data/presets/fields.json @@ -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", diff --git a/data/presets/fields/maxheight.json b/data/presets/fields/maxheight.json new file mode 100644 index 000000000..b307ae441 --- /dev/null +++ b/data/presets/fields/maxheight.json @@ -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 +} diff --git a/data/presets/presets.json b/data/presets/presets.json index 186cf7adb..46ebcd5f4 100644 --- a/data/presets/presets.json +++ b/data/presets/presets.json @@ -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": [ diff --git a/data/presets/presets/highway/living_street.json b/data/presets/presets/highway/living_street.json index 8a9b70aec..35bc46c84 100644 --- a/data/presets/presets/highway/living_street.json +++ b/data/presets/presets/highway/living_street.json @@ -5,7 +5,9 @@ "maxspeed", "structure", "access", + "lanes", "surface", + "maxheight", "cycleway" ], "geometry": [ diff --git a/data/presets/presets/highway/motorway.json b/data/presets/presets/highway/motorway.json index c05ac6e54..28adc22ad 100644 --- a/data/presets/presets/highway/motorway.json +++ b/data/presets/presets/highway/motorway.json @@ -7,6 +7,7 @@ "access", "lanes", "surface", + "maxheight", "ref" ], "geometry": [ diff --git a/data/presets/presets/highway/motorway_link.json b/data/presets/presets/highway/motorway_link.json index a42ad9f22..4b9f57be1 100644 --- a/data/presets/presets/highway/motorway_link.json +++ b/data/presets/presets/highway/motorway_link.json @@ -5,7 +5,9 @@ "maxspeed", "structure", "access", + "lanes", "surface", + "maxheight", "ref" ], "geometry": [ diff --git a/data/presets/presets/highway/primary.json b/data/presets/presets/highway/primary.json index a9d54ac8c..25cef6951 100644 --- a/data/presets/presets/highway/primary.json +++ b/data/presets/presets/highway/primary.json @@ -7,6 +7,7 @@ "access", "lanes", "surface", + "maxheight", "ref", "cycleway" ], diff --git a/data/presets/presets/highway/primary_link.json b/data/presets/presets/highway/primary_link.json index 3972c3aea..69851523c 100644 --- a/data/presets/presets/highway/primary_link.json +++ b/data/presets/presets/highway/primary_link.json @@ -5,7 +5,9 @@ "maxspeed", "structure", "access", + "lanes", "surface", + "maxheight", "ref", "cycleway" ], diff --git a/data/presets/presets/highway/residential.json b/data/presets/presets/highway/residential.json index f17d5e565..b268a7467 100644 --- a/data/presets/presets/highway/residential.json +++ b/data/presets/presets/highway/residential.json @@ -5,7 +5,9 @@ "maxspeed", "structure", "access", + "lanes", "surface", + "maxheight", "cycleway" ], "geometry": [ diff --git a/data/presets/presets/highway/road.json b/data/presets/presets/highway/road.json index fa7963776..54a07312f 100644 --- a/data/presets/presets/highway/road.json +++ b/data/presets/presets/highway/road.json @@ -5,7 +5,9 @@ "maxspeed", "structure", "access", - "surface" + "lanes", + "surface", + "maxheight" ], "geometry": [ "line" @@ -15,4 +17,4 @@ }, "terms": [], "name": "Unknown Road" -} \ No newline at end of file +} diff --git a/data/presets/presets/highway/secondary.json b/data/presets/presets/highway/secondary.json index 244e3aaf9..32810f145 100644 --- a/data/presets/presets/highway/secondary.json +++ b/data/presets/presets/highway/secondary.json @@ -7,6 +7,7 @@ "access", "lanes", "surface", + "maxheight", "ref", "cycleway" ], diff --git a/data/presets/presets/highway/secondary_link.json b/data/presets/presets/highway/secondary_link.json index d791f3aec..68e35b56a 100644 --- a/data/presets/presets/highway/secondary_link.json +++ b/data/presets/presets/highway/secondary_link.json @@ -5,7 +5,9 @@ "maxspeed", "structure", "access", + "lanes", "surface", + "maxheight", "ref", "cycleway" ], diff --git a/data/presets/presets/highway/service.json b/data/presets/presets/highway/service.json index 46efb695a..958c403d0 100644 --- a/data/presets/presets/highway/service.json +++ b/data/presets/presets/highway/service.json @@ -7,7 +7,7 @@ "structure", "access", "surface", - "cycleway" + "maxheight" ], "geometry": [ "line" diff --git a/data/presets/presets/highway/service/alley.json b/data/presets/presets/highway/service/alley.json index 9c8c11a86..091f457c4 100644 --- a/data/presets/presets/highway/service/alley.json +++ b/data/presets/presets/highway/service/alley.json @@ -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" -} \ No newline at end of file +} diff --git a/data/presets/presets/highway/service/drive-through.json b/data/presets/presets/highway/service/drive-through.json index 1461ea1cb..f6e3b7c20 100644 --- a/data/presets/presets/highway/service/drive-through.json +++ b/data/presets/presets/highway/service/drive-through.json @@ -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" -} \ No newline at end of file +} diff --git a/data/presets/presets/highway/service/driveway.json b/data/presets/presets/highway/service/driveway.json index 73b1045f7..d86e41427 100644 --- a/data/presets/presets/highway/service/driveway.json +++ b/data/presets/presets/highway/service/driveway.json @@ -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" -} \ No newline at end of file +} diff --git a/data/presets/presets/highway/service/emergency_access.json b/data/presets/presets/highway/service/emergency_access.json index 0345da169..0ecb3dc00 100644 --- a/data/presets/presets/highway/service/emergency_access.json +++ b/data/presets/presets/highway/service/emergency_access.json @@ -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" -} \ No newline at end of file +} diff --git a/data/presets/presets/highway/service/parking_aisle.json b/data/presets/presets/highway/service/parking_aisle.json index 215950ceb..2022f3bec 100644 --- a/data/presets/presets/highway/service/parking_aisle.json +++ b/data/presets/presets/highway/service/parking_aisle.json @@ -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" -} \ No newline at end of file +} diff --git a/data/presets/presets/highway/tertiary.json b/data/presets/presets/highway/tertiary.json index 42e4aa43b..cbd72aac6 100644 --- a/data/presets/presets/highway/tertiary.json +++ b/data/presets/presets/highway/tertiary.json @@ -7,6 +7,7 @@ "access", "lanes", "surface", + "maxheight", "ref", "cycleway" ], diff --git a/data/presets/presets/highway/tertiary_link.json b/data/presets/presets/highway/tertiary_link.json index 8985e1336..51d0c79e8 100644 --- a/data/presets/presets/highway/tertiary_link.json +++ b/data/presets/presets/highway/tertiary_link.json @@ -5,7 +5,9 @@ "maxspeed", "structure", "access", + "lanes", "surface", + "maxheight", "ref", "cycleway" ], diff --git a/data/presets/presets/highway/trunk.json b/data/presets/presets/highway/trunk.json index bd39ee073..a820c1e9d 100644 --- a/data/presets/presets/highway/trunk.json +++ b/data/presets/presets/highway/trunk.json @@ -7,6 +7,7 @@ "access", "lanes", "surface", + "maxheight", "ref" ], "geometry": [ @@ -17,4 +18,4 @@ }, "terms": [], "name": "Trunk Road" -} \ No newline at end of file +} diff --git a/data/presets/presets/highway/trunk_link.json b/data/presets/presets/highway/trunk_link.json index 37b934151..251c832da 100644 --- a/data/presets/presets/highway/trunk_link.json +++ b/data/presets/presets/highway/trunk_link.json @@ -5,7 +5,9 @@ "maxspeed", "structure", "access", + "lanes", "surface", + "maxheight", "ref" ], "geometry": [ diff --git a/data/presets/presets/highway/unclassified.json b/data/presets/presets/highway/unclassified.json index 775550cea..91c06a5c5 100644 --- a/data/presets/presets/highway/unclassified.json +++ b/data/presets/presets/highway/unclassified.json @@ -5,7 +5,9 @@ "maxspeed", "structure", "access", + "lanes", "surface", + "maxheight", "cycleway" ], "geometry": [ diff --git a/dist/locales/en.json b/dist/locales/en.json index 227dc647c..270693cad 100644 --- a/dist/locales/en.json +++ b/dist/locales/en.json @@ -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..."