From 33d616a6eeca540b9c5cd22abda09c7290f596d4 Mon Sep 17 00:00:00 2001 From: Martin Raifer Date: Fri, 21 Oct 2022 10:15:45 +0200 Subject: [PATCH 1/2] add values of the "generator:method" tag https://wiki.openstreetmap.org/w/index.php?title=Key:generator:method&oldid=2315464 --- data/fields/generator/method.json | 18 +++++++++++++++++- 1 file changed, 17 insertions(+), 1 deletion(-) diff --git a/data/fields/generator/method.json b/data/fields/generator/method.json index 211e4b154..ecb6421a1 100644 --- a/data/fields/generator/method.json +++ b/data/fields/generator/method.json @@ -1,5 +1,21 @@ { "key": "generator:method", "type": "combo", - "label": "Method" + "label": "Method", + "options": [ + "fission", + "fusion", + "wind_turbine", + "water-storage", + "water-pumped-storage", + "run-of-the-river", + "barrage", + "stream", + "thermal", + "photovoltaic", + "combustion", + "gasification", + "anaerobic_digestion" + ], + "autoSuggestions": false } From 1347360a0325e4f770941c932a15a1714dd0f35a Mon Sep 17 00:00:00 2001 From: Martin Raifer Date: Fri, 21 Oct 2022 13:44:15 +0200 Subject: [PATCH 2/2] add strings for power generation sources and method and refine some presets accordingly --- data/fields/generator/method.json | 32 +++--- data/fields/generator/method/hydro.json | 16 +++ data/fields/generator/source.json | 23 +++- data/fields/plant/method.json | 4 +- data/fields/plant/method/hydro.json | 16 +++ data/fields/plant/method/solar.json | 15 +++ data/fields/plant/method/waste.json | 15 +++ data/fields/plant/output.json | 18 ++++ data/fields/plant/output/electricity.json | 8 +- data/fields/plant/source.json | 3 +- .../presets/power/generator/source/hydro.json | 2 +- .../power/generator/source/nuclear.json | 1 - data/presets/power/plant.json | 3 +- data/presets/power/plant/source/coal.json | 3 +- data/presets/power/plant/source/gas.json | 3 +- data/presets/power/plant/source/hydro.json | 8 +- .../plant/source/method/photovoltaic.json | 46 ++++++++ data/presets/power/plant/source/oil.json | 3 +- data/presets/power/plant/source/solar.json | 26 +++-- data/presets/power/plant/source/waste.json | 4 +- data/presets/power/plant/source/wind.json | 2 +- interim/source_strings.yaml | 102 +++++++++++++++++- 22 files changed, 306 insertions(+), 47 deletions(-) create mode 100644 data/fields/generator/method/hydro.json create mode 100644 data/fields/plant/method/hydro.json create mode 100644 data/fields/plant/method/solar.json create mode 100644 data/fields/plant/method/waste.json create mode 100644 data/fields/plant/output.json create mode 100644 data/presets/power/plant/source/method/photovoltaic.json diff --git a/data/fields/generator/method.json b/data/fields/generator/method.json index ecb6421a1..de107f684 100644 --- a/data/fields/generator/method.json +++ b/data/fields/generator/method.json @@ -2,20 +2,22 @@ "key": "generator:method", "type": "combo", "label": "Method", - "options": [ - "fission", - "fusion", - "wind_turbine", - "water-storage", - "water-pumped-storage", - "run-of-the-river", - "barrage", - "stream", - "thermal", - "photovoltaic", - "combustion", - "gasification", - "anaerobic_digestion" - ], + "strings": { + "options": { + "fission": "Fission", + "fusion": "Fusion", + "wind_turbine": "Wind Turbine", + "water-storage": "Reservoir", + "water-pumped-storage": "Pumped-Storage", + "run-of-the-river": "Run-of-the-River", + "barrage": "Tidal Barrage", + "stream": "Tidal Stream", + "thermal": "Solar Thermal", + "photovoltaic": "Photovoltaic", + "combustion": "Combustion", + "gasification": "Gasification", + "anaerobic_digestion": "Anaerobic Digestion" + } + }, "autoSuggestions": false } diff --git a/data/fields/generator/method/hydro.json b/data/fields/generator/method/hydro.json new file mode 100644 index 000000000..1695d6e78 --- /dev/null +++ b/data/fields/generator/method/hydro.json @@ -0,0 +1,16 @@ +{ + "key": "generator:method", + "type": "combo", + "label": "{generator/method}", + "stringsCrossReference": "{generator/method}", + "options": [ + "water-storage", + "water-pumped-storage", + "run-of-the-river" + ], + "autoSuggestions": false, + "prerequisiteTag": { + "key": "generator:source", + "value": "hydro" + } +} diff --git a/data/fields/generator/source.json b/data/fields/generator/source.json index 43016ad3d..ab366f77c 100644 --- a/data/fields/generator/source.json +++ b/data/fields/generator/source.json @@ -1,5 +1,26 @@ { "key": "generator:source", "type": "combo", - "label": "Source" + "label": "Source", + "strings": { + "options": { + "nuclear": "Nuclear Power", + "wind": "Wind", + "hydro": "Hydropower", + "tidal": "Tidal Power", + "wave": "Wave Power", + "geothermal": "Geothermal Energy", + "solar": "Solar Radiation", + "coal": "Coal", + "gas": "Natural Gas", + "biomass": "Plant Matter", + "biofuel": "Plant Based Fuels", + "biogas": "Biogas", + "oil": "Oil", + "diesel": "Diesel", + "gasoline": "Gasoline", + "waste": "Waste", + "battery": "Battery" + } + } } diff --git a/data/fields/plant/method.json b/data/fields/plant/method.json index fd91bc1f1..aec4d6616 100644 --- a/data/fields/plant/method.json +++ b/data/fields/plant/method.json @@ -1,5 +1,7 @@ { "key": "plant:method", "type": "combo", - "label": "Generation Method" + "label": "Generation Method", + "stringsCrossReference": "{generator/method}", + "autoSuggestions": false } diff --git a/data/fields/plant/method/hydro.json b/data/fields/plant/method/hydro.json new file mode 100644 index 000000000..eb69df91b --- /dev/null +++ b/data/fields/plant/method/hydro.json @@ -0,0 +1,16 @@ +{ + "key": "plant:method", + "type": "combo", + "label": "{plant/method}", + "stringsCrossReference": "{generator/method}", + "options": [ + "water-storage", + "water-pumped-storage", + "run-of-the-river" + ], + "autoSuggestions": false, + "prerequisiteTag": { + "key": "plant:source", + "value": "hydro" + } +} diff --git a/data/fields/plant/method/solar.json b/data/fields/plant/method/solar.json new file mode 100644 index 000000000..0c404eb9a --- /dev/null +++ b/data/fields/plant/method/solar.json @@ -0,0 +1,15 @@ +{ + "key": "plant:method", + "type": "combo", + "label": "{plant/method}", + "stringsCrossReference": "{generator/method}", + "options": [ + "thermal", + "photovoltaic" + ], + "autoSuggestions": false, + "prerequisiteTag": { + "key": "plant:source", + "value": "solar" + } +} diff --git a/data/fields/plant/method/waste.json b/data/fields/plant/method/waste.json new file mode 100644 index 000000000..c67ef7e3c --- /dev/null +++ b/data/fields/plant/method/waste.json @@ -0,0 +1,15 @@ +{ + "key": "plant:method", + "type": "combo", + "label": "{plant/method}", + "stringsCrossReference": "{generator/method}", + "options": [ + "combustion", + "gasification" + ], + "autoSuggestions": false, + "prerequisiteTag": { + "key": "plant:source", + "value": "waste" + } +} diff --git a/data/fields/plant/output.json b/data/fields/plant/output.json new file mode 100644 index 000000000..ca33f096b --- /dev/null +++ b/data/fields/plant/output.json @@ -0,0 +1,18 @@ +{ + "key": "plant:output", + "type": "multiCombo", + "label": "Form of Power Output", + "strings": { + "options": { + "electricity": "Electricity", + "hot_water": "Hot Water", + "hot_air": "Hot Air", + "cold_water": "Cold Water", + "cold_air": "Cold Air", + "compressed_air": "Compressed Air", + "steam": "Steam", + "vacuum": "Vacuum" + } + }, + "autoSuggestions": false +} diff --git a/data/fields/plant/output/electricity.json b/data/fields/plant/output/electricity.json index 8e903cf86..8cedd1738 100644 --- a/data/fields/plant/output/electricity.json +++ b/data/fields/plant/output/electricity.json @@ -1,7 +1,11 @@ { "key": "plant:output:electricity", "type": "typeCombo", - "label": "Power Output", + "label": "Electric Power Output", "placeholder": "500 MW, 1000 MW, 2000 MW...", - "snake_case": false + "snake_case": false, + "prerequisiteTag": { + "key": "plant:output:electricity", + "valueNot": "no" + } } diff --git a/data/fields/plant/source.json b/data/fields/plant/source.json index 63d3a713d..fdee95d15 100644 --- a/data/fields/plant/source.json +++ b/data/fields/plant/source.json @@ -1,5 +1,6 @@ { "key": "plant:source", "type": "combo", - "label": "Energy Source" + "label": "Energy Source", + "stringsCrossReference": "{generator/source}" } diff --git a/data/presets/power/generator/source/hydro.json b/data/presets/power/generator/source/hydro.json index 399da5339..1b289ad7f 100644 --- a/data/presets/power/generator/source/hydro.json +++ b/data/presets/power/generator/source/hydro.json @@ -3,7 +3,7 @@ "fields": [ "ref", "operator", - "generator/method", + "generator/method/hydro", "generator/type", "generator/output/electricity" ], diff --git a/data/presets/power/generator/source/nuclear.json b/data/presets/power/generator/source/nuclear.json index f68257352..66ffd6d05 100644 --- a/data/presets/power/generator/source/nuclear.json +++ b/data/presets/power/generator/source/nuclear.json @@ -3,7 +3,6 @@ "fields": [ "ref", "operator", - "generator/method", "generator/type", "generator/output/electricity" ], diff --git a/data/presets/power/plant.json b/data/presets/power/plant.json index 35bb7e0ae..abed3c92a 100644 --- a/data/presets/power/plant.json +++ b/data/presets/power/plant.json @@ -3,10 +3,11 @@ "fields": [ "name", "operator", - "address", "plant/source", "plant/method", + "plant/output", "plant/output/electricity", + "address", "start_date" ], "moreFields": [ diff --git a/data/presets/power/plant/source/coal.json b/data/presets/power/plant/source/coal.json index bbfd55ede..c872b2d44 100644 --- a/data/presets/power/plant/source/coal.json +++ b/data/presets/power/plant/source/coal.json @@ -3,8 +3,9 @@ "fields": [ "name", "operator", - "address", + "plant/output", "plant/output/electricity", + "address", "start_date" ], "moreFields": [ diff --git a/data/presets/power/plant/source/gas.json b/data/presets/power/plant/source/gas.json index cbe8a9616..e02d939c2 100644 --- a/data/presets/power/plant/source/gas.json +++ b/data/presets/power/plant/source/gas.json @@ -3,8 +3,9 @@ "fields": [ "name", "operator", - "address", + "plant/output", "plant/output/electricity", + "address", "start_date" ], "moreFields": [ diff --git a/data/presets/power/plant/source/hydro.json b/data/presets/power/plant/source/hydro.json index d7521441e..0521085f3 100644 --- a/data/presets/power/plant/source/hydro.json +++ b/data/presets/power/plant/source/hydro.json @@ -1,7 +1,13 @@ { "icon": "maki-dam", "fields": [ - "{power/plant}" + "name", + "operator", + "plant/source", + "plant/method/hydro", + "plant/output/electricity", + "address", + "start_date" ], "moreFields": [ "{power/plant}" diff --git a/data/presets/power/plant/source/method/photovoltaic.json b/data/presets/power/plant/source/method/photovoltaic.json new file mode 100644 index 000000000..d120fd020 --- /dev/null +++ b/data/presets/power/plant/source/method/photovoltaic.json @@ -0,0 +1,46 @@ +{ + "icon": "fas-solar-panel", + "fields": [ + "name", + "operator", + "plant/method/solar", + "plant/output/electricity", + "address", + "start_date" + ], + "moreFields": [ + "{power/plant}" + ], + "geometry": [ + "area" + ], + "tags": { + "power": "plant", + "plant:source": "solar", + "plant:method": "photovoltaic" + }, + "addTags": { + "power": "plant", + "plant:source": "solar", + "plant:method": "photovoltaic", + "plant:output:electricity": "*" + }, + "removeTags": { + "power": "plant", + "plant:method": "*", + "plant:source": "solar", + "plant:output:electricity": "*", + "landuse": "industrial" + }, + "reference": { + "key": "plant:method", + "value": "photovoltaic" + }, + "terms": [ + "photovoltaic power station", + "solar panels", + "solar park", + "utility-scale solar" + ], + "name": "Solar Farm" +} diff --git a/data/presets/power/plant/source/oil.json b/data/presets/power/plant/source/oil.json index d6d801086..b21ec2849 100644 --- a/data/presets/power/plant/source/oil.json +++ b/data/presets/power/plant/source/oil.json @@ -3,8 +3,9 @@ "fields": [ "name", "operator", - "address", + "plant/output", "plant/output/electricity", + "address", "start_date" ], "moreFields": [ diff --git a/data/presets/power/plant/source/solar.json b/data/presets/power/plant/source/solar.json index 26efb8e5b..62ef1d799 100644 --- a/data/presets/power/plant/source/solar.json +++ b/data/presets/power/plant/source/solar.json @@ -1,7 +1,13 @@ { "icon": "fas-solar-panel", "fields": [ - "{power/plant}" + "name", + "operator", + "plant/method/solar", + "plant/output", + "plant/output/electricity", + "address", + "start_date" ], "moreFields": [ "{power/plant}" @@ -15,26 +21,18 @@ }, "addTags": { "power": "plant", - "plant:source": "solar", - "plant:method": "photovoltaic", - "plant:output:electricity": "*" + "plant:source": "solar" }, "removeTags": { "power": "plant", - "plant:method": "*", "plant:source": "solar", + "plant:method": "*", "plant:output:electricity": "*", "landuse": "industrial" }, "reference": { - "key": "plant:method", - "value": "photovoltaic" + "key": "plant:source", + "value": "solar" }, - "terms": [ - "photovoltaic power station", - "solar panels", - "solar park", - "utility-scale solar" - ], - "name": "Solar Farm" + "name": "Solar Power Plant" } diff --git a/data/presets/power/plant/source/waste.json b/data/presets/power/plant/source/waste.json index e57ae6def..adadc6f82 100644 --- a/data/presets/power/plant/source/waste.json +++ b/data/presets/power/plant/source/waste.json @@ -3,8 +3,10 @@ "fields": [ "name", "operator", - "address", + "plant/method/waste", + "plant/output", "plant/output/electricity", + "address", "start_date" ], "moreFields": [ diff --git a/data/presets/power/plant/source/wind.json b/data/presets/power/plant/source/wind.json index 86076bef6..fd41a9588 100644 --- a/data/presets/power/plant/source/wind.json +++ b/data/presets/power/plant/source/wind.json @@ -3,8 +3,8 @@ "fields": [ "name", "operator", - "address", "plant/output/electricity", + "address", "start_date" ], "moreFields": [ diff --git a/interim/source_strings.yaml b/interim/source_strings.yaml index 28be94af8..9c99cd60d 100644 --- a/interim/source_strings.yaml +++ b/interim/source_strings.yaml @@ -1483,6 +1483,35 @@ en: generator/method: # generator:method=* label: Method + options: + # generator:method=anaerobic_digestion + anaerobic_digestion: Anaerobic Digestion + # generator:method=barrage + barrage: Tidal Barrage + # generator:method=combustion + combustion: Combustion + # generator:method=fission + fission: Fission + # generator:method=fusion + fusion: Fusion + # generator:method=gasification + gasification: Gasification + # generator:method=photovoltaic + photovoltaic: Photovoltaic + # generator:method=run-of-the-river + run-of-the-river: Run-of-the-River + # generator:method=stream + stream: Tidal Stream + # generator:method=thermal + thermal: Solar Thermal + # generator:method=water-pumped-storage + water-pumped-storage: Pumped-Storage + # generator:method=water-storage + water-storage: Reservoir + # generator:method=wind_turbine + wind_turbine: Wind Turbine + generator/method/hydro: + # generator:method=* generator/output/electricity: # generator:output:electricity=* label: Power Output @@ -1491,6 +1520,41 @@ en: generator/source: # generator:source=* label: Source + options: + # generator:source=battery + battery: Battery + # generator:source=biofuel + biofuel: Plant Based Fuels + # generator:source=biogas + biogas: Biogas + # generator:source=biomass + biomass: Plant Matter + # generator:source=coal + coal: Coal + # generator:source=diesel + diesel: Diesel + # generator:source=gas + gas: Natural Gas + # generator:source=gasoline + gasoline: Gasoline + # generator:source=geothermal + geothermal: Geothermal Energy + # generator:source=hydro + hydro: Hydropower + # generator:source=nuclear + nuclear: Nuclear Power + # generator:source=oil + oil: Oil + # generator:source=solar + solar: Solar Radiation + # generator:source=tidal + tidal: Tidal Power + # generator:source=waste + waste: Waste + # generator:source=wave + wave: Wave Power + # generator:source=wind + wind: Wind generator/type: # generator:type=* label: Type @@ -2733,9 +2797,35 @@ en: plant/method: # plant:method=* label: Generation Method + plant/method/hydro: + # plant:method=* + plant/method/solar: + # plant:method=* + plant/method/waste: + # plant:method=* + plant/output: + # plant:output=* + label: Form of Power Output + options: + # plant:output=cold_air + cold_air: Cold Air + # plant:output=cold_water + cold_water: Cold Water + # plant:output=compressed_air + compressed_air: Compressed Air + # plant:output=electricity + electricity: Electricity + # plant:output=hot_air + hot_air: Hot Air + # plant:output=hot_water + hot_water: Hot Water + # plant:output=steam + steam: Steam + # plant:output=vacuum + vacuum: Vacuum plant/output/electricity: # plant:output:electricity=* - label: Power Output + label: Electric Power Output # plant/output/electricity field placeholder placeholder: 500 MW, 1000 MW, 2000 MW... plant/source: @@ -9231,6 +9321,11 @@ en: name: Hydroelectric Power Station # 'terms: dam,power plant,run-of-the-river,tidal,water turbine' terms: + power/plant/source/method/photovoltaic: + # power=plant + plant:source=solar + plant:method=photovoltaic | Translate the primary name. Optionally, add equivalent synonyms on newlines in order of preference (press the Return key). + name: Solar Farm + # 'terms: photovoltaic power station,solar panels,solar park,utility-scale solar' + terms: power/plant/source/nuclear: # power=plant + plant:source=nuclear | Translate the primary name. Optionally, add equivalent synonyms on newlines in order of preference (press the Return key). name: Nuclear Power Plant @@ -9243,9 +9338,8 @@ en: terms: power/plant/source/solar: # power=plant + plant:source=solar | Translate the primary name. Optionally, add equivalent synonyms on newlines in order of preference (press the Return key). - name: Solar Farm - # 'terms: photovoltaic power station,solar panels,solar park,utility-scale solar' - terms: + name: Solar Power Plant + terms: power/plant/source/waste: # power=plant + plant:source=waste | Translate the primary name. Optionally, add equivalent synonyms on newlines in order of preference (press the Return key). name: Waste Incineration Power Plant