From cc2f1c06b71e8ec661ed898e7c4634934762ac92 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Stephan=20B=C3=B6sch-Plepelits?= Date: Thu, 7 Jun 2018 22:02:35 +0200 Subject: [PATCH 1/6] Fossil Energy: new category --- fossil-energy.json | 52 ++++++++++++++++++++++++++++++++++++++++++++++ index.json | 3 +++ 2 files changed, 55 insertions(+) create mode 100644 fossil-energy.json diff --git a/fossil-energy.json b/fossil-energy.json new file mode 100644 index 0000000..9e13d73 --- /dev/null +++ b/fossil-energy.json @@ -0,0 +1,52 @@ +{ + "type": "overpass", + "name": { + "de": "Fossile Energie", + "en": "Fossil energy" + }, + "query": { + "11": [ + "(", + "way[man_made=pipeline][substance~\"^(oil|gas|lng|cng|multiphase)$\"];", + "relation[man_made=pipeline][substance~\"^(oil|gas|lng|cng|multiphase)$\"];", + "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)$\"];", + ")" + ], + "13": [ + "(", + "way[man_made=pipeline][substance~\"^(oil|gas|lng|cng|multiphase)$\"];", + "relation[man_made=pipeline][substance~\"^(oil|gas|lng|cng|multiphase)$\"];", + "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)$\"];", + ")" + ] + }, + "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 1b5b475..5c4104e 100644 --- a/index.json +++ b/index.json @@ -237,6 +237,9 @@ { "id": "power" }, + { + "id": "fossil-energy" + }, { "id": "railway", "type": "index", From 44fe15406c04ea9e860bbb1b4261a377b5bbb417 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Stephan=20B=C3=B6sch-Plepelits?= Date: Sun, 10 Jun 2018 20:53:34 +0200 Subject: [PATCH 2/6] Fossil Energy: include coal and power generators --- fossil-energy.json | 30 +++++++++++++++++++----------- 1 file changed, 19 insertions(+), 11 deletions(-) diff --git a/fossil-energy.json b/fossil-energy.json index 9e13d73..b34f2eb 100644 --- a/fossil-energy.json +++ b/fossil-energy.json @@ -7,31 +7,39 @@ "query": { "11": [ "(", - "way[man_made=pipeline][substance~\"^(oil|gas|lng|cng|multiphase)$\"];", - "relation[man_made=pipeline][substance~\"^(oil|gas|lng|cng|multiphase)$\"];", - "way[landuse=industrial][industrial~\"^(refinery)$\"];", - "relation[landuse=industrial][industrial~\"^(refinery)$\"];", + "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": [ "(", - "way[man_made=pipeline][substance~\"^(oil|gas|lng|cng|multiphase)$\"];", - "relation[man_made=pipeline][substance~\"^(oil|gas|lng|cng|multiphase)$\"];", - "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[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)$\"];", + "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)(|;.*)$\"];", ")" ] }, From 9858d7908018e9371e2b5acc6665f701b6c30ee1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Stephan=20B=C3=B6sch-Plepelits?= Date: Sun, 17 Jun 2018 21:41:46 +0200 Subject: [PATCH 3/6] fossil-energy: include quarry and mine_shaft (coal) --- fossil-energy.json | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/fossil-energy.json b/fossil-energy.json index b34f2eb..cb4714e 100644 --- a/fossil-energy.json +++ b/fossil-energy.json @@ -7,6 +7,11 @@ "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)(|;.*)$\"];", @@ -24,6 +29,12 @@ ], "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)(|;.*)$\"];", From 1147a67d8319f621f610dcf39addeb1bab1d8c07 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Stephan=20B=C3=B6sch-Plepelits?= Date: Tue, 14 Aug 2018 06:19:46 +0200 Subject: [PATCH 4/6] Re-organize infrastructure/energy; Rename power->electric_power --- power.json => electric_power.json | 4 ++-- index.json | 18 ++++++++++++++---- 2 files changed, 16 insertions(+), 6 deletions(-) rename power.json => electric_power.json (96%) diff --git a/power.json b/electric_power.json similarity index 96% rename from power.json rename to electric_power.json index b833d32..029fac5 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/index.json b/index.json index 5c4104e..acb6252 100644 --- a/index.json +++ b/index.json @@ -235,10 +235,20 @@ "id": "military" }, { - "id": "power" - }, - { - "id": "fossil-energy" + "id": "energy", + "type": "index", + "name": { + "en": "Energy", + "de": "Energie" + }, + "subCategories": [ + { + "id": "electric_power" + }, + { + "id": "fossil-energy" + } + ] }, { "id": "railway", From 8261dedec9b6bbe1e88cb950fdcbace9fcb2247e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Stephan=20B=C3=B6sch-Plepelits?= Date: Wed, 15 Aug 2018 21:36:08 +0200 Subject: [PATCH 5/6] Split fossil-energy in coal resp oil_gas --- coal.json | 35 ++++++++++++++++++++++++++++++ index.json | 5 ++++- oil_gas.json | 60 ++++++++++++++++++++++++++++++++++++++++++++++++++++ 3 files changed, 99 insertions(+), 1 deletion(-) create mode 100644 coal.json create mode 100644 oil_gas.json diff --git a/coal.json b/coal.json new file mode 100644 index 0000000..1ac92b1 --- /dev/null +++ b/coal.json @@ -0,0 +1,35 @@ +{ + "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.landuse == 'industrial' %}", + "{{ tagTrans('landuse', tags.landuse) }} ({{ tagTrans('industrial', tags.industrial) }})", + "{% endif %}" + ], + "markerSymbol": null + } +} diff --git a/index.json b/index.json index acb6252..ec3dece 100644 --- a/index.json +++ b/index.json @@ -246,7 +246,10 @@ "id": "electric_power" }, { - "id": "fossil-energy" + "id": "coal" + }, + { + "id": "oil_gas" } ] }, diff --git a/oil_gas.json b/oil_gas.json new file mode 100644 index 0000000..6ce7d9a --- /dev/null +++ b/oil_gas.json @@ -0,0 +1,60 @@ +{ + "type": "overpass", + "name": { + "de": "Erdgas", + "en": "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.landuse == 'industrial' %}", + "{{ tagTrans('landuse', tags.landuse) }} ({{ tagTrans('industrial', tags.industrial) }})", + "{% elseif tags.waterway == 'offshore_field' %}", + "{{ tagTrans('waterway', tags.waterway) }}", + "{% endif %}" + ], + "markerSymbol": null + } +} From dd826ba6e6f9a0ccbff8ed7f0e6fe40756aa1cfd Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Stephan=20B=C3=B6sch-Plepelits?= Date: Thu, 25 Oct 2018 19:21:44 +0200 Subject: [PATCH 6/6] coal, oil_gas: improvements --- coal.json | 4 ++++ oil_gas.json | 10 ++++++---- 2 files changed, 10 insertions(+), 4 deletions(-) diff --git a/coal.json b/coal.json index 1ac92b1..ff11913 100644 --- a/coal.json +++ b/coal.json @@ -26,6 +26,10 @@ "{{ 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 %}" diff --git a/oil_gas.json b/oil_gas.json index 6ce7d9a..96aa126 100644 --- a/oil_gas.json +++ b/oil_gas.json @@ -1,8 +1,8 @@ { "type": "overpass", "name": { - "de": "Erdgas", - "en": "Natural gas" + "de": "Erdöl und Erdgas", + "en": "Petroleum and natural gas" }, "query": { "11": [ @@ -49,10 +49,12 @@ "{{ 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.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