Reorder relation preset files - icon, fields, geometry, tags, name

data/presets/presets/type/_multipolygon.json

@@ -1,4 +1,5 @@
 {
+    "icon": "multipolygon",
     "geometry": [
         "area",
         "relation"
@@ -8,7 +9,6 @@
     },
     "removeTags": {},
     "name": "Multipolygon",
-    "icon": "multipolygon",
     "searchable": false,
     "matchScore": 0.1
-}
+}

data/presets/presets/type/boundary.json

@@ -1,14 +1,14 @@
 {
+    "icon": "boundary",
+    "fields": [
+        "name",
+        "boundary"
+    ],
     "geometry": [
         "relation"
     ],
     "tags": {
         "type": "boundary"
     },
-    "name": "Boundary",
-    "icon": "boundary",
-    "fields": [
-        "name",
-        "boundary"
-    ]
-}
+    "name": "Boundary"
+}

data/presets/presets/type/restriction.json

@@ -1,15 +1,15 @@
 {
+    "icon": "restriction",
+    "fields": [
+        "name",
+        "restriction",
+        "except"
+    ],
     "geometry": [
         "relation"
     ],
     "tags": {
         "type": "restriction"
     },
-    "name": "Restriction",
-    "icon": "restriction",
-    "fields": [
-        "name",
-        "restriction",
-        "except"
-    ]
-}
+    "name": "Restriction"
+}

data/presets/presets/type/restriction/no_left_turn.json

@@ -1,5 +1,8 @@
 {
-    "name": "No Left Turn",
+    "icon": "restriction-no-left-turn",
+    "fields": [
+        "except"
+    ],
     "geometry": [
         "relation"
     ],
@@ -7,8 +10,5 @@
         "type": "restriction",
         "restriction": "no_left_turn"
     },
-    "fields": [
-        "except"
-    ],
-    "icon": "restriction-no-left-turn"
+    "name": "No Left Turn"
 }

data/presets/presets/type/restriction/no_right_turn.json

@@ -1,5 +1,8 @@
 {
-    "name": "No Right Turn",
+    "icon": "restriction-no-right-turn",
+    "fields": [
+        "except"
+    ],
     "geometry": [
         "relation"
     ],
@@ -7,8 +10,5 @@
         "type": "restriction",
         "restriction": "no_right_turn"
     },
-    "fields": [
-        "except"
-    ],
-    "icon": "restriction-no-right-turn"
+    "name": "No Right Turn"
 }

data/presets/presets/type/restriction/no_straight_on.json

@@ -1,5 +1,8 @@
 {
-    "name": "No Straight On",
+    "icon": "restriction-no-straight-on",
+    "fields": [
+        "except"
+    ],
     "geometry": [
         "relation"
     ],
@@ -7,8 +10,5 @@
         "type": "restriction",
         "restriction": "no_straight_on"
     },
-    "fields": [
-        "except"
-    ],
-    "icon": "restriction-no-straight-on"
+    "name": "No Straight On"
 }

data/presets/presets/type/restriction/no_u_turn.json

@@ -1,5 +1,8 @@
 {
-    "name": "No U-turn",
+    "icon": "restriction-no-u-turn",
+    "fields": [
+        "except"
+    ],
     "geometry": [
         "relation"
     ],
@@ -7,8 +10,5 @@
         "type": "restriction",
         "restriction": "no_u_turn"
     },
-    "fields": [
-        "except"
-    ],
-    "icon": "restriction-no-u-turn"
+    "name": "No U-turn"
 }

data/presets/presets/type/restriction/only_left_turn.json

@@ -1,5 +1,8 @@
 {
-    "name": "Left Turn Only",
+    "icon": "restriction-only-left-turn",
+    "fields": [
+        "except"
+    ],
     "geometry": [
         "relation"
     ],
@@ -7,8 +10,5 @@
         "type": "restriction",
         "restriction": "only_left_turn"
     },
-    "fields": [
-        "except"
-    ],
-    "icon": "restriction-only-left-turn"
+    "name": "Left Turn Only"
 }

data/presets/presets/type/restriction/only_right_turn.json

@@ -1,5 +1,8 @@
 {
-    "name": "Right Turn Only",
+    "icon": "restriction-only-right-turn",
+    "fields": [
+        "except"
+    ],
     "geometry": [
         "relation"
     ],
@@ -7,8 +10,5 @@
         "type": "restriction",
         "restriction": "only_right_turn"
     },
