Ticket #8847: defaultpresets.xml.power_plant_2.patch

File defaultpresets.xml.power_plant_2.patch, 14.2 KB (added by skyper, 13 years ago)

patch version 2

  • data/defaultpresets.xml

     
    5454                  database values, order and number must be equal to values
    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=""/>
    6060        icon: location of icon
     
    48334833        </item>
    48344834    </group> <!-- Man Made -->
    48354835    <group name="Power" icon="presets/power.png">
    4836         <item name="Power Generator" icon="presets/power.png" type="node,closedway">
     4836        <item name="Power Plant" icon="presets/power.png" type="closedway,relation">
     4837            <link href="http://wiki.openstreetmap.org/wiki/Tag:power=plant" />
     4838            <label text="Edit Power Plant" />
     4839            <key key="power" value="plant" />
     4840            <text key="name" text="Name" />
     4841            <text key="operator" text="Operator" />
     4842            <text key="ref" text="Reference" />
     4843            <text key="start_date" text="Start date" />
     4844            <optional>
     4845                <label text="Output forms of energy (please add this information to the generators if possible)" />
     4846                <space />
     4847                <combo key="plant:output:electricity" text="electricity" values="yes,2 W,3 kW,5 MW,7 GW" />
     4848                <combo key="plant:output:hot_water" text="hot water" values="yes,2 W,3 kW,5 MW,7 GW" />
     4849                <combo key="plant:output:hot_air" text="hot air" values="yes,2 W,3 kW,5 MW,7 GW" />
     4850                <combo key="plant:output:cold_water" text="cold water" values="yes,2 W,3 kW,5 MW,7 GW" />
     4851                <combo key="plant:output:cold_air" text="cold air" values="yes,2 W,3 kW,5 MW,7 GW" />
     4852                <combo key="plant:output:compressed_air" text="compressed air" values="yes,2 W,3 kW,5 MW,7 GW" />
     4853                <combo key="plant:output:steam" text="steam" values="yes,2 W,3 kW,5 MW,7 GW" />
     4854                <combo key="plant:output:vacuum" text="vacuum" values="yes,2 W,3 kW,5 MW,7 GW" />
     4855                <combo key="frequency" text="frequency in Hertz (Hz)" values="0,16.7,50,60" /> <!-- Recheck values -->
     4856            </optional>
     4857        </item>
     4858        <item name="Power Generator" icon="presets/power.png" type="node,closedway,relation">
    48374859            <link href="http://wiki.openstreetmap.org/wiki/Tag:power=generator"
    48384860                  de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:power=generator"
    48394861                  fr.href="http://wiki.openstreetmap.org/wiki/FR:Tag:power=generator"
     
    48434865            <label text="Edit Power Generator" />
    48444866            <key key="power" value="generator" />
    48454867            <text key="name" text="Name" />
    4846             <combo key="generator:source" text="Source" values="biofuel,biogas,biomass,coal,diesel,gas,gasoline,geothermal,hydro,nuclear,oil,osmotic,solar,tidal,waste,wave,wind" />
    4847             <combo key="generator:method" text="Method" values="anaerobic_digestion,combustion,dam,fission,fusion,gasification,photovoltaic,pumped-storage,pumping,pyrolysis,run-of-the-river,thermal" />
     4868            <text key="operator" text="Operator" />
     4869            <text key="ref" text="Reference" />
     4870            <text key="start_date" text="Start date" />
     4871            <multiselect key="generator:source" text="Source" delimiter=";">   <!--    <list_entry value="" display_value="" short_description="" icon="" icon_size=""/> -->
     4872                <list_entry value="biofuel" icon="http://wiki.openstreetmap.org/w/images/6/6b/Bahnpirat-power_source-biofuel.svg" />
     4873                <list_entry value="biogas" icon="http://wiki.openstreetmap.org/w/images/6/6b/Bahnpirat-power_source-biofuel.svg" />
     4874                <list_entry value="biomass" icon="http://wiki.openstreetmap.org/w/images/6/6b/Bahnpirat-power_source-biofuel.svg" />
     4875                <list_entry value="coal" icon="http://wiki.openstreetmap.org/w/images/4/4b/Bahnpirat-power_source-coal.svg" />
     4876                <list_entry value="diesel" icon="http://wiki.openstreetmap.org/w/images/f/f7/Bahnpirat-power_source-oil.svg" />
     4877                <list_entry value="gas" icon="http://wiki.openstreetmap.org/w/images/e/e6/Bahnpirat-power_source-gas.svg" />
     4878                <list_entry value="gasoline" icon="http://wiki.openstreetmap.org/w/images/f/f7/Bahnpirat-power_source-oil.svg" />
     4879                <list_entry value="geothermal" icon="http://wiki.openstreetmap.org/w/images/e/ed/2020_stBN_powergensource_water.svg" />
     4880                <list_entry value="hydro" icon="http://wiki.openstreetmap.org/w/images/e/ed/2020_stBN_powergensource_water.svg" />
     4881                <list_entry value="nuclear" icon="http://wiki.openstreetmap.org/w/images/3/3e/2020_stBN_powergensource_nuclear.svg" />
     4882                <list_entry value="oil" icon="http://wiki.openstreetmap.org/w/images/f/f7/Bahnpirat-power_source-oil.svg" />
     4883                <list_entry value="osmotic" icon="http://wiki.openstreetmap.org/w/images/e/ed/2020_stBN_powergensource_water.svg" />
     4884                <list_entry value="solar" icon="http://wiki.openstreetmap.org/w/images/2/22/2020_stBN_powergensource_sun.svg" />
     4885                <list_entry value="tidal" icon="http://wiki.openstreetmap.org/w/images/e/ed/2020_stBN_powergensource_water.svg" />
     4886                <list_entry value="waste" icon="http://wiki.openstreetmap.org/w/images/2/2f/Bahnpirat-power_source-waste.svg" />
     4887                <list_entry value="wave" icon="http://wiki.openstreetmap.org/w/images/e/ed/2020_stBN_powergensource_water.svg" />
     4888                <list_entry value="wind" icon="http://wiki.openstreetmap.org/w/images/0/03/2020_stBN_powergensource_wind.svg" />
     4889            </multiselect>
     4890            <multiselect key="generator:method" text="Method" values="barrage;combustion;fission;fusion;gasification;photovoltaic;pyrolysis;run-of-the-river;stream;thermal;water-pumped-storage;water-storage" />
     4891            <combo key="generator:type" text="Generator Type" values="cold-fusion,combined_cycle,francis_turbine,gas_turbine,heat_pump,horizontal_axis,kaplan_turbine,pelton_turbine,reciprocating_engine,solar_photovoltaic_panel,solar_thermal_collector,steam_generator,steam_turbine,stellarator,tokamak,vertical_axis,BWR-1,BWR-2,BWR-3,BWR-4,BWR-5,BWR-6,CANDU,CPR-1000,EPR,ICF,PWR,RBMK-1000,RBMK-1500,VVER" display_values="cold-fusion,combined_cycle,francis_turbine,gas_turbine,heat_pump,horizontal_axis,kaplan_turbine,pelton_turbine,reciprocating_engine,solar_photovoltaic_panel,solar_thermal_collector,steam_generator,steam_turbine,stellarator,tokamak,vertical_axis,Boiling Water Reactor 1 (BWR-1),Boiling Water Reactor 2 (BWR-2),Boiling Water Reactor 3 (BWR-3),Boiling Water Reactor 4 (BWR-4),Boiling Water Reactor 5 (BWR-5),Boiling Water Reactor 6 (BWR-6),CANada Deuterium Uranium reactor (CANDU),China Pressurized Reactor (CPR-1000),European Pressurized Reactor (EPR),Inertial Confinement Fusion (ICF),Pressurized water reactor (PWR),Reactor Bolshoy Moshchnosti Kanalniy 1000 (RBMK-1000),Reactor Bolshoy Moshchnosti Kanalniy 1500 (RBMK-1500),Vodo-Vodyanoi Energetichesky Reactor (VVER)" />
    48484892            <space />
    48494893            <label text="Output forms of energy" />
    48504894            <combo key="generator:output:electricity" text="electricity" values="yes,2 W,3 kW,5 MW,7 GW" />
     
    48554899            <combo key="generator:output:compressed_air" text="compressed air" values="yes,2 W,3 kW,5 MW,7 GW" />
    48564900            <combo key="generator:output:steam" text="steam" values="yes,2 W,3 kW,5 MW,7 GW" />
    48574901            <combo key="generator:output:vacuum" text="vacuum" values="yes,2 W,3 kW,5 MW,7 GW" />
    4858             <combo key="generator:output:battery_charging" text="battery charging" values="yes,2 W,3 kW,5 MW,7 GW" />
     4902            <combo key="frequency" text="frequency in Hertz (Hz)" values="0,16.7,50,60" /> <!-- Recheck values -->
    48594903        </item>
     4904        <!-- deprecated should be removed autumn 2013 -->
    48604905        <item name="Power Station" icon="presets/power.png" type="node,closedway">
    4861             <link href="http://wiki.openstreetmap.org/wiki/Tag:power=line"
    4862                   de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:power=line"
    4863                   fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:power=line"
    4864                   fr.href="http://wiki.openstreetmap.org/wiki/FR:Tag:power=line"
    4865                   pl.href="http://wiki.openstreetmap.org/wiki/Pl:Tag:power=line"
    4866                   pt_BR.href="http://wiki.openstreetmap.org/wiki/Pt-br:Tag:power=line"
    4867                   ru.href="http://wiki.openstreetmap.org/wiki/RU:Tag:power=line" />
     4906            <link href="http://wiki.openstreetmap.org/wiki/Tag:power=station"
     4907                  de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:power=station"
     4908                  fr.href="http://wiki.openstreetmap.org/wiki/FR:Tag:power=station"
     4909                  pt_BR.href="http://wiki.openstreetmap.org/wiki/Pt-br:Tag:power=station"
     4910                  ru.href="http://wiki.openstreetmap.org/wiki/RU:Tag:power=station" />
    48684911            <label text="Edit Power Station" />
    48694912            <key key="power" value="station" />
    48704913            <text key="name" text="Name" />
     
    48764919                  de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:power=sub_station"
    48774920                  fr.href="http://wiki.openstreetmap.org/wiki/FR:Tag:power=sub_station"
    48784921                  pt_BR.href="http://wiki.openstreetmap.org/wiki/Pt-br:Tag:power=sub_station"
     4922                  pl.href="http://wiki.openstreetmap.org/wiki/Pl:Tag:power=sub_station"
    48794923                  ru.href="http://wiki.openstreetmap.org/wiki/RU:Tag:power=sub_station" />
    48804924            <label text="Edit Power Sub Station" />
    48814925            <key key="power" value="sub_station" />
    48824926            <text key="operator" text="Operator" />
    48834927            <text key="ref" text="Line reference" />
     4928            <multiselect key="voltage" text="Voltage in Volts (V)" values="400000;380000;220000;110000;20000;high;medium;low" /> <!-- Recheck values -->
     4929            <combo key="frequency" text="frequency in Hertz (Hz)" values="0,16.7,50,60" /> <!-- Recheck values -->
    48844930        </item>
    48854931        <item name="Cable Distribution Cabinet" icon="presets/power.png" type="node">
    48864932            <link href="http://wiki.openstreetmap.org/wiki/Tag:power=cable_distribution_cabinet"
     
    48904936            <key key="power" value="cable_distribution_cabinet" />
    48914937            <text key="operator" text="Operator" />
    48924938            <text key="ref" text="Reference" />
     4939            <multiselect key="voltage" text="Voltage in Volts (V)" values="110000;20000;medium;low" /> <!-- Recheck values -->
    48934940        </item>
    48944941        <separator/>
    48954942        <item name="Power Tower" icon="presets/power_tower.png" type="node">
     
    49034950                  ru.href="http://wiki.openstreetmap.org/wiki/RU:Tag:power=tower" />
    49044951            <label text="Edit Power Tower" />
    49054952            <key key="power" value="tower" />
     4953            <text key="operator" text="Operator" />
    49064954            <text key="ref" text="Tower reference" />
     4955            <text key="height" text="Height in meter (m)" />
     4956            <combo key="material" text="Material" values="stone,metal,steel,wood,plastic" />
    49074957        </item>
    49084958        <item name="Pole" icon="styles/standard/misc/landmark/power/pole.png" type="node">
    49094959            <link href="http://wiki.openstreetmap.org/wiki/Tag:power=pole"
     
    49154965                  pt_BR.href="http://wiki.openstreetmap.org/wiki/Pt-br:Tag:power=pole" />
    49164966            <label text="Edit Power Pole" />
    49174967            <key key="power" value="pole" />
     4968            <text key="operator" text="Operator" />
    49184969            <text key="ref" text="Pole reference" />
     4970            <text key="height" text="Height in meter (m)" />
     4971            <combo key="material" text="Material" values="stone,metal,steel,wood,plastic" />
    49194972        </item>
    49204973        <item name="Power Line" icon="presets/power.png" type="way">
    49214974            <link href="http://wiki.openstreetmap.org/wiki/Tag:power=line"
    4922                   de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:power=line" />
     4975                  de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:power=line"
     4976                  fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:power=line"
     4977                  fr.href="http://wiki.openstreetmap.org/wiki/FR:Tag:power=line"
     4978                  pl.href="http://wiki.openstreetmap.org/wiki/Pl:Tag:power=line"
     4979                  pt_BR.href="http://wiki.openstreetmap.org/wiki/Pt-br:Tag:power=line"
     4980                  ru.href="http://wiki.openstreetmap.org/wiki/RU:Tag:power=line" />
    49234981            <label text="Edit Power Line" />
    49244982            <combo key="power" text="Line type" values_context="Power Line" values="line,minor_line" default="line" match="keyvalue" />
    49254983            <text key="operator" text="Operator" />
    49264984            <text key="ref" text="Line reference" />
    49274985            <!-- TODO: voltage values used are a mixture of power lines and railways - needs cleanup -->
    4928             <combo key="voltage" text="Voltage" values="3000,10000,15000,20000,25000,110000,220000,380000" />
     4986            <combo key="voltage" text="Voltage in Volts (V)" values="400000,380000,220000,110000,20000,high,medium,low" /> <!-- Recheck values -->
     4987            <combo key="frequency" text="frequency in Hertz (Hz)" values="0,16.7,50,60" /> <!-- Recheck values -->
    49294988            <text key="cables" text="Amount of Cables" />
    49304989            <combo key="wires" text="Number of wires (better: conductors) per power cable" values="single,double,triple,quad" />
    49314990        </item>
     
    58245883            <key key="natural" value="tree" />
    58255884            <text key="name" text="Name" />
    58265885            <text key="type" text="Type" />
    5827             <text key="height" text="Height" />
     5886            <text key="height" text="Height in meter (m)" />
    58285887            <text key="name:botanical" text="Botanical Name" />
    58295888        </item>
    58305889        <item name="Wood" icon="presets/landuse.png" type="node,closedway,relation">