From 92e2efa46af8c0de97266aad273f7947e8436c11 Mon Sep 17 00:00:00 2001
From: Bryan Housel <bryan@mapbox.com>
Date: Fri, 8 Sep 2017 14:52:48 -0400
Subject: [PATCH] Reorder relation preset files - icon, fields, geometry, tags,
 name

---
 data/presets/presets/type/_multipolygon.json   |  4 ++--
 data/presets/presets/type/boundary.json        | 14 +++++++-------
 data/presets/presets/type/restriction.json     | 16 ++++++++--------
 .../presets/type/restriction/no_left_turn.json | 10 +++++-----
 .../type/restriction/no_right_turn.json        | 10 +++++-----
 .../type/restriction/no_straight_on.json       | 10 +++++-----
 .../presets/type/restriction/no_u_turn.json    | 10 +++++-----
 .../type/restriction/only_left_turn.json       | 10 +++++-----
 .../type/restriction/only_right_turn.json      | 10 +++++-----
 .../type/restriction/only_straight_on.json     | 10 +++++-----
 data/presets/presets/type/route.json           | 16 ++++++++--------
 data/presets/presets/type/route/bicycle.json   | 16 ++++++++--------
 data/presets/presets/type/route/bus.json       | 16 ++++++++--------
 data/presets/presets/type/route/detour.json    | 12 ++++++------
 data/presets/presets/type/route/ferry.json     | 16 ++++++++--------
 data/presets/presets/type/route/foot.json      | 16 ++++++++--------
 data/presets/presets/type/route/hiking.json    | 16 ++++++++--------
 data/presets/presets/type/route/horse.json     | 16 ++++++++--------
 data/presets/presets/type/route/pipeline.json  | 14 +++++++-------
 data/presets/presets/type/route/power.json     | 14 +++++++-------
 data/presets/presets/type/route/road.json      | 14 +++++++-------
 data/presets/presets/type/route/train.json     | 16 ++++++++--------
 data/presets/presets/type/route/tram.json      | 16 ++++++++--------
 data/presets/presets/type/route_master.json    | 18 +++++++++---------
 data/presets/presets/type/site.json            | 12 ++++++------
 25 files changed, 166 insertions(+), 166 deletions(-)

diff --git a/data/presets/presets/type/_multipolygon.json b/data/presets/presets/type/_multipolygon.json
index 01f0f3c21..db6cc93c0 100644
--- a/data/presets/presets/type/_multipolygon.json
+++ b/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
-}
\ No newline at end of file
+}
diff --git a/data/presets/presets/type/boundary.json b/data/presets/presets/type/boundary.json
index 06a46309c..da0f19b96 100644
--- a/data/presets/presets/type/boundary.json
+++ b/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"
-    ]
-}
\ No newline at end of file
+    "name": "Boundary"
+}
diff --git a/data/presets/presets/type/restriction.json b/data/presets/presets/type/restriction.json
index 829f15a06..47a8bf117 100644
--- a/data/presets/presets/type/restriction.json
+++ b/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"
-    ]
-}
\ No newline at end of file
+    "name": "Restriction"
+}
diff --git a/data/presets/presets/type/restriction/no_left_turn.json b/data/presets/presets/type/restriction/no_left_turn.json
index 68a035964..66b231d6c 100644
--- a/data/presets/presets/type/restriction/no_left_turn.json
+++ b/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"
 }
diff --git a/data/presets/presets/type/restriction/no_right_turn.json b/data/presets/presets/type/restriction/no_right_turn.json
index 1fe2b3eb7..c0e2bd4fb 100644
--- a/data/presets/presets/type/restriction/no_right_turn.json
+++ b/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"
 }
diff --git a/data/presets/presets/type/restriction/no_straight_on.json b/data/presets/presets/type/restriction/no_straight_on.json
index b6e20e952..e5c813e0e 100644
--- a/data/presets/presets/type/restriction/no_straight_on.json
+++ b/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"
 }
diff --git a/data/presets/presets/type/restriction/no_u_turn.json b/data/presets/presets/type/restriction/no_u_turn.json
index ce526a5f6..f4b0ed7dd 100644
--- a/data/presets/presets/type/restriction/no_u_turn.json
+++ b/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"
 }
