diff --git a/coal.json b/coal.json
new file mode 100644
index 0000000..ff11913
--- /dev/null
+++ b/coal.json
@@ -0,0 +1,39 @@
+{
+ "type": "overpass",
+ "name": {
+ "de": "Kohle",
+ "en": "Coal"
+ },
+ "query": {
+ "11": [
+ "(",
+ "node[landuse~\"^(quarry)$\"][resource~\"^(|.*;)coal(|;.*)$\"];",
+ "way[landuse~\"^(quarry)$\"][resource~\"^(|.*;)coal(|;.*)$\"];",
+ "relation[landuse~\"^(quarry)$\"][resource~\"^(|.*;)coal(|;.*)$\"];",
+ "node[man_made~\"^(mineshaft)$\"][resource~\"^(|.*;)coal(|;.*)$\"];",
+ "way[man_made~\"^(mineshaft)$\"][resource~\"^(|.*;)coal(|;.*)$\"];",
+ "way[man_made~\"^(pipeline|goods_conveyor)$\"][substance~\"^(|.*;)(coal)(|;.*)$\"];",
+ "relation[man_made~\"^(pipeline|goods_conveyor)$\"][substance~\"^(|.*;)(coal)(|;.*)$\"];",
+ "node[power~\"^(plant)$\"][\"generator:source\"~\"^(|.*;)(coal)(|;.*)$\"];",
+ "way[power~\"^(plant)$\"][\"generator:source\"~\"^(|.*;)(coal)(|;.*)$\"];",
+ "relation[power~\"^(plant)$\"][\"generator:source\"~\"^(|.*;)(coal)(|;.*)$\"];",
+ ")"
+ ]
+ },
+ "feature": {
+ "description": [
+ "{% if tags.man_made == 'pipeline' %}",
+ "{{ tagTrans('man_made', 'pipeline') }} ({{ tagTrans('substance', tags.substance) }})",
+ "{% elseif tags.man_made %}",
+ "{{ tagTrans('man_made', tags.man_made) }}",
+ "{% elseif tags.power == 'plant' %}",
+ "{{ tagTrans('power', 'plant') }} {% if attribute(tags, 'generator:source') %}({{ tagTransList('generator:source', attribute(tags, 'generator:source')) }}){% endif %}",
+ "{% elseif tags.landuse == 'quarry' %}",
+ "{{ tagTrans('landuse', tags.landuse) }} {% if tags.resource %}({{ tagTrans('resource', tags.resource) }}){% endif %}",
+ "{% elseif tags.landuse == 'industrial' %}",
+ "{{ tagTrans('landuse', tags.landuse) }} ({{ tagTrans('industrial', tags.industrial) }})",
+ "{% endif %}"
+ ],
+ "markerSymbol": null
+ }
+}
diff --git a/power.json b/electric_power.json
similarity index 96%
rename from power.json
rename to electric_power.json
index 4be4028..ce31be5 100644
--- a/power.json
+++ b/electric_power.json
@@ -3,8 +3,8 @@
"name": {
"ast": "Enerxía",
"cs": "Elektřina",
- "de": "Energie",
- "en": "Power",
+ "de": "Elektrischer Strom",
+ "en": "Electric Power",
"et": "Elekter",
"fr": "Énergie",
"hu": "Áramellátás",
diff --git a/fossil-energy.json b/fossil-energy.json
new file mode 100644
index 0000000..cb4714e
--- /dev/null
+++ b/fossil-energy.json
@@ -0,0 +1,71 @@
+{
+ "type": "overpass",
+ "name": {
+ "de": "Fossile Energie",
+ "en": "Fossil energy"
+ },
+ "query": {
+ "11": [
+ "(",
+ "node[landuse~\"^(quarry)$\"][resource~\"^(|.*;)coal(|;.*)$\"];",
+ "way[landuse~\"^(quarry)$\"][resource~\"^(|.*;)coal(|;.*)$\"];",
+ "relation[landuse~\"^(quarry)$\"][resource~\"^(|.*;)coal(|;.*)$\"];",
+ "node[man_made~\"^(mineshaft)$\"][resource~\"^(|.*;)coal(|;.*)$\"];",
+ "way[man_made~\"^(mineshaft)$\"][resource~\"^(|.*;)coal(|;.*)$\"];",
+ "way[man_made~\"^(pipeline|goods_conveyor)$\"][substance~\"^(|.*;)(coal|oil|gas|lng|cng|multiphase)(|;.*)$\"];",
+ "relation[man_made~\"^(pipeline|goods_conveyor)$\"][substance~\"^(|.*;)(coal|oil|gas|lng|cng|multiphase)(|;.*)$\"];",
+ "node[landuse=industrial][industrial~\"^(|.*;)(refinery)(|;.*)$\"];",
+ "way[landuse=industrial][industrial~\"^(|.*;)(refinery)(|;.*)$\"];",
+ "relation[landuse=industrial][industrial~\"^(|.*;)(refinery)(|;.*)$\"];",
+ "way[waterway=offshore_field];",
+ "relation[waterway=offshore_field];",
+ "node[man_made~\"^(offshore_platform)$\"];",
+ "way[man_made~\"^(offshore_platform)$\"];",
+ "relation[man_made~\"^(offshore_platform)$\"];",
+ "node[power~\"^(plant)$\"][\"generator:source\"~\"^(|.*;)(coal|oil|gas|diesel|gasoline)(|;.*)$\"];",
+ "way[power~\"^(plant)$\"][\"generator:source\"~\"^(|.*;)(coal|oil|gas|diesel|gasoline)(|;.*)$\"];",
+ "relation[power~\"^(plant)$\"][\"generator:source\"~\"^(|.*;)(coal|oil|gas|diesel|gasoline)(|;.*)$\"];",
+ ")"
+ ],
+ "13": [
+ "(",
+ "node[landuse~\"^(quarry)$\"][resource~\"^(|.*;)coal(|;.*)$\"];",
+ "way[landuse~\"^(quarry)$\"][resource~\"^(|.*;)coal(|;.*)$\"];",
+ "relation[landuse~\"^(quarry)$\"][resource~\"^(|.*;)coal(|;.*)$\"];",
+ "node[man_made~\"^(mineshaft)$\"][resource~\"^(|.*;)coal(|;.*)$\"];",
+ "way[man_made~\"^(mineshaft)$\"][resource~\"^(|.*;)coal(|;.*)$\"];",
+ "relation[man_made~\"^(mineshaft)$\"][resource~\"^(|.*;)coal(|;.*)$\"];",
+ "way[man_made~\"^(pipeline|goods_conveyor)$\"][substance~\"^(|.*;)(coal|oil|gas|lng|cng|multiphase)(|;.*)$\"];",
+ "relation[man_made~\"^(pipeline|goods_conveyor)$\"][substance~\"^(|.*;)(coal|oil|gas|lng|cng|multiphase)(|;.*)$\"];",
+ "node[landuse=industrial][industrial~\"^(|.*;)(coal|oil|gas|lng|cng|multiphase|refinery|oil_refinery)(|;.*)$\"];",
+ "way[landuse=industrial][industrial~\"^(|.*;)(coal|oil|gas|lng|cng|multiphase|refinery|oil_refinery)(|;.*)$\"];",
+ "relation[landuse=industrial][industrial~\"^(|.*;)(coal|oil|gas|lng|cng|multiphase|refinery|oil_refinery)(|;.*)$\"];",
+ "way[waterway=offshore_field];",
+ "relation[waterway=offshore_field];",
+ "node[man_made~\"^(petroleum_well|offshore_platform|gasometer|oil_tank|gas_cavern)$\"];",
+ "node[man_made~\"^(storage_tank)$\"][contents~\"^(oil|gas|lng|cng|multiphase)$\"];",
+ "way[man_made~\"^(petroleum_well|offshore_platform|gasometer|oil_tank|gas_cavern)$\"];",
+ "way[man_made~\"^(storage_tank)$\"][contents~\"^(oil|gas|lng|cng|multiphase)(|;.*)$\"];",
+ "relation[man_made~\"^(petroleum_well|offshore_platform|gasometer|oil_tank|gas_cavern)(|;.*)$\"];",
+ "relation[man_made~\"^(storage_tank)$\"][contents~\"^(|.*;)(oil|gas|lng|cng|multiphase)(|;.*)$\"];",
+ "node[power~\"^(plant|generator)$\"][\"generator:source\"~\"^(|.*;)(coal|oil|gas|diesel|gasoline)(|;.*)$\"];",
+ "way[power~\"^(plant|generator)$\"][\"generator:source\"~\"^(|.*;)(coal|oil|gas|diesel|gasoline)(|;.*)$\"];",
+ "relation[power~\"^(plant|generator)$\"][\"generator:source\"~\"^(|.*;)(coal|oil|gas|diesel|gasoline)(|;.*)$\"];",
+ ")"
+ ]
+ },
+ "feature": {
+ "description": [
+ "{% if tags.man_made == 'pipeline' %}",
+ "{{ tagTrans('man_made', 'pipeline') }} ({{ tagTrans('substance', tags.substance) }})",
+ "{% elseif tags.man_made %}",
+ "{{ tagTrans('man_made', tags.man_made) }}",
+ "{% elseif tags.landuse == 'industrial' %}",
+ "{{ tagTrans('landuse', tags.landuse) }} ({{ tagTrans('industrial', tags.industrial) }})",
+ "{% elseif tags.waterway == 'offshore_field' %}",
+ "{{ tagTrans('waterway', tags.waterway) }}",
+ "{% endif %}"
+ ],
+ "markerSymbol": null
+ }
+}
diff --git a/index.json b/index.json
index 3438f79..1b56e05 100644
--- a/index.json
+++ b/index.json
@@ -250,7 +250,23 @@
"id": "military"
},
{
- "id": "power"
+ "id": "energy",
+ "type": "index",
+ "name": {
+ "en": "Energy",
+ "de": "Energie"
+ },
+ "subCategories": [
+ {
+ "id": "electric_power"
+ },
+ {
+ "id": "coal"
+ },
+ {
+ "id": "oil_gas"
+ }
+ ]
},
{
"id": "railway",
diff --git a/oil_gas.json b/oil_gas.json
new file mode 100644
index 0000000..96aa126
--- /dev/null
+++ b/oil_gas.json
@@ -0,0 +1,62 @@
+{
+ "type": "overpass",
+ "name": {
+ "de": "Erdöl und Erdgas",
+ "en": "Petroleum and natural gas"
+ },
+ "query": {
+ "11": [
+ "(",
+ "way[man_made~\"^(pipeline|goods_conveyor)$\"][substance~\"^(|.*;)(oil|gas|lng|cng|multiphase)(|;.*)$\"];",
+ "relation[man_made~\"^(pipeline|goods_conveyor)$\"][substance~\"^(|.*;)(oil|gas|lng|cng|multiphase)(|;.*)$\"];",
+ "node[landuse=industrial][industrial~\"^(|.*;)(refinery)(|;.*)$\"];",
+ "way[landuse=industrial][industrial~\"^(|.*;)(refinery)(|;.*)$\"];",
+ "relation[landuse=industrial][industrial~\"^(|.*;)(refinery)(|;.*)$\"];",
+ "way[waterway=offshore_field];",
+ "relation[waterway=offshore_field];",
+ "node[man_made~\"^(offshore_platform)$\"];",
+ "way[man_made~\"^(offshore_platform)$\"];",
+ "relation[man_made~\"^(offshore_platform)$\"];",
+ "node[power~\"^(plant)$\"][\"generator:source\"~\"^(|.*;)(oil|gas|diesel|gasoline)(|;.*)$\"];",
+ "way[power~\"^(plant)$\"][\"generator:source\"~\"^(|.*;)(oil|gas|diesel|gasoline)(|;.*)$\"];",
+ "relation[power~\"^(plant)$\"][\"generator:source\"~\"^(|.*;)(oil|gas|diesel|gasoline)(|;.*)$\"];",
+ ")"
+ ],
+ "13": [
+ "(",
+ "way[man_made~\"^(pipeline|goods_conveyor)$\"][substance~\"^(|.*;)(oil|gas|lng|cng|multiphase)(|;.*)$\"];",
+ "relation[man_made~\"^(pipeline|goods_conveyor)$\"][substance~\"^(|.*;)(oil|gas|lng|cng|multiphase)(|;.*)$\"];",
+ "node[landuse=industrial][industrial~\"^(|.*;)(oil|gas|lng|cng|multiphase|refinery|oil_refinery)(|;.*)$\"];",
+ "way[landuse=industrial][industrial~\"^(|.*;)(oil|gas|lng|cng|multiphase|refinery|oil_refinery)(|;.*)$\"];",
+ "relation[landuse=industrial][industrial~\"^(|.*;)(oil|gas|lng|cng|multiphase|refinery|oil_refinery)(|;.*)$\"];",
+ "way[waterway=offshore_field];",
+ "relation[waterway=offshore_field];",
+ "node[man_made~\"^(petroleum_well|offshore_platform|gasometer|oil_tank|gas_cavern)$\"];",
+ "node[man_made~\"^(storage_tank)$\"][contents~\"^(oil|gas|lng|cng|multiphase)$\"];",
+ "way[man_made~\"^(petroleum_well|offshore_platform|gasometer|oil_tank|gas_cavern)$\"];",
+ "way[man_made~\"^(storage_tank)$\"][contents~\"^(oil|gas|lng|cng|multiphase)(|;.*)$\"];",
+ "relation[man_made~\"^(petroleum_well|offshore_platform|gasometer|oil_tank|gas_cavern)(|;.*)$\"];",
+ "relation[man_made~\"^(storage_tank)$\"][contents~\"^(|.*;)(oil|gas|lng|cng|multiphase)(|;.*)$\"];",
+ "node[power~\"^(plant|generator)$\"][\"generator:source\"~\"^(|.*;)(oil|gas|diesel|gasoline)(|;.*)$\"];",
+ "way[power~\"^(plant|generator)$\"][\"generator:source\"~\"^(|.*;)(oil|gas|diesel|gasoline)(|;.*)$\"];",
+ "relation[power~\"^(plant|generator)$\"][\"generator:source\"~\"^(|.*;)(oil|gas|diesel|gasoline)(|;.*)$\"];",
+ ")"
+ ]
+ },
+ "feature": {
+ "description": [
+ "{% if tags.man_made == 'pipeline' %}",
+ "{{ tagTrans('man_made', 'pipeline') }} ({{ tagTrans('substance', tags.substance) }})",
+ "{% elseif tags.man_made %}",
+ "{{ tagTrans('man_made', tags.man_made) }}",
+ "{% elseif tags.power == 'plant' %}",
+ "{{ tagTrans('power', 'plant') }} {% if attribute(tags, 'generator:source') %}({{ tagTransList('generator:source', attribute(tags, 'generator:source')) }}){% endif %}",
+ "{% elseif tags.waterway == 'offshore_field' %}",
+ "{{ tagTrans('waterway', tags.waterway) }}",
+ "{% elseif tags.landuse == 'industrial' %}",
+ "{{ tagTrans('landuse', tags.landuse) }} ({{ tagTrans('industrial', tags.industrial) }})",
+ "{% endif %}"
+ ],
+ "markerSymbol": null
+ }
+}