Skip to content

Commit 15a02ad

Browse files
tyrasdtyrasd
authored
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
1 parent b91bbce commit 15a02ad

File tree

22 files changed

+308
-33
lines changed

22 files changed

+308
-33
lines changed

‎data/fields/generator/method.json‎

Lines changed: 19 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,23 @@
11
{
22
"key": "generator:method",
33
"type": "combo",
4-
"label": "Method"
4+
"label": "Method",
5+
"strings": {
6+
"options": {
7+
"fission": "Fission",
8+
"fusion": "Fusion",
9+
"wind_turbine": "Wind Turbine",
10+
"water-storage": "Reservoir",
11+
"water-pumped-storage": "Pumped-Storage",
12+
"run-of-the-river": "Run-of-the-River",
13+
"barrage": "Tidal Barrage",
14+
"stream": "Tidal Stream",
15+
"thermal": "Solar Thermal",
16+
"photovoltaic": "Photovoltaic",
17+
"combustion": "Combustion",
18+
"gasification": "Gasification",
19+
"anaerobic_digestion": "Anaerobic Digestion"
20+
}
21+
},
22+
"autoSuggestions": false
523
}

‎data/fields/generator/method/hydro.json‎

Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,16 @@
1+
{
2+
"key": "generator:method",
3+
"type": "combo",
4+
"label": "{generator/method}",
5+
"stringsCrossReference": "{generator/method}",
6+
"options": [
7+
"water-storage",
8+
"water-pumped-storage",
9+
"run-of-the-river"
10+
],
11+
"autoSuggestions": false,
12+
"prerequisiteTag": {
13+
"key": "generator:source",
14+
"value": "hydro"
15+
}
16+
}

‎data/fields/generator/source.json‎

Lines changed: 22 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,26 @@
11
{
22
"key": "generator:source",
33
"type": "combo",
4-
"label": "Source"
4+
"label": "Source",
5+
"strings": {
6+
"options": {
7+
"nuclear": "Nuclear Power",
8+
"wind": "Wind",
9+
"hydro": "Hydropower",
10+
"tidal": "Tidal Power",
11+
"wave": "Wave Power",
12+
"geothermal": "Geothermal Energy",
13+
"solar": "Solar Radiation",
14+
"coal": "Coal",
15+
"gas": "Natural Gas",
16+
"biomass": "Plant Matter",
17+
"biofuel": "Plant Based Fuels",
18+
"biogas": "Biogas",
19+
"oil": "Oil",
20+
"diesel": "Diesel",
21+
"gasoline": "Gasoline",
22+
"waste": "Waste",
23+
"battery": "Battery"
24+
}
25+
}
526
}

‎data/fields/plant/method.json‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,7 @@
11
{
22
"key": "plant:method",
33
"type": "combo",
4-
"label": "Generation Method"
4+
"label": "Generation Method",
5+
"stringsCrossReference": "{generator/method}",
6+
"autoSuggestions": false
57
}

‎data/fields/plant/method/hydro.json‎

Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,16 @@
1+
{
2+
"key": "plant:method",
3+
"type": "combo",
4+
"label": "{plant/method}",
5+
"stringsCrossReference": "{generator/method}",
6+
"options": [
7+
"water-storage",
8+
"water-pumped-storage",
9+
"run-of-the-river"
10+
],
11+
"autoSuggestions": false,
12+
"prerequisiteTag": {
13+
"key": "plant:source",
14+
"value": "hydro"
15+
}
16+
}

‎data/fields/plant/method/solar.json‎

Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,15 @@
1+
{
2+
"key": "plant:method",
3+
"type": "combo",
4+
"label": "{plant/method}",
5+
"stringsCrossReference": "{generator/method}",
6+
"options": [
7+
"thermal",
8+
"photovoltaic"
9+
],
10+
"autoSuggestions": false,
11+
"prerequisiteTag": {
12+
"key": "plant:source",
13+
"value": "solar"
14+
}
15+
}

‎data/fields/plant/method/waste.json‎

Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,15 @@
1+
{
2+
"key": "plant:method",
3+
"type": "combo",
4+
"label": "{plant/method}",
5+
"stringsCrossReference": "{generator/method}",
6+
"options": [
7+
"combustion",
8+
"gasification"
9+
],
10+
"autoSuggestions": false,
11+
"prerequisiteTag": {
12+
"key": "plant:source",
13+
"value": "waste"
14+
}
15+
}

‎data/fields/plant/output.json‎

Lines changed: 18 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,18 @@
1+
{
2+
"key": "plant:output",
3+
"type": "multiCombo",
4+
"label": "Form of Power Output",
5+
"strings": {
6+
"options": {
7+
"electricity": "Electricity",
8+
"hot_water": "Hot Water",
9+
"hot_air": "Hot Air",
10+
"cold_water": "Cold Water",
11+
"cold_air": "Cold Air",
12+
"compressed_air": "Compressed Air",
13+
"steam": "Steam",
14+
"vacuum": "Vacuum"
15+
}
16+
},
17+
"autoSuggestions": false
18+
}

‎data/fields/plant/output/electricity.json‎

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,11 @@
11
{
22
"key": "plant:output:electricity",
33
"type": "typeCombo",
4-
"label": "Power Output",
4+
"label": "Electric Power Output",
55
"placeholder": "500 MW, 1000 MW, 2000 MW...",
6-
"snake_case": false
6+
"snake_case": false,
7+
"prerequisiteTag": {
8+
"key": "plant:output:electricity",
9+
"valueNot": "no"
10+
}
711
}

‎data/fields/plant/source.json‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
{
22
"key": "plant:source",
33
"type": "combo",
4-
"label": "Energy Source"
4+
"label": "Energy Source",
5+
"stringsCrossReference": "{generator/source}"
56
}

0 commit comments

Comments
 (0)
⚡