Ticket #9169: josm_9169_v3.diff

File josm_9169_v3.diff, 10.0 KB (added by simon04, 12 years ago)

  • data/defaultpresets.xml 

    diff --git a/data/defaultpresets.xml b/data/defaultpresets.xml
index 0ddad2d..732996b 100755
    a b Note that for a match, at least one positive and no negative is required.  
    50505050        </item>
    50515051    </group> <!-- Man Made -->
    50525052    <group name="Power" icon="presets/power.png">
    5053         <item name="Power Plant" icon="presets/power.png" type="closedway,relation">
     5053        <item name="Power Plant" icon="presets/powerplant.png" type="closedway,relation">
    50545054            <link href="http://wiki.openstreetmap.org/wiki/Tag:power=plant"
    50555055                  ru.href="http://wiki.openstreetmap.org/wiki/RU:Tag:power=plant" />
    50565056            <label text="Edit Power Plant" />
    … … Note that for a match, at least one positive and no negative is required.  
    51645164                <combo key="frequency" text="Frequency in Hertz (Hz)" values="0,16.67,16.7,50,60" length="5" />
    51655165            </optional>
    51665166        </item>
    5167         <item name="Power Sub Station" icon="presets/power.png" type="node,closedway">
    5168             <link href="http://wiki.openstreetmap.org/wiki/Tag:power=sub_station"
    5169                   de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:power=sub_station"
    5170                   fr.href="http://wiki.openstreetmap.org/wiki/FR:Tag:power=sub_station"
    5171                   it.href="http://wiki.openstreetmap.org/wiki/IT:Tag:power=sub_station"
    5172                   pl.href="http://wiki.openstreetmap.org/wiki/Pl:Tag:power=sub_station"
    5173                   pt_BR.href="http://wiki.openstreetmap.org/wiki/Pt-br:Tag:power=sub_station"
    5174                   ru.href="http://wiki.openstreetmap.org/wiki/RU:Tag:power=sub_station" />
    5175             <label text="Edit Power Sub Station" />
     5167        <separator/>
     5168        <item name="Power Substation" icon="presets/powersubstation.png" type="node,closedway">
     5169            <link href="http://wiki.openstreetmap.org/wiki/Tag:power=substation"
     5170                  de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:power=substation"
     5171                  ru.href="http://wiki.openstreetmap.org/wiki/RU:Tag:power=substation" />
     5172            <label text="Edit Power Substation" />
    51765173            <space />
    5177             <key key="power" value="sub_station" />
    5178             <text key="operator" text="Operator" />
    5179             <text key="ref" text="Line reference" />
     5174            <key key="power" value="substation" />
     5175            <text key="name" text="Name" />
     5176            <combo key="substation" text="Type of substation" values="transmission,distribution,converter,compensation,transition,traction,industrial" />
     5177            <combo key="location" text="Location" values="outdoor,indoor,underground,platform,kiosk" />
    51805178            <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" />
    51815179            <combo key="frequency" text="Frequency in Hertz (Hz)" values="0,16.67,16.7,50,60" length="5" />
     5180            <optional>
     5181                <text key="operator" text="Operator" />
     5182                <text key="ref" text="Reference" />
     5183                <check key="gas_insulated" text="Gas insulated" />
     5184            </optional>
    51825185        </item>
     5186        <item name="Power Transformer" icon="misc/landmark/power/transformer.png" type="node,closedway">
     5187            <link href="http://wiki.openstreetmap.org/wiki/Tag:power=transformer"
     5188                  fr.href="http://wiki.openstreetmap.org/wiki/FR:Tag:power=transformersubstation"
     5189                  pl.href="http://wiki.openstreetmap.org/wiki/Pl:Tag:power=transformer" />
     5190            <label text="Edit Power Transformer" />
     5191            <space />
     5192            <combo key="power" text="Power" values="transformer,pole" default="transformer" />
     5193            <combo key="transformer" text="Type of transformer" values="distribution,generator,coverter,traction,auto,phase_angle_regulator,yes" match="key" />
     5194            <combo key="location" text="Location" values="outdoor,indoor,underground,platform,kiosk" />
     5195            <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" />
     5196            <optional>
     5197                <combo key="frequency" text="Frequency in Hertz (Hz)" values="0,16.67,16.7,50,60" length="5" />
     5198                <combo key="phases" text="Phases" values="1,3" length="1" />
     5199                <text key="rating" text="Rating (kVA)" />
     5200            </optional>
     5201        </item>
     5202        <item name="Power Switchgear" icon="presets/splice.png" type="closedway">
     5203            <label text="Edit Power Switchgear" />
     5204            <space />
     5205            <label text="(please only use this tag if more detailed mapping is impossible)" />
     5206            <space />
     5207            <key key="power" value="switchgear" />
     5208            <combo key="location" text="Location" values="outdoor,indoor,underground,platform,kiosk" />
     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            <optional>
     5211                <check key="gas_insulated" text="Gas insulated" />
     5212            </optional>
     5213        </item>
     5214        <item name="Power Busbar" icon="presets/splice.png" type="way">
     5215            <label text="Edit Power Busbar" />
     5216            <space />
     5217            <key key="power" value="line" />
     5218            <key key="line" value="busbar" />
     5219            <combo key="cables" text="Amount of cables" values="3,6,9,12" />
     5220            <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" />
     5221        </item>
     5222        <item name="Power Bay" icon="presets/splice.png" type="way">
     5223            <label text="Edit Power Bay" />
     5224            <space />
     5225            <key key="power" value="line" />
     5226            <key key="line" value="bay" />
     5227            <combo key="cables" text="Amount of cables" values="3,6,9,12" />
     5228            <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" />
     5229        </item>
     5230        <item name="Power Switch" icon="presets/splice.png" type="node">
     5231            <key key="power" value="switch" />
     5232        </item>
     5233        <separator/>
    51835234        <item name="Cable Distribution Cabinet" icon="presets/power.png" type="node">
    51845235            <link href="http://wiki.openstreetmap.org/wiki/Tag:power=cable_distribution_cabinet"
    51855236                  de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:power=cable_distribution_cabinet"
    … … Note that for a match, at least one positive and no negative is required.  
    52255276            <text key="height" text="Height in meter (m)" />
    52265277            <combo key="material" text="Material" values="metal,plastic,steel,stone,wood" />
    52275278        </item>
    5228         <item name="Power Line" icon="presets/power.png" type="way">
     5279        <item name="Power Line" icon="presets/powerlinepole.png" type="way">
    52295280            <link href="http://wiki.openstreetmap.org/wiki/Tag:power=line"
    52305281                  de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:power=line"
    52315282                  fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:power=line"
    … … Note that for a match, at least one positive and no negative is required.  
    52415292            <text key="ref" text="Line reference" />
    52425293            <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" />
    52435294            <combo key="frequency" text="Frequency in Hertz (Hz)" values="0,16.67,16.7,50,60" length="5" />
    5244             <text key="cables" text="Amount of Cables" />
    5245             <combo key="wires" text="Number of wires (better: conductors) per power cable" values="single,double,triple,quad" />
     5295            <text key="cables" text="Amount of cables" />
     5296            <combo key="wires" text="Number of conductors/wires per cable" values="single,double,triple,quad" />
    52465297        </item>
    52475298    </group> <!-- Power -->
    52485299    <group name="Historic Places" icon="presets/State_Tourist.png">
    … … Note that for a match, at least one positive and no negative is required.  
    54745525            <key key="shop" value="farm" />
    54755526            <reference ref="name_oh" />
    54765527            <text key="description" text="Description" />
    5477             <text key="phone" text="Phone Number" match="key" />
     5528            <text key="phone" text="Phone Number" />
    54785529            <text key="website" text="Website" />
    54795530            <combo key="organic" text="Organic" values="only,yes,no" />
    54805531        </item>