From 3627eaab1615fc27041bb30763f09be619e6fa84 Mon Sep 17 00:00:00 2001
From: Bryan Housel <bryan@mapbox.com>
Date: Thu, 2 Nov 2017 15:14:55 -0400
Subject: [PATCH] Add some more fields to power presets (ref, operator,
 voltage)

---
 data/presets/presets.json                     | 40 +++++++++++++++----
 data/presets/presets/power/_sub_station.json  |  4 +-
 data/presets/presets/power/generator.json     |  3 +-
 .../power/generator/source_nuclear.json       |  3 +-
 .../presets/power/generator/source_wind.json  |  3 +-
 data/presets/presets/power/line.json          |  6 +++
 data/presets/presets/power/minor_line.json    |  8 +++-
 data/presets/presets/power/pole.json          |  5 ++-
 data/presets/presets/power/substation.json    |  3 +-
 data/presets/presets/power/switch.json        |  2 +-
 data/presets/presets/power/tower.json         |  5 ++-
 data/presets/presets/power/transformer.json   |  4 +-
 12 files changed, 69 insertions(+), 17 deletions(-)

diff --git a/data/presets/presets.json b/data/presets/presets.json
index 791011c30..3ec4bcb95 100644
--- a/data/presets/presets.json
+++ b/data/presets/presets.json
@@ -12699,10 +12699,12 @@
             "matchScore": 0.1
         },
         "power/sub_station": {
+            "icon": "poi-power",
             "fields": [
                 "substation",
                 "operator",
-                "building"
+                "building",
+                "ref"
             ],
             "geometry": [
                 "point",
@@ -12725,7 +12727,8 @@
                 "generator/source",
                 "generator/method",
                 "generator/type",
-                "generator/output/electricity"
+                "generator/output/electricity",
+                "ref"
             ],
             "geometry": [
                 "point",
@@ -12750,7 +12753,8 @@
                 "generator/source",
                 "generator/method",
                 "generator/type",
-                "generator/output/electricity"
+                "generator/output/electricity",
+                "ref"
             ],
             "geometry": [
                 "point",
@@ -12783,7 +12787,8 @@
                 "generator/method",
                 "generator/type",
                 "generator/output/electricity",
-                "height"
+                "height",
+                "ref"
             ],
             "geometry": [
                 "point",
@@ -12809,6 +12814,12 @@
         },
         "power/line": {
             "icon": "power-line",
+            "fields": [
+                "name",
+                "operator",
+                "voltage",
+                "ref"
+            ],
             "geometry": [
                 "line"
             ],
@@ -12819,6 +12830,12 @@
         },
         "power/minor_line": {
             "icon": "power-line",
+            "fields": [
+                "name",
+                "operator",
+                "voltage",
+                "ref"
+            ],
             "geometry": [
                 "line"
             ],
@@ -12862,6 +12879,9 @@
             "name": "Power Station Grounds"
         },
         "power/pole": {
+            "fields": [
+                "ref"
+            ],
             "geometry": [
                 "vertex"
             ],
@@ -12875,7 +12895,8 @@
             "fields": [
                 "substation",
                 "operator",
-                "building"
+                "building",
+                "ref"
             ],
             "geometry": [
                 "point",
@@ -12890,10 +12911,10 @@
             "icon": "poi-power",
             "fields": [
                 "switch",
+                "operator",
                 "location",
                 "cables",
                 "voltage",
-                "operator",
                 "ref"
             ],
             "geometry": [
@@ -12907,6 +12928,9 @@
             "name": "Power Switch"
         },
         "power/tower": {
+            "fields": [
+                "ref"
+            ],
             "geometry": [
                 "vertex"
             ],
@@ -12919,6 +12943,7 @@
             "icon": "poi-power",
             "fields": [
                 "transformer",
+                "operator",
                 "location",
                 "rating",
                 "devices",
@@ -12928,7 +12953,8 @@
                 "voltage/secondary",
                 "voltage/tertiary",
                 "windings",
-                "windings/configuration"
+                "windings/configuration",
+                "ref"
             ],
             "geometry": [
                 "point",
diff --git a/data/presets/presets/power/_sub_station.json b/data/presets/presets/power/_sub_station.json
index 05c8f1f2a..6f75de3f5 100644
--- a/data/presets/presets/power/_sub_station.json
+++ b/data/presets/presets/power/_sub_station.json
@@ -1,8 +1,10 @@
 {
+    "icon": "poi-power",
     "fields": [
         "substation",
         "operator",
-        "building"
+        "building",
+        "ref"
     ],
     "geometry": [
         "point",
diff --git a/data/presets/presets/power/generator.json b/data/presets/presets/power/generator.json
index 1ff06547e..f52fef86d 100644
--- a/data/presets/presets/power/generator.json
+++ b/data/presets/presets/power/generator.json
@@ -5,7 +5,8 @@
         "generator/source",
         "generator/method",
         "generator/type",
-        "generator/output/electricity"
+        "generator/output/electricity",
+        "ref"
     ],
     "geometry": [
         "point",
diff --git a/data/presets/presets/power/generator/source_nuclear.json b/data/presets/presets/power/generator/source_nuclear.json
index 753a3eda4..8d83e6f6c 100644
--- a/data/presets/presets/power/generator/source_nuclear.json
+++ b/data/presets/presets/power/generator/source_nuclear.json
@@ -5,7 +5,8 @@
         "generator/source",
         "generator/method",
         "generator/type",
-        "generator/output/electricity"
+        "generator/output/electricity",
+        "ref"
     ],
     "geometry": [
         "point",
diff --git a/data/presets/presets/power/generator/source_wind.json b/data/presets/presets/power/generator/source_wind.json
index 1c62b7e1b..4cf6ca95d 100644
--- a/data/presets/presets/power/generator/source_wind.json
+++ b/data/presets/presets/power/generator/source_wind.json
@@ -6,7 +6,8 @@
         "generator/method",
         "generator/type",
         "generator/output/electricity",
-        "height"
+        "height",
+        "ref"
     ],
     "geometry": [
         "point",
diff --git a/data/presets/presets/power/line.json b/data/presets/presets/power/line.json
index c446480e0..eded63610 100644
--- a/data/presets/presets/power/line.json
+++ b/data/presets/presets/power/line.json
@@ -1,5 +1,11 @@
 {
     "icon": "power-line",
+    "fields": [
+        "name",
+        "operator",
+        "voltage",
+        "ref"
+    ],
     "geometry": [
         "line"
     ],
diff --git a/data/presets/presets/power/minor_line.json b/data/presets/presets/power/minor_line.json
index 9ca424a31..bcf793508 100644
--- a/data/presets/presets/power/minor_line.json
+++ b/data/presets/presets/power/minor_line.json
@@ -1,6 +1,12 @@
 {
     "icon": "power-line",
-    "geometry": [
+    "fields": [
+        "name",
+        "operator",
+        "voltage",
+        "ref"
+    ],
+   "geometry": [
         "line"
     ],
     "tags": {
diff --git a/data/presets/presets/power/pole.json b/data/presets/presets/power/pole.json
index 129f6c11d..c5fdc58b2 100644
--- a/data/presets/presets/power/pole.json
+++ b/data/presets/presets/power/pole.json
@@ -1,4 +1,7 @@
 {
+    "fields": [
+        "ref"
+    ],
     "geometry": [
         "vertex"
     ],
@@ -6,4 +9,4 @@
         "power": "pole"
     },
     "name": "Power Pole"
-}
\ No newline at end of file
+}
diff --git a/data/presets/presets/power/substation.json b/data/presets/presets/power/substation.json
index 451a9b4c6..eb7544814 100644
--- a/data/presets/presets/power/substation.json
+++ b/data/presets/presets/power/substation.json
@@ -3,7 +3,8 @@
     "fields": [
         "substation",
         "operator",
-        "building"
+        "building",
+        "ref"
     ],
     "geometry": [
         "point",
diff --git a/data/presets/presets/power/switch.json b/data/presets/presets/power/switch.json
index 138cfee1e..734b18f48 100644
--- a/data/presets/presets/power/switch.json
+++ b/data/presets/presets/power/switch.json
@@ -2,10 +2,10 @@
     "icon": "poi-power",
     "fields": [
         "switch",
+        "operator",
         "location",
         "cables",
         "voltage",
-        "operator",
         "ref"
     ],
     "geometry": [
diff --git a/data/presets/presets/power/tower.json b/data/presets/presets/power/tower.json
index e745313c6..09ce2afe4 100644
--- a/data/presets/presets/power/tower.json
+++ b/data/presets/presets/power/tower.json
@@ -1,4 +1,7 @@
 {
+    "fields": [
+        "ref"
+    ],
     "geometry": [
         "vertex"
     ],
@@ -6,4 +9,4 @@
         "power": "tower"
     },
     "name": "High-Voltage Tower"
-}
\ No newline at end of file
+}
diff --git a/data/presets/presets/power/transformer.json b/data/presets/presets/power/transformer.json
index f1af8a2ec..a5a851135 100644
--- a/data/presets/presets/power/transformer.json
+++ b/data/presets/presets/power/transformer.json
@@ -2,6 +2,7 @@
     "icon": "poi-power",
     "fields": [
         "transformer",
+        "operator",
         "location",
         "rating",
         "devices",
@@ -11,7 +12,8 @@
         "voltage/secondary",
         "voltage/tertiary",
         "windings",
-        "windings/configuration"
+        "windings/configuration",
+        "ref"
     ],
     "geometry": [
         "point",