From 5adefe24572128ee4887fba4e14875f1f8c874d8 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Stephan=20B=C3=B6sch-Plepelits?= <skunk@xover.mud.at>
Date: Sat, 27 Oct 2018 06:56:45 +0200
Subject: [PATCH] Energy: add new 'renewables' category

---
 index.json         |  3 +++
 lang/ast.json      |  2 +-
 lang/ca.json       |  2 +-
 lang/cs.json       |  2 +-
 lang/de.json       |  2 +-
 lang/el.json       |  2 +-
 lang/en.json       |  2 +-
 lang/es.json       |  2 +-
 lang/et.json       |  2 +-
 lang/fr.json       |  2 +-
 lang/hu.json       |  2 +-
 lang/it.json       |  2 +-
 lang/ja.json       |  2 +-
 lang/nl.json       |  2 +-
 lang/pl.json       |  2 +-
 lang/pt-br.json    |  2 +-
 lang/pt.json       |  2 +-
 lang/ro.json       |  2 +-
 lang/ru.json       |  2 +-
 lang/template.json |  2 +-
 lang/uk.json       |  2 +-
 renewables.json    | 37 +++++++++++++++++++++++++++++++++++++
 22 files changed, 60 insertions(+), 20 deletions(-)
 create mode 100644 renewables.json

diff --git a/index.json b/index.json
index 1b56e051e..2fbd6b829 100644
--- a/index.json
+++ b/index.json
@@ -265,6 +265,9 @@
                         },
                         {
                             "id": "oil_gas"
+                        },
+                        {
+                            "id": "renewables"
                         }
                     ]
                 },
diff --git a/lang/ast.json b/lang/ast.json
index bbf1fe4f9..a5e172fe2 100644
--- a/lang/ast.json
+++ b/lang/ast.json
@@ -36,7 +36,6 @@
     "category:military": "Militar",
     "category:mtb-routes": "",
     "category:natural": "Formaciones naturales",
-    "category:network": "",
     "category:oil_gas": "",
     "category:other": "Otres",
     "category:outdoor": "",
@@ -56,6 +55,7 @@
     "category:railway-maxspeed": "",
     "category:railway-routes": "",
     "category:religion": "Relixón",
+    "category:renewables": "",
     "category:residential": "Zones residenciales",
     "category:resources": "Estraición de recursos",
     "category:services": "Servicios",
diff --git a/lang/ca.json b/lang/ca.json
index 817dabdd5..9a95a3e15 100644
--- a/lang/ca.json
+++ b/lang/ca.json
@@ -36,7 +36,6 @@
     "category:military": "",
     "category:mtb-routes": "",
     "category:natural": "",
-    "category:network": "",
     "category:oil_gas": "",
     "category:other": "",
     "category:outdoor": "",
@@ -56,6 +55,7 @@
     "category:railway-maxspeed": "",
     "category:railway-routes": "",
     "category:religion": "",
+    "category:renewables": "",
     "category:residential": "",
     "category:resources": "",
     "category:services": "Serveis",
diff --git a/lang/cs.json b/lang/cs.json
index 3983a2564..316a8e552 100644
--- a/lang/cs.json
+++ b/lang/cs.json
@@ -36,7 +36,6 @@
     "category:military": "Vojenské",
     "category:mtb-routes": "",
     "category:natural": "Přírodní úkazy",
-    "category:network": "",
     "category:oil_gas": "",
     "category:other": "Jiné",
     "category:outdoor": "",
@@ -56,6 +55,7 @@
     "category:railway-maxspeed": "",
     "category:railway-routes": "",
     "category:religion": "Religion",
+    "category:renewables": "",
     "category:residential": "Obytné oblasti",
     "category:resources": "Těžba surovin",
     "category:services": "Služby",
diff --git a/lang/de.json b/lang/de.json
index e48999236..2a7700985 100644
--- a/lang/de.json
+++ b/lang/de.json
@@ -36,7 +36,6 @@
     "category:military": "Militär",
     "category:mtb-routes": "",
     "category:natural": "Geographische Objekte",