-    "fields": [
-        "except"
-    ],
-    "icon": "restriction-only-right-turn"
+    "name": "Right Turn Only"
 }

data/presets/presets/type/restriction/only_straight_on.json

@@ -1,5 +1,8 @@
 {
-    "name": "No Turns",
+    "icon": "restriction-only-straight-on",
+    "fields": [
+        "except"
+    ],
     "geometry": [
         "relation"
     ],
@@ -7,8 +10,5 @@
         "type": "restriction",
         "restriction": "only_straight_on"
     },
-    "fields": [
-        "except"
-    ],
-    "icon": "restriction-only-straight-on"
+    "name": "No Turns"
 }

data/presets/presets/type/route.json

@@ -1,11 +1,4 @@
 {
-    "geometry": [
-        "relation"
-    ],
-    "tags": {
-        "type": "route"
-    },
-    "name": "Route",
     "icon": "route",
     "fields": [
         "name",
@@ -13,5 +6,12 @@
         "ref_route",
         "operator",
         "network"
-    ]
+    ],
+    "geometry": [
+        "relation"
+    ],
+    "tags": {
+        "type": "route"
+    },
+    "name": "Route"
 }

data/presets/presets/type/route/bicycle.json

@@ -1,4 +1,11 @@
 {
+    "icon": "route-bicycle",
+    "fields": [
+        "name",
+        "ref_route",
+        "network_bicycle",
+        "cycle_network"
+    ],
     "geometry": [
         "relation"
     ],
@@ -6,12 +13,5 @@
         "type": "route",
         "route": "bicycle"
     },
-    "name": "Cycle Route",
-    "icon": "route-bicycle",
-    "fields": [
-        "name",
-        "ref_route",
-        "network_bicycle",
-        "cycle_network"
-    ]
+    "name": "Cycle Route"
 }

data/presets/presets/type/route/bus.json

@@ -1,4 +1,11 @@
 {
+    "icon": "route-bus",
+    "fields": [
+        "name",
+        "ref_route",
+        "operator",
+        "network"
+    ],
     "geometry": [
         "relation"
     ],
@@ -6,12 +13,5 @@
         "type": "route",
         "route": "bus"
     },
-    "name": "Bus Route",
-    "icon": "route-bus",
-    "fields": [
-        "name",
-        "ref_route",
-        "operator",
-        "network"
-    ]
+    "name": "Bus Route"
 }

data/presets/presets/type/route/detour.json

@@ -1,4 +1,9 @@
 {
+    "icon": "route-detour",
+    "fields": [
+        "name",
+        "ref_route"
+    ],
     "geometry": [
         "relation"
     ],
@@ -6,10 +11,5 @@
         "type": "route",
         "route": "detour"
     },
-    "name": "Detour Route",
-    "icon": "route-detour",
-    "fields": [
-        "name",
-        "ref_route"
-    ]
+    "name": "Detour Route"
 }

data/presets/presets/type/route/ferry.json

@@ -1,4 +1,11 @@
 {
+    "icon": "route-ferry",
+    "fields": [
+        "name",
+        "ref_route",
+        "operator",
+        "network"
+    ],
     "geometry": [
         "relation"
     ],
@@ -6,12 +13,5 @@
         "type": "route",
         "route": "ferry"
     },
-    "name": "Ferry Route",
-    "icon": "route-ferry",
-    "fields": [
-        "name",
-        "ref_route",
-        "operator",
-        "network"
-    ]
+    "name": "Ferry Route"
 }

data/presets/presets/type/route/foot.json

@@ -1,4 +1,11 @@
 {
+    "icon": "route-foot",
+    "fields": [
+        "name",
+        "ref_route",
+        "operator",
+        "network_foot"
+    ],
     "geometry": [
         "relation"
     ],
@@ -6,12 +13,5 @@
         "type": "route",
         "route": "foot"
     },
-    "name": "Foot Route",
-    "icon": "route-foot",
-    "fields": [
-        "name",
-        "ref_route",
-        "operator",
-        "network_foot"
-    ]
+    "name": "Foot Route"
 }

data/presets/presets/type/route/hiking.json

@@ -1,4 +1,11 @@
 {
+    "icon": "route-foot",
+    "fields": [
+        "name",
+        "ref_route",
+        "operator",
+        "network_foot"
+    ],
     "geometry": [
         "relation"
     ],
@@ -6,12 +13,5 @@
         "type": "route",
         "route": "hiking"
     },
