refine power generation presets (#624)

* add values of the "generator:method" tag

https://wiki.openstreetmap.org/w/index.php?title=Key:generator:method&oldid=2315464

* add strings for power generation sources and method

and refine some presets accordingly
This commit is contained in:
Martin Raifer 2022-10-27 18:42:16 +02:00 committed by GitHub
parent b91bbcecc4
commit 15a02ada3e
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
22 changed files with 308 additions and 33 deletions

View file

@ -1,5 +1,23 @@
{
"key": "generator:method",
"type": "combo",
"label": "Method"
"label": "Method",
"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
}

View file

@ -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"
}
}

View file

@ -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"
}
}
}

View file

@ -1,5 +1,7 @@
{
"key": "plant:method",
"type": "combo",
"label": "Generation Method"
"label": "Generation Method",
"stringsCrossReference": "{generator/method}",
"autoSuggestions": false
}

View file

@ -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"
}
}

View file

@ -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"
}
}

View file

@ -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"
}
}

View file

@ -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
}

View file

@ -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"
}
}

View file

@ -1,5 +1,6 @@
{
"key": "plant:source",
"type": "combo",
"label": "Energy Source"
"label": "Energy Source",
"stringsCrossReference": "{generator/source}"
}

View file

@ -3,7 +3,7 @@
"fields": [
"ref",
"operator",
"generator/method",
"generator/method/hydro",
"generator/type",
"generator/output/electricity"
],

View file

@ -3,7 +3,6 @@
"fields": [
"ref",
"operator",
"generator/method",
"generator/type",
"generator/output/electricity"
],

View file

@ -3,10 +3,11 @@
"fields": [
"name",
"operator",
"address",
"plant/source",
"plant/method",
"plant/output",
"plant/output/electricity",
"address",
"start_date"
],
"moreFields": [

View file

@ -3,8 +3,9 @@
"fields": [
"name",
"operator",
"address",
"plant/output",
"plant/output/electricity",
"address",
"start_date"
],
"moreFields": [

View file

@ -3,8 +3,9 @@
"fields": [
"name",
"operator",
"address",
"plant/output",
"plant/output/electricity",
"address",
"start_date"
],
"moreFields": [

View file

@ -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}"

View file

@ -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"
}

View file

@ -3,8 +3,9 @@
"fields": [
"name",
"operator",
"address",
"plant/output",
"plant/output/electricity",
"address",
"start_date"
],
"moreFields": [

View file

@ -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"
}

View file

@ -3,8 +3,10 @@
"fields": [
"name",
"operator",
"address",
"plant/method/waste",
"plant/output",
"plant/output/electricity",
"address",
"start_date"
],
"moreFields": [

View file

@ -3,8 +3,8 @@
"fields": [
"name",
"operator",
"address",
"plant/output/electricity",
"address",
"start_date"
],
"moreFields": [

View file

@ -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:
@ -9248,6 +9338,11 @@ en:
name: Hydroelectric Power Station
# 'terms: dam,power plant,run-of-the-river,tidal,water turbine'
terms: <translate with synonyms or related terms for 'Hydroelectric Power Station', separated by commas>
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: <translate with synonyms or related terms for 'Solar Farm', separated by commas>
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
@ -9260,9 +9355,8 @@ en:
terms: <translate with synonyms or related terms for 'Oil-Fired Power Plant', separated by commas>
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: <translate with synonyms or related terms for 'Solar Farm', separated by commas>
name: Solar Power Plant
terms: <translate with synonyms or related terms for 'Solar Power Plant', separated by commas>
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