Changeset 6967 in josm for trunk/data


Ignore:
Timestamp:
2014-04-10T12:33:40+02:00 (10 years ago)
Author:
bastiK
Message:

applied #9766 - Power mod (patch by Otnow, minor changes)

File:
1 edited

Legend:

Unmodified
Added
Removed

  • trunk/data/defaultpresets.xml

    r6963 r6967  
    48954895    </group> <!-- Man Made -->
    48964896    <group name="Power" icon="presets/power.png">
    4897         <item name="Power Plant" icon="presets/power.png" type="closedway,relation" preset_name_label="true">
     4897        <item name="Power Plant" icon="icons/power_station.png" type="closedway,relation" preset_name_label="true">
    48984898            <link href="http://wiki.openstreetmap.org/wiki/Tag:power=plant"
    48994899                  it.href="http://wiki.openstreetmap.org/wiki/IT:Tag:power=plant"
    … …  
    49024902            <key key="power" value="plant" />
    49034903            <reference ref="name_operator" />
     4904            <text key="branch" text="Branch operator" />
    49044905            <text key="ref" text="Reference" />
    49054906            <text key="start_date" text="Start date" />
    4906             <optional>
    4907                 <label text="Output forms of energy" />
    4908                 <label text="(please add this information to the generators if possible)" />
    4909                 <space />
     4907            <optional text="Output forms of energy (optional):">
    49104908                <combo key="plant:output:electricity" text="electricity" values="yes,2 W,3 kW,5 MW,7 GW" />
    49114909                <combo key="plant:output:hot_water" text="hot water" values="yes,2 W,3 kW,5 MW,7 GW" />
    … …  
    49164914                <combo key="plant:output:steam" text="steam" values="yes,2 W,3 kW,5 MW,7 GW" />
    49174915                <combo key="plant:output:vacuum" text="vacuum" values="yes,2 W,3 kW,5 MW,7 GW" />
     4916                <space />
    49184917                <combo key="frequency" text="Frequency in Hertz (Hz)" values="0,16.67,16.7,50,60" length="5" />
    49194918            </optional>
    … …  
    49314930            <key key="power" value="generator" />
    49324931            <reference ref="name_operator" />
     4932            <text key="branch" text="Branch operator" />
    49334933            <text key="ref" text="Reference" />
    49344934            <text key="start_date" text="Start date" />
    … …  
    49984998                <list_entry value="VVER" display_value="Vodo-Vodyanoi Energetichesky Reactor (VVER)" short_description="nuclear fission" />
    49994999            </combo>
    5000             <optional text="Output forms of energy:">
     5000            <optional>
     5001                <label text="Output forms of energy:" />
     5002                <space />
    50015003                <combo key="generator:output:electricity" text="electricity" values="yes,2 W,3 kW,5 MW,7 GW" />
    50025004                <combo key="generator:output:hot_water" text="hot water" values="yes,2 W,3 kW,5 MW,7 GW" />
    … …  
    50075009                <combo key="generator:output:steam" text="steam" values="yes,2 W,3 kW,5 MW,7 GW" />
    50085010                <combo key="generator:output:vacuum" text="vacuum" values="yes,2 W,3 kW,5 MW,7 GW" />
     5011                <space />
    50095012                <combo key="frequency" text="Frequency in Hertz (Hz)" values="0,16.67,16.7,50,60" length="5" />
    50105013            </optional>
    50115014        </item>
    50125015        <separator/>
    5013         <item name="Power Substation" icon="presets/power.png" type="node,closedway" preset_name_label="true">
     5016        <item name="Power Substation" icon="icons/power_substation.n.16.png" type="node,closedway" preset_name_label="true">
    50145017            <link href="http://wiki.openstreetmap.org/wiki/Tag:power=substation"
    50155018                  de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:power=substation"
    … …  
    50195022            <key key="power" value="substation" />
    50205023            <text key="name" text="Name" />
    5021             <combo key="substation" text="Type of substation" values="transmission,distribution,converter,compensation,transition,traction,industrial" values_context="power" />
     5024            <combo key="substation" text="Type of substation" values="transmission,distribution,minor_distribution,converter,compensation,transition,traction,industrial" values_context="power" />
    50225025            <combo key="location" text="Location" values="outdoor,indoor,underground,platform,kiosk" values_context="power" />
    50235026            <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" />
    50245027            <combo key="frequency" text="Frequency in Hertz (Hz)" values="0,16.67,16.7,50,60" length="5" />
    5025             <optional>
    5026                 <text key="operator" text="Operator" />
    5027                 <text key="ref" text="Reference" />
     5028            <combo key="rating" text="Power rating (kVA/MVA)" values="2700 kVA,12500 kVA,15 MVA,50 MVA,100 MVA" />
     5029            <text key="operator" text="Operator" />
     5030            <text key="branch" text="Branch operator" />
     5031            <text key="ref" text="Reference" />
     5032            <optional>
     5033                <text key="start_date" text="Start date" />
    50285034                <check key="gas_insulated" text="Gas insulated" />
    50295035            </optional>
    50305036        </item>
    5031         <item name="Power Transformer" type="node,closedway" preset_name_label="true">
     5037        <item name="Power Transformer" icon="styles/standard/misc/landmark/power/transformer.png" type="node,closedway" preset_name_label="true">
    50325038            <link href="http://wiki.openstreetmap.org/wiki/Tag:power=transformer"
    50335039                  de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:power=transformer"
    … …  
    50405046            <combo key="location" text="Location" values="outdoor,indoor,underground,platform,kiosk" values_context="power" />
    50415047            <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" />
    5042             <optional>
    5043                 <combo key="frequency" text="Frequency in Hertz (Hz)" values="0,16.67,16.7,50,60" length="5" />
     5048            <combo key="frequency" text="Frequency in Hertz (Hz)" values="0,16.67,16.7,50,60" length="5" />
     5049            <text key="operator" text="Operator" />
     5050            <text key="branch" text="Branch operator" />
     5051            <optional>                         
     5052                <combo key="rating" text="Power rating (kVA/MVA)" values="2700 kVA,12500 kVA,15 MVA,50 MVA,100 MVA" />
    50445053                <combo key="phases" text="Phases" values="1,3" length="1" />
    5045                 <text key="rating" text="Power rating (kVA)" values_context="power" />
    5046             </optional>
    5047         </item>
    5048         <item name="Power Switchgear" type="closedway" preset_name_label="true">
     5054            </optional>
     5055        </item>
     5056        <item name="Power Switchgear" icon="presets/power.png" type="closedway" preset_name_label="true">
     5057            <link href="http://wiki.openstreetmap.org/wiki/Tag:power=switchgear" />
     5058            <space />
    50495059            <label text="(Please only use this tag if more detailed mapping using busbars and bays is impossible!)" />
    50505060            <space />
    … …  
    50565066            </optional>
    50575067        </item>
    5058         <item name="Power Busbar" type="way" preset_name_label="true">
     5068        <item name="Power Busbar" icon="presets/power.png" type="way" preset_name_label="true">
     5069            <link href="http://wiki.openstreetmap.org/wiki/Tag:line=busbar" />
    50595070            <space />
    50605071            <key key="power" value="line" />
    50615072            <key key="line" value="busbar" />
    50625073            <combo key="cables" text="Amount of Cables" values="3,6,9,12" />
     5074            <combo key="circuits" text="Amount of circuits" values="1,2,3" />
    50635075            <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" />
    5064         </item>
    5065         <item name="Power Bay" type="way" preset_name_label="true">
     5076            <combo key="frequency" text="Frequency in Hertz (Hz)" values="0,16.67,16.7,50,60" length="5" />
     5077        </item>
     5078        <item name="Power Bay" icon="presets/power.png" type="way" preset_name_label="true">
     5079            <link href="http://wiki.openstreetmap.org/wiki/Tag:line=bay" />
    50665080            <space />
    50675081            <key key="power" value="line" />
    50685082            <key key="line" value="bay" />
    50695083            <combo key="cables" text="Amount of Cables" values="3,6,9,12" />
     5084            <combo key="circuits" text="Amount of circuits" values="1,2,3" />
    50705085            <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" />
    5071         </item>
    5072         <item name="Power Switch" type="node" preset_name_label="true">
     5086            <combo key="frequency" text="Frequency in Hertz (Hz)" values="0,16.67,16.7,50,60" length="5" />
     5087        </item>
     5088        <item name="Power Switch" icon="presets/power.png" type="node" preset_name_label="true">
     5089            <link href="http://wiki.openstreetmap.org/wiki/Tag:power=switch" />
     5090            <space />
    50735091            <key key="power" value="switch" />
     5092        </item>
     5093        <separator/>
     5094        <item name="Power Converter" icon="presets/power.png" type="node,closedway" preset_name_label="true">
     5095            <link href="http://wiki.openstreetmap.org/wiki/Tag:power=converter" />
     5096            <space />
     5097            <key key="power" value="converter" />
     5098            <combo key="converter" text="Type of converter" values="lcc,vsc,back-to-back" match="key" values_context="power" />
     5099            <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" />
     5100            <combo key="frequency" text="Frequency in Hertz (Hz)" values="0,16.67,16.7,50,60,0;50" length="5" />
     5101            <text key="operator" text="Operator" />
     5102            <text key="branch" text="Branch operator" />
     5103            <optional>
     5104                <combo key="poles" text="Amount of poles" values="monopole,bipole" />
     5105                <combo key="rating" text="Power rating (MVA)" values="15 MVA,50 MVA,100 MVA" />
     5106            </optional>         
     5107        </item>
     5108        <item name="Power Compensator" icon="presets/power.png" type="node,closedway" preset_name_label="true">
     5109            <link href="http://wiki.openstreetmap.org/wiki/Tag:power=compensator" />
     5110            <space />
     5111            <key key="power" value="compensator" />
     5112            <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" />
     5113            <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" />
     5114            <combo key="frequency" text="Frequency in Hertz (Hz)" values="0,16.67,16.7,50,60,0;50" length="5" />
     5115            <text key="operator" text="Operator" />
     5116            <text key="branch" text="Branch operator" />
     5117            <optional>
     5118                <combo key="rating" text="Power rating (kvar/Mvar)" values="500 kvar,1 Mvar,5 Mvar" />
     5119            </optional>         
    50745120        </item>
    50755121        <separator/>
    … …  
    50815127            <space />
    50825128            <key key="power" value="cable_distribution_cabinet" />
     5129            <text key="ref" text="Reference" />
     5130            <combo key="voltage" text="Voltage in Volts (V)" values="600,400,220,110,low" /> <!-- Recheck values -->                   
    50835131            <text key="operator" text="Operator" />
    5084             <text key="ref" text="Reference" />
    5085             <combo key="voltage" text="Voltage in Volts (V)" values="600,400,220,110,low" /> <!-- Recheck values -->
     5132            <text key="branch" text="Branch operator" />
    50865133        </item>
    50875134        <separator/>
    5088         <item name="Power Tower" icon="presets/power_tower.png" type="node" preset_name_label="true">
     5135        <item name="Power Tower" icon="icons/power_tower_high2.n.16.png" type="node" preset_name_label="true">
    50895136            <link href="http://wiki.openstreetmap.org/wiki/Tag:power=tower"
    50905137                  de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:power=tower"
    … …  
    50985145            <space />
    50995146            <key key="power" value="tower" />
    5100             <text key="operator" text="Operator" />
    51015147            <text key="ref" text="Tower reference" />
    51025148            <text key="height" text="Height in meter (m)" />
    5103             <combo key="material" text="Material" values="metal,plastic,steel,stone,wood" />
    5104         </item>
    5105         <item name="Pole" icon="styles/standard/misc/landmark/power/pole.png" type="node" preset_name_label="true">
     5149            <combo key="structure" text="Type of construction" values="lattice,tubular,solid " />
     5150            <combo key="material" text="Material" values="metal,plastic,steel,stone,wood,concrete" />
     5151            <combo key="colour" text="Color (HTML name or hexadecimal code)" values="black,red,white,gray,red/white" values_context="color" />
     5152            <text key="operator" text="Operator" />
     5153            <text key="branch" text="Branch operator" />
     5154            <optional>                 
     5155                <combo key="tower:type" text="Tower type" values="suspension,anchor,termination,branch,transposing,crossing,transition" values_context="power" />
     5156                <combo key="branch:type" text="Branch tower type" values="tap,split,loop,cross" values_context="power" />
     5157                <combo key="design" text="Tower design" values="one-level,two-level,donau,three-level,barrel,asymmetric,triangle,flag,donau;one-level,four-level,six-level,nine-level,delta,delta_two-level,y-frame,x-frame,h-frame,guyed_h-frame,portal,portal_two-level,portal_three-level,guyed_v-frame,bipole,monopolar" values_context="power" />
     5158                <check key="triple_tower" text="Triple tower" />
     5159                <check key="design:incomplete" text="Incomplete tower" />
     5160            </optional>                 
     5161        </item>
     5162        <item name="Pole" icon="icons/power_tower_low.n.16.png" type="node" preset_name_label="true">
    51065163            <link href="http://wiki.openstreetmap.org/wiki/Tag:power=pole"
    51075164                  de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:power=pole"
    … …  
    51155172            <key key="power" value="pole" />
    51165173            <text key="operator" text="Operator" />
     5174            <text key="branch" text="Branch operator" />
    51175175            <text key="ref" text="Pole reference" />
    51185176            <text key="height" text="Height in meter (m)" />
    5119             <combo key="material" text="Material" values="metal,plastic,steel,stone,wood" />
     5177            <combo key="material" text="Material" values="metal,plastic,steel,stone,wood,concrete" />
    51205178        </item>
    51215179        <item name="Power Line" icon="presets/power.png" type="way" preset_name_label="true">
    … …  
    51305188            <space />
    51315189            <combo key="power" text="Line type" values="line,minor_line" default="line" match="keyvalue" />
     5190            <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" />
     5191            <text key="ref" text="Line reference" />
    51325192            <text key="operator" text="Operator" />
     5193            <text key="branch" text="Branch operator" />
     5194            <combo key="frequency" text="Frequency in Hertz (Hz)" values="0,16.67,16.7,50,60" length="5" />
     5195            <optional>
     5196                <combo key="cables" text="Amount of Cables" values="1,3,6,9" />
     5197                <combo key="circuits" text="Amount of circuits" values="1,2,3" />
     5198                <combo key="wires" text="Number of conductors/wires per cable" values="single,double,triple,quad,fivefold,sixfold,eightfold" values_context="power" />
     5199                <combo key="layer" text="Layer" values="5,4,3,2,1,0,-1,-2,-3,-4,-5" length="3" />
     5200                <check key="communication" text="Used to communication data" value_on="line" value_off="" default="off" />
     5201            </optional>
     5202        </item>         
     5203        <item name="Power Cable" icon="presets/power.png" type="way" preset_name_label="true">
     5204            <link href="http://wiki.openstreetmap.org/wiki/Tag:power=cable"
     5205                  de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:power=cable"
     5206                  it.href="http://wiki.openstreetmap.org/wiki/IT:Tag:power=cable" />
     5207            <space />
     5208            <key key="power" value="cable" />
     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,750,400,220,110,high,medium,low,750000;200000,110000;20000" />
    51335210            <text key="ref" text="Line reference" />
    5134             <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" />
     5211            <text key="operator" text="Operator" />
     5212            <text key="branch" text="Branch operator" />
    51355213            <combo key="frequency" text="Frequency in Hertz (Hz)" values="0,16.67,16.7,50,60" length="5" />
    5136             <text key="cables" text="Amount of Cables" />
    5137             <combo key="wires" text="Number of conductors/wires per cable" values="single,double,triple,quad" />
    5138         </item>
    5139     </group> <!-- Power -->
     5214            <optional>
     5215                <combo key="cables" text="Amount of Cables" values="1,3,6,9" />
     5216                <combo key="circuits" text="Amount of circuits" values="1,2,3" />
     5217                <combo key="location" text="Location" values="underground,underwater,overground" />
     5218                <combo key="layer" text="Layer" values="5,4,3,2,1,0,-1,-2,-3,-4,-5" length="3" />
     5219                <check key="communication" text="Used to communication data" value_on="line" value_off="" default="off" />
     5220            </optional>
     5221        </item>         
     5222    </group> <!-- Power -->             
    51405223    <group name="Historic Places" icon="presets/State_Tourist.png">
    51415224        <item name="Castle" icon="presets/State_Tourist.png" type="node,closedway" preset_name_label="true">
Note: See TracChangeset for help on using the changeset viewer.