-    "name": "Hiking Route",
-    "icon": "route-foot",
-    "fields": [
-        "name",
-        "ref_route",
-        "operator",
-        "network_foot"
-    ]
+    "name": "Hiking Route"
 }

data/presets/presets/type/route/horse.json

@@ -1,4 +1,11 @@
 {
+    "icon": "route-horse",
+    "fields": [
+        "name",
+        "ref_route",
+        "operator",
+        "network_horse"
+    ],
     "geometry": [
         "relation"
     ],
@@ -6,12 +13,5 @@
         "type": "route",
         "route": "horse"
     },
-    "name": "Riding Route",
-    "icon": "route-horse",
-    "fields": [
-        "name",
-        "ref_route",
-        "operator",
-        "network_horse"
-    ]
+    "name": "Riding Route"
 }

data/presets/presets/type/route/pipeline.json

@@ -1,4 +1,10 @@
 {
+    "icon": "route-pipeline",
+    "fields": [
+        "name",
+        "ref_route",
+        "operator"
+    ],
     "geometry": [
         "relation"
     ],
@@ -6,11 +12,5 @@
         "type": "route",
         "route": "pipeline"
     },
-    "name": "Pipeline Route",
-    "icon": "route-pipeline",
-    "fields": [
-        "name",
-        "ref_route",
-        "operator"
-    ]
+    "name": "Pipeline Route"
 }

data/presets/presets/type/route/power.json

@@ -1,4 +1,10 @@
 {
+    "icon": "route-power",
+    "fields": [
+        "name",
+        "ref_route",
+        "operator"
+    ],
     "geometry": [
         "relation"
     ],
@@ -6,11 +12,5 @@
         "type": "route",
         "route": "power"
     },
-    "name": "Power Route",
-    "icon": "route-power",
-    "fields": [
-        "name",
-        "ref_route",
-        "operator"
-    ]
+    "name": "Power Route"
 }

data/presets/presets/type/route/road.json

@@ -1,4 +1,10 @@
 {
+    "icon": "route-road",
+    "fields": [
+        "name",
+        "ref_route",
+        "network_road"
+    ],
     "geometry": [
         "relation"
     ],
@@ -6,11 +12,5 @@
         "type": "route",
         "route": "road"
     },
-    "name": "Road Route",
-    "icon": "route-road",
-    "fields": [
-        "name",
-        "ref_route",
-        "network_road"
-    ]
+    "name": "Road Route"
 }

data/presets/presets/type/route/train.json

@@ -1,4 +1,11 @@
 {
+    "icon": "route-train",
+    "fields": [
+        "name",
+        "ref_route",
+        "operator",
+        "network"
+    ],
     "geometry": [
         "relation"
     ],
@@ -6,12 +13,5 @@
         "type": "route",
         "route": "train"
     },
-    "name": "Train Route",
-    "icon": "route-train",
-    "fields": [
-        "name",
-        "ref_route",
-        "operator",
-        "network"
-    ]
+    "name": "Train Route"
 }

data/presets/presets/type/route/tram.json

@@ -1,4 +1,11 @@
 {
+    "icon": "route-tram",
+    "fields": [
+        "name",
+        "ref_route",
+        "operator",
+        "network"
+    ],
     "geometry": [
         "relation"
     ],
@@ -6,12 +13,5 @@
         "type": "route",
         "route": "tram"
     },
-    "name": "Tram Route",
-    "icon": "route-tram",
-    "fields": [
-        "name",
-        "ref_route",
-        "operator",
-        "network"
-    ]
+    "name": "Tram Route"
 }

data/presets/presets/type/route_master.json

@@ -1,11 +1,4 @@
 {
-    "geometry": [
-        "relation"
-    ],
-    "tags": {
-        "type": "route_master"
-    },
-    "name": "Route Master",
     "icon": "route-master",
     "fields": [
         "name",
@@ -13,5 +6,12 @@
         "ref",
         "operator",
         "network"
-    ]
-}
+    ],
+    "geometry": [
+        "relation"
+    ],
+    "tags": {
+        "type": "route_master"
+    },
+    "name": "Route Master"
+}

data/presets/presets/type/site.json

@@ -1,14 +1,14 @@
 {
+    "icon": "relation",
+    "fields": [
+        "name",
+        "site"
+    ],
     "geometry": [
         "relation"
     ],
     "tags": {
         "type": "site"
     },
-    "name": "Site",
-    "icon": "relation",
-    "fields": [
-        "name",
-        "site"
-    ]
+    "name": "Site"
 }