Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

refine power generation presets #624

Merged
merged 2 commits into from
Oct 27, 2022
Merged

refine power generation presets #624

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
33d616a
add values of the "generator:method" tag
tyrasd Oct 21, 2022
1347360
add strings for power generation sources and method
tyrasd Oct 21, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
20 changes: 19 additions & 1 deletion data/fields/generator/method.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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
}
16 changes: 16 additions & 0 deletions data/fields/generator/method/hydro.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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"
}
}
23 changes: 22 additions & 1 deletion data/fields/generator/source.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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"
}
}
}
4 changes: 3 additions & 1 deletion data/fields/plant/method.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,7 @@
{
"key": "plant:method",
"type": "combo",
"label": "Generation Method"
"label": "Generation Method",
"stringsCrossReference": "{generator/method}",
"autoSuggestions": false
}
16 changes: 16 additions & 0 deletions data/fields/plant/method/hydro.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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"
}
}
15 changes: 15 additions & 0 deletions data/fields/plant/method/solar.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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"
}
}
15 changes: 15 additions & 0 deletions data/fields/plant/method/waste.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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"
}
}
18 changes: 18 additions & 0 deletions data/fields/plant/output.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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
}
8 changes: 6 additions & 2 deletions data/fields/plant/output/electricity.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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"
}
}
3 changes: 2 additions & 1 deletion data/fields/plant/source.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
{
"key": "plant:source",
"type": "combo",
"label": "Energy Source"
"label": "Energy Source",
"stringsCrossReference": "{generator/source}"
}
2 changes: 1 addition & 1 deletion data/presets/power/generator/source/hydro.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
"fields": [
"ref",
"operator",
"generator/method",
"generator/method/hydro",
"generator/type",
"generator/output/electricity"
],
Expand Down
1 change: 0 additions & 1 deletion data/presets/power/generator/source/nuclear.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,6 @@
"fields": [
"ref",
"operator",
"generator/method",
"generator/type",
"generator/output/electricity"
],
Expand Down
3 changes: 2 additions & 1 deletion data/presets/power/plant.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,10 +3,11 @@
"fields": [
"name",
"operator",
"address",
"plant/source",
"plant/method",
"plant/output",
"plant/output/electricity",
"address",
"start_date"
],
"moreFields": [
Expand Down
3 changes: 2 additions & 1 deletion data/presets/power/plant/source/coal.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,9 @@
"fields": [
"name",
"operator",
"address",
"plant/output",
"plant/output/electricity",
"address",
"start_date"
],
"moreFields": [
Expand Down
3 changes: 2 additions & 1 deletion data/presets/power/plant/source/gas.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,9 @@
"fields": [
"name",
"operator",
"address",
"plant/output",
"plant/output/electricity",
"address",
"start_date"
],
"moreFields": [
Expand Down
8 changes: 7 additions & 1 deletion data/presets/power/plant/source/hydro.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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}"
Expand Down
46 changes: 46 additions & 0 deletions data/presets/power/plant/source/method/photovoltaic.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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"
}
3 changes: 2 additions & 1 deletion data/presets/power/plant/source/oil.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,9 @@
"fields": [
"name",
"operator",
"address",
"plant/output",
"plant/output/electricity",
"address",
"start_date"
],
"moreFields": [
Expand Down
26 changes: 12 additions & 14 deletions data/presets/power/plant/source/solar.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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}"
Expand All @@ -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"
}
4 changes: 3 additions & 1 deletion data/presets/power/plant/source/waste.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,10 @@
"fields": [
"name",
"operator",
"address",
"plant/method/waste",
"plant/output",
"plant/output/electricity",
"address",
"start_date"
],
"moreFields": [
Expand Down
2 changes: 1 addition & 1 deletion data/presets/power/plant/source/wind.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,8 @@
"fields": [
"name",
"operator",
"address",
"plant/output/electricity",
"address",
"start_date"
],
"moreFields": [
Expand Down
Loading