Changeset 7361 in josm


Ignore:
Timestamp:
2014-08-03T19:59:16+02:00 (5 years ago)
Author:
Don-vip
Message:

fix #10289 - update power=generator presets (modified patch by skyper)

Location:
trunk
Files:
26 edited

Legend:

Unmodified
Added
Removed
  • trunk/data/defaultpresets.xml

    r7355 r7361  
    262262    </chunk>
    263263    <chunk id="name_operator_oh">
    264         <text key="name" text="Name" />
    265         <text key="operator" text="Operator" />
     264        <reference ref="name_operator" />
    266265        <reference ref="oh" />
    267266    </chunk>
     
    364363        <combo key="denomination" text="Denomination" values="anglican,baptist,catholic,evangelical,jehovahs_witness,lutheran,methodist,mormon,orthodox,pentecostal,presbyterian,protestant,quaker,shia,sunni" />
    365364    </chunk>
     365    <chunk id="voltage">
     366        <combo key="voltage" text="Voltage in Volts (V)" values="1150000,765000,750000,735000,500000,450000,420000,400000,380000,350000,345000,330000,315000,300000,275000,238000,230000,225000,220000,200000,161000,154000,150000,138000,132000,120000,115000,110000,100000,90000,69000,66000,65000,63000,60000,55000,49000,45000,35000,33000,30000,20000,15000,high,medium,low,750000;200000,110000;20000" />
     367    </chunk>
     368    <chunk id="frequency">
     369        <combo key="frequency" text="Frequency in Hertz (Hz)" values="0,16.67,16.7,50,60" length="5" />
     370    </chunk>
     371    <chunk id="voltage_frequency">
     372        <reference ref="voltage" />
     373        <reference ref="frequency" />
     374    </chunk>
     375    <chunk id="ref_operator_branch">
     376        <text key="ref" text="Reference" />
     377        <text key="operator" text="Operator" />
     378        <text key="branch" text="Branch operator" />
     379    </chunk>
     380    <chunk id="cable_circuit">
     381        <combo key="cables" text="Amount of Cables" values="1,3,6,9,12" lenght="2" />
     382        <combo key="circuits" text="Amount of circuits" values="1,2,3" lenght="2" />
     383    </chunk>
     384    <chunk id="power_loc">
     385        <combo key="location" text="Location" values="outdoor,indoor,underground,platform,kiosk" values_context="power" />
     386    </chunk>
     387    <chunk id="power_extra">
     388        <reference ref="power_loc" />
     389        <reference ref="voltage_frequency" />
     390        <reference ref="ref_operator_branch" />
     391    </chunk>
     392    <chunk id="power_line_extra">
     393        <reference ref="cable_circuit" />
     394        <reference ref="voltage_frequency" />
     395    </chunk>
     396    <chunk id="power_generator">
     397        <link href="http://wiki.openstreetmap.org/wiki/Tag:power=generator"
     398              de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:power=generator"
     399              fr.href="http://wiki.openstreetmap.org/wiki/FR:Tag:power=generator"
     400              it.href="http://wiki.openstreetmap.org/wiki/IT:Tag:power=generator"
     401              ja.href="http://wiki.openstreetmap.org/wiki/JA:Tag:power=generator"
     402              pl.href="http://wiki.openstreetmap.org/wiki/Pl:Tag:power=generator"
     403              pt_BR.href="http://wiki.openstreetmap.org/wiki/Pt-br:Tag:power=generator"
     404              ru.href="http://wiki.openstreetmap.org/wiki/RU:Tag:power=generator" />
     405        <space />
     406        <key key="power" value="generator" />
     407        <reference ref="name_ref_operator" />
     408        <text key="branch" text="Branch operator" />
     409        <text key="start_date" text="Start date" />
     410    </chunk>
     411    <chunk id="power_output">
     412        <optional text="Output forms of energy:">
     413            <combo key="generator:output:biogas" text="biogas" values="yes,2 W,3 kW,5 MW,7 GW" />
     414            <combo key="generator:output:electricity" text="electricity" values="yes,2 W,3 kW,5 MW,7 GW" />
     415            <combo key="generator:output:hot_water" text="hot water" values="yes,2 W,3 kW,5 MW,7 GW" />
     416            <combo key="generator:output:hot_air" text="hot air" values="yes,2 W,3 kW,5 MW,7 GW" />
     417            <combo key="generator:output:cold_water" text="cold water" values="yes,2 W,3 kW,5 MW,7 GW" />
     418            <combo key="generator:output:cold_air" text="cold air" values="yes,2 W,3 kW,5 MW,7 GW" />
     419            <combo key="generator:output:compressed_air" text="compressed air" values="yes,2 W,3 kW,5 MW,7 GW" />
     420            <combo key="generator:output:steam" text="steam" values="yes,2 W,3 kW,5 MW,7 GW" />
     421            <combo key="generator:output:vacuum" text="vacuum" values="yes,2 W,3 kW,5 MW,7 GW" />
     422            <space />
     423            <combo key="frequency" text="Frequency in Hertz (Hz)" values="0,16.67,16.7,50,60" length="5" />
     424        </optional>
     425    </chunk>
    366426  <!-- Link chunks -->
    367427  <chunk id="link_contact">
     
    49755035            <space />
    49765036            <key key="power" value="plant" />
    4977             <reference ref="name_operator" />
     5037            <reference ref="name_ref_operator" />
    49785038            <text key="branch" text="Branch operator" />
    4979             <text key="ref" text="Reference" />
    49805039            <text key="start_date" text="Start date" />
    49815040            <optional text="Output forms of energy (optional):">
     
    49925051            </optional>
    49935052        </item>
    4994         <item name="Power Generator" icon="presets/power.png" type="node,closedway,relation" preset_name_label="true">
    4995             <link href="http://wiki.openstreetmap.org/wiki/Tag:power=generator"
    4996                   de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:power=generator"
    4997                   fr.href="http://wiki.openstreetmap.org/wiki/FR:Tag:power=generator"
    4998                   it.href="http://wiki.openstreetmap.org/wiki/IT:Tag:power=generator"
    4999                   ja.href="http://wiki.openstreetmap.org/wiki/JA:Tag:power=generator"
    5000                   pl.href="http://wiki.openstreetmap.org/wiki/Pl:Tag:power=generator"
    5001                   pt_BR.href="http://wiki.openstreetmap.org/wiki/Pt-br:Tag:power=generator"
    5002                   ru.href="http://wiki.openstreetmap.org/wiki/RU:Tag:power=generator" />
    5003             <space />
    5004             <key key="power" value="generator" />
    5005             <reference ref="name_operator" />
    5006             <text key="branch" text="Branch operator" />
    5007             <text key="ref" text="Reference" />
    5008             <text key="start_date" text="Start date" />
    5009             <combo key="generator:source" text="Source" values_searchable="true">
    5010                 <list_entry value="biofuel"    icon="presets/power_source-biofuel.svg" />
    5011                 <list_entry value="biogas"     icon="presets/power_source-biofuel.svg" />
    5012                 <list_entry value="biomass"    icon="presets/power_source-biofuel.svg" />
    5013                 <list_entry value="coal"       icon="presets/power_source-coal.svg" />
    5014                 <list_entry value="diesel"     icon="presets/power_source-oil.svg" />
    5015                 <list_entry value="gas"        icon="presets/power_source-gas.svg" />
    5016                 <list_entry value="gasoline"   icon="presets/power_source-oil.svg" />
    5017                 <list_entry value="geothermal" icon="presets/power_source-water.svg" />
    5018                 <list_entry value="hydro"      icon="presets/power_source-water.svg" />
    5019                 <list_entry value="nuclear"    icon="presets/power_source-nuclear.svg" />
    5020                 <list_entry value="oil"        icon="presets/power_source-oil.svg" />
    5021                 <list_entry value="osmotic"    icon="presets/power_source-water.svg" />
    5022                 <list_entry value="solar"      icon="presets/power_source-sun.svg" />
    5023                 <list_entry value="tidal"      icon="presets/power_source-water.svg" />
    5024                 <list_entry value="waste"      icon="presets/power_source-waste.svg" />
    5025                 <list_entry value="wave"       icon="presets/power_source-water.svg" />
    5026                 <list_entry value="wind"       icon="presets/power_source-wind.svg" />
    5027             </combo>
    5028             <combo key="generator:method" text="Method" values_context="generator method" values_searchable="true">
    5029                 <list_entry value="anaerobic_digestion" short_description="" /> <!-- Recheck -->
    5030                 <list_entry value="barrage" short_description="tidal" />
    5031                 <list_entry value="combustion" short_description="bio / coal / diesel / gas / gasoline / oil / waste" />
    5032                 <list_entry value="fission" short_description="nuclear" />
    5033                 <list_entry value="fusion" short_description="nuclear" />
    5034                 <list_entry value="gasification" short_description="biomass / waste" />
    5035                 <list_entry value="photovoltaic" short_description="solar" />
    5036                 <list_entry value="pyrolysis" short_description="" /> <!-- Recheck -->
    5037                 <list_entry value="run-of-the-river" short_description="hydro" />
    5038                 <list_entry value="stream" short_description="tidal" />
    5039                 <list_entry value="thermal" short_description="solar" />
    5040                 <list_entry value="water-pumped-storage" short_description="hydro" />
    5041                 <list_entry value="water-storage" short_description="hydro" />
    5042             </combo>
    5043             <combo key="generator:type" text="Generator Type" values_searchable="true">
    5044                 <list_entry value="combined_cycle" short_description="gas combustion" />
    5045                 <list_entry value="francis_turbine" short_description="hydro" />
    5046                 <list_entry value="gas_turbine" short_description="biogas, biomass, gas, waste combustion" />
    5047                 <list_entry value="heat_pump" short_description="geothermal" />
    5048                 <list_entry value="horizontal_axis" short_description="tidal steam / wind" />
    5049                 <list_entry value="kaplan_turbine" short_description="hygro run-of-the-river / hydro water-storage / tidal barrage" />
    5050                 <list_entry value="pelton_turbine" short_description="hygro run-of-the-river / hydro water-storage" />
    5051                 <list_entry value="reciprocating_engine" short_description="biofuel, biogas, diesel, gas, gasoline" />
    5052                 <list_entry value="solar_photovoltaic_panel" short_description="solar photovoltaic" />
    5053                 <list_entry value="solar_thermal_collector" short_description="solar thermal" />
    5054                 <list_entry value="steam_generator" short_description="bio, coal, diesel, gas, gasoline, oil, waste combustion" />
    5055                 <list_entry value="steam_turbine" short_description="geothermal / solar thermal / bio, coal, oil, waste combustion" />
    5056                 <list_entry value="stellarator" short_description="nuclear fusion" />
    5057                 <list_entry value="tokamak" short_description="nuclear fusion" />
    5058                 <list_entry value="vertical_axis" short_description="tidal steam / wind" />
    5059                 <list_entry value="BWR-1" display_value="Boiling Water Reactor 1 (BWR-1)" short_description="nuclear fission" />
    5060                 <list_entry value="BWR-2" display_value="Boiling Water Reactor 2 (BWR-2)" short_description="nuclear fission" />
    5061                 <list_entry value="BWR-3" display_value="Boiling Water Reactor 3 (BWR-3)" short_description="nuclear fission" />
    5062                 <list_entry value="BWR-4" display_value="Boiling Water Reactor 4 (BWR-4)" short_description="nuclear fission" />
    5063                 <list_entry value="BWR-5" display_value="Boiling Water Reactor 5 (BWR-5)" short_description="nuclear fission" />
    5064                 <list_entry value="BWR-6" display_value="Boiling Water Reactor 6 (BWR-6)" short_description="nuclear fission" />
    5065                 <list_entry value="CANDU" display_value="CANada Deuterium Uranium reactor (CANDU)" short_description="nuclear fission" />
    5066                 <list_entry value="CPR-1000" display_value="China Pressurized Reactor (CPR-1000)" short_description="nuclear fission" />
    5067                 <list_entry value="EPR" display_value="European Pressurized Reactor (EPR)" short_description="nuclear fission" />
    5068                 <list_entry value="ICF" display_value="Inertial Confinement Fusion (ICF)" short_description="nuclear fusion" />
    5069                 <list_entry value="PWR" display_value="Pressurized water reactor (PWR)" short_description="nuclear fission" />
    5070                 <list_entry value="RBMK-1000" display_value="Reactor Bolshoy Moshchnosti Kanalniy 1000 (RBMK-1000)" short_description="nuclear fission" />
    5071                 <list_entry value="RBMK-1500" display_value="Reactor Bolshoy Moshchnosti Kanalniy 1500 (RBMK-1500)" short_description="nuclear fission" />
    5072                 <list_entry value="VVER" display_value="Vodo-Vodyanoi Energetichesky Reactor (VVER)" short_description="nuclear fission" />
    5073             </combo>
    5074             <optional>
    5075                 <label text="Output forms of energy:" />
    5076                 <space />
    5077                 <combo key="generator:output:electricity" text="electricity" values="yes,2 W,3 kW,5 MW,7 GW" />
    5078                 <combo key="generator:output:hot_water" text="hot water" values="yes,2 W,3 kW,5 MW,7 GW" />
    5079                 <combo key="generator:output:hot_air" text="hot air" values="yes,2 W,3 kW,5 MW,7 GW" />
    5080                 <combo key="generator:output:cold_water" text="cold water" values="yes,2 W,3 kW,5 MW,7 GW" />
    5081                 <combo key="generator:output:cold_air" text="cold air" values="yes,2 W,3 kW,5 MW,7 GW" />
    5082                 <combo key="generator:output:compressed_air" text="compressed air" values="yes,2 W,3 kW,5 MW,7 GW" />
    5083                 <combo key="generator:output:steam" text="steam" values="yes,2 W,3 kW,5 MW,7 GW" />
    5084                 <combo key="generator:output:vacuum" text="vacuum" values="yes,2 W,3 kW,5 MW,7 GW" />
    5085                 <space />
    5086                 <combo key="frequency" text="Frequency in Hertz (Hz)" values="0,16.67,16.7,50,60" length="5" />
    5087             </optional>
    5088         </item>
     5053        <group name="Power Generator" icon="presets/power.png">
     5054            <item name="Biofuel Power Generator" icon="presets/power_source-biofuel.svg" type="node,closedway,relation" preset_name_label="true">
     5055                <key key="generator:source" value="biofuel" />
     5056                <reference ref="power_generator" />
     5057                <key key="generator:method" value="combustion" />
     5058                <combo key="generator:type" text="Generator Type" values="gas_turbine,reciprocating_engine,steam_generator" />
     5059                <reference ref="power_output" />
     5060            </item>
     5061            <item name="Biogas Power Generator" icon="presets/power_source-biofuel.svg" type="node,closedway,relation" preset_name_label="true">
     5062                <key key="generator:source" value="biogas" />
     5063                <reference ref="power_generator" />
     5064                <key key="generator:method" value="combustion" />
     5065                <combo key="generator:type" text="Generator Type" values="reciprocating_engine,steam_generator" />
     5066                <reference ref="power_output" />
     5067            </item>
     5068            <item name="Biomass Power Generator" icon="presets/power_source-biofuel.svg" type="node,closedway,relation" preset_name_label="true">
     5069                <key key="generator:source" value="biomass" />
     5070                <reference ref="power_generator" />
     5071                <combo key="generator:method" text="Method" values_context="generator method" values="anaerobic_digestion,combustion,gasification" />
     5072                <combo key="generator:type" text="Generator Type" values_searchable="true">
     5073                    <list_entry value="bioreactor" short_description="anaerobic_digestion / combustion" />
     5074                    <list_entry value="pyrolysis" short_description="" />
     5075                    <list_entry value="steam_generator" short_description="combustion" />
     5076                    <list_entry value="steam_turbine" short_description="combustion" />
     5077                </combo>
     5078                <reference ref="power_output" />
     5079            </item>
     5080            <item name="Coal Power Generator" icon="presets/power_source-coal.svg" type="node,closedway,relation" preset_name_label="true">
     5081                <key key="generator:source" value="coal" />
     5082                <reference ref="power_generator" />
     5083                <key key="generator:method" value="combustion" />
     5084                <combo key="generator:type" text="Generator Type" values="steam_generator,steam_turbine" />
     5085                <reference ref="power_output" />
     5086            </item>
     5087            <item name="Gas Power Generator" icon="presets/power_source-gas.svg" type="node,closedway,relation" preset_name_label="true">
     5088                <key key="generator:source" value="gas" />
     5089                <reference ref="power_generator" />
     5090                <key key="generator:method" value="combustion" />
     5091                <combo key="generator:type" text="Generator Type" values="combined_cycle,gas_turbine,reciprocating_engine,steam_generator,steam_turbine" />
     5092                <reference ref="power_output" />
     5093            </item>
     5094            <item name="Oil Power Generator" icon="presets/power_source-oil.svg" type="node,closedway,relation" preset_name_label="true">
     5095                <key key="generator:source" value="oil" />
     5096                <reference ref="power_generator" />
     5097                <key key="generator:method" value="combustion" />
     5098                <combo key="generator:type" text="Generator Type" values="steam_generator,steam_turbine" />
     5099                <reference ref="power_output" />
     5100            </item>
     5101            <item name="Diesel Power Generator" icon="presets/power_source-oil.svg" type="node,closedway,relation" preset_name_label="true">
     5102                <key key="generator:source" value="diesel" />
     5103                <reference ref="power_generator" />
     5104                <key key="generator:method" value="combustion" />
     5105                <combo key="generator:type" text="Generator Type" values="reciprocating_engine,steam_generator" />
     5106                <reference ref="power_output" />
     5107            </item>
     5108            <item name="Gasoline Power Generator" icon="presets/power_source-oil.svg" type="node,closedway,relation" preset_name_label="true">
     5109                <key key="generator:source" value="gasoline" />
     5110                <reference ref="power_generator" />
     5111                <key key="generator:method" value="combustion" />
     5112                <combo key="generator:type" text="Generator Type" values="reciprocating_engine,steam_generator" />
     5113                <reference ref="power_output" />
     5114            </item>
     5115            <item name="Nuclear Reactor" icon="presets/power_source-nuclear.svg" type="node,closedway,relation" preset_name_label="true">
     5116                <key key="generator:source" value="nuclear" />
     5117                <reference ref="power_generator" />
     5118                <combo key="generator:method" text="Method" values_context="generator method" values="fission,fusion" />
     5119                <combo key="generator:type" text="Generator Type" values_searchable="true">
     5120                    <list_entry value="BWR-1" display_value="Boiling Water Reactor 1 (BWR-1)" short_description="fission" />
     5121                    <list_entry value="BWR-2" display_value="Boiling Water Reactor 2 (BWR-2)" short_description="fission" />
     5122                    <list_entry value="BWR-3" display_value="Boiling Water Reactor 3 (BWR-3)" short_description="fission" />
     5123                    <list_entry value="BWR-4" display_value="Boiling Water Reactor 4 (BWR-4)" short_description="fission" />
     5124                    <list_entry value="BWR-5" display_value="Boiling Water Reactor 5 (BWR-5)" short_description="fission" />
     5125                    <list_entry value="BWR-6" display_value="Boiling Water Reactor 6 (BWR-6)" short_description="fission" />
     5126                    <list_entry value="CANDU" display_value="CANada Deuterium Uranium reactor (CANDU)" short_description="fission" />
     5127                    <list_entry value="cold-fusion" short_description="fusion" />
     5128                    <list_entry value="CPR-1000" display_value="China Pressurized Reactor (CPR-1000)" short_description="fission" />
     5129                    <list_entry value="EPR" display_value="European Pressurized Reactor (EPR)" short_description="fission" />
     5130                    <list_entry value="ICF" display_value="Inertial Confinement Fusion (ICF)" short_description="fusion" />
     5131                    <list_entry value="PWR" display_value="Pressurized water reactor (PWR)" short_description="fission" />
     5132                    <list_entry value="RBMK-1000" display_value="Reactor Bolshoy Moshchnosti Kanalniy 1000 (RBMK-1000)" short_description="fission" />
     5133                    <list_entry value="RBMK-1500" display_value="Reactor Bolshoy Moshchnosti Kanalniy 1500 (RBMK-1500)" short_description="fission" />
     5134                    <list_entry value="stellarator" short_description="fusion" />
     5135                    <list_entry value="tokamak" short_description="fusion" />
     5136                    <list_entry value="VVER" display_value="Vodo-Vodyanoi Energetichesky Reactor (VVER)" short_description="fission" />
     5137                </combo>
     5138                <reference ref="power_output" />
     5139            </item>
     5140            <item name="Solar Power Generator" icon="presets/power_source-sun.svg" type="node,closedway,relation" preset_name_label="true">
     5141                <key key="generator:source" value="solar" />
     5142                <reference ref="power_generator" />
     5143                <combo key="generator:method" text="Method" values_context="generator method" values="photovoltaic,thermal" />
     5144                <combo key="generator:type" text="Generator Type" values_searchable="true">
     5145                    <list_entry value="solar_photovoltaic_panel" short_description="photovoltaic" />
     5146                    <list_entry value="solar_thermal_collector" short_description="thermal" />
     5147                    <list_entry value="steam_turbine" short_description="thermal" />
     5148                </combo>
     5149                <reference ref="power_output" />
     5150            </item>
     5151            <item name="Waste Power Generator" icon="presets/power_source-waste.svg" type="node,closedway,relation" preset_name_label="true">
     5152                <key key="generator:source" value="waste" />
     5153                <reference ref="power_generator" />
     5154                <combo key="generator:method" text="Method" values_context="generator method" values="combustion,gasification,pyrolysis" />
     5155                <combo key="generator:type" text="Generator Type" values_searchable="true">
     5156                    <list_entry value="bioreactor" short_description="gasification" />
     5157                    <list_entry value="pyrolysis" short_description="" />
     5158                    <list_entry value="reciprocating_engine" short_description="combustion" />
     5159                    <list_entry value="steam_generator" short_description="combustion" />
     5160                </combo>
     5161                <combo key="generator:type" text="Generator Type" values="bioreactor,reciprocating_engine,steam_generator" />
     5162                <reference ref="power_output" />
     5163            </item>
     5164            <item name="Water Turbine" icon="presets/power_source-water.svg" type="node,closedway,relation" preset_name_label="true">
     5165                <key key="generator:source" value="hydro" />
     5166                <reference ref="power_generator" />
     5167                <combo key="generator:method" text="Method" values_context="generator method" values="run-of-the-river,water-pumped-storage,water-storage" />
     5168                <combo key="generator:type" text="Generator Type" values_searchable="true">
     5169                    <list_entry value="francis_turbine" short_description="all methods" />
     5170                    <list_entry value="hydrodynamic_screw" short_description="run-of-the-river" />
     5171                    <list_entry value="kaplan_turbine" short_description="run-of-the-river / water-storage" />
     5172                    <list_entry value="pelton_turbine" short_description="run-of-the-river / water-storage" />
     5173                </combo>
     5174                <reference ref="power_output" />
     5175            </item>
     5176            <item name="Tidal Water Turbine" icon="presets/power_source-water.svg" type="node,closedway,relation" preset_name_label="true">
     5177                <key key="generator:source" value="tidal" />
     5178                <reference ref="power_generator" />
     5179                <combo key="generator:method" text="Method" values_context="generator method" values="barrage,stream" />
     5180                <combo key="generator:type" text="Generator Type" values_searchable="true">
     5181                    <list_entry value="horizontal_axis" short_description="steam" />
     5182                    <list_entry value="kaplan_turbine" short_description="barrage" />
     5183                    <list_entry value="vertical_axis" short_description="steam" />
     5184                </combo>
     5185                <reference ref="power_output" />
     5186            </item>
     5187            <item name="Wave Energy Converter" icon="presets/power_source-water.svg" type="node,closedway,relation" preset_name_label="true">
     5188                <key key="generator:source" value="wave" />
     5189                <reference ref="power_generator" />
     5190                <reference ref="power_output" />
     5191            </item>
     5192            <item name="Osmotic Power Generator" icon="presets/power_source-water.svg" type="node,closedway,relation" preset_name_label="true">
     5193                <key key="generator:source" value="osmotic" />
     5194                <reference ref="power_generator" />
     5195                <reference ref="power_output" />
     5196            </item>
     5197            <item name="Geothermal Power Generator" icon="presets/power_source-water.svg" type="node,closedway,relation" preset_name_label="true">
     5198                <key key="generator:source" value="geothermal" />
     5199                <reference ref="power_generator" />
     5200                <combo key="generator:type" text="Generator Type" values="heat_pump,steam_turbine" />
     5201                <reference ref="power_output" />
     5202            </item>
     5203            <item name="Wind Turbine" icon="presets/power_source-wind.svg" type="node,closedway,relation" preset_name_label="true">
     5204                <key key="generator:source" value="wind" />
     5205                <reference ref="power_generator" />
     5206                <key key="generator:method" value="wind_turbine" />
     5207                <combo key="generator:type" text="Generator Type" values="horizontal_axis,vertical_axis" />
     5208                <reference ref="power_output" />
     5209            </item>
     5210        </group>
    50895211        <separator/>
    50905212        <item name="Power Substation" icon="icons/power_substation.n.16.png" type="node,closedway" preset_name_label="true">
     
    50985220            <text key="name" text="Name" />
    50995221            <combo key="substation" text="Type of substation" values="transmission,distribution,minor_distribution,converter,compensation,transition,traction,industrial" values_context="power" />
    5100             <combo key="location" text="Location" values="outdoor,indoor,underground,platform,kiosk" values_context="power" />
    5101             <combo key="voltage" text="Voltage in Volts (V)" values="1150000,765000,750000,735000,500000,450000,420000,400000,380000,350000,345000,330000,315000,300000,275000,238000,230000,225000,220000,200000,161000,154000,150000,138000,132000,120000,115000,110000,100000,90000,69000,66000,65000,63000,60000,55000,49000,45000,35000,33000,30000,20000,15000,high,medium,low,750000;200000,110000;20000" />
    5102             <combo key="frequency" text="Frequency in Hertz (Hz)" values="0,16.67,16.7,50,60" length="5" />
    5103             <combo key="rating" text="Power rating (kVA/MVA)" values="2700 kVA,12500 kVA,15 MVA,50 MVA,100 MVA" />
    5104             <text key="operator" text="Operator" />
    5105             <text key="branch" text="Branch operator" />
    5106             <text key="ref" text="Reference" />
    5107             <optional>
     5222            <reference ref="power_extra" />
     5223            <optional>
     5224                <combo key="rating" text="Power rating (kVA/MVA)" values="2700 kVA,12500 kVA,15 MVA,50 MVA,100 MVA" />
    51085225                <text key="start_date" text="Start date" />
    51095226                <check key="gas_insulated" text="Gas insulated" />
     
    51205237            <key key="power" value="transformer" />
    51215238            <combo key="transformer" text="Type of transformer" values="distribution,generator,converter,traction,auto,phase_angle_regulator,yes" match="key" values_context="power" />
    5122             <combo key="location" text="Location" values="outdoor,indoor,underground,platform,kiosk" values_context="power" />
    5123             <combo key="voltage" text="Voltage in Volts (V)" values="1150000,765000,750000,735000,500000,450000,420000,400000,380000,350000,345000,330000,315000,300000,275000,238000,230000,225000,220000,200000,161000,154000,150000,138000,132000,120000,115000,110000,100000,90000,69000,66000,65000,63000,60000,55000,49000,45000,35000,33000,30000,20000,15000,high,medium,low,750000;200000,110000;20000" />
    5124             <combo key="frequency" text="Frequency in Hertz (Hz)" values="0,16.67,16.7,50,60" length="5" />
    5125             <text key="operator" text="Operator" />
    5126             <text key="branch" text="Branch operator" />
     5239            <reference ref="power_extra" />
    51275240            <optional>
    51285241                <combo key="rating" text="Power rating (kVA/MVA)" values="2700 kVA,12500 kVA,15 MVA,50 MVA,100 MVA" />
     
    51405253            <space />
    51415254            <key key="power" value="switchgear" />
    5142             <combo key="location" text="Location" values="outdoor,indoor,underground,platform,kiosk" values_context="power" />
    5143             <combo key="voltage" text="Voltage in Volts (V)" values="1150000,765000,750000,735000,500000,450000,420000,400000,380000,350000,345000,330000,315000,300000,275000,238000,230000,225000,220000,200000,161000,154000,150000,138000,132000,120000,115000,110000,100000,90000,69000,66000,65000,63000,60000,55000,49000,45000,35000,33000,30000,20000,15000,high,medium,low,750000;200000,110000;20000" />
     5255            <reference ref="power_loc" />
     5256            <reference ref="voltage" />
    51445257            <optional>
    51455258                <check key="gas_insulated" text="Gas insulated" />
     
    51555268            <key key="power" value="line" />
    51565269            <key key="line" value="busbar" />
    5157             <combo key="cables" text="Amount of Cables" values="3,6,9,12" />
    5158             <combo key="circuits" text="Amount of circuits" values="1,2,3" />
    5159             <combo key="voltage" text="Voltage in Volts (V)" values="1150000,765000,750000,735000,500000,450000,420000,400000,380000,350000,345000,330000,315000,300000,275000,238000,230000,225000,220000,200000,161000,154000,150000,138000,132000,120000,115000,110000,100000,90000,69000,66000,65000,63000,60000,55000,49000,45000,35000,33000,30000,20000,15000,high,medium,low,750000;200000,110000;20000" />
    5160             <combo key="frequency" text="Frequency in Hertz (Hz)" values="0,16.67,16.7,50,60" length="5" />
     5270            <reference ref="power_line_extra" />
    51615271        </item>
    51625272        <item name="Power Bay" icon="presets/power.png" type="way" preset_name_label="true">
     
    51695279            <key key="power" value="line" />
    51705280            <key key="line" value="bay" />
    5171             <combo key="cables" text="Amount of Cables" values="3,6,9,12" />
    5172             <combo key="circuits" text="Amount of circuits" values="1,2,3" />
    5173             <combo key="voltage" text="Voltage in Volts (V)" values="1150000,765000,750000,735000,500000,450000,420000,400000,380000,350000,345000,330000,315000,300000,275000,238000,230000,225000,220000,200000,161000,154000,150000,138000,132000,120000,115000,110000,100000,90000,69000,66000,65000,63000,60000,55000,49000,45000,35000,33000,30000,20000,15000,high,medium,low,750000;200000,110000;20000" />
    5174             <combo key="frequency" text="Frequency in Hertz (Hz)" values="0,16.67,16.7,50,60" length="5" />
     5281            <reference ref="power_line_extra" />
    51755282        </item>
    51765283        <item name="Power Switch" icon="presets/power.png" type="node" preset_name_label="true">
     
    51895296            <key key="power" value="converter" />
    51905297            <combo key="converter" text="Type of converter" values="lcc,vsc,back-to-back" match="key" values_context="power" />
    5191             <combo key="voltage" text="Voltage in Volts (V)" values="1150000,765000,750000,735000,500000,450000,420000,400000,380000,350000,345000,330000,315000,300000,275000,238000,230000,225000,220000,200000,161000,154000,150000,138000,132000,120000,115000,110000,100000,90000,69000,66000,65000,63000,60000,55000,49000,45000,35000,33000,30000,20000,15000,high,medium,low,750000;200000,110000;20000" />
    5192             <combo key="frequency" text="Frequency in Hertz (Hz)" values="0,16.67,16.7,50,60,0;50" length="5" />
    5193             <text key="operator" text="Operator" />
    5194             <text key="branch" text="Branch operator" />
     5298            <reference ref="voltage_frequency" />
     5299            <reference ref="ref_operator_branch" />
    51955300            <optional>
    51965301                <combo key="poles" text="Amount of poles" values="monopole,bipole" />
     
    52075312            <key key="power" value="compensator" />
    52085313            <combo key="compensator" text="Type of compensator" values="shunt_reactor,shunt_capacitor,static_var,statcom,synchronous_condenser,filter,series_reactor,series_capacitor" match="key" values_context="power" />
    5209             <combo key="voltage" text="Voltage in Volts (V)" values="1150000,765000,750000,735000,500000,450000,420000,400000,380000,350000,345000,330000,315000,300000,275000,238000,230000,225000,220000,200000,161000,154000,150000,138000,132000,120000,115000,110000,100000,90000,69000,66000,65000,63000,60000,55000,49000,45000,35000,33000,30000,20000,15000,high,medium,low,750000;200000,110000;20000" />
    5210             <combo key="frequency" text="Frequency in Hertz (Hz)" values="0,16.67,16.7,50,60,0;50" length="5" />
    5211             <text key="operator" text="Operator" />
    5212             <text key="branch" text="Branch operator" />
     5314            <reference ref="voltage_frequency" />
     5315            <reference ref="ref_operator_branch" />
    52135316            <optional>
    52145317                <combo key="rating" text="Power rating (kvar/Mvar)" values="500 kvar,1 Mvar,5 Mvar" />
     
    52225325            <space />
    52235326            <key key="power" value="cable_distribution_cabinet" />
    5224             <text key="ref" text="Reference" />
    52255327            <combo key="voltage" text="Voltage in Volts (V)" values="600,400,220,110,low" /> <!-- Recheck values -->
    5226             <text key="operator" text="Operator" />
    5227             <text key="branch" text="Branch operator" />
     5328            <reference ref="ref_operator_branch" />
    52285329        </item>
    52295330        <separator/>
     
    52405341            <space />
    52415342            <key key="power" value="tower" />
    5242             <text key="ref" text="Tower reference" />
    52435343            <text key="height" text="Height in meter (m)" />
    52445344            <combo key="structure" text="Type of construction" values="lattice,tubular,solid " />
    52455345            <combo key="material" text="Material" values="metal,plastic,steel,stone,wood,concrete" />
    52465346            <combo key="colour" text="Color (HTML name or hexadecimal code)" values="black,red,white,gray,red/white" values_context="color" />
    5247             <text key="operator" text="Operator" />
    5248             <text key="branch" text="Branch operator" />
     5347            <reference ref="ref_operator_branch" />
    52495348            <optional>
    52505349                <combo key="tower:type" text="Tower type" values="suspension,anchor,termination,branch,transposing,crossing,transition" values_context="power" />
     
    52665365            <space />
    52675366            <key key="power" value="pole" />
    5268             <text key="operator" text="Operator" />
    5269             <text key="branch" text="Branch operator" />
    5270             <text key="ref" text="Pole reference" />
    52715367            <text key="height" text="Height in meter (m)" />
    52725368            <combo key="material" text="Material" values="metal,plastic,steel,stone,wood,concrete" />
     5369            <reference ref="ref_operator_branch" />
    52735370        </item>
    52745371        <item name="Power Line" icon="presets/power.png" type="way" preset_name_label="true">
     
    52835380            <space />
    52845381            <combo key="power" text="Line type" values="line,minor_line" default="line" match="keyvalue" />
    5285             <combo key="voltage" text="Voltage in Volts (V)" values="1150000,765000,750000,735000,500000,450000,420000,400000,380000,350000,345000,330000,315000,300000,275000,238000,230000,225000,220000,200000,161000,154000,150000,138000,132000,120000,115000,110000,100000,90000,69000,66000,65000,63000,60000,55000,49000,45000,35000,33000,30000,20000,15000,750,400,220,110,high,medium,low,750000;200000,110000;20000" />
    5286             <text key="ref" text="Line reference" />
    5287             <text key="operator" text="Operator" />
    5288             <text key="branch" text="Branch operator" />
    5289             <combo key="frequency" text="Frequency in Hertz (Hz)" values="0,16.67,16.7,50,60" length="5" />
    5290             <optional>
    5291                 <combo key="cables" text="Amount of Cables" values="1,3,6,9" />
    5292                 <combo key="circuits" text="Amount of circuits" values="1,2,3" />
     5382            <reference ref="voltage_frequency" />
     5383            <reference ref="ref_operator_branch" />
     5384            <optional>
     5385                <reference ref="cable_circuit" />
    52935386                <combo key="wires" text="Number of conductors/wires per cable" values="single,double,triple,quad,fivefold,sixfold,eightfold" values_context="power" />
    52945387                <combo key="layer" text="Layer" values="5,4,3,2,1,0,-1,-2,-3,-4,-5" length="3" />
     
    53025395            <space />
    53035396            <key key="power" value="cable" />
    5304             <combo key="voltage" text="Voltage in Volts (V)" values="1150000,765000,750000,735000,500000,450000,420000,400000,380000,350000,345000,330000,315000,300000,275000,238000,230000,225000,220000,200000,161000,154000,150000,138000,132000,120000,115000,110000,100000,90000,69000,66000,65000,63000,60000,55000,49000,45000,35000,33000,30000,20000,15000,750,400,220,110,high,medium,low,750000;200000,110000;20000" />
    5305             <text key="ref" text="Line reference" />
    5306             <text key="operator" text="Operator" />
    5307             <text key="branch" text="Branch operator" />
    5308             <combo key="frequency" text="Frequency in Hertz (Hz)" values="0,16.67,16.7,50,60" length="5" />
    5309             <optional>
    5310                 <combo key="cables" text="Amount of Cables" values="1,3,6,9" />
    5311                 <combo key="circuits" text="Amount of circuits" values="1,2,3" />
     5397            <reference ref="voltage_frequency" />
     5398            <reference ref="ref_operator_branch" />
     5399            <optional>
     5400                <reference ref="cable_circuit" />
    53125401                <combo key="location" text="Location" values="underground,underwater,overground" />
    53135402                <combo key="layer" text="Layer" values="5,4,3,2,1,0,-1,-2,-3,-4,-5" length="3" />
  • trunk/images

    • Property svn:ignore set to
      Thumbs.db
  • trunk/images/cursor

    • Property svn:ignore set to
      Thumbs.db
  • trunk/images/cursor/modifier

    • Property svn:ignore set to
      Thumbs.db
  • trunk/images/data

    • Property svn:ignore set to
      Thumbs.db
  • trunk/images/data/projection

    • Property svn:ignore set to
      Thumbs.db
  • trunk/images/dialogs

    • Property svn:ignore set to
      Thumbs.db
  • trunk/images/dialogs/autoscale

    • Property svn:ignore set to
      Thumbs.db
  • trunk/images/dialogs/changeset

    • Property svn:ignore set to
      Thumbs.db
  • trunk/images/dialogs/conflict

    • Property svn:ignore set to
      Thumbs.db
  • trunk/images/dialogs/geoimage

    • Property svn:ignore set to
      Thumbs.db
  • trunk/images/dialogs/layerlist

    • Property svn:ignore set to
      Thumbs.db
  • trunk/images/dialogs/mappaint

    • Property svn:ignore set to
      Thumbs.db
  • trunk/images/dialogs/relation

    • Property svn:ignore set to
      Thumbs.db
  • trunk/images/help

    • Property svn:ignore set to
      Thumbs.db
  • trunk/images/icons

    • Property svn:ignore set to
      Thumbs.db
  • trunk/images/layer

    • Property svn:ignore set to
      Thumbs.db
  • trunk/images/mapmode

    • Property svn:ignore set to
      Thumbs.db
  • trunk/images/mapmode/extrude

    • Property svn:ignore set to
      Thumbs.db
  • trunk/images/mapmode/move

    • Property svn:ignore set to
      Thumbs.db
  • trunk/images/mapmode/node

    • Property svn:ignore set to
      Thumbs.db
  • trunk/images/markers

    • Property svn:ignore set to
      Thumbs.db
  • trunk/images/misc

    • Property svn:ignore set to
      Thumbs.db
  • trunk/images/oauth

    • Property svn:ignore set to
      Thumbs.db
  • trunk/images/preferences

    • Property svn:ignore set to
      Thumbs.db
  • trunk/images/statusline

    • Property svn:ignore set to
      Thumbs.db
Note: See TracChangeset for help on using the changeset viewer.