diff --git a/data/presets/presets/type/restriction/only_left_turn.json b/data/presets/presets/type/restriction/only_left_turn.json
index 516f178f1..06d8db52b 100644
--- a/data/presets/presets/type/restriction/only_left_turn.json
+++ b/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"
 }
diff --git a/data/presets/presets/type/restriction/only_right_turn.json b/data/presets/presets/type/restriction/only_right_turn.json
index 428d274e7..9a4b05993 100644
--- a/data/presets/presets/type/restriction/only_right_turn.json
+++ b/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"
 }
diff --git a/data/presets/presets/type/restriction/only_straight_on.json b/data/presets/presets/type/restriction/only_straight_on.json
index 889c441c6..587467014 100644
--- a/data/presets/presets/type/restriction/only_straight_on.json
+++ b/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"
 }
diff --git a/data/presets/presets/type/route.json b/data/presets/presets/type/route.json
index a139b6d8b..37463d61f 100644
--- a/data/presets/presets/type/route.json
+++ b/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"
 }
diff --git a/data/presets/presets/type/route/bicycle.json b/data/presets/presets/type/route/bicycle.json
index 671784201..871c3d6e1 100644
--- a/data/presets/presets/type/route/bicycle.json
+++ b/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"
 }
diff --git a/data/presets/presets/type/route/bus.json b/data/presets/presets/type/route/bus.json
index eb64025c2..ad3a696a6 100644
--- a/data/presets/presets/type/route/bus.json
+++ b/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"
 }
diff --git a/data/presets/presets/type/route/detour.json b/data/presets/presets/type/route/detour.json
index c096a31ab..31013590e 100644
--- a/data/presets/presets/type/route/detour.json
+++ b/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"
 }
diff --git a/data/presets/presets/type/route/ferry.json b/data/presets/presets/type/route/ferry.json
index 3552ca5c2..407aaa5e6 100644
--- a/data/presets/presets/type/route/ferry.json
+++ b/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"
 }
diff --git a/data/presets/presets/type/route/foot.json b/data/presets/presets/type/route/foot.json
index ff03848b5..5a71ab61e 100644
--- a/data/presets/presets/type/route/foot.json
+++ b/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"
 }
diff --git a/data/presets/presets/type/route/hiking.json b/data/presets/presets/type/route/hiking.json
index ae44478ff..059f652d3 100644
--- a/data/presets/presets/type/route/hiking.json
+++ b/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"
 }
diff --git a/data/presets/presets/type/route/horse.json b/data/presets/presets/type/route/horse.json
index 0d71d1867..53c6ddc98 100644
--- a/data/presets/presets/type/route/horse.json
+++ b/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"
 }
diff --git a/data/presets/presets/type/route/pipeline.json b/data/presets/presets/type/route/pipeline.json
index 7d39c3fa3..75413ae16 100644
--- a/data/presets/presets/type/route/pipeline.json
+++ b/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"
 }
diff --git a/data/presets/presets/type/route/power.json b/data/presets/presets/type/route/power.json
index 7014ef50c..232846eea 100644
--- a/data/presets/presets/type/route/power.json
+++ b/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"
 }
diff --git a/data/presets/presets/type/route/road.json b/data/presets/presets/type/route/road.json
index ffb0cac7f..5ea1994ce 100644
--- a/data/presets/presets/type/route/road.json
+++ b/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"
 }
diff --git a/data/presets/presets/type/route/train.json b/data/presets/presets/type/route/train.json
index fa3f7e6d7..f1767eb98 100644
--- a/data/presets/presets/type/route/train.json
+++ b/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"
 }
diff --git a/data/presets/presets/type/route/tram.json b/data/presets/presets/type/route/tram.json
index 4eff2a362..2c45840f4 100644
--- a/data/presets/presets/type/route/tram.json
+++ b/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"
 }
diff --git a/data/presets/presets/type/route_master.json b/data/presets/presets/type/route_master.json
index 223e78648..9a29ce9a4 100644
--- a/data/presets/presets/type/route_master.json
+++ b/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"
-    ]
-}
\ No newline at end of file
+    ],
+    "geometry": [
+        "relation"
+    ],
+    "tags": {
+        "type": "route_master"
+    },
+    "name": "Route Master"
+}
diff --git a/data/presets/presets/type/site.json b/data/presets/presets/type/site.json
index 6796af70f..7d7413c69 100644
--- a/data/presets/presets/type/site.json
+++ b/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"
 }