-    "category:network": "",
     "category:oil_gas": "Erdöl und Erdgas",
     "category:other": "Andere",
     "category:outdoor": "Freiluftaktivitäten",
@@ -56,6 +55,7 @@
     "category:railway-maxspeed": "Eisenbahn Höchstgeschwindigkeiten",
     "category:railway-routes": "",
     "category:religion": "Religion",
+    "category:renewables": "Erneuerbare Energien",
     "category:residential": "Wohngebiete",
     "category:resources": "Ressourcengewinnung",
     "category:services": "Dienste",
diff --git a/lang/el.json b/lang/el.json
index c25f63f47..97c3dc668 100644
--- a/lang/el.json
+++ b/lang/el.json
@@ -36,7 +36,6 @@
     "category:military": "Στρατιωτικό",
     "category:mtb-routes": "",
     "category:natural": "Φυσικοί Σχηματισμοί",
-    "category:network": "",
     "category:oil_gas": "",
     "category:other": "",
     "category:outdoor": "",
@@ -56,6 +55,7 @@
     "category:railway-maxspeed": "",
     "category:railway-routes": "",
     "category:religion": "Θρησκεία",
+    "category:renewables": "",
     "category:residential": "Περιοχές Κατοικίας",
     "category:resources": "",
     "category:services": "Υπηρεσίες",
diff --git a/lang/en.json b/lang/en.json
index 46851f26c..153aea4a5 100644
--- a/lang/en.json
+++ b/lang/en.json
@@ -36,7 +36,6 @@
     "category:military": "Military",
     "category:mtb-routes": "Mountain bike routes",
     "category:natural": "Natural Formations",
-    "category:network": "Network infrastructure",
     "category:oil_gas": "Petroleum and natural gas",
     "category:other": "Other",
     "category:outdoor": "Outdoor activities",
@@ -56,6 +55,7 @@
     "category:railway-maxspeed": "Railway Maxspeed",
     "category:railway-routes": "Railway Routes",
     "category:religion": "Religion",
+    "category:renewables": "Renewables",
     "category:residential": "Residential Areas",
     "category:resources": "Resource Extraction",
     "category:services": "Services",
diff --git a/lang/es.json b/lang/es.json
index 853d88bc2..b13fced3b 100644
--- a/lang/es.json
+++ b/lang/es.json
@@ -36,7 +36,6 @@
     "category:military": "",
     "category:mtb-routes": "",
     "category:natural": "",
-    "category:network": "",
     "category:oil_gas": "",
     "category:other": "",
     "category:outdoor": "",
@@ -56,6 +55,7 @@
     "category:railway-maxspeed": "",
     "category:railway-routes": "",
     "category:religion": "",
+    "category:renewables": "",
     "category:residential": "",
     "category:resources": "",
     "category:services": "Servicios",
diff --git a/lang/et.json b/lang/et.json
index 2a1d43e4c..e64744101 100644
--- a/lang/et.json
+++ b/lang/et.json
@@ -36,7 +36,6 @@
     "category:military": "",
     "category:mtb-routes": "",
     "category:natural": "",
-    "category:network": "",
     "category:oil_gas": "",
     "category:other": "Ülejäänud",
     "category:outdoor": "",
@@ -56,6 +55,7 @@
     "category:railway-maxspeed": "",
     "category:railway-routes": "",
     "category:religion": "Religioon",
+    "category:renewables": "",
     "category:residential": "Elamupiirkonnad",
     "category:resources": "",
     "category:services": "Teenused",
diff --git a/lang/fr.json b/lang/fr.json
index 93d167cc1..784d81c96 100644
--- a/lang/fr.json
+++ b/lang/fr.json
@@ -36,7 +36,6 @@
     "category:military": "Militaire",
     "category:mtb-routes": "Itinéraires de VTT",
     "category:natural": "Éléments naturels",
