Ticket #10289: power_generator.diff

File power_generator.diff, 24.1 KB (added by skyper, 10 years ago)

patch

  • data/defaultpresets.xml

     
    363363        <combo key="religion" text="Religion" values="bahai,buddhist,christian,hindu,jain,jewish,muslim,shinto,sikh,spiritualist,taoist,unitarian,zoroastrian" />
    364364        <combo key="denomination" text="Denomination" values="anglican,baptist,catholic,evangelical,jehovahs_witness,lutheran,methodist,mormon,orthodox,pentecostal,presbyterian,protestant,quaker,shia,sunni" />
    365365    </chunk>
     366    <chunk id="power_generator">
     367        <link href="http://wiki.openstreetmap.org/wiki/Tag:power=generator"
     368              de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:power=generator"
     369              fr.href="http://wiki.openstreetmap.org/wiki/FR:Tag:power=generator"
     370              it.href="http://wiki.openstreetmap.org/wiki/IT:Tag:power=generator"
     371              ja.href="http://wiki.openstreetmap.org/wiki/JA:Tag:power=generator"
     372              pl.href="http://wiki.openstreetmap.org/wiki/Pl:Tag:power=generator"
     373              pt_BR.href="http://wiki.openstreetmap.org/wiki/Pt-br:Tag:power=generator"
     374              ru.href="http://wiki.openstreetmap.org/wiki/RU:Tag:power=generator" />
     375        <space />
     376        <key key="power" value="generator" />
     377        <reference ref="name_ref_operator" />
     378        <text key="branch" text="Branch operator" />
     379        <text key="start_date" text="Start date" />
     380    </chunk>
     381    <chunk id="power_output">
     382        <optional text="Output forms of energy:">
     383            <combo key="generator:output:biogas" text="biogas" values="yes,2 W,3 kW,5 MW,7 GW" />
     384            <combo key="generator:output:electricity" text="electricity" values="yes,2 W,3 kW,5 MW,7 GW" />
     385            <combo key="generator:output:hot_water" text="hot water" values="yes,2 W,3 kW,5 MW,7 GW" />
     386            <combo key="generator:output:hot_air" text="hot air" values="yes,2 W,3 kW,5 MW,7 GW" />
     387            <combo key="generator:output:cold_water" text="cold water" values="yes,2 W,3 kW,5 MW,7 GW" />
     388            <combo key="generator:output:cold_air" text="cold air" values="yes,2 W,3 kW,5 MW,7 GW" />
     389            <combo key="generator:output:compressed_air" text="compressed air" values="yes,2 W,3 kW,5 MW,7 GW" />
     390            <combo key="generator:output:steam" text="steam" values="yes,2 W,3 kW,5 MW,7 GW" />
     391            <combo key="generator:output:vacuum" text="vacuum" values="yes,2 W,3 kW,5 MW,7 GW" />
     392            <space />
     393            <combo key="frequency" text="Frequency in Hertz (Hz)" values="0,16.67,16.7,50,60" length="5" />
     394        </optional>
     395    </chunk>
    366396  <!-- Link chunks -->
    367397  <chunk id="link_contact">
    368398    <preset_link preset_name="Contact (common schema)" />
    … …  
    49664996                <combo key="frequency" text="Frequency in Hertz (Hz)" values="0,16.67,16.7,50,60" length="5" />
    49674997            </optional>
    49684998        </item>
    4969         <item name="Power Generator" icon="presets/power.png" type="node,closedway,relation" preset_name_label="true">
    4970             <link href="http://wiki.openstreetmap.org/wiki/Tag:power=generator"
    4971                   de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:power=generator"
    4972                   fr.href="http://wiki.openstreetmap.org/wiki/FR:Tag:power=generator"
    4973                   it.href="http://wiki.openstreetmap.org/wiki/IT:Tag:power=generator"
    4974                   ja.href="http://wiki.openstreetmap.org/wiki/JA:Tag:power=generator"
    4975                   pl.href="http://wiki.openstreetmap.org/wiki/Pl:Tag:power=generator"
    4976                   pt_BR.href="http://wiki.openstreetmap.org/wiki/Pt-br:Tag:power=generator"
    4977                   ru.href="http://wiki.openstreetmap.org/wiki/RU:Tag:power=generator" />
    4978             <space />
    4979             <key key="power" value="generator" />
    4980             <reference ref="name_operator" />
    4981             <text key="branch" text="Branch operator" />
    4982             <text key="ref" text="Reference" />
    4983             <text key="start_date" text="Start date" />
    4984             <combo key="generator:source" text="Source" values_searchable="true">
    4985                 <list_entry value="biofuel"    icon="presets/power_source-biofuel.svg" />
    4986                 <list_entry value="biogas"     icon="presets/power_source-biofuel.svg" />
    4987                 <list_entry value="biomass"    icon="presets/power_source-biofuel.svg" />
    4988                 <list_entry value="coal"       icon="presets/power_source-coal.svg" />
    4989                 <list_entry value="diesel"     icon="presets/power_source-oil.svg" />
    4990                 <list_entry value="gas"        icon="presets/power_source-gas.svg" />
    4991                 <list_entry value="gasoline"   icon="presets/power_source-oil.svg" />
    4992                 <list_entry value="geothermal" icon="presets/power_source-water.svg" />
    4993                 <list_entry value="hydro"      icon="presets/power_source-water.svg" />
    4994                 <list_entry value="nuclear"    icon="presets/power_source-nuclear.svg" />
    4995                 <list_entry value="oil"        icon="presets/power_source-oil.svg" />
    4996                 <list_entry value="osmotic"    icon="presets/power_source-water.svg" />
    4997                 <list_entry value="solar"      icon="presets/power_source-sun.svg" />
    4998                 <list_entry value="tidal"      icon="presets/power_source-water.svg" />
    4999                 <list_entry value="waste"      icon="presets/power_source-waste.svg" />
    5000                 <list_entry value="wave"       icon="presets/power_source-water.svg" />
    5001                 <list_entry value="wind"       icon="presets/power_source-wind.svg" />
    5002             </combo>
    5003             <combo key="generator:method" text="Method" values_context="generator method" values_searchable="true">
    5004                 <list_entry value="anaerobic_digestion" short_description="" /> <!-- Recheck -->
    5005                 <list_entry value="barrage" short_description="tidal" />
    5006                 <list_entry value="combustion" short_description="bio / coal / diesel / gas / gasoline / oil / waste" />
    5007                 <list_entry value="fission" short_description="nuclear" />
    5008                 <list_entry value="fusion" short_description="nuclear" />
    5009                 <list_entry value="gasification" short_description="biomass / waste" />
    5010                 <list_entry value="photovoltaic" short_description="solar" />
    5011                 <list_entry value="pyrolysis" short_description="" /> <!-- Recheck -->
    5012                 <list_entry value="run-of-the-river" short_description="hydro" />
    5013                 <list_entry value="stream" short_description="tidal" />
    5014                 <list_entry value="thermal" short_description="solar" />
    5015                 <list_entry value="water-pumped-storage" short_description="hydro" />
    5016                 <list_entry value="water-storage" short_description="hydro" />
    5017             </combo>
    5018             <combo key="generator:type" text="Generator Type" values_searchable="true">
    5019                 <list_entry value="combined_cycle" short_description="gas combustion" />
    5020                 <list_entry value="francis_turbine" short_description="hydro" />
    5021                 <list_entry value="gas_turbine" short_description="biogas, biomass, gas, waste combustion" />
    5022                 <list_entry value="heat_pump" short_description="geothermal" />
    5023                 <list_entry value="horizontal_axis" short_description="tidal steam / wind" />
    5024                 <list_entry value="kaplan_turbine" short_description="hygro run-of-the-river / hydro water-storage / tidal barrage" />
    5025                 <list_entry value="pelton_turbine" short_description="hygro run-of-the-river / hydro water-storage" />
    5026                 <list_entry value="reciprocating_engine" short_description="biofuel, biogas, diesel, gas, gasoline" />
    5027                 <list_entry value="solar_photovoltaic_panel" short_description="solar photovoltaic" />
    5028                 <list_entry value="solar_thermal_collector" short_description="solar thermal" />
    5029                 <list_entry value="steam_generator" short_description="bio, coal, diesel, gas, gasoline, oil, waste combustion" />
    5030                 <list_entry value="steam_turbine" short_description="geothermal / solar thermal / bio, coal, oil, waste combustion" />
    5031                 <list_entry value="stellarator" short_description="nuclear fusion" />
    5032                 <list_entry value="tokamak" short_description="nuclear fusion" />
    5033                 <list_entry value="vertical_axis" short_description="tidal steam / wind" />
    5034                 <list_entry value="BWR-1" display_value="Boiling Water Reactor 1 (BWR-1)" short_description="nuclear fission" />
    5035                 <list_entry value="BWR-2" display_value="Boiling Water Reactor 2 (BWR-2)" short_description="nuclear fission" />
    5036                 <list_entry value="BWR-3" display_value="Boiling Water Reactor 3 (BWR-3)" short_description="nuclear fission" />
    5037                 <list_entry value="BWR-4" display_value="Boiling Water Reactor 4 (BWR-4)" short_description="nuclear fission" />
    5038                 <list_entry value="BWR-5" display_value="Boiling Water Reactor 5 (BWR-5)" short_description="nuclear fission" />
    5039                 <list_entry value="BWR-6" display_value="Boiling Water Reactor 6 (BWR-6)" short_description="nuclear fission" />
    5040                 <list_entry value="CANDU" display_value="CANada Deuterium Uranium reactor (CANDU)" short_description="nuclear fission" />
    5041                 <list_entry value="CPR-1000" display_value="China Pressurized Reactor (CPR-1000)" short_description="nuclear fission" />
    5042                 <list_entry value="EPR" display_value="European Pressurized Reactor (EPR)" short_description="nuclear fission" />
    5043                 <list_entry value="ICF" display_value="Inertial Confinement Fusion (ICF)" short_description="nuclear fusion" />
    5044                 <list_entry value="PWR" display_value="Pressurized water reactor (PWR)" short_description="nuclear fission" />
    5045                 <list_entry value="RBMK-1000" display_value="Reactor Bolshoy Moshchnosti Kanalniy 1000 (RBMK-1000)" short_description="nuclear fission" />
    5046                 <list_entry value="RBMK-1500" display_value="Reactor Bolshoy Moshchnosti Kanalniy 1500 (RBMK-1500)" short_description="nuclear fission" />
    5047                 <list_entry value="VVER" display_value="Vodo-Vodyanoi Energetichesky Reactor (VVER)" short_description="nuclear fission" />
    5048             </combo>
    5049             <optional>
    5050                 <label text="Output forms of energy:" />
    5051                 <space />
    5052                 <combo key="generator:output:electricity" text="electricity" values="yes,2 W,3 kW,5 MW,7 GW" />
    5053                 <combo key="generator:output:hot_water" text="hot water" values="yes,2 W,3 kW,5 MW,7 GW" />
    5054                 <combo key="generator:output:hot_air" text="hot air" values="yes,2 W,3 kW,5 MW,7 GW" />
    5055                 <combo key="generator:output:cold_water" text="cold water" values="yes,2 W,3 kW,5 MW,7 GW" />
    5056                 <combo key="generator:output:cold_air" text="cold air" values="yes,2 W,3 kW,5 MW,7 GW" />
    5057                 <combo key="generator:output:compressed_air" text="compressed air" values="yes,2 W,3 kW,5 MW,7 GW" />
    5058                 <combo key="generator:output:steam" text="steam" values="yes,2 W,3 kW,5 MW,7 GW" />
    5059                 <combo key="generator:output:vacuum" text="vacuum" values="yes,2 W,3 kW,5 MW,7 GW" />
    5060                 <space />
    5061                 <combo key="frequency" text="Frequency in Hertz (Hz)" values="0,16.67,16.7,50,60" length="5" />
    5062             </optional>
    5063         </item>
     4999        <group name="Power Generator" icon="presets/power.png">
     5000            <item name="Biofuel Power Generator" icon="presets/power_source-biofuel.svg" type="node,closedway,relation" preset_name_label="true">
     5001                <key key="generator:source" value="biofuel" />
     5002                <reference ref="power_generator" />
     5003                <key key="generator:method" value="combustion" />
     5004                <combo key="generator:type" text="Generator Type" values="gas_turbine,reciprocating_engine,steam_generator" />
     5005                <reference ref="power_output" />
     5006            </item>
     5007            <item name="Biogas Power Generator" icon="presets/power_source-biofuel.svg" type="node,closedway,relation" preset_name_label="true">
     5008                <key key="generator:source" value="biogas" />
     5009                <reference ref="power_generator" />
     5010                <key key="generator:method" value="combustion" />
     5011                <combo key="generator:type" text="Generator Type" values="reciprocating_engine,steam_generator" />
     5012                <reference ref="power_output" />
     5013            </item>
     5014            <item name="Biomass Power Generator" icon="presets/power_source-biofuel.svg" type="node,closedway,relation" preset_name_label="true">
     5015                <key key="generator:source" value="biomass" />
     5016                <reference ref="power_generator" />
     5017                <combo key="generator:method" text="Method" values_context="generator method" values="anaerobic_digestion,combustion,gasification" />
     5018                <combo key="generator:type" text="Generator Type" values_searchable="true">
     5019                    <list_entry value="bioreactor" short_description="anaerobic_digestion / combustion" />
     5020                    <list_entry value="pyrolysis" short_description="" />
     5021                    <list_entry value="steam_generator" short_description="combustion" />
     5022                    <list_entry value="steam_turbine" short_description="combustion" />
     5023                </combo>
     5024                <reference ref="power_output" />
     5025            </item>
     5026            <item name="Coal Power Generator" icon="presets/power_source-coal.svg" type="node,closedway,relation" preset_name_label="true">
     5027                <key key="generator:source" value="coal" />
     5028                <reference ref="power_generator" />
     5029                <key key="generator:method" value="combustion" />
     5030                <combo key="generator:type" text="Generator Type" values="steam_generator,steam_turbine" />
     5031                <reference ref="power_output" />
     5032            </item>
     5033            <item name="Diesel Power Generator" icon="presets/power_source-oil.svg" type="node,closedway,relation" preset_name_label="true">
     5034                <key key="generator:source" value="diesel" />
     5035                <reference ref="power_generator" />
     5036                <key key="generator:method" value="combustion" />
     5037                <combo key="generator:type" text="Generator Type" values="reciprocating_engine,steam_generator" />
     5038                <reference ref="power_output" />
     5039            </item>
     5040            <item name="Gas Power Generator" icon="presets/power_source-gas.svg" type="node,closedway,relation" preset_name_label="true">
     5041                <key key="generator:source" value="gas" />
     5042                <reference ref="power_generator" />
     5043                <key key="generator:method" value="combustion" />
     5044                <combo key="generator:type" text="Generator Type" values="combined_cycle,gas_turbine,reciprocating_engine,steam_generator,steam_turbine" />
     5045                <reference ref="power_output" />
     5046            </item>
     5047            <item name="Gasoline Power Generator" icon="presets/power_source-oil.svg" type="node,closedway,relation" preset_name_label="true">
     5048                <key key="generator:source" value="gasoline" />
     5049                <reference ref="power_generator" />
     5050                <key key="generator:method" value="combustion" />
     5051                <combo key="generator:type" text="Generator Type" values="reciprocating_engine,steam_generator" />
     5052                <reference ref="power_output" />
     5053            </item>
     5054            <item name="Geothermal Power Generator" icon="presets/power_source-water.svg" type="node,closedway,relation" preset_name_label="true">
     5055                <key key="generator:source" value="geothermal" />
     5056                <reference ref="power_generator" />
     5057                <combo key="generator:type" text="Generator Type" values="heat_pump,steam_turbine" />
     5058                <reference ref="power_output" />
     5059            </item>
     5060            <item name="Hydro Power Generator" icon="presets/power_source-water.svg" type="node,closedway,relation" preset_name_label="true">
     5061                <key key="generator:source" value="hydro" />
     5062                <reference ref="power_generator" />
     5063                <combo key="generator:method" text="Method" values_context="generator method" values="run-of-the-river,water-pumped-storage,water-storage" />
     5064                <combo key="generator:type" text="Generator Type" values_searchable="true">
     5065                    <list_entry value="francis_turbine" short_description="all methods" />
     5066                    <list_entry value="hydrodynamic_screw" short_description="run-of-the-river" />
     5067                    <list_entry value="kaplan_turbine" short_description="run-of-the-river / water-storage" />
     5068                    <list_entry value="pelton_turbine" short_description="run-of-the-river / water-storage" />
     5069                </combo>
     5070                <reference ref="power_output" />
     5071            </item>
     5072            <item name="Nuclear Power Generator" icon="presets/power_source-nuclear.svg" type="node,closedway,relation" preset_name_label="true">
     5073                <key key="generator:source" value="nuclear" />
     5074                <reference ref="power_generator" />
     5075                <combo key="generator:method" text="Method" values_context="generator method" values="fision,fusion" />
     5076                <combo key="generator:type" text="Generator Type" values_searchable="true">
     5077                    <list_entry value="BWR-1" display_value="Boiling Water Reactor 1 (BWR-1)" short_description="fission" />
     5078                    <list_entry value="BWR-2" display_value="Boiling Water Reactor 2 (BWR-2)" short_description="fission" />
     5079                    <list_entry value="BWR-3" display_value="Boiling Water Reactor 3 (BWR-3)" short_description="fission" />
     5080                    <list_entry value="BWR-4" display_value="Boiling Water Reactor 4 (BWR-4)" short_description="fission" />
     5081                    <list_entry value="BWR-5" display_value="Boiling Water Reactor 5 (BWR-5)" short_description="fission" />
     5082                    <list_entry value="BWR-6" display_value="Boiling Water Reactor 6 (BWR-6)" short_description="fission" />
     5083                    <list_entry value="CANDU" display_value="CANada Deuterium Uranium reactor (CANDU)" short_description="fission" />
     5084                    <list_entry value="cold-fusion" short_description="fusion" />
     5085                    <list_entry value="CPR-1000" display_value="China Pressurized Reactor (CPR-1000)" short_description="fission" />
     5086                    <list_entry value="EPR" display_value="European Pressurized Reactor (EPR)" short_description="fission" />
     5087                    <list_entry value="ICF" display_value="Inertial Confinement Fusion (ICF)" short_description="fusion" />
     5088                    <list_entry value="PWR" display_value="Pressurized water reactor (PWR)" short_description="fission" />
     5089                    <list_entry value="RBMK-1000" display_value="Reactor Bolshoy Moshchnosti Kanalniy 1000 (RBMK-1000)" short_description="fission" />
     5090                    <list_entry value="RBMK-1500" display_value="Reactor Bolshoy Moshchnosti Kanalniy 1500 (RBMK-1500)" short_description="fission" />
     5091                    <list_entry value="stellarator" short_description="fusion" />
     5092                    <list_entry value="tokamak" short_description="fusion" />
     5093                    <list_entry value="VVER" display_value="Vodo-Vodyanoi Energetichesky Reactor (VVER)" short_description="fission" />
     5094                </combo>
     5095                <reference ref="power_output" />
     5096            </item>
     5097            <item name="Oil Power Generator" icon="presets/power_source-oil.svg" type="node,closedway,relation" preset_name_label="true">
     5098                <key key="generator:source" value="oil" />
     5099                <reference ref="power_generator" />
     5100                <key key="generator:method" value="combustion" />
     5101                <combo key="generator:type" text="Generator Type" values="steam_generator,steam_turbine" />
     5102                <reference ref="power_output" />
     5103            </item>
     5104            <item name="Osmotic Power Generator" icon="presets/power_source-water.svg" type="node,closedway,relation" preset_name_label="true">
     5105                <key key="generator:source" value="osmotic" />
     5106                <reference ref="power_generator" />
     5107                <reference ref="power_output" />
     5108            </item>
     5109            <item name="Solar Power Generator" icon="presets/power_source-sun.svg" type="node,closedway,relation" preset_name_label="true">
     5110                <key key="generator:source" value="solar" />
     5111                <reference ref="power_generator" />
     5112                <combo key="generator:method" text="Method" values_context="generator method" values="photovoltaic,thermal" />
     5113                <combo key="generator:type" text="Generator Type" values_searchable="true">
     5114                    <list_entry value="solar_photovoltaic_panel" short_description="photovoltaic" />
     5115                    <list_entry value="solar_thermal_collector" short_description="thermal" />
     5116                    <list_entry value="steam_turbine" short_description="thermal" />
     5117                </combo>
     5118                <reference ref="power_output" />
     5119            </item>
     5120            <item name="Tidal Power Generator" icon="presets/power_source-water.svg" type="node,closedway,relation" preset_name_label="true">
     5121                <key key="generator:source" value="tidal" />
     5122                <reference ref="power_generator" />
     5123                <combo key="generator:method" text="Method" values_context="generator method" values="barrage,stream" />
     5124                <combo key="generator:type" text="Generator Type" values_searchable="true">
     5125                    <list_entry value="horizontal_axis" short_description="steam" />
     5126                    <list_entry value="kaplan_turbine" short_description="barrage" />
     5127                    <list_entry value="vertical_axis" short_description="steam" />
     5128                </combo>
     5129                <reference ref="power_output" />
     5130            </item>
     5131            <item name="Waste Power Generator" icon="presets/power_source-waste.svg" type="node,closedway,relation" preset_name_label="true">
     5132                <key key="generator:source" value="waste" />
     5133                <reference ref="power_generator" />
     5134                <combo key="generator:method" text="Method" values_context="generator method" values="combustion,gasification,pyrolysis" />
     5135                <combo key="generator:type" text="Generator Type" values_searchable="true">
     5136                    <list_entry value="bioreactor" short_description="gasification" />
     5137                    <list_entry value="pyrolysis" short_description="" />
     5138                    <list_entry value="reciprocating_engine" short_description="combustion" />
     5139                    <list_entry value="steam_generator" short_description="combustion" />
     5140                </combo>
     5141                <combo key="generator:type" text="Generator Type" values="bioreactor,reciprocating_engine,steam_generator" />
     5142                <reference ref="power_output" />
     5143            </item>
     5144            <item name="Wave Power Generator" icon="presets/power_source-water.svg" type="node,closedway,relation" preset_name_label="true">
     5145                <key key="generator:source" value="wave" />
     5146                <reference ref="power_generator" />
     5147                <reference ref="power_output" />
     5148            </item>
     5149            <item name="Wind Power Generator" icon="presets/power_source-wind.svg" type="node,closedway,relation" preset_name_label="true">
     5150                <key key="generator:source" value="wind" />
     5151                <reference ref="power_generator" />
     5152                <key key="generator:method" value="wind_turbine" />
     5153                <combo key="generator:type" text="Generator Type" values="horizontal_axis,vertical_axis" />
     5154                <reference ref="power_output" />
     5155            </item>
     5156        </group>
    50645157        <separator/>
    50655158        <item name="Power Substation" icon="icons/power_substation.n.16.png" type="node,closedway" preset_name_label="true">
    50665159            <link href="http://wiki.openstreetmap.org/wiki/Tag:power=substation"