Ticket #9766: power_mod.patch

File power_mod.patch, 22.2 KB (added by Otnow, 11 years ago)

  • .xml

    old new  
    48914891        </item>
    48924892    </group> <!-- Man Made -->
    48934893    <group name="Power" icon="presets/power.png">
    4894         <item name="Power Plant" icon="presets/power.png" type="closedway,relation" preset_name_label="true">
     4894        <item name="Power Plant" icon="icons/power_station.png" type="closedway,relation" preset_name_label="true">
    48954895            <link href="http://wiki.openstreetmap.org/wiki/Tag:power=plant"
    48964896                  it.href="http://wiki.openstreetmap.org/wiki/IT:Tag:power=plant"
    48974897                  ru.href="http://wiki.openstreetmap.org/wiki/RU:Tag:power=plant" />
    … …  
    48984898            <space />
    48994899            <key key="power" value="plant" />
    49004900            <reference ref="name_operator" />
     4901            <text key="branch" text="Branch operator" />
    49014902            <text key="ref" text="Reference" />
    49024903            <text key="start_date" text="Start date" />
    49034904            <optional>
    4904                 <label text="Output forms of energy" />
     4905                <label text="Output forms of energy:" />
    49054906                <label text="(please add this information to the generators if possible)" />
    49064907                <space />
    49074908                <combo key="plant:output:electricity" text="electricity" values="yes,2 W,3 kW,5 MW,7 GW" />
    … …  
    49124913                <combo key="plant:output:compressed_air" text="compressed air" values="yes,2 W,3 kW,5 MW,7 GW" />
    49134914                <combo key="plant:output:steam" text="steam" values="yes,2 W,3 kW,5 MW,7 GW" />
    49144915                <combo key="plant:output:vacuum" text="vacuum" values="yes,2 W,3 kW,5 MW,7 GW" />
     4916                <space />
    49154917                <combo key="frequency" text="Frequency in Hertz (Hz)" values="0,16.67,16.7,50,60" length="5" />
    49164918            </optional>
    49174919        </item>
    … …  
    49274929            <space />
    49284930            <key key="power" value="generator" />
    49294931            <reference ref="name_operator" />
     4932            <text key="branch" text="Branch operator" />
    49304933            <text key="ref" text="Reference" />
    49314934            <text key="start_date" text="Start date" />
    49324935            <combo key="generator:source" text="Source" values_searchable="true">
    … …  
    49944997                <list_entry value="RBMK-1500" display_value="Reactor Bolshoy Moshchnosti Kanalniy 1500 (RBMK-1500)" short_description="nuclear fission" />
    49954998                <list_entry value="VVER" display_value="Vodo-Vodyanoi Energetichesky Reactor (VVER)" short_description="nuclear fission" />
    49964999            </combo>
    4997             <optional text="Output forms of energy:">
     5000            <optional>
     5001                <label text="Output forms of energy:" />
     5002                <space />
    49985003                <combo key="generator:output:electricity" text="electricity" values="yes,2 W,3 kW,5 MW,7 GW" />
    49995004                <combo key="generator:output:hot_water" text="hot water" values="yes,2 W,3 kW,5 MW,7 GW" />
    50005005                <combo key="generator:output:hot_air" text="hot air" values="yes,2 W,3 kW,5 MW,7 GW" />
    … …  
    50035008                <combo key="generator:output:compressed_air" text="compressed air" values="yes,2 W,3 kW,5 MW,7 GW" />
    50045009                <combo key="generator:output:steam" text="steam" values="yes,2 W,3 kW,5 MW,7 GW" />
    50055010                <combo key="generator:output:vacuum" text="vacuum" values="yes,2 W,3 kW,5 MW,7 GW" />
     5011                <space />
    50065012                <combo key="frequency" text="Frequency in Hertz (Hz)" values="0,16.67,16.7,50,60" length="5" />
    50075013            </optional>
    50085014        </item>
    50095015        <separator/>
    5010         <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">
    50115017            <link href="http://wiki.openstreetmap.org/wiki/Tag:power=substation"
    50125018                  de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:power=substation"
    50135019                  it.href="http://wiki.openstreetmap.org/wiki/IT:Tag:power=substation"
    … …  
    50155021            <space />
    50165022            <key key="power" value="substation" />
    50175023            <text key="name" text="Name" />
    5018             <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" />
    50195025            <combo key="location" text="Location" values="outdoor,indoor,underground,platform,kiosk" values_context="power" />
    50205026            <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" />
    50215027            <combo key="frequency" text="Frequency in Hertz (Hz)" values="0,16.67,16.7,50,60" length="5" />
     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" />
    50225032            <optional>
    5023                 <text key="operator" text="Operator" />
    5024                 <text key="ref" text="Reference" />
     5033                <text key="start_date" text="Start date" />
    50255034                <check key="gas_insulated" text="Gas insulated" />
    50265035            </optional>
    50275036        </item>
    5028         <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">
    50295038            <link href="http://wiki.openstreetmap.org/wiki/Tag:power=transformer"
    50305039                  fr.href="http://wiki.openstreetmap.org/wiki/FR:Tag:power=transformer"
    50315040                  it.href="http://wiki.openstreetmap.org/wiki/IT:Tag:power=transformer"
    … …  
    50325041                  pl.href="http://wiki.openstreetmap.org/wiki/Pl:Tag:power=transformer" />
    50335042            <space />
    50345043            <key key="power" value="transformer" />
    5035             <combo key="transformer" text="Type of transformer" values="distribution,generator,converter,traction,auto,phase_angle_regulator,yes" match="key" values_context="power" />
     5044            <combo key="transformer" text="Type of transformer" values="distribution,generator,converter,traction,auto,phase_angle_regulator,yes" match="key" values_context="transformer type" />
    50365045            <combo key="location" text="Location" values="outdoor,indoor,underground,platform,kiosk" values_context="power" />
    50375046            <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" />
    5038             <optional>
    5039                 <combo key="frequency" text="Frequency in Hertz (Hz)" values="0,16.67,16.7,50,60" length="5" />
     5047            <combo key="frequency" text="Frequency in Hertz (Hz)" values="0,16.67,16.7,50,60" length="5" />
     5048            <text key="operator" text="Operator" />
     5049            <text key="branch" text="Branch operator" />
     5050            <optional>                         
     5051                <combo key="rating" text="Power rating (kVA/MVA)" values="2700 kVA,12500 kVA,15 MVA,50 MVA,100 MVA" />
    50405052                <combo key="phases" text="Phases" values="1,3" length="1" />
    5041                 <text key="rating" text="Power rating (kVA)" values_context="power" />
    50425053            </optional>
    50435054        </item>
    5044         <item name="Power Switchgear" type="closedway" preset_name_label="true">
     5055        <item name="Power Switchgear" icon="presets/power.png" type="closedway" preset_name_label="true">
     5056            <link href="http://wiki.openstreetmap.org/wiki/Tag:power=switchgear" />
     5057            <space />
    50455058            <label text="(Please only use this tag if more detailed mapping using busbars and bays is impossible!)" />
    50465059            <space />
    50475060            <key key="power" value="switchgear" />
    … …  
    50515064                <check key="gas_insulated" text="Gas insulated" />
    50525065            </optional>
    50535066        </item>
    5054         <item name="Power Busbar" type="way" preset_name_label="true">
     5067        <item name="Power Busbar" icon="presets/power.png" type="way" preset_name_label="true">
     5068            <link href="http://wiki.openstreetmap.org/wiki/Tag:line=busbar" />
    50555069            <space />
    50565070            <key key="power" value="line" />
    50575071            <key key="line" value="busbar" />
    50585072            <combo key="cables" text="Amount of Cables" values="3,6,9,12" />
     5073            <combo key="circuits" text="Amount of circuits" values="1,2,3" />
    50595074            <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" />
     5075            <combo key="frequency" text="Frequency in Hertz (Hz)" values="0,16.67,16.7,50,60" length="5" />
    50605076        </item>
    5061         <item name="Power Bay" type="way" preset_name_label="true">
     5077        <item name="Power Bay" icon="presets/power.png" type="way" preset_name_label="true">
     5078            <link href="http://wiki.openstreetmap.org/wiki/Tag:line=bay" />
    50625079            <space />
    50635080            <key key="power" value="line" />
    50645081            <key key="line" value="bay" />
    50655082            <combo key="cables" text="Amount of Cables" values="3,6,9,12" />
     5083            <combo key="circuits" text="Amount of circuits" values="1,2,3" />
    50665084            <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" />
     5085            <combo key="frequency" text="Frequency in Hertz (Hz)" values="0,16.67,16.7,50,60" length="5" />
    50675086        </item>
    5068         <item name="Power Switch" type="node" preset_name_label="true">
     5087        <item name="Power Switch" icon="presets/power.png" type="node" preset_name_label="true">
     5088            <link href="http://wiki.openstreetmap.org/wiki/Tag:power=switch" />
     5089            <space />
    50695090            <key key="power" value="switch" />
    50705091        </item>
    50715092        <separator/>
     5093        <item name="Power Converter" icon="presets/power.png" type="node,closedway" preset_name_label="true">
     5094            <link href="http://wiki.openstreetmap.org/wiki/Tag:power=converter" />
     5095            <space />
     5096            <key key="power" value="converter" />
     5097            <combo key="converter" text="Type of converter" values="lcc,vsc,back-to-back" match="key" values_context="power" />
     5098            <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" />
     5099            <combo key="frequency" text="Frequency in Hertz (Hz)" values="0,16.67,16.7,50,60,0;50" length="5" />
     5100            <text key="operator" text="Operator" />
     5101            <text key="branch" text="Branch operator" />
     5102            <optional>
     5103                <combo key="poles" text="Amount of poles" values="monopole,bipole" />
     5104                <combo key="rating" text="Power rating (MVA)" values="15 MVA,50 MVA,100 MVA" />
     5105            </optional>         
     5106        </item>
     5107        <item name="Power Compensator" icon="presets/power.png" type="node,closedway" preset_name_label="true">
     5108            <link href="http://wiki.openstreetmap.org/wiki/Tag:power=compensator" />
     5109            <space />
     5110            <key key="power" value="compensator" />
     5111            <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" />
     5112            <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" />
     5113            <combo key="frequency" text="Frequency in Hertz (Hz)" values="0,16.67,16.7,50,60,0;50" length="5" />
     5114            <text key="operator" text="Operator" />
     5115            <text key="branch" text="Branch operator" />
     5116            <optional>
     5117                <combo key="rating" text="Power rating (kvar/Mvar)" values="500 kvar,1 Mvar,5 Mvar" />
     5118            </optional>         
     5119        </item>
     5120        <separator/>
    50725121        <item name="Cable Distribution Cabinet" icon="presets/power.png" type="node" preset_name_label="true">
    50735122            <link href="http://wiki.openstreetmap.org/wiki/Tag:power=cable_distribution_cabinet"
    50745123                  de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:power=cable_distribution_cabinet"
    … …  
    50765125                  pt_BR.href="http://wiki.openstreetmap.org/wiki/Pt-br:Tag:power=cable_distribution_cabinet" />
    50775126            <space />
    50785127            <key key="power" value="cable_distribution_cabinet" />
     5128            <text key="ref" text="Reference" />
     5129            <combo key="voltage" text="Voltage in Volts (V)" values="600,400,220,110,low" /> <!-- Recheck values -->                   
    50795130            <text key="operator" text="Operator" />
    5080             <text key="ref" text="Reference" />
    5081             <combo key="voltage" text="Voltage in Volts (V)" values="600,400,220,110,low" /> <!-- Recheck values -->
     5131            <text key="branch" text="Branch operator" />
    50825132        </item>
    50835133        <separator/>
    5084         <item name="Power Tower" icon="presets/power_tower.png" type="node" preset_name_label="true">
     5134        <item name="Power Tower" icon="icons/power_tower_high2.n.16.png" type="node" preset_name_label="true">
    50855135            <link href="http://wiki.openstreetmap.org/wiki/Tag:power=tower"
    50865136                  de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:power=tower"
    50875137                  es.href="http://wiki.openstreetmap.org/wiki/ES:Tag:power=tower"
    … …  
    50935143                  ru.href="http://wiki.openstreetmap.org/wiki/RU:Tag:power=tower" />
    50945144            <space />
    50955145            <key key="power" value="tower" />
    5096             <text key="operator" text="Operator" />
    50975146            <text key="ref" text="Tower reference" />
    50985147            <text key="height" text="Height in meter (m)" />
    5099             <combo key="material" text="Material" values="metal,plastic,steel,stone,wood" />
     5148            <combo key="structure" text="Type of construction" values="lattice,tubular,solid " />
     5149            <combo key="material" text="Material" values="metal,plastic,steel,stone,wood,concrete" />
     5150            <combo key="colour" text="Color (HTML name or hexadecimal code)" values="black,red,white,gray,red/white" values_context="color" />
     5151            <text key="operator" text="Operator" />
     5152            <text key="branch" text="Branch operator" />
     5153            <optional>                 
     5154                <combo key="tower:type" text="Tower type" values="suspension,anchor,termination,branch,transposing,crossing,transition" values_context="power" />
     5155                <combo key="branch:type" text="Branch tower type" values="tap,split,loop,cross" values_context="power" />
     5156                <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" />
     5157                <check key="triple_tower" text="Triple tower" />
     5158                <check key="design:incomplete" text="Incomplete tower" />
     5159            </optional>                 
    51005160        </item>
    5101         <item name="Pole" icon="styles/standard/misc/landmark/power/pole.png" type="node" preset_name_label="true">
     5161        <item name="Pole" icon="icons/power_tower_low.n.16.png" type="node" preset_name_label="true">
    51025162            <link href="http://wiki.openstreetmap.org/wiki/Tag:power=pole"
    51035163                  de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:power=pole"
    51045164                  es.href="http://wiki.openstreetmap.org/wiki/ES:Tag:power=pole"
    … …  
    51105170            <space />
    51115171            <key key="power" value="pole" />
    51125172            <text key="operator" text="Operator" />
     5173            <text key="branch" text="Branch operator" />
    51135174            <text key="ref" text="Pole reference" />
    51145175            <text key="height" text="Height in meter (m)" />
    5115             <combo key="material" text="Material" values="metal,plastic,steel,stone,wood" />
     5176            <combo key="material" text="Material" values="metal,plastic,steel,stone,wood,concrete" />
    51165177        </item>
    51175178        <item name="Power Line" icon="presets/power.png" type="way" preset_name_label="true">
    51185179            <link href="http://wiki.openstreetmap.org/wiki/Tag:power=line"
    … …  
    51255186                  ru.href="http://wiki.openstreetmap.org/wiki/RU:Tag:power=line" />
    51265187            <space />
    51275188            <combo key="power" text="Line type" values="line,minor_line" default="line" match="keyvalue" />
     5189            <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" />
     5190            <text key="ref" text="Line reference" />
    51285191            <text key="operator" text="Operator" />
     5192            <text key="branch" text="Branch operator" />
     5193            <combo key="frequency" text="Frequency in Hertz (Hz)" values="0,16.67,16.7,50,60" length="5" />
     5194            <optional>
     5195                <combo key="cables" text="Amount of Cables" values="1,3,6,9" />
     5196                <combo key="circuits" text="Amount of circuits" values="1,2,3" />
     5197                <combo key="wires" text="Number of conductors/wires per cable" values="single,double,triple,quad,fivefold,sixfold,eightfold" values_context="power" />
     5198                <combo key="layer" text="Layer" values="5,4,3,2,1,0,-1,-2,-3,-4,-5" length="3" />
     5199                <check key="communication" text="Used to communication data" value_on="line" value_off="" default="off" />
     5200            </optional>
     5201        </item>         
     5202        <item name="Power Cable" icon="presets/power.png" type="way" preset_name_label="true">
     5203            <link href="http://wiki.openstreetmap.org/wiki/Tag:power=cable"
     5204                  de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:power=cable"
     5205                  it.href="http://wiki.openstreetmap.org/wiki/IT:Tag:power=cable" />
     5206            <space />
     5207            <key key="power" value="cable" />
     5208            <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" />
    51295209            <text key="ref" text="Line reference" />
    5130             <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" />
     5210            <text key="operator" text="Operator" />
     5211            <text key="branch" text="Branch operator" />
    51315212            <combo key="frequency" text="Frequency in Hertz (Hz)" values="0,16.67,16.7,50,60" length="5" />
    5132             <text key="cables" text="Amount of Cables" />
    5133             <combo key="wires" text="Number of conductors/wires per cable" values="single,double,triple,quad" />
    5134         </item>
    5135     </group> <!-- Power -->
     5213            <optional>
     5214                <combo key="cables" text="Amount of Cables" values="1,3,6,9" />
     5215                <combo key="circuits" text="Amount of circuits" values="1,2,3" />
     5216                <combo key="location" text="Location" values="underground,underwater,overground" />
     5217                <combo key="layer" text="Layer" values="5,4,3,2,1,0,-1,-2,-3,-4,-5" length="3" />
     5218                <check key="communication" text="Used to communication data" value_on="line" value_off="" default="off" />
     5219            </optional>
     5220        </item>         
     5221    </group> <!-- Power -->             
    51365222    <group name="Historic Places" icon="presets/State_Tourist.png">
    51375223        <item name="Castle" icon="presets/State_Tourist.png" type="node,closedway" preset_name_label="true">
    51385224            <link href="http://wiki.openstreetmap.org/wiki/Tag:historic=castle"