Ticket #23209: josm_23209.patch

File josm_23209.patch, 6.5 KB (added by gaben, 3 years ago)

  • resources/data/defaultpresets.xml

     
    66166621                <space />
    66176622                <reference ref="power_generator" />
    66186623                <key key="generator:method" value="combustion" match="none" />
    6619                 <combo key="generator:type" text="Generator Type" values="gas_turbine,reciprocating_engine,steam_generator" />
     6624                <combo key="generator:type" text="Generator Type" values="boiler,gas_turbine,reciprocating_engine,steam_generator" />
    66206625                <reference ref="power_output" />
    66216626            </item> <!-- Biofuel Power Generator -->
    66226627            <item name="Biogas Power Generator" icon="presets/power/power_source-biofuel.svg" type="node,closedway,multipolygon" preset_name_label="true">
    … …  
    66256630                <space />
    66266631                <reference ref="power_generator" />
    66276632                <key key="generator:method" value="combustion" match="none" />
    6628                 <combo key="generator:type" text="Generator Type" values="reciprocating_engine,steam_generator" />
     6633                <combo key="generator:type" text="Generator Type" values="boiler,reciprocating_engine,steam_generator" />
    66296634                <reference ref="power_output" />
    66306635            </item> <!-- Biogas Power Generator -->
    66316636            <item name="Biomass Power Generator" icon="presets/power/power_source-biofuel.svg" type="node,closedway,multipolygon" preset_name_label="true">
    … …  
    66356640                <reference ref="power_generator" />
    66366641                <combo key="generator:method" text="Method" values_context="generator method" values="anaerobic_digestion,combustion,gasification" />
    66376642                <combo key="generator:type" text="Generator Type" values_searchable="true">
    6638                     <list_entry value="bioreactor" short_description="anaerobic_digestion / combustion" />
    6639                     <list_entry value="pyrolysis" short_description="" />
     6643                    <list_entry value="bioreactor" short_description="anaerobic_digestion / gasification" />
     6644                    <list_entry value="boiler" short_description="combustion" />
    66406645                    <list_entry value="steam_generator" short_description="combustion" />
    66416646                    <list_entry value="steam_turbine" short_description="combustion" />
    66426647                </combo>
    … …  
    66486653                <space />
    66496654                <reference ref="power_generator" />
    66506655                <key key="generator:method" value="combustion" match="none" />
    6651                 <combo key="generator:type" text="Generator Type" values="steam_generator,steam_turbine" />
     6656                <combo key="generator:type" text="Generator Type" values="steam_generator,steam_turbine,boiler" />
    66526657                <reference ref="power_output" />
    66536658            </item> <!-- Coal Power Generator -->
    66546659            <item name="Gas Power Generator" icon="presets/power/power_source-gas.svg" type="node,closedway,multipolygon" preset_name_label="true">
    … …  
    66576662                <space />
    66586663                <reference ref="power_generator" />
    66596664                <key key="generator:method" value="combustion" match="none" />
    6660                 <combo key="generator:type" text="Generator Type" values="combined_cycle,gas_turbine,reciprocating_engine,steam_generator,steam_turbine" />
     6665                <combo key="generator:type" text="Generator Type" values="boiler,combined_cycle,gas_turbine,reciprocating_engine,steam_generator,steam_turbine" />
    66616666                <reference ref="power_output" />
    66626667            </item> <!-- Gas Power Generator -->
    66636668            <item name="Oil Power Generator" icon="presets/power/power_source-oil.svg" type="node,closedway,multipolygon" preset_name_label="true">
    … …  
    66666671                <space />
    66676672                <reference ref="power_generator" />
    66686673                <key key="generator:method" value="combustion" match="none" />
    6669                 <combo key="generator:type" text="Generator Type" values="steam_generator,steam_turbine" />
     6674                <combo key="generator:type" text="Generator Type" values="boiler,steam_generator,steam_turbine" />
    66706675                <reference ref="power_output" />
    66716676            </item> <!-- Oil Power Generator -->
    66726677            <item name="Diesel Power Generator" icon="presets/power/power_source-oil.svg" type="node,closedway,multipolygon" preset_name_label="true">
    … …  
    66756680                <space />
    66766681                <reference ref="power_generator" />
    66776682                <key key="generator:method" value="combustion" match="none" />
    6678                 <combo key="generator:type" text="Generator Type" values="reciprocating_engine,steam_generator" />
     6683                <combo key="generator:type" text="Generator Type" values="boiler,reciprocating_engine,steam_generator" />
    66796684                <reference ref="power_output" />
    66806685            </item> <!-- Diesel Power Generator -->
    66816686            <item name="Gasoline Power Generator" icon="presets/power/power_source-oil.svg" type="node,closedway,multipolygon" preset_name_label="true">
    … …  
    66846689                <space />
    66856690                <reference ref="power_generator" />
    66866691                <key key="generator:method" value="combustion" match="none" />
    6687                 <combo key="generator:type" text="Generator Type" values="reciprocating_engine,steam_generator" />
     6692                <combo key="generator:type" text="Generator Type" values="boiler,reciprocating_engine,steam_generator" />
    66886693                <reference ref="power_output" />
    66896694            </item> <!-- Gasoline Power Generator -->
    66906695            <item name="Nuclear Reactor" icon="presets/power/power_source-nuclear.svg" type="node,closedway,multipolygon" preset_name_label="true">
    … …  
    67516756                    <list_entry value="reciprocating_engine" short_description="combustion" />
    67526757                    <list_entry value="steam_generator" short_description="combustion" />
    67536758                </combo>
    6754                 <combo key="generator:type" text="Generator Type" values="bioreactor,reciprocating_engine,steam_generator" />
     6759                <combo key="generator:type" text="Generator Type" values="bioreactor,boiler,reciprocating_engine,steam_generator" />
    67556760                <reference ref="power_output" />
    67566761            </item> <!-- Waste Power Generator -->
    67576762            <item name="Water Turbine" icon="presets/power/power_source-water.svg" type="node,closedway,multipolygon" preset_name_label="true">