-    "category:network": "",
     "category:oil_gas": "",
     "category:other": "Autres",
     "category:outdoor": "Activités de plein air",
@@ -56,6 +55,7 @@
     "category:railway-maxspeed": "Limites de vitesse",
     "category:railway-routes": "Lignes ferroviaires",
     "category:religion": "Religion",
+    "category:renewables": "",
     "category:residential": "Zones résidentielles",
     "category:resources": "Extraction des ressources",
     "category:services": "Services",
diff --git a/lang/hu.json b/lang/hu.json
index 159590406..a673480cb 100644
--- a/lang/hu.json
+++ b/lang/hu.json
@@ -36,7 +36,6 @@
     "category:military": "Katonai objektumok",
     "category:mtb-routes": "Hegyikerékpáros útvonalak",
     "category:natural": "Természeti képződmények",
-    "category:network": "",
     "category:oil_gas": "",
     "category:other": "Egyéb",
     "category:outdoor": "Szabadtéri tevékenységek",
@@ -56,6 +55,7 @@
     "category:railway-maxspeed": "Sebességkorlátozás",
     "category:railway-routes": "Vasútvonalak",
     "category:religion": "Vallás",
+    "category:renewables": "",
     "category:residential": "Lakóövezetek",
     "category:resources": "Bányászat",
     "category:services": "Szolgáltatások",
diff --git a/lang/it.json b/lang/it.json
index 7c62381d8..1e54cd380 100644
--- a/lang/it.json
+++ b/lang/it.json
@@ -36,7 +36,6 @@
     "category:military": "Militare",
     "category:mtb-routes": "",
     "category:natural": "Natura",
-    "category:network": "",
     "category:oil_gas": "",
     "category:other": "Altri",
     "category:outdoor": "",
@@ -56,6 +55,7 @@
     "category:railway-maxspeed": "",
     "category:railway-routes": "",
     "category:religion": "Religione",
+    "category:renewables": "",
     "category:residential": "Aree residenziali",
     "category:resources": "Areee estrattive",
     "category:services": "Servizi",
diff --git a/lang/ja.json b/lang/ja.json
index 0e5e62f62..6f92a3bf9 100644
--- a/lang/ja.json
+++ b/lang/ja.json
@@ -36,7 +36,6 @@
     "category:military": "軍事",
     "category:mtb-routes": "",
     "category:natural": "自然地層",
-    "category:network": "",
     "category:oil_gas": "",
     "category:other": "その他",
     "category:outdoor": "",
@@ -56,6 +55,7 @@
     "category:railway-maxspeed": "",
     "category:railway-routes": "",
     "category:religion": "宗教",
+    "category:renewables": "",
     "category:residential": "住居エリア",
     "category:resources": "",
     "category:services": "サービス",
diff --git a/lang/nl.json b/lang/nl.json
index 8b1d6afad..a7ca08ee4 100644
--- a/lang/nl.json
+++ b/lang/nl.json
@@ -36,7 +36,6 @@
     "category:military": "Militair",
     "category:mtb-routes": "",
     "category:natural": "Natuurlijke Formaties",
-    "category:network": "",
     "category:oil_gas": "",
     "category:other": "Andere",
     "category:outdoor": "",
@@ -56,6 +55,7 @@
     "category:railway-maxspeed": "",
     "category:railway-routes": "",
     "category:religion": "Religie",
+    "category:renewables": "",
     "category:residential": "Woongebieden",
     "category:resources": "Grondstoffenwinning",
     "category:services": "Dienstverlening",
diff --git a/lang/pl.json b/lang/pl.json
index aced0df22..fbce3f3f3 100644
--- a/lang/pl.json
+++ b/lang/pl.json
@@ -36,7 +36,6 @@
     "category:military": "",
     "category:mtb-routes": "",
     "category:natural": "",
