Merge pull request #4026 from willemarcel/highway_fields

Change ordering in highway fields presets
openstreetmap · May 8, 2017 · df3f07b · df3f07b
2 parents 1ec672c + 6417476
commit df3f07b
Show file tree

Hide file tree

Showing 18 changed files with 94 additions and 94 deletions.
diff --git a/data/presets/presets.json b/data/presets/presets.json
@@ -5349,10 +5349,10 @@
         "highway/cycleway": {
             "icon": "highway-cycleway",
             "fields": [
+                "oneway",
                 "surface",
                 "lit",
                 "width",
-                "oneway",
                 "structure",
                 "access"
             ],
@@ -5415,11 +5415,11 @@
             "fields": [
                 "oneway",
                 "maxspeed",
-                "structure",
-                "access",
                 "lanes",
                 "surface",
+                "structure",
                 "maxheight",
+                "access",
                 "cycleway"
             ],
             "geometry": [
@@ -5459,14 +5459,14 @@
         "highway/motorway_link": {
             "icon": "highway-motorway-link",
             "fields": [
+                "ref",
                 "oneway_yes",
                 "maxspeed",
-                "structure",
-                "access",
                 "lanes",
                 "surface",
+                "structure",
                 "maxheight",
-                "ref"
+                "access"
             ],
             "geometry": [
                 "line"
@@ -5492,15 +5492,15 @@
         "highway/motorway": {
             "icon": "highway-motorway",
             "fields": [
+                "ref",
                 "oneway_yes",
                 "maxspeed",
-                "structure",
-                "access",
                 "lanes",
                 "surface",
+                "structure",
                 "maxheight",
                 "toll",
-                "ref"
+                "access"
             ],
             "geometry": [
                 "line"
@@ -5575,13 +5575,13 @@
             "fields": [
                 "oneway",
                 "maxspeed",
-                "structure",
-                "access",
                 "lanes",
                 "surface",
                 "maxheight",
                 "ref",
-                "cycleway"
+                "cycleway",
+                "structure",
+                "access"
             ],
             "geometry": [
                 "line"
@@ -5601,13 +5601,13 @@
             "fields": [
                 "oneway",
                 "maxspeed",
-                "structure",
-                "access",
                 "lanes",
                 "surface",
+                "structure",
                 "maxheight",
                 "ref",
-                "cycleway"
+                "cycleway",
+                "access"
             ],
             "geometry": [
                 "line"
@@ -5624,10 +5624,10 @@
                 "oneway",
                 "surface",
                 "sport_racing_motor",
-                "structure",
                 "lit",
                 "width",
-                "lanes"
+                "lanes",
+                "structure"
             ],
             "geometry": [
                 "point",
@@ -5657,12 +5657,12 @@
             "fields": [
                 "oneway",
                 "maxspeed",
-                "structure",
-                "access",
                 "lanes",
                 "surface",
+                "structure",
                 "maxheight",
-                "cycleway"
+                "cycleway",
+                "access"
             ],
             "geometry": [
                 "line"
@@ -5693,11 +5693,11 @@
             "fields": [
                 "oneway",
                 "maxspeed",
-                "structure",
-                "access",
                 "lanes",
                 "surface",
-                "maxheight"
+                "structure",
+                "maxheight",
+                "access"
             ],
             "geometry": [
                 "line"
@@ -5713,13 +5713,13 @@
             "fields": [
                 "oneway",
                 "maxspeed",
-                "structure",
-                "access",
                 "lanes",
                 "surface",
+                "structure",
                 "maxheight",
                 "ref",
-                "cycleway"
+                "cycleway",
+                "access"
             ],
             "geometry": [
                 "line"
@@ -5739,13 +5739,13 @@
             "fields": [
                 "oneway",
                 "maxspeed",
-                "structure",
-                "access",
                 "lanes",
                 "surface",
+                "structure",
                 "maxheight",
                 "ref",
-                "cycleway"
+                "cycleway",
+                "access"
             ],
             "geometry": [
                 "line"
@@ -5762,10 +5762,10 @@
                 "service",
                 "oneway",
                 "maxspeed",
-                "structure",
-                "access",
                 "surface",
-                "maxheight"
+                "structure",
+                "maxheight",
+                "access"
             ],
             "geometry": [
                 "line"
@@ -5991,13 +5991,13 @@
             "fields": [
                 "oneway",
                 "maxspeed",
-                "structure",
-                "access",
                 "lanes",
                 "surface",
+                "structure",
                 "maxheight",
                 "ref",
-                "cycleway"
+                "cycleway",
+                "access"
             ],
             "geometry": [
                 "line"
@@ -6017,13 +6017,13 @@
             "fields": [
                 "oneway",
                 "maxspeed",
-                "structure",
-                "access",
                 "lanes",
                 "surface",
+                "structure",
                 "maxheight",
                 "ref",
-                "cycleway"
+                "cycleway",
+                "access"
             ],
             "geometry": [
                 "line"
@@ -6119,14 +6119,14 @@
         "highway/trunk_link": {
             "icon": "highway-trunk-link",
             "fields": [
+                "ref",
                 "oneway",
                 "maxspeed",
-                "structure",
-                "access",
                 "lanes",
                 "surface",
+                "structure",
                 "maxheight",
-                "ref"
+                "access"
             ],
             "geometry": [
                 "line"
@@ -6144,15 +6144,15 @@
         "highway/trunk": {
             "icon": "highway-trunk",
             "fields": [
+                "ref",
                 "oneway",
                 "maxspeed",
-                "structure",
-                "access",
                 "lanes",
                 "surface",
+                "structure",
                 "maxheight",
                 "toll",
-                "ref"
+                "access"
             ],
             "geometry": [
                 "line"
@@ -6194,12 +6194,12 @@
             "fields": [
                 "oneway",
                 "maxspeed",
-                "structure",
-                "access",
                 "lanes",
                 "surface",
+                "structure",
                 "maxheight",
-                "cycleway"
+                "cycleway",
+                "access"
             ],
             "geometry": [
                 "line"

diff --git a/data/presets/presets/highway/cycleway.json b/data/presets/presets/highway/cycleway.json
@@ -1,10 +1,10 @@
 {
     "icon": "highway-cycleway",
     "fields": [
+        "oneway",
         "surface",
         "lit",
         "width",
-        "oneway",
         "structure",
         "access"
     ],

diff --git a/data/presets/presets/highway/living_street.json b/data/presets/presets/highway/living_street.json
@@ -3,11 +3,11 @@
     "fields": [
         "oneway",
         "maxspeed",
-        "structure",
-        "access",
         "lanes",
         "surface",
+        "structure",
         "maxheight",
+        "access",
         "cycleway"
     ],
     "geometry": [

diff --git a/data/presets/presets/highway/motorway.json b/data/presets/presets/highway/motorway.json
@@ -1,15 +1,15 @@
 {
     "icon": "highway-motorway",
     "fields": [
+        "ref",
         "oneway_yes",
         "maxspeed",
-        "structure",
-        "access",
         "lanes",
         "surface",
+        "structure",
         "maxheight",
         "toll",
-        "ref"
+        "access"
     ],
     "geometry": [
         "line"

diff --git a/data/presets/presets/highway/motorway_link.json b/data/presets/presets/highway/motorway_link.json
@@ -1,14 +1,14 @@
 {
     "icon": "highway-motorway-link",
     "fields": [
+        "ref",
         "oneway_yes",
         "maxspeed",
-        "structure",
-        "access",
         "lanes",
         "surface",
+        "structure",
         "maxheight",
-        "ref"
+        "access"
     ],
     "geometry": [
         "line"

diff --git a/data/presets/presets/highway/primary.json b/data/presets/presets/highway/primary.json
@@ -3,13 +3,13 @@
     "fields": [
         "oneway",
         "maxspeed",
-        "structure",
-        "access",
         "lanes",
         "surface",
+        "structure",
         "maxheight",
         "ref",
-        "cycleway"
+        "cycleway",
+        "access"
     ],
     "geometry": [
         "line"

diff --git a/data/presets/presets/highway/primary_link.json b/data/presets/presets/highway/primary_link.json
@@ -3,13 +3,13 @@
     "fields": [
         "oneway",
         "maxspeed",
-        "structure",
-        "access",
         "lanes",
         "surface",
         "maxheight",
         "ref",
-        "cycleway"
+        "cycleway",
+        "structure",
+        "access"
     ],
     "geometry": [
         "line"

diff --git a/data/presets/presets/highway/raceway.json b/data/presets/presets/highway/raceway.json
@@ -4,10 +4,10 @@
         "oneway",
         "surface",
         "sport_racing_motor",
-        "structure",
         "lit",
         "width",
-        "lanes"
+        "lanes",
+        "structure"
     ],
     "geometry": [
         "point",