Changeset 6136 in josm


Ignore:
Timestamp:
2013-08-11T09:11:29+02:00 (12 years ago)
Author:
bastiK
Message:

applied #8847 - New power plant specification (patch by skyper)

File:
1 edited

Legend:

Unmodified
Added
Removed

  • trunk/data/defaultpresets.xml

    r6114 r6136  
    5555  short_descriptions: comma separated list of texts to be displayed below each
    5656                      display_value. (Only if it is not possible to describe
    57                       the entry in 2-3 words.) Instead of comma separeted list
     57                      the entry in 2-3 words.) Instead of comma separated list
    5858  instead using values, display_values and short_descriptions, the following form is also supported:
    5959    <list_entry value="" display_value="" short_description="" icon="" icon_size=""/>
    … …  
    20042004                <combo key="gauge" text="Gauge (mm)" values="1668,1676,1674,1600,1524,1520,1495,1435,1067,1000,914,762,760,750" length="4" />
    20052005                <combo key="electrified" text="Electrified" values="contact_line,no,yes,rail" />
    2006                 <combo key="voltage" text="Voltage" values="600,650,750,1500,3000,15000,25000" lenght="5" />
    2007                 <combo key="frequency" text="Frequency (Hz)" values="0,16.7,50,60" length="4"/>
     2006                <combo key="voltage" text="Voltage in Volts (V)" values="600,650,750,1500,3000,15000,25000" lenght="5" />
     2007                <combo key="frequency" text="Frequency in Hertz (Hz)" values="0,16.67,16.7" length="5" />
    20082008            </optional>
    20092009        </item>
    … …  
    20192019                <combo key="gauge" text="Gauge (mm)" values="1668,1676,1674,1600,1524,1520,1495,1435,1067,1000,914,762,760,750" length="4" />
    20202020                <combo key="electrified" text="Electrified" values="contact_line,no,yes,rail" />
    2021                 <combo key="voltage" text="Voltage" values="600,650,750,1500,3000,15000,25000" length="5" />
    2022                 <combo key="frequency" text="Frequency (Hz)" values="0,16.7,50,60" length="4" />
     2021                <combo key="voltage" text="Voltage in Volts (V)" values="600,650,750,1500,3000,15000,25000" length="5" />
     2022                <combo key="frequency" text="Frequency in Hertz (Hz)" values="0,16.67,16.7" length="5" />
    20232023            </optional>
    20242024        </item>
    … …  
    20342034                <combo key="service" text="Types" values="yard,siding,spur" />
    20352035                <combo key="electrified" text="Electrified" values="contact_line,no,yes,rail" />
    2036                 <combo key="voltage" text="Voltage" values="600,650,750,1500,3000,15000,25000" length="5" />
    2037                 <combo key="frequency" text="Frequency (Hz)" values="0,16.7,50,60" length="4" />
     2036                <combo key="voltage" text="Voltage in Volts (V)" values="600,650,750,1500,3000,15000,25000" length="5" />
     2037                <combo key="frequency" text="Frequency in Hertz (Hz)" values="0,16.67,16.7" length="5" />
    20382038            </optional>
    20392039        </item>
    … …  
    20472047                <combo key="gauge" text="Gauge (mm)" values="1668,1676,1674,1600,1524,1520,1495,1435,1067,1000,914,762,760,750" length="4" />
    20482048                <combo key="electrified" text="Electrified" values="contact_line,no,yes,rail" />
    2049                 <combo key="voltage" text="Voltage" values="600,650,750,1500,3000,15000,25000" length="5" />
    2050                 <combo key="frequency" text="Frequency (Hz)" values="0,16.7,50,60" length="4" />
     2049                <combo key="voltage" text="Voltage in Volts (V)" values="600,650,750,1500,3000,15000,25000" length="5" />
     2050                <combo key="frequency" text="Frequency in Hertz (Hz)" values="0,16.67,16.7" length="5" />
    20512051            </optional>
    20522052        </item>
    … …  
    20602060                <combo key="gauge" text="Gauge (mm)" values="1668,1676,1674,1600,1524,1520,1495,1435,1067,1000,914,762,760,750" length="4" />
    20612061                <combo key="electrified" text="Electrified" values="contact_line,no,yes,rail" />
    2062                 <combo key="voltage" text="Voltage" values="600,650,750,1500,3000,15000,25000" length="5" />
    2063                 <combo key="frequency" text="Frequency (Hz)" values="0,16.7,50,60" length="4" />
     2062                <combo key="voltage" text="Voltage in Volts (V)" values="600,650,750,1500,3000,15000,25000" length="5" />
     2063                <combo key="frequency" text="Frequency in Hertz (Hz)" values="0,16.67,16.7" length="5" />
    20642064            </optional>
    20652065        </item>
    … …  
    20772077                <combo key="gauge" text="Gauge (mm)" values="1668,1676,1674,1600,1524,1520,1495,1435,1067,1000,914,762,760,750" length="4" />
    20782078                <combo key="electrified" text="Electrified" values="contact_line,no,yes,rail" />
    2079                 <combo key="voltage" text="Voltage" values="600,650,750,1500,3000,15000,25000" length="5" />
    2080                 <combo key="frequency" text="Frequency (Hz)" values="0,16.7,50,60" length="4" />
     2079                <combo key="voltage" text="Voltage in Volts (V)" values="600,650,750,1500,3000,15000,25000" length="5" />
     2080                <combo key="frequency" text="Frequency in Hertz (Hz)" values="0,16.67,16.7" length="5" />
    20812081            </optional>
    20822082        </item>
    … …  
    20952095                <combo key="gauge" text="Gauge (mm)" values="1668,1676,1674,1600,1524,1520,1495,1435,1067,1000,914,762,760,750" length="4" />
    20962096                <combo key="electrified" text="Electrified" values="contact_line,no,yes,rail" />
    2097                 <combo key="voltage" text="Voltage" values="600,650,750,1500,3000,15000,25000" length="5" />
    2098                 <combo key="frequency" text="Frequency (Hz)" values="0,16.7,50,60" length="4" />
     2097                <combo key="voltage" text="Voltage in Volts (V)" values="600,650,750,1500,3000,15000,25000" length="5" />
     2098                <combo key="frequency" text="Frequency in Hertz (Hz)" values="0,16.67,16.7" length="5" />
    20992099            </optional>
    21002100        </item>
    … …  
    48394839    </group> <!-- Man Made -->
    48404840    <group name="Power" icon="presets/power.png">
    4841         <item name="Power Generator" icon="presets/power.png" type="node,closedway">
     4841        <item name="Power Plant" icon="presets/power.png" type="closedway,relation">
     4842            <link href="http://wiki.openstreetmap.org/wiki/Tag:power=plant" />
     4843            <label text="Edit Power Plant" />
     4844            <key key="power" value="plant" />
     4845            <text key="name" text="Name" />
     4846            <text key="operator" text="Operator" />
     4847            <text key="ref" text="Reference" />
     4848            <text key="start_date" text="Start date" />
     4849            <optional>
     4850                <label text="Output forms of energy" />
     4851                <label text="(please add this information to the generators if possible)" />
     4852                <space />
     4853                <combo key="plant:output:electricity" text="electricity" values="yes,2 W,3 kW,5 MW,7 GW" />
     4854                <combo key="plant:output:hot_water" text="hot water" values="yes,2 W,3 kW,5 MW,7 GW" />
     4855                <combo key="plant:output:hot_air" text="hot air" values="yes,2 W,3 kW,5 MW,7 GW" />
     4856                <combo key="plant:output:cold_water" text="cold water" values="yes,2 W,3 kW,5 MW,7 GW" />
     4857                <combo key="plant:output:cold_air" text="cold air" values="yes,2 W,3 kW,5 MW,7 GW" />
     4858                <combo key="plant:output:compressed_air" text="compressed air" values="yes,2 W,3 kW,5 MW,7 GW" />
     4859                <combo key="plant:output:steam" text="steam" values="yes,2 W,3 kW,5 MW,7 GW" />
     4860                <combo key="plant:output:vacuum" text="vacuum" values="yes,2 W,3 kW,5 MW,7 GW" />
     4861                <combo key="frequency" text="Frequency in Hertz (Hz)" values="0,16.67,16.7,50,60" length="5" />
     4862            </optional>
     4863        </item>
     4864        <item name="Power Generator" icon="presets/power.png" type="node,closedway,relation">
    48424865            <link href="http://wiki.openstreetmap.org/wiki/Tag:power=generator"
    48434866                  de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:power=generator"
    … …  
    48494872            <key key="power" value="generator" />
    48504873            <text key="name" text="Name" />
    4851             <combo key="generator:source" text="Source" values="biofuel,biogas,biomass,coal,diesel,gas,gasoline,geothermal,hydro,nuclear,oil,osmotic,solar,tidal,waste,wave,wind" />
    4852             <combo key="generator:method" text="Method" values="anaerobic_digestion,combustion,dam,fission,fusion,gasification,photovoltaic,pumped-storage,pumping,pyrolysis,run-of-the-river,thermal" />
     4874            <text key="operator" text="Operator" />
     4875            <text key="ref" text="Reference" />
     4876            <text key="start_date" text="Start date" />
     4877            <combo key="generator:source" text="Source">
     4878                <list_entry value="biofuel" icon="http://wiki.openstreetmap.org/w/images/6/6b/Bahnpirat-power_source-biofuel.svg" />
     4879                <list_entry value="biogas" icon="http://wiki.openstreetmap.org/w/images/6/6b/Bahnpirat-power_source-biofuel.svg" />
     4880                <list_entry value="biomass" icon="http://wiki.openstreetmap.org/w/images/6/6b/Bahnpirat-power_source-biofuel.svg" />
     4881                <list_entry value="coal" icon="http://wiki.openstreetmap.org/w/images/4/4b/Bahnpirat-power_source-coal.svg" />
     4882                <list_entry value="diesel" icon="http://wiki.openstreetmap.org/w/images/f/f7/Bahnpirat-power_source-oil.svg" />
     4883                <list_entry value="gas" icon="http://wiki.openstreetmap.org/w/images/e/e6/Bahnpirat-power_source-gas.svg" />
     4884                <list_entry value="gasoline" icon="http://wiki.openstreetmap.org/w/images/f/f7/Bahnpirat-power_source-oil.svg" />
     4885                <list_entry value="geothermal" icon="http://wiki.openstreetmap.org/w/images/e/ed/2020_stBN_powergensource_water.svg" />
     4886                <list_entry value="hydro" icon="http://wiki.openstreetmap.org/w/images/e/ed/2020_stBN_powergensource_water.svg" />
     4887                <list_entry value="nuclear" icon="http://wiki.openstreetmap.org/w/images/3/3e/2020_stBN_powergensource_nuclear.svg" />
     4888                <list_entry value="oil" icon="http://wiki.openstreetmap.org/w/images/f/f7/Bahnpirat-power_source-oil.svg" />
     4889                <list_entry value="osmotic" icon="http://wiki.openstreetmap.org/w/images/e/ed/2020_stBN_powergensource_water.svg" />
     4890                <list_entry value="solar" icon="http://wiki.openstreetmap.org/w/images/2/22/2020_stBN_powergensource_sun.svg" />
     4891                <list_entry value="tidal" icon="http://wiki.openstreetmap.org/w/images/e/ed/2020_stBN_powergensource_water.svg" />
     4892                <list_entry value="waste" icon="http://wiki.openstreetmap.org/w/images/2/2f/Bahnpirat-power_source-waste.svg" />
     4893                <list_entry value="wave" icon="http://wiki.openstreetmap.org/w/images/e/ed/2020_stBN_powergensource_water.svg" />
     4894                <list_entry value="wind" icon="http://wiki.openstreetmap.org/w/images/0/03/2020_stBN_powergensource_wind.svg" />
     4895            </combo>
     4896            <combo key="generator:method" text="Method">
     4897                <list_entry value="anaerobic_digestion" short_description="" /> <!-- Recheck -->
     4898                <list_entry value="barrage" short_description="tidal" />
     4899                <list_entry value="combustion" short_description="bio / coal / diesel / gas / gasoline / oil / waste" />
     4900                <list_entry value="fission" short_description="nuclear" />
     4901                <list_entry value="fusion" short_description="nuclear" />
     4902                <list_entry value="gasification" short_description="biomass / waste" />
     4903                <list_entry value="photovoltaic" short_description="solar" />
     4904                <list_entry value="pyrolysis" short_description="" /> <!-- Recheck -->
     4905                <list_entry value="run-of-the-river" short_description="hydro" />
     4906                <list_entry value="stream" short_description="tidal" />
     4907                <list_entry value="thermal" short_description="solar" />
     4908                <list_entry value="water-pumped-storage" short_description="hydro" />
     4909                <list_entry value="water-storage" short_description="hydro" />
     4910            </combo>
     4911            <combo key="generator:type" text="Generator Type">
     4912                <list_entry value="cold-fusion" short_description="nuclear fusion" />
     4913                <list_entry value="combined_cycle" short_description="gas combustion" />
     4914                <list_entry value="francis_turbine" short_description="hydro" />
     4915                <list_entry value="gas_turbine" short_description="biogas, biomass, gas, waste combustion" />
     4916                <list_entry value="heat_pump" short_description="geothermal" />
     4917                <list_entry value="horizontal_axis" short_description="tidal steam / wind" />
     4918                <list_entry value="kaplan_turbine" short_description="hygro run-of-the-river / hydro water-storage / tidal barrage" />
     4919                <list_entry value="pelton_turbine" short_description="hygro run-of-the-river / hydro water-storage" />
     4920                <list_entry value="reciprocating_engine" short_description="biofuel, biogas, diesel, gas, gasoline" />
     4921                <list_entry value="solar_photovoltaic_panel" short_description="solar photovoltaic" />
     4922                <list_entry value="solar_thermal_collector" short_description="solar thermal" />
     4923                <list_entry value="steam_generator" short_description="bio, coal, diesel, gas, gasoline, oil, waste combustion" />
     4924                <list_entry value="steam_turbine" short_description="geothermal / solar thermal / bio, coal, oil, waste combustion" />
     4925                <list_entry value="stellarator" short_description="nuclear fusion" />
     4926                <list_entry value="tokamak" short_description="nuclear fusion" />
     4927                <list_entry value="vertical_axis" short_description="tidal steam / wind" />
     4928                <list_entry value="BWR-1" display_value="Boiling Water Reactor 1 (BWR-1)" short_description="nuclear fission" />
     4929                <list_entry value="BWR-2" display_value="Boiling Water Reactor 2 (BWR-2)" short_description="nuclear fission" />
     4930                <list_entry value="BWR-3" display_value="Boiling Water Reactor 3 (BWR-3)" short_description="nuclear fission" />
     4931                <list_entry value="BWR-4" display_value="Boiling Water Reactor 4 (BWR-4)" short_description="nuclear fission" />
     4932                <list_entry value="BWR-5" display_value="Boiling Water Reactor 5 (BWR-5)" short_description="nuclear fission" />
     4933                <list_entry value="BWR-6" display_value="Boiling Water Reactor 6 (BWR-6)" short_description="nuclear fission" />
     4934                <list_entry value="CANDU" display_value="CANada Deuterium Uranium reactor (CANDU)" short_description="nuclear fission" />
     4935                <list_entry value="CPR-1000" display_value="China Pressurized Reactor (CPR-1000)" short_description="nuclear fission" />
     4936                <list_entry value="EPR" display_value="European Pressurized Reactor (EPR)" short_description="nuclear fission" />
     4937                <list_entry value="ICF" display_value="Inertial Confinement Fusion (ICF)" short_description="nuclear fusion" />
     4938                <list_entry value="PWR" display_value="Pressurized water reactor (PWR)" short_description="nuclear fission" />
     4939                <list_entry value="RBMK-1000" display_value="Reactor Bolshoy Moshchnosti Kanalniy 1000 (RBMK-1000)" short_description="nuclear fission" />
     4940                <list_entry value="RBMK-1500" display_value="Reactor Bolshoy Moshchnosti Kanalniy 1500 (RBMK-1500)" short_description="nuclear fission" />
     4941                <list_entry value="VVER" display_value="Vodo-Vodyanoi Energetichesky Reactor (VVER)" short_description="nuclear fission" />
     4942            </combo>
    48534943            <space />
    48544944            <label text="Output forms of energy" />
    … …  
    48614951            <combo key="generator:output:steam" text="steam" values="yes,2 W,3 kW,5 MW,7 GW" />
    48624952            <combo key="generator:output:vacuum" text="vacuum" values="yes,2 W,3 kW,5 MW,7 GW" />
    4863             <combo key="generator:output:battery_charging" text="battery charging" values="yes,2 W,3 kW,5 MW,7 GW" />
    4864         </item>
    4865         <item name="Power Station" icon="presets/power.png" type="node,closedway">
    4866             <link href="http://wiki.openstreetmap.org/wiki/Tag:power=line"
    4867                   de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:power=line"
    4868                   fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:power=line"
    4869                   fr.href="http://wiki.openstreetmap.org/wiki/FR:Tag:power=line"
    4870                   pl.href="http://wiki.openstreetmap.org/wiki/Pl:Tag:power=line"
    4871                   pt_BR.href="http://wiki.openstreetmap.org/wiki/Pt-br:Tag:power=line"
    4872                   ru.href="http://wiki.openstreetmap.org/wiki/RU:Tag:power=line" />
    4873             <label text="Edit Power Station" />
    4874             <key key="power" value="station" />
    4875             <text key="name" text="Name" />
    4876             <text key="operator" text="Operator" />
    4877             <text key="ref" text="Reference" />
     4953            <combo key="frequency" text="Frequency in Hertz (Hz)" values="0,16.67,16.7,50,60" length="5" />
    48784954        </item>
    48794955        <item name="Power Sub Station" icon="presets/power.png" type="node,closedway">
    … …  
    48824958                  fr.href="http://wiki.openstreetmap.org/wiki/FR:Tag:power=sub_station"
    48834959                  pt_BR.href="http://wiki.openstreetmap.org/wiki/Pt-br:Tag:power=sub_station"
     4960                  pl.href="http://wiki.openstreetmap.org/wiki/Pl:Tag:power=sub_station"
    48844961                  ru.href="http://wiki.openstreetmap.org/wiki/RU:Tag:power=sub_station" />
    48854962            <label text="Edit Power Sub Station" />
    … …  
    48874964            <text key="operator" text="Operator" />
    48884965            <text key="ref" text="Line reference" />
     4966            <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" />
     4967            <combo key="frequency" text="Frequency in Hertz (Hz)" values="0,16.67,16.7,50,60" length="5" />
    48894968        </item>
    48904969        <item name="Cable Distribution Cabinet" icon="presets/power.png" type="node">
    … …  
    48964975            <text key="operator" text="Operator" />
    48974976            <text key="ref" text="Reference" />
     4977            <combo key="voltage" text="Voltage in Volts (V)" values="600,400,220,110,low" /> <!-- Recheck values -->
    48984978        </item>
    48994979        <separator/>
    … …  
    49094989            <label text="Edit Power Tower" />
    49104990            <key key="power" value="tower" />
     4991            <text key="operator" text="Operator" />
    49114992            <text key="ref" text="Tower reference" />
     4993            <text key="height" text="Height in meter (m)" />
     4994            <combo key="material" text="Material" values="metal,plastic,steel,stone,wood" />
    49124995        </item>
    49134996        <item name="Pole" icon="styles/standard/misc/landmark/power/pole.png" type="node">
    … …  
    49215004            <label text="Edit Power Pole" />
    49225005            <key key="power" value="pole" />
     5006            <text key="operator" text="Operator" />
    49235007            <text key="ref" text="Pole reference" />
     5008            <text key="height" text="Height in meter (m)" />
     5009            <combo key="material" text="Material" values="metal,plastic,steel,stone,wood" />
    49245010        </item>
    49255011        <item name="Power Line" icon="presets/power.png" type="way">
    49265012            <link href="http://wiki.openstreetmap.org/wiki/Tag:power=line"
    4927                   de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:power=line" />
     5013                  de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:power=line"
     5014                  fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:power=line"
     5015                  fr.href="http://wiki.openstreetmap.org/wiki/FR:Tag:power=line"
     5016                  pl.href="http://wiki.openstreetmap.org/wiki/Pl:Tag:power=line"
     5017                  pt_BR.href="http://wiki.openstreetmap.org/wiki/Pt-br:Tag:power=line"
     5018                  ru.href="http://wiki.openstreetmap.org/wiki/RU:Tag:power=line" />
    49285019            <label text="Edit Power Line" />
    49295020            <combo key="power" text="Line type" values_context="Power Line" values="line,minor_line" default="line" match="keyvalue" />
    49305021            <text key="operator" text="Operator" />
    49315022            <text key="ref" text="Line reference" />
    4932             <!-- TODO: voltage values used are a mixture of power lines and railways - needs cleanup -->
    4933             <combo key="voltage" text="Voltage" values="3000,10000,15000,20000,25000,110000,220000,380000" />
     5023            <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" />
     5024            <combo key="frequency" text="Frequency in Hertz (Hz)" values="0,16.67,16.7,50,60" length="5" />
    49345025            <text key="cables" text="Amount of Cables" />
    49355026            <combo key="wires" text="Number of wires (better: conductors) per power cable" values="single,double,triple,quad" />
    … …  
    58305921            <text key="name" text="Name" />
    58315922            <text key="type" text="Type" />
    5832             <text key="height" text="Height" />
     5923            <text key="height" text="Height in meter (m)" />
    58335924            <text key="name:botanical" text="Botanical Name" />
    58345925        </item>
Note: See TracChangeset for help on using the changeset viewer.