Skip to content

Commit

Permalink
fix #21340 - Use generator:source specific wiki links in power=genera…
Browse files Browse the repository at this point in the history 
…tor presets (patch by gaben)

git-svn-id: https://josm.openstreetmap.de/svn/trunk@18239 0c6e7542-c601-0410-84e7-c038aed88b3b
  • Loading branch information
@don-vip
don-vip committed Sep 30, 2021
1 parent 3640fc1 commit 9329fcd
Showing 1 changed file with 16 additions and 2 deletions.
18 changes: 16 additions & 2 deletions resources/data/defaultpresets.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -390,8 +390,6 @@
<reference ref="voltage_frequency" />
</chunk>
<chunk id="power_generator">
<link wiki="Tag:power=generator" />
<space />
<key key="power" value="generator" />
<reference ref="name_ref_operator" />
<text key="start_date" text="Start date" />
Expand Down Expand Up @@ -6193,13 +6191,15 @@
<key key="generator:method" value="combustion" />
<combo key="generator:type" text="Generator Type" values="gas_turbine,reciprocating_engine,steam_generator" />
<reference ref="power_output" />
<link wiki="Tag:generator:source=biofuel" />
</item> <!-- Power Generator -->
<item name="Biogas Power Generator" icon="presets/power/power_source-biofuel.svg" type="node,closedway,multipolygon" preset_name_label="true">
<key key="generator:source" value="biogas" />
<reference ref="power_generator" />
<key key="generator:method" value="combustion" />
<combo key="generator:type" text="Generator Type" values="reciprocating_engine,steam_generator" />
<reference ref="power_output" />
<link wiki="Tag:generator:source=biogas" />
</item> <!-- Biogas Power Generator -->
<item name="Biomass Power Generator" icon="presets/power/power_source-biofuel.svg" type="node,closedway,multipolygon" preset_name_label="true">
<key key="generator:source" value="biomass" />
Expand All @@ -6212,27 +6212,31 @@
<list_entry value="steam_turbine" short_description="combustion" />
</combo>
<reference ref="power_output" />
<link wiki="Tag:generator:source=biomass" />
</item> <!-- Biomass Power Generator -->
<item name="Coal Power Generator" icon="presets/power/power_source-coal.svg" type="node,closedway,multipolygon" preset_name_label="true">
<key key="generator:source" value="coal" />
<reference ref="power_generator" />
<key key="generator:method" value="combustion" />
<combo key="generator:type" text="Generator Type" values="steam_generator,steam_turbine" />
<reference ref="power_output" />
<link wiki="Tag:generator:source=coal" />
</item> <!-- Coal Power Generator -->
<item name="Gas Power Generator" icon="presets/power/power_source-gas.svg" type="node,closedway,multipolygon" preset_name_label="true">
<key key="generator:source" value="gas" />
<reference ref="power_generator" />
<key key="generator:method" value="combustion" />
<combo key="generator:type" text="Generator Type" values="combined_cycle,gas_turbine,reciprocating_engine,steam_generator,steam_turbine" />
<reference ref="power_output" />
<link wiki="Tag:generator:source=gas" />
</item> <!-- Gas Power Generator -->
<item name="Oil Power Generator" icon="presets/power/power_source-oil.svg" type="node,closedway,multipolygon" preset_name_label="true">
<key key="generator:source" value="oil" />
<reference ref="power_generator" />
<key key="generator:method" value="combustion" />
<combo key="generator:type" text="Generator Type" values="steam_generator,steam_turbine" />
<reference ref="power_output" />
<link wiki="Tag:generator:source=oil" />
</item> <!-- Oil Power Generator -->
<item name="Diesel Power Generator" icon="presets/power/power_source-oil.svg" type="node,closedway,multipolygon" preset_name_label="true">
<key key="generator:source" value="diesel" />
Expand All @@ -6247,6 +6251,7 @@
<key key="generator:method" value="combustion" />
<combo key="generator:type" text="Generator Type" values="reciprocating_engine,steam_generator" />
<reference ref="power_output" />
<link wiki="Tag:generator:source=gasoline" />
</item> <!-- Gasoline Power Generator -->
<item name="Nuclear Reactor" icon="presets/power/power_source-nuclear.svg" type="node,closedway,multipolygon" preset_name_label="true">
<key key="generator:source" value="nuclear" />
Expand All @@ -6272,6 +6277,7 @@
<list_entry value="VVER" display_value="Vodo-Vodyanoi Energetichesky Reactor (VVER)" short_description="fission" />
</combo>
<reference ref="power_output" />
<link wiki="Tag:generator:source=nuclear" />
</item> <!-- Nuclear Reactor -->
<item name="Solar Power Generator" icon="presets/power/power_source-sun.svg" type="node,closedway,multipolygon" preset_name_label="true">
<key key="generator:source" value="solar" />
Expand All @@ -6283,6 +6289,7 @@
<list_entry value="steam_turbine" short_description="thermal" />
</combo>
<reference ref="power_output" />
<link wiki="Tag:generator:source=solar" />
</item> <!-- Solar Power Generator -->
<item name="Waste Power Generator" icon="presets/power/power_source-waste.svg" type="node,closedway,multipolygon" preset_name_label="true">
<key key="generator:source" value="waste" />
Expand All @@ -6296,6 +6303,7 @@
</combo>
<combo key="generator:type" text="Generator Type" values="bioreactor,reciprocating_engine,steam_generator" />
<reference ref="power_output" />
<link wiki="Tag:generator:source=waste" />
</item> <!-- Waste Power Generator -->
<item name="Water Turbine" icon="presets/power/power_source-water.svg" type="node,closedway,multipolygon" preset_name_label="true">
<key key="generator:source" value="hydro" />
Expand All @@ -6308,6 +6316,7 @@
<list_entry value="pelton_turbine" short_description="run-of-the-river / water-storage" />
</combo>
<reference ref="power_output" />
<link wiki="Tag:generator:source=hydro" />
</item> <!-- Water Turbine -->
<item name="Tidal Water Turbine" icon="presets/power/power_source-water.svg" type="node,closedway,multipolygon" preset_name_label="true">
<key key="generator:source" value="tidal" />
Expand All @@ -6319,29 +6328,34 @@
<list_entry value="vertical_axis" short_description="stream" />
</combo>
<reference ref="power_output" />
<link wiki="Tag:generator:source=tidal" />
</item> <!-- Tidal Water Turbine -->
<item name="Wave Energy Converter" icon="presets/power/power_source-water.svg" type="node,closedway,multipolygon" preset_name_label="true">
<key key="generator:source" value="wave" />
<reference ref="power_generator" />
<reference ref="power_output" />
<link wiki="Tag:generator:source=wave" />
</item> <!-- Wave Energy Converter -->
<item name="Osmotic Power Generator" icon="presets/power/power_source-water.svg" type="node,closedway,multipolygon" preset_name_label="true">
<key key="generator:source" value="osmotic" />
<reference ref="power_generator" />
<reference ref="power_output" />
<link wiki="Tag:generator:source=osmotic" />
</item> <!-- Osmotic Power Generator -->
<item name="Geothermal Power Generator" icon="presets/power/power_source-geothermal.svg" type="node,closedway,multipolygon" preset_name_label="true">
<key key="generator:source" value="geothermal" />
<reference ref="power_generator" />
<combo key="generator:type" text="Generator Type" values="heat_pump,steam_turbine" />
<reference ref="power_output" />
<link wiki="Tag:generator:source=geothermal" />
</item> <!-- Geothermal Power Generator -->
<item name="Wind Turbine" icon="presets/power/power_source-wind.svg" type="node,closedway" preset_name_label="true">
<key key="generator:source" value="wind" />
<reference ref="power_generator" />
<key key="generator:method" value="wind_turbine" />
<combo key="generator:type" text="Generator Type" values="horizontal_axis,vertical_axis" />
<reference ref="power_output" />
<link wiki="Tag:generator:source=wind" />
</item> <!-- Wind Turbine -->
</group> <!-- Power Generator -->
<separator/>
Expand Down

0 comments on commit 9329fcd

Please sign in to comment.