-    "category:network": "",
     "category:oil_gas": "",
     "category:other": "",
     "category:outdoor": "",
@@ -56,6 +55,7 @@
     "category:railway-maxspeed": "",
     "category:railway-routes": "",
     "category:religion": "",
+    "category:renewables": "",
     "category:residential": "",
     "category:resources": "",
     "category:services": "Usługi",
diff --git a/lang/pt-br.json b/lang/pt-br.json
index 10476d8b9..e0fa41fcf 100644
--- a/lang/pt-br.json
+++ b/lang/pt-br.json
@@ -36,7 +36,6 @@
     "category:military": "Militar",
     "category:mtb-routes": "Rotas mountain bike",
     "category:natural": "Formações naturais",
-    "category:network": "",
     "category:oil_gas": "",
     "category:other": "Outros",
     "category:outdoor": "Atividades ao ar livre",
@@ -56,6 +55,7 @@
     "category:railway-maxspeed": "Velocidade máxima",
     "category:railway-routes": "Rotas ferroviárias",
     "category:religion": "Religião",
+    "category:renewables": "",
     "category:residential": "Áreas residenciais",
     "category:resources": "Extração de recursos",
     "category:services": "Prestação de serviços",
diff --git a/lang/pt.json b/lang/pt.json
index bc57099f6..64314ad90 100644
--- a/lang/pt.json
+++ b/lang/pt.json
@@ -36,7 +36,6 @@
     "category:military": "Militar",
     "category:mtb-routes": "",
     "category:natural": "Formações naturais",
-    "category:network": "",
     "category:oil_gas": "",
     "category:other": "Outros",
     "category:outdoor": "",
@@ -56,6 +55,7 @@
     "category:railway-maxspeed": "Velocidade máxima",
     "category:railway-routes": "",
     "category:religion": "Religião",
+    "category:renewables": "",
     "category:residential": "Áreas residenciais",
     "category:resources": "Extração de recursos",
     "category:services": "Serviços",
diff --git a/lang/ro.json b/lang/ro.json
index dbc1e619a..827c3298d 100644
--- a/lang/ro.json
+++ b/lang/ro.json
@@ -36,7 +36,6 @@
     "category:military": "Militar",
     "category:mtb-routes": "",
     "category:natural": "",
-    "category:network": "",
     "category:oil_gas": "",
     "category:other": "Altele",
     "category:outdoor": "",
@@ -56,6 +55,7 @@
     "category:railway-maxspeed": "",
     "category:railway-routes": "",
     "category:religion": "Religie",
+    "category:renewables": "",
     "category:residential": "Zona rezidentiala",
     "category:resources": "",
     "category:services": "Servicii",
diff --git a/lang/ru.json b/lang/ru.json
index 0237ae35c..57ed50079 100644
--- a/lang/ru.json
+++ b/lang/ru.json
@@ -36,7 +36,6 @@
     "category:military": "Вооружённые силы",
     "category:mtb-routes": "",
     "category:natural": "Природные образования",
-    "category:network": "",
     "category:oil_gas": "",
     "category:other": "Прочее",
     "category:outdoor": "",
@@ -56,6 +55,7 @@
     "category:railway-maxspeed": "",
     "category:railway-routes": "",
     "category:religion": "Религия",
+    "category:renewables": "",
     "category:residential": "Жилые районы",
     "category:resources": "Добыча ресурсов",
     "category:services": "Услуги",
diff --git a/lang/template.json b/lang/template.json
index 6f83241eb..39c78d335 100644
--- a/lang/template.json
+++ b/lang/template.json
@@ -36,7 +36,6 @@
     "category:military": "",
     "category:mtb-routes": "",
     "category:natural": "",
-    "category:network": "",
     "category:oil_gas": "",
     "category:other": "",
     "category:outdoor": "",
@@ -56,6 +55,7 @@
     "category:railway-maxspeed": "",
     "category:railway-routes": "",
     "category:religion": "",
