From 50f892a75b4d1345d56e01864bc13afe253e8948 Mon Sep 17 00:00:00 2001
From: endro <eBin@zrujnowane.pl>
Date: Sat, 18 Oct 2014 13:16:48 +0200
Subject: [PATCH] Prefer power=substation to sub_station

---
 data/presets.yaml                           |  3 +++
 data/presets/presets.json                   | 15 +++++++++++++++
 data/presets/presets/power/sub_station.json |  3 ++-
 data/presets/presets/power/substation.json  | 14 ++++++++++++++
 data/taginfo.json                           |  4 ++++
 dist/locales/en.json                        |  4 ++++
 6 files changed, 42 insertions(+), 1 deletion(-)
 create mode 100644 data/presets/presets/power/substation.json

diff --git a/data/presets.yaml b/data/presets.yaml
index f36548628..3d2509572 100644
--- a/data/presets.yaml
+++ b/data/presets.yaml
@@ -1700,6 +1700,9 @@ en:
       power/sub_station:
         name: Substation
         terms: "<translate with synonyms or related terms for 'Substation', separated by commas>"
+      power/substation:
+        name: Substation
+        terms: "<translate with synonyms or related terms for 'Substation', separated by commas>"
       power/tower:
         name: High-Voltage Tower
         terms: "<translate with synonyms or related terms for 'High-Voltage Tower', separated by commas>"
diff --git a/data/presets/presets.json b/data/presets/presets.json
index 35d20bcd3..a5c90b439 100644
--- a/data/presets/presets.json
+++ b/data/presets/presets.json
@@ -6368,6 +6368,21 @@
         "tags": {
             "power": "sub_station"
         },
+        "name": "Substation",
+        "searchable": false
+    },
+    "power/substation": {
+        "fields": [
+            "operator",
+            "building"
+        ],
+        "geometry": [
+            "point",
+            "area"
+        ],
+        "tags": {
+            "power": "substation"
+        },
         "name": "Substation"
     },
     "power/tower": {
diff --git a/data/presets/presets/power/sub_station.json b/data/presets/presets/power/sub_station.json
index 8c3350f5a..08c0c38b0 100644
--- a/data/presets/presets/power/sub_station.json
+++ b/data/presets/presets/power/sub_station.json
@@ -10,5 +10,6 @@
     "tags": {
         "power": "sub_station"
     },
-    "name": "Substation"
+    "name": "Substation",
+    "searchable": false
 }
diff --git a/data/presets/presets/power/substation.json b/data/presets/presets/power/substation.json
new file mode 100644
index 000000000..b7559051f
--- /dev/null
+++ b/data/presets/presets/power/substation.json
@@ -0,0 +1,14 @@
+{
+    "fields": [
+        "operator",
+        "building"
+    ],
+    "geometry": [
+        "point",
+        "area"
+    ],
+    "tags": {
+        "power": "substation"
+    },
+    "name": "Substation"
+}
diff --git a/data/taginfo.json b/data/taginfo.json
index 0b7844bfd..e65b66a77 100644
--- a/data/taginfo.json
+++ b/data/taginfo.json
@@ -1522,6 +1522,10 @@
             "key": "power",
             "value": "sub_station"
         },
+        {
+            "key": "power",
+            "value": "substation"
+        },
         {
             "key": "power",
             "value": "tower"
diff --git a/dist/locales/en.json b/dist/locales/en.json
index fdcd04bda..9ce5a469b 100644
--- a/dist/locales/en.json
+++ b/dist/locales/en.json
@@ -2702,6 +2702,10 @@
                 "name": "Substation",
                 "terms": ""
             },
+            "power/substation": {
+                "name": "Substation",
+                "terms": ""
+            },
             "power/tower": {
                 "name": "High-Voltage Tower",
                 "terms": ""