From dafcc7dd5935aa55c558eb6f922fdad34f138fd8 Mon Sep 17 00:00:00 2001
From: Quincy Morgan <quincy.morgan@icloud.com>
Date: Tue, 20 Aug 2019 16:32:42 -0500
Subject: [PATCH] Reorder power pole and power tower fields (re: #6762)

---
 data/presets.yaml                     | 1 -
 data/presets/presets.json             | 4 ++--
 data/presets/presets/power/pole.json  | 6 +++---
 data/presets/presets/power/tower.json | 8 ++++----
 4 files changed, 9 insertions(+), 10 deletions(-)

diff --git a/data/presets.yaml b/data/presets.yaml
index a99e03790..d9c2f9a07 100644
--- a/data/presets.yaml
+++ b/data/presets.yaml
@@ -1153,7 +1153,6 @@ en:
       line_attachment:
         # line_attachment=*
         label: Line Attachment
-        terms: '[translate with synonyms or related terms for ''Line Attachment'', separated by commas]'
       lit:
         # lit=*
         label: Lit
diff --git a/data/presets/presets.json b/data/presets/presets.json
index 118e4975b..12fb9b3bc 100644
--- a/data/presets/presets.json
+++ b/data/presets/presets.json
@@ -892,10 +892,10 @@
     "power/line": {"icon": "iD-power-line", "fields": ["name", "operator", "voltage", "ref", "layer"], "geometry": ["line"], "terms": ["electric power transmission line", "high voltage line", "high tension line"], "tags": {"power": "line"}, "name": "Power Line"},
     "power/minor_line": {"icon": "iD-power-line", "fields": ["name", "operator", "voltage", "ref", "layer"], "geometry": ["line"], "tags": {"power": "minor_line"}, "name": "Minor Power Line"},
     "power/plant": {"icon": "maki-industry", "fields": ["name", "operator", "address", "plant/output/electricity", "start_date"], "geometry": ["area"], "tags": {"power": "plant"}, "addTags": {"power": "plant", "landuse": "industrial"}, "terms": ["coal", "gas", "generat*", "hydro", "nuclear", "power", "station"], "name": "Power Station Grounds"},
-    "power/pole": {"fields": ["ref", "material", "operator", "manufacturer"], "moreFields": ["line_attachment"], "geometry": ["point", "vertex"], "tags": {"power": "pole"}, "name": "Power Pole"},
+    "power/pole": {"fields": ["ref", "operator", "material", "line_attachment"], "moreFields": ["manufacturer"], "geometry": ["point", "vertex"], "tags": {"power": "pole"}, "name": "Power Pole"},
     "power/substation": {"icon": "temaki-power", "fields": ["substation", "operator", "building", "ref"], "geometry": ["point", "area"], "tags": {"power": "substation"}, "name": "Substation"},
     "power/switch": {"icon": "temaki-power", "fields": ["switch", "operator", "location", "cables", "voltage", "ref"], "geometry": ["point", "vertex"], "tags": {"power": "switch"}, "name": "Power Switch"},
-    "power/tower": {"fields": ["design", "ref", "material", "operator", "manufacturer"], "moreFields": ["line_attachment"], "geometry": ["point", "vertex"], "terms": ["power"], "tags": {"power": "tower"}, "matchScore": 1.05, "name": "High-Voltage Tower"},
+    "power/tower": {"fields": ["ref", "operator", "design", "material", "line_attachment"], "moreFields": ["manufacturer"], "geometry": ["point", "vertex"], "terms": ["power"], "tags": {"power": "tower"}, "matchScore": 1.05, "name": "High-Voltage Tower"},
     "power/transformer": {"icon": "temaki-power", "fields": ["ref", "operator", "transformer", "location", "rating", "devices", "phases"], "moreFields": ["frequency", "manufacturer", "voltage/primary", "voltage/secondary", "voltage/tertiary", "windings", "windings/configuration"], "geometry": ["point", "vertex", "area"], "tags": {"power": "transformer"}, "name": "Transformer"},
     "public_transport/platform_point": {"icon": "maki-rail", "fields": ["name", "network", "operator", "departures_board", "shelter"], "moreFields": ["bench", "bin", "lit", "wheelchair"], "geometry": ["point"], "tags": {"public_transport": "platform"}, "terms": ["platform", "public transit", "public transportation", "transit", "transportation"], "name": "Transit Stop / Platform", "matchScore": 0.6},
     "public_transport/platform": {"icon": "temaki-pedestrian", "fields": ["ref_platform", "network", "operator", "departures_board", "surface"], "moreFields": ["access", "covered", "indoor", "layer", "lit", "wheelchair"], "geometry": ["line", "area"], "tags": {"public_transport": "platform"}, "terms": ["platform", "public transit", "public transportation", "transit", "transportation"], "name": "Transit Platform", "matchScore": 0.6},
diff --git a/data/presets/presets/power/pole.json b/data/presets/presets/power/pole.json
index 9bb50752a..3afc4a316 100644
--- a/data/presets/presets/power/pole.json
+++ b/data/presets/presets/power/pole.json
@@ -1,12 +1,12 @@
 {
     "fields": [
         "ref",
-        "material",
         "operator",
-        "manufacturer"
+        "material",
+        "line_attachment"
     ],
     "moreFields": [
-        "line_attachment"
+        "manufacturer"
     ],
     "geometry": [
         "point",
diff --git a/data/presets/presets/power/tower.json b/data/presets/presets/power/tower.json
index 5684ffd8b..5bd69ab7c 100644
--- a/data/presets/presets/power/tower.json
+++ b/data/presets/presets/power/tower.json
@@ -1,13 +1,13 @@
 {
     "fields": [
-        "design",
         "ref",
-        "material",
         "operator",
-        "manufacturer"
+        "design",
+        "material",
+        "line_attachment"
     ],
     "moreFields": [
-        "line_attachment"
+        "manufacturer"
     ],
     "geometry": [
         "point",