Changeset 18239 in josm for trunk/resources

Timestamp:

2021-10-01T00:16:34+02:00 (3 years ago)

Author:

Don-vip

Message:

fix #21340 - Use generator:source specific wiki links in power=generator presets (patch by gaben)

File:

• trunk/resources/data/defaultpresets.xml (modified) (17 diffs)

trunk/resources/data/defaultpresets.xml

@@ -391 +391 @@
     </chunk>
     <chunk id="power_generator">
-        <link wiki="Tag:power=generator" />
-        <space />
         <key key="power" value="generator" />
         <reference ref="name_ref_operator" />
@@ -6194 +6192 @@
                 <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">
@@ -6201 +6200 @@
                 <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">
@@ -6213 +6213 @@
                 </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">
@@ -6220 +6221 @@
                 <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">
@@ -6227 +6229 @@
                 <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">
@@ -6234 +6237 @@
                 <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">
@@ -6248 +6252 @@
                 <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">
@@ -6273 +6278 @@
                 </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">
@@ -6284 +6290 @@
                 </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">
@@ -6297 +6304 @@
                 <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">
@@ -6309 +6317 @@
                 </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">
@@ -6320 +6329 @@
                 </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">
@@ -6325 +6335 @@
                 <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">
@@ -6330 +6341 @@
                 <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">
@@ -6336 +6348 @@
                 <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">
@@ -6343 +6356 @@
                 <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 -->