From 344bc685895a9f0caaa0d316959284144653d99e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Stephan=20B=C3=B6sch-Plepelits?= <skunk@xover.mud.at>
Date: Sat, 15 Jul 2017 21:52:12 +0200
Subject: [PATCH] Improve power category

---
 power.json | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/power.json b/power.json
index d61f3c6..bd045a7 100644
--- a/power.json
+++ b/power.json
@@ -1,15 +1,16 @@
 {
     "type": "overpass",
     "query": {
-        "11": "(node[power~'^(generator)$'];way[power~'^(generator)$'];relation[power~'^(generator)$'];)",
-        "13": "(node[power~'^(generator|station)$'];way[power~'^(generator|station)$'];relation[power~'^(generator|station)$'];)",
-        "16": "(node[power~'^(generator|station|sub_station|transformer)$'];way[power~'^(generator|station|sub_station|transformer)$'];relation[power~'^(generator|station|sub_station|transformer)$'];)"
+        "11": "(node[power~'^(plant)$'];way[power~'^(plant|line)$'];relation[power~'^(plant)$'];)",
+        "13": "(node[power~'^(plant|generator|substation)$'];way[power~'^(plant|line|generator|substation)$'];relation[power~'^(plant|generator|substation)$'];)",
+        "15": "(node[power~'^(plant|generator|substation|transformer|tower)$'];way[power~'^(plant|line|generator|substation|transformer|minor_line)$'];relation[power~'^(plant|generator|substation|transformer)$'];)",
+        "16": "(node[power];way[power];relation[power];)"
     },
     "minZoom": 11,
     "feature": {
         "markerSign": "",
         "body": "{{ tagTrans('power', tags.power) }}\n{% set x='generator:source' %}{% if tags[x] %}<br/>{{ tagTrans('generator:source') }}: {{ tagTransList('generator:source', tags[x]) }}{% endif %}\n{% set x='generator:method' %}{% if tags[x] %}<br/>{{ tagTrans('generator:method') }}: {{ tagTransList('generator:method', tags[x]) }}{% endif %}\n{% set x='generator:type' %}{% if tags[x] %}<br/>{{ tagTransList('generator:type') }}: {{ tagTrans('generator:type', tags[x]) }}{% endif %}",
         "description": "{{ tagTrans('power', tags.power) }}{% set x='generator:source' %}{% if tags[x] %}, {{ tagTransList('generator:source', tags[x]) }}{% endif %}",
-        "priority": "{% if tags.power == 'generator' %}0{% elseif tags.power == 'station' %}1{% else %}2{% endif %}"
+        "priority": "{% if tags.power == 'plant' %}0{% elseif tags.power == 'generator' or tags.power == 'line' %}1{% elseif tags.power == 'substation' %}2{% else %}3{% endif %}"
     }
 }