Changeset 18286 in josm for trunk/resources/data


Ignore:
Timestamp:
2021-10-18T22:28:20+02:00 (3 years ago)
Author:
Don-vip
Message:

fix #21398 - Update power plant related preset (patch by skyper)

File:
1 edited

Legend:

Unmodified
Added
Removed

  • trunk/resources/data/defaultpresets.xml

    r18279 r18286  
    403403    </chunk>
    404404    <chunk id="power_output">
     405        <combo key="generator:plant" text="Plant generator type" values="output,intermediate" />
    405406        <optional text="Output forms of energy:">
    406407            <combo key="generator:output:biogas" text="biogas" values="yes,2 W,3 kW,5 MW,7 GW" />
    … …  
    62206221    <group name="Power" icon="presets/power/power.svg">
    62216222        <group name="Power Plant" icon="presets/power/plant.svg">
    6222             <item name="Power Plant" icon="presets/power/plant.svg" type="closedway,multipolygon,relation" preset_name_label="true">
    6223               <!-- FIXME, following does not work: match_expression="power=plant !(plant:source=biofuel|plant:source=biogas|plant:source=biomass|plant:source=coal|plant:source=diesel|plant:source=gas|plant:source=gasoline|plant:source=geothermal|plant:source=hydro|plant:source=nuclear|plant:source=oil|plant:source=osmotic|plant:source=solar|plant:source=tidal|plant:source=waste|plant:source=wave|plant:source=wind)" -->
     6223            <item name="Power Plant" icon="presets/power/plant_plain.svg" type="closedway,multipolygon,relation" preset_name_label="true" match_expression="power=plant -(&quot;plant:source&quot;=biofuel|&quot;plant:source&quot;=biogas|&quot;plant:source&quot;=biomass|&quot;plant:source&quot;=coal|&quot;plant:source&quot;=diesel|&quot;plant:source&quot;=gas|&quot;plant:source&quot;=gasoline|&quot;plant:source&quot;=geothermal|&quot;plant:source&quot;=hydro|&quot;plant:source&quot;=nuclear|&quot;plant:source&quot;=oil|&quot;plant:source&quot;=osmotic|&quot;plant:source&quot;=solar|&quot;plant:source&quot;=tidal|&quot;plant:source&quot;=waste|&quot;plant:source&quot;=wave|&quot;plant:source&quot;=wind)">
    62246224                <link wiki="Tag:power=plant" />
    62256225                <space />
    … …  
    62466246            </item> <!-- Power Plant -->
    62476247            <separator/>
    6248             <item name="Biofuel Power Plant" icon="presets/power/plant.svg" type="closedway,multipolygon,relation" preset_name_label="true">
     6248            <item name="Biofuel Power Plant" icon="presets/power/plant_biofuel.svg" type="closedway,multipolygon,relation" preset_name_label="true">
    62496249                <link wiki="Tag:power=plant" />
    62506250                <key key="plant:source" value="biofuel" />
    … …  
    62536253                <reference ref="power_plant" />
    62546254            </item> <!-- Biofuel Power Plant -->
    6255             <item name="Biogas Power Plant" icon="presets/power/plant.svg" type="closedway,multipolygon,relation" preset_name_label="true">
     6255            <item name="Biogas Power Plant" icon="presets/power/plant_biofuel.svg" type="closedway,multipolygon,relation" preset_name_label="true">
    62566256                <link wiki="Tag:power=plant" />
    62576257                <key key="plant:source" value="biogas" />
    … …  
    62606260                <reference ref="power_plant" />
    62616261            </item> <!-- Biogas Power Plant -->
    6262             <item name="Biomass Power Plant" icon="presets/power/plant.svg" type="closedway,multipolygon,relation" preset_name_label="true">
     6262            <item name="Biomass Power Plant" icon="presets/power/plant_biofuel.svg" type="closedway,multipolygon,relation" preset_name_label="true">
    62636263                <link wiki="Tag:plant:source=biomass" />
    62646264                <key key="plant:source" value="biomass" />
    … …  
    62686268                <combo key="plant:method" text="Method" values_context="generator method" values="anaerobic_digestion,combustion,gasification" />
    62696269            </item> <!-- Biomass Power Plant -->
    6270             <item name="Coal Power Plant" icon="presets/power/plant.svg" type="closedway,multipolygon,relation" preset_name_label="true">
     6270            <item name="Coal Power Plant" icon="presets/power/plant_coal.svg" type="closedway,multipolygon,relation" preset_name_label="true">
    62716271                <link wiki="Tag:plant:source=coal" />
    62726272                <key key="plant:source" value="coal" />
    … …  
    62756275                <reference ref="power_plant" />
    62766276            </item> <!-- Coal Power Plant -->
    6277             <item name="Gas Power Plant" icon="presets/power/plant.svg" type="closedway,multipolygon,relation" preset_name_label="true">
     6277            <item name="Gas Power Plant" icon="presets/power/plant_gas.svg" type="closedway,multipolygon,relation" preset_name_label="true">
    62786278                <link wiki="Tag:plant:source=gas" />
    62796279                <key key="plant:source" value="gas" />
    … …  
    62826282                <reference ref="power_plant" />
    62836283            </item> <!-- Gas Power Plant -->
    6284             <item name="Oil Power Plant" icon="presets/power/plant.svg" type="closedway,multipolygon,relation" preset_name_label="true">
     6284            <item name="Oil Power Plant" icon="presets/power/plant_oil.svg" type="closedway,multipolygon,relation" preset_name_label="true">
    62856285                <link wiki="Tag:plant:source=oil" />
    62866286                <key key="plant:source" value="oil" />
    … …  
    62896289                <reference ref="power_plant" />
    62906290            </item> <!-- Oil Power Plant -->
    6291             <item name="Diesel Power Plant" icon="presets/power/plant.svg" type="closedway,multipolygon,relation" preset_name_label="true">
     6291            <item name="Diesel Power Plant" icon="presets/power/plant_oil.svg" type="closedway,multipolygon,relation" preset_name_label="true">
    62926292                <link wiki="Tag:power=plant" />
    62936293                <key key="plant:source" value="diesel" />
    … …  
    62966296                <reference ref="power_plant" />
    62976297            </item> <!-- Diesel Power Plant -->
    6298             <item name="Gasoline Power Plant" icon="presets/power/plant.svg" type="closedway,multipolygon,relation" preset_name_label="true">
     6298            <item name="Gasoline Power Plant" icon="presets/power/plant_oil.svg" type="closedway,multipolygon,relation" preset_name_label="true">
    62996299                <link wiki="Tag:power=plant" />
    63006300                <key key="plant:source" value="gasoline" />
    … …  
    63036303                <reference ref="power_plant" />
    63046304            </item> <!-- Gasoline Power Plant -->
    6305             <item name="Nuclear Power Plant" icon="presets/power/plant.svg" type="closedway,multipolygon,relation" preset_name_label="true">
     6305            <item name="Nuclear Power Plant" icon="presets/power/plant_nuclear.svg" type="closedway,multipolygon,relation" preset_name_label="true">
    63066306                <link wiki="Tag:plant:source=nuclear" />
    63076307                <key key="plant:source" value="nuclear" />
    … …  
    63116311                <combo key="plant:method" text="Method" values_context="generator method" values="fission,fusion" />
    63126312            </item> <!-- Nuclear Power Plant -->
    6313             <item name="Solar Power Plant" icon="presets/power/plant.svg" type="closedway,multipolygon,relation" preset_name_label="true">
     6313            <item name="Waste Power Plant" icon="presets/power/plant_waste.svg" type="closedway,multipolygon,relation" preset_name_label="true">
     6314                <link wiki="Tag:plant:source=waste" />
     6315                <key key="plant:source" value="waste" />
     6316                <space />
     6317                <reference ref="power_plant" />
     6318                <space />
     6319                <combo key="plant:method" text="Method" values_context="generator method" values="combustion,gasification,pyrolysis" />
     6320            </item> <!-- Waste Power Plant -->
     6321            <item name="Geothermal Power Plant" icon="presets/power/plant_geothermal.svg" type="closedway,multipolygon,relation" preset_name_label="true">
     6322                <link wiki="Tag:plant:source=geothermal" />
     6323                <key key="plant:source" value="geothermal" />
     6324                <space />
     6325                <reference ref="power_plant" />
     6326            </item> <!-- Geothermal Power Plant -->
     6327            <item name="Hydro Power Plant" icon="presets/power/plant_water.svg" type="closedway,multipolygon,relation" preset_name_label="true">
     6328                <link wiki="Tag:plant:source=hydro" />
     6329                <key key="plant:source" value="hydro" />
     6330                <space />
     6331                <reference ref="power_plant" />
     6332                <space />
     6333                <combo key="plant:method" text="Method" values_context="generator method" values="run-of-the-river,water-pumped-storage,water-storage" />
     6334            </item> <!-- Hydro Power Plant -->
     6335            <item name="Tidal Power Plant" icon="presets/power/plant_water.svg" type="closedway,multipolygon,relation" preset_name_label="true">
     6336                <link wiki="Tag:power=plant" />
     6337                <key key="plant:source" value="tidal" />
     6338                <space />
     6339                <reference ref="power_plant" />
     6340                <space />
     6341                <combo key="plant:method" text="Method" values_context="generator method" values="barrage,stream" />
     6342            </item> <!-- Tidal Power Plant -->
     6343            <item name="Wave Power Plant" icon="presets/power/plant_water.svg" type="closedway,multipolygon,relation" preset_name_label="true">
     6344                <link wiki="Tag:power=plant" />
     6345                <key key="plant:source" value="wave" />
     6346                <space />
     6347                <reference ref="power_plant" />
     6348            </item> <!-- Wave Power Plant -->
     6349            <item name="Osmotic Power Plant" icon="presets/power/plant_water.svg" type="closedway,multipolygon,relation" preset_name_label="true">
     6350                <link wiki="Tag:power=plant" />
     6351                <key key="plant:source" value="osmotic" />
     6352                <space />
     6353                <reference ref="power_plant" />
     6354            </item> <!-- Osmotic Power Plant -->
     6355            <item name="Solar Power Plant" icon="presets/power/plant_gas.svg" type="closedway,multipolygon,relation" preset_name_label="true">
    63146356                <link wiki="Tag:plant:source=solar" />
    63156357                <key key="plant:source" value="solar" />
    … …  
    63196361                <combo key="plant:method" text="Method" values_context="generator method" values="photovoltaic,thermal" />
    63206362            </item> <!-- Solar Power Plant -->
    6321             <item name="Waste Power Plant" icon="presets/power/plant.svg" type="closedway,multipolygon,relation" preset_name_label="true">
    6322                 <link wiki="Tag:plant:source=waste" />
    6323                 <key key="plant:source" value="waste" />
    6324                 <space />
    6325                 <reference ref="power_plant" />
    6326                 <space />
    6327                 <combo key="plant:method" text="Method" values_context="generator method" values="combustion,gasification,pyrolysis" />
    6328             </item> <!-- Waste Power Plant -->
    6329             <item name="Hydro Power Plant" icon="presets/power/plant.svg" type="closedway,multipolygon,relation" preset_name_label="true">
    6330                 <link wiki="Tag:plant:source=hydro" />
    6331                 <key key="plant:source" value="hydro" />
    6332                 <space />
    6333                 <reference ref="power_plant" />
    6334                 <space />
    6335                 <combo key="plant:method" text="Method" values_context="generator method" values="run-of-the-river,water-pumped-storage,water-storage" />
    6336             </item> <!-- Hydro Power Plant -->
    6337             <item name="Tidal Power Plant" icon="presets/power/plant.svg" type="closedway,multipolygon,relation" preset_name_label="true">
    6338                 <link wiki="Tag:power=plant" />
    6339                 <key key="plant:source" value="tidal" />
    6340                 <space />
    6341                 <reference ref="power_plant" />
    6342                 <space />
    6343                 <combo key="plant:method" text="Method" values_context="generator method" values="barrage,stream" />
    6344             </item> <!-- Tidal Power Plant -->
    6345             <item name="Wave Power Plant" icon="presets/power/plant.svg" type="closedway,multipolygon,relation" preset_name_label="true">
    6346                 <link wiki="Tag:power=plant" />
    6347                 <key key="plant:source" value="wave" />
    6348                 <space />
    6349                 <reference ref="power_plant" />
    6350             </item> <!-- Wave Power Plant -->
    6351             <item name="Osmotic Power Plant" icon="presets/power/plant.svg" type="closedway,multipolygon,relation" preset_name_label="true">
    6352                 <link wiki="Tag:power=plant" />
    6353                 <key key="plant:source" value="osmotic" />
    6354                 <space />
    6355                 <reference ref="power_plant" />
    6356             </item> <!-- Osmotic Power Plant -->
    6357             <item name="Geothermal Power Plant" icon="presets/power/plant.svg" type="closedway,multipolygon,relation" preset_name_label="true">
    6358                 <link wiki="Tag:plant:source=geothermal" />
    6359                 <key key="plant:source" value="geothermal" />
    6360                 <space />
    6361                 <reference ref="power_plant" />
    6362             </item> <!-- Geothermal Power Plant -->
    6363             <item name="Wind Power Plant" icon="presets/power/plant.svg" type="closedway,multipolygon,relation" preset_name_label="true">
     6363            <item name="Wind Power Plant" icon="presets/power/plant_wind.svg" type="closedway,multipolygon,relation" preset_name_label="true">
    63646364                <link wiki="Tag:plant:source=wind" />
    63656365                <key key="plant:source" value="wind" />
Note: See TracChangeset for help on using the changeset viewer.