+    "category:renewables": "",
     "category:residential": "",
     "category:resources": "",
     "category:services": "",
diff --git a/lang/uk.json b/lang/uk.json
index 7c67359c1..ae7ca298e 100644
--- a/lang/uk.json
+++ b/lang/uk.json
@@ -36,7 +36,6 @@
     "category:military": "",
     "category:mtb-routes": "",
     "category:natural": "Природне середовище",
-    "category:network": "",
     "category:oil_gas": "",
     "category:other": "Інше",
     "category:outdoor": "",
@@ -56,6 +55,7 @@
     "category:railway-maxspeed": "",
     "category:railway-routes": "",
     "category:religion": "Релігія",
+    "category:renewables": "",
     "category:residential": "Житлова зона",
     "category:resources": "",
     "category:services": "Послуги",
diff --git a/renewables.json b/renewables.json
new file mode 100644
index 000000000..8e22ef7ff
--- /dev/null
+++ b/renewables.json
@@ -0,0 +1,37 @@
+{
+    "type": "overpass",
+    "name": {
+        "de": "Erneuerbare Energien",
+        "en": "Renewables"
+    },
+    "query": {
+        "11": [
+            "(",
+            "node[power~\"^(plant)$\"][\"plant:source\"~\"^(wind|solar|biomass|hydro|geothermal|biogas|biofuel)$\"];",
+            "way[power~\"^(plant)$\"][\"plant:source\"~\"^(wind|solar|biomass|hydro|geothermal|biogas|biofuel)$\"];",
+            "relation[power~\"^(plant)$\"][\"plant:source\"~\"^(wind|solar|biomass|hydro|geothermal|biogas|biofuel)$\"];",
+            ")",
+            ""
+        ],
+        "15": [
+            "(",
+            "node[power~\"^(plant)$\"][\"plant:source\"~\"^(wind|solar|biomass|hydro|geothermal|biogas|biofuel)$\"];",
+            "way[power~\"^(plant)$\"][\"plant:source\"~\"^(wind|solar|biomass|hydro|geothermal|biogas|biofuel)$\"];",
+            "relation[power~\"^(plant)$\"][\"plant:source\"~\"^(wind|solar|biomass|hydro|geothermal|biogas|biofuel)$\"];",
+            "node[power~\"^(generator)$\"][\"generator:source\"~\"^(wind|solar|biomass|hydro|geothermal|biogas|biofuel)$\"];",
+            "way[power~\"^(generator)$\"][\"generator:source\"~\"^(wind|solar|biomass|hydro|geothermal|biogas|biofuel)$\"];",
+            "relation[power~\"^(generator)$\"][\"generator:source\"~\"^(wind|solar|biomass|hydro|geothermal|biogas|biofuel)$\"];",
+            ")"
+        ]
+    },
+    "feature": {
+        "description": "{{ tagTrans('power', tags.power) }}{% set x='generator:source' %}{% if tags[x] %}, {{ tagTransList('generator:source', tags[x]) }}{% endif %}",
+        "popupDescription": "{{ tagTrans('power', tags.power) }}",
+        "body": [
+            "{% set x='generator:source' %}{% if tags[x] %}<br/>{{ keyTrans('generator:source') }}: {{ tagTransList('generator:source', tags[x]) }}{% endif %}",
+            "{% set x='generator:method' %}{% if tags[x] %}<br/>{{ keyTrans('generator:method') }}: {{ tagTransList('generator:method', tags[x]) }}{% endif %}",
+            "{% set x='generator:type' %}{% if tags[x] %}<br/>{{ tagTransList('generator:type') }}: {{ tagTrans('generator:type', tags[x]) }}{% endif %}"
+        ],
+        "priority": "{% if tags.power == 'plant' %}0{% elseif tags.power == 'generator' or tags.power == 'line' %}1{% elseif tags.power == 'substation' %}2{% else %}3{% endif %}"
+    }
+}