Ticket #21997: josm_21997.patch

File josm_21997.patch, 11.9 KB (added by skyper, 4 years ago)

patch

  • resources/data/defaultpresets.xml

     
    395395        <reference ref="cables_circuits" />
    396396        <reference ref="voltage_frequency" />
    397397    </chunk>
     398    <chunk id="power_source">
     399        <list_entry value="biofuel" display_value="Biofuel" icon="presets/power/power_source-biofuel.svg" />
     400        <list_entry value="oil" display_value="Oil" icon="presets/power/power_source-oil.svg" />
     401        <list_entry value="diesel" display_value="Diesel" icon="presets/power/power_source-oil.svg" />
     402        <list_entry value="gasoline" display_value="Gasoline" icon="presets/power/power_source-oil.svg" />
     403        <list_entry value="biogas" display_value="Biogas" icon="presets/power/power_source-biofuel.svg" />
     404        <list_entry value="gas" display_value="Gas" icon="presets/power/power_source-gas.svg" />
     405        <list_entry value="biomass" display_value="Biomass" icon="presets/power/power_source-biofuel.svg" />
     406        <list_entry value="waste" display_value="Waste" icon="presets/power/power_source-waste.svg" />
     407        <list_entry value="coal" display_value="Coal" icon="presets/power/power_source-coal.svg" />
     408        <list_entry value="nuclear" display_value="Nuclear" icon="presets/power/power_source-nuclear.svg" />
     409        <list_entry value="geothermal" display_value="Geothermal" icon="presets/power/power_source-geothermal.svg" />
     410        <list_entry value="hydro" display_value="Hydro" icon="presets/power/power_source-water.svg" />
     411        <list_entry value="osmotic" display_value="Osmotic" icon="presets/power/power_source-water.svg" />
     412        <list_entry value="tidal" display_value="Tidal" icon="presets/power/power_source-water.svg" />
     413        <list_entry value="wave" display_value="Wave" icon="presets/power/power_source-water.svg" />
     414        <list_entry value="solar" display_value="Solar" icon="presets/power/power_source-sun.svg" />
     415        <list_entry value="wind" display_value="Wind" icon="presets/power/power_source-wind.svg" />
     416    </chunk>
    398417    <chunk id="power_generator">
    399418        <key key="power" value="generator" />
    400419        <reference ref="name_ref_operator" />
    … …  
    403422    <chunk id="power_output">
    404423        <combo key="generator:plant" text="Plant generator type" values="output,intermediate" />
    405424        <optional text="Output forms of energy:">
    406             <combo key="generator:output:biogas" text="biogas" values="yes,2 W,3 kW,5 MW,7 GW" />
    407             <combo key="generator:output:electricity" text="electricity" values="yes,2 W,3 kW,5 MW,7 GW" />
    408             <combo key="generator:output:hot_water" text="hot water" values="yes,2 W,3 kW,5 MW,7 GW" />
    409             <combo key="generator:output:hot_air" text="hot air" values="yes,2 W,3 kW,5 MW,7 GW" />
    410             <combo key="generator:output:cold_water" text="cold water" values="yes,2 W,3 kW,5 MW,7 GW" />
    411             <combo key="generator:output:cold_air" text="cold air" values="yes,2 W,3 kW,5 MW,7 GW" />
    412             <combo key="generator:output:compressed_air" text="compressed air" values="yes,2 W,3 kW,5 MW,7 GW" />
    413             <combo key="generator:output:steam" text="steam" values="yes,2 W,3 kW,5 MW,7 GW" />
    414             <combo key="generator:output:vacuum" text="vacuum" values="yes,2 W,3 kW,5 MW,7 GW" />
     425            <combo key="generator:output:biogas" text="Biogas" values="yes,2 W,3 kW,5 MW,7 GW" />
     426            <combo key="generator:output:electricity" text="Electricity" values="yes,2 W,3 kW,5 MW,7 GW" />
     427            <combo key="generator:output:hot_water" text="Hot Water" values="yes,2 W,3 kW,5 MW,7 GW" />
     428            <combo key="generator:output:hot_air" text="Hot Air" values="yes,2 W,3 kW,5 MW,7 GW" />
     429            <combo key="generator:output:cold_water" text="Cold Water" values="yes,2 W,3 kW,5 MW,7 GW" />
     430            <combo key="generator:output:cold_air" text="Cold Air" values="yes,2 W,3 kW,5 MW,7 GW" />
     431            <combo key="generator:output:compressed_air" text="Compressed Air" values="yes,2 W,3 kW,5 MW,7 GW" />
     432            <combo key="generator:output:steam" text="Steam" values="yes,2 W,3 kW,5 MW,7 GW" />
     433            <combo key="generator:output:vacuum" text="Vacuum" values="yes,2 W,3 kW,5 MW,7 GW" />
    415434            <space />
    416435            <reference ref="voltage_frequency" />
    417436        </optional>
    … …  
    421440        <reference ref="name_ref_operator" />
    422441        <text key="start_date" text="Start date" />
    423442        <optional text="Output forms of energy (optional):">
    424             <combo key="plant:output:electricity" text="electricity" values="yes,2 W,3 kW,5 MW,7 GW" />
    425             <combo key="plant:output:hot_water" text="hot water" values="yes,2 W,3 kW,5 MW,7 GW" />
    426             <combo key="plant:output:hot_air" text="hot air" values="yes,2 W,3 kW,5 MW,7 GW" />
    427             <combo key="plant:output:cold_water" text="cold water" values="yes,2 W,3 kW,5 MW,7 GW" />
    428             <combo key="plant:output:cold_air" text="cold air" values="yes,2 W,3 kW,5 MW,7 GW" />
    429             <combo key="plant:output:compressed_air" text="compressed air" values="yes,2 W,3 kW,5 MW,7 GW" />
    430             <combo key="plant:output:steam" text="steam" values="yes,2 W,3 kW,5 MW,7 GW" />
    431             <combo key="plant:output:vacuum" text="vacuum" values="yes,2 W,3 kW,5 MW,7 GW" />
     443            <combo key="plant:output:electricity" text="Electricity" values="yes,2 W,3 kW,5 MW,7 GW" />
     444            <combo key="plant:output:hot_water" text="Hot Water" values="yes,2 W,3 kW,5 MW,7 GW" />
     445            <combo key="plant:output:hot_air" text="Hot Air" values="yes,2 W,3 kW,5 MW,7 GW" />
     446            <combo key="plant:output:cold_water" text="Cold Water" values="yes,2 W,3 kW,5 MW,7 GW" />
     447            <combo key="plant:output:cold_air" text="Cold Air" values="yes,2 W,3 kW,5 MW,7 GW" />
     448            <combo key="plant:output:compressed_air" text="Compressed Air" values="yes,2 W,3 kW,5 MW,7 GW" />
     449            <combo key="plant:output:steam" text="Steam" values="yes,2 W,3 kW,5 MW,7 GW" />
     450            <combo key="plant:output:vacuum" text="Vacuum" values="yes,2 W,3 kW,5 MW,7 GW" />
    432451        </optional>
    433452    </chunk>
    434453    <chunk id="power_source_values">
    … …  
    63026321            <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)">
    63036322                <link wiki="Tag:power=plant" />
    63046323                <space />
    6305                 <reference ref="power_plant" />
    6306                 <multiselect key="plant:source" text="Plant source" values_searchable="true" values_sort="false">
    6307                     <list_entry value="biofuel" display_value="Biofuel" icon="presets/power/power_source-biofuel.svg" />
    6308                     <list_entry value="oil" display_value="Oil" icon="presets/power/power_source-oil.svg" />
    6309                     <list_entry value="diesel" display_value="Diesel" icon="presets/power/power_source-oil.svg" />
    6310                     <list_entry value="gasoline" display_value="Gasoline" icon="presets/power/power_source-oil.svg" />
    6311                     <list_entry value="biogas" display_value="Biogas" icon="presets/power/power_source-biofuel.svg" />
    6312                     <list_entry value="gas" display_value="Gas" icon="presets/power/power_source-gas.svg" />
    6313                     <list_entry value="biomass" display_value="Biomass" icon="presets/power/power_source-biofuel.svg" />
    6314                     <list_entry value="waste" display_value="Waste" icon="presets/power/power_source-waste.svg" />
    6315                     <list_entry value="coal" display_value="Coal" icon="presets/power/power_source-coal.svg" />
    6316                     <list_entry value="nuclear" display_value="Nuclear" icon="presets/power/power_source-nuclear.svg" />
    6317                     <list_entry value="geothermal" display_value="Geothermal" icon="presets/power/power_source-geothermal.svg" />
    6318                     <list_entry value="hydro" display_value="Hydro" icon="presets/power/power_source-water.svg" />
    6319                     <list_entry value="osmotic" display_value="Osmotic" icon="presets/power/power_source-water.svg" />
    6320                     <list_entry value="tidal" display_value="Tidal" icon="presets/power/power_source-water.svg" />
    6321                     <list_entry value="wave" display_value="Wave" icon="presets/power/power_source-water.svg" />
    6322                     <list_entry value="solar" display_value="Solar" icon="presets/power/power_source-sun.svg" />
    6323                     <list_entry value="wind" display_value="Wind" icon="presets/power/power_source-wind.svg" />
     6324                <multiselect key="plant:source" text="Plant Source" values_searchable="true" values_sort="false">
     6325                    <reference ref="power_source" />
    63246326                </multiselect>
     6327                <reference ref="power_plant" />
    63256328            </item> <!-- Power Plant -->
    63266329            <separator/>
    63276330            <item name="Biofuel Power Plant" icon="presets/power/plant_biofuel.svg" type="closedway,multipolygon,relation" preset_name_label="true">
    … …  
    64486451            </item> <!-- Wind Power Plant -->
    64496452        </group> <!-- Power Plant -->
    64506453        <group name="Power Generator" icon="presets/power/generator.svg">
     6454            <item name="Power Generator" icon="presets/power/generator.svg" type="node,closedway,multipolygon" preset_name_label="true" match_expression="power=generator -(&quot;generator:source&quot;=biofuel|&quot;generator:source&quot;=biogas|&quot;generator:source&quot;=biomass|&quot;generator:source&quot;=coal|&quot;generator:source&quot;=diesel|&quot;generator:source&quot;=gas|&quot;generator:source&quot;=gasoline|&quot;generator:source&quot;=geothermal|&quot;generator:source&quot;=hydro|&quot;generator:source&quot;=nuclear|&quot;generator:source&quot;=oil|&quot;generator:source&quot;=osmotic|&quot;generator:source&quot;=solar|&quot;generator:source&quot;=tidal|&quot;generator:source&quot;=waste|&quot;generator:source&quot;=wave|&quot;generator:source&quot;=wind)">
     6455                <link wiki="Tag:power=generator" />
     6456                <space />
     6457                <combo key="generator:source" text="Generator Source" values_searchable="true" values_sort="false">
     6458                    <reference ref="power_source" />
     6459                </combo>
     6460                <reference ref="power_generator" />
     6461                <reference ref="power_output" />
     6462            </item> <!-- Power Generator -->
     6463            <separator/>
    64516464            <item name="Biofuel Power Generator" icon="presets/power/power_source-biofuel.svg" type="node,closedway,multipolygon" preset_name_label="true">
    64526465                <link wiki="Tag:generator:source=biofuel" />
    64536466                <key key="generator:source" value="biofuel" />
    … …  
    64566469                <key key="generator:method" value="combustion" match="none" />
    64576470                <combo key="generator:type" text="Generator Type" values="gas_turbine,reciprocating_engine,steam_generator" />
    64586471                <reference ref="power_output" />
    6459             </item> <!-- Power Generator -->
     6472            </item> <!-- Biofuel Power Generator -->
    64606473            <item name="Biogas Power Generator" icon="presets/power/power_source-biofuel.svg" type="node,closedway,multipolygon" preset_name_label="true">
    64616474                <link wiki="Tag:generator:source=biogas" />
    64626475                <key key="generator:source" value="biogas" />