Ticket #9169: josm_9169.diff

File josm_9169.diff, 9.5 KB (added by skyper, 12 years ago)

patch

  • data/defaultpresets.xml

     
    52775277        </item>
    52785278    </group> <!-- Man Made -->
    52795279    <group name="Power" icon="presets/power.png">
    5280         <item name="Power Plant" icon="presets/power.png" type="closedway,relation">
     5280        <item name="Power Plant" icon="presets/powerplant.png" type="closedway,relation">
    52815281            <link href="http://wiki.openstreetmap.org/wiki/Tag:power=plant"
    52825282                  ru.href="http://wiki.openstreetmap.org/wiki/RU:Tag:power=plant" />
    52835283            <label text="Edit Power Plant" />
    … …  
    53935393                <combo key="frequency" text="Frequency in Hertz (Hz)" values="0,16.67,16.7,50,60" length="5" />
    53945394            </optional>
    53955395        </item>
    5396         <item name="Power Sub Station" icon="presets/power.png" type="node,closedway">
    5397             <link href="http://wiki.openstreetmap.org/wiki/Tag:power=sub_station"
    5398                   de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:power=sub_station"
    5399                   fr.href="http://wiki.openstreetmap.org/wiki/FR:Tag:power=sub_station"
    5400                   it.href="http://wiki.openstreetmap.org/wiki/IT:Tag:power=sub_station"
    5401                   pl.href="http://wiki.openstreetmap.org/wiki/Pl:Tag:power=sub_station"
    5402                   pt_BR.href="http://wiki.openstreetmap.org/wiki/Pt-br:Tag:power=sub_station"
    5403                   ru.href="http://wiki.openstreetmap.org/wiki/RU:Tag:power=sub_station" />
     5396        <separator/>
     5397        <item name="Power Sub Station" icon="presets/powersubstation.png" type="node,closedway">
     5398            <link href="http://wiki.openstreetmap.org/wiki/Tag:power=substation"
     5399                  de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:power=substation"
     5400                  ru.href="http://wiki.openstreetmap.org/wiki/RU:Tag:power=substation" />
    54045401            <label text="Edit Power Sub Station" />
    54055402            <space />
    5406             <key key="power" value="sub_station" />
    5407             <text key="operator" text="Operator" />
    5408             <text key="ref" text="Line reference" />
     5403            <key key="power" value="substation" />
     5404            <text key="name" text="Name" />
     5405            <combo key="substation" text="Type of substation" values="transmission,distribution,converter,compensation,transition,traction,industrial" />
     5406            <combo key="location" text="Location" values="outdoor,indoor,underground,platform,kiosk" />
    54095407            <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" />
    54105408            <combo key="frequency" text="Frequency in Hertz (Hz)" values="0,16.67,16.7,50,60" length="5" />
     5409            <optional>
     5410                <text key="operator" text="Operator" />
     5411                <text key="ref" text="Reference" />
     5412                <check key="gas_insulated" text="Gas insulated" />
     5413            </optional>
    54115414        </item>
     5415        <item name="Power Transformer" icon="presets/powersubstation.png" type="node,closedway">
     5416            <link href="http://wiki.openstreetmap.org/wiki/Tag:power=transformer"
     5417                  fr.href="http://wiki.openstreetmap.org/wiki/FR:Tag:power=transformersubstation"
     5418                  pl.href="http://wiki.openstreetmap.org/wiki/Pl:Tag:power=transformer" />
     5419            <label text="Edit Power Transformer" />
     5420            <space />
     5421            <key key="power" value="transformer" />
     5422            <combo key="transformer" text="Type of transformer" values="distribution,generator,coverter,traction,auto,phase_angle_regulator,yes" match="key" />
     5423            <combo key="location" text="Location" values="outdoor,indoor,underground,platform,kiosk" />
     5424            <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" />
     5425            <optional>
     5426                <combo key="frequency" text="Frequency in Hertz (Hz)" values="0,16.67,16.7,50,60" length="5" />
     5427                <combo key="phases" text="Phases" values="1,3" length="1" />
     5428                <text key="rating" text="Rating (kVA)" />
     5429            </optional>
     5430        </item>
     5431        <item name="Power Switchgear" icon="presets/splice.png" type="closedway">
     5432            <label text="Edit Power Switchgear" />
     5433            <space />
     5434            <label text="(please only use this tag if more detailed mapping is impossible)" />
     5435            <space />
     5436            <key key="power" value="switchgear" />
     5437            <combo key="location" text="Location" values="outdoor,indoor,underground,platform,kiosk" />
     5438            <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" />
     5439            <optional>
     5440                <check key="gas_insulated" text="Gas insulated" />
     5441            </optional>
     5442        </item>
     5443        <item name="Power Busbar" icon="presets/splice.png" type="way">
     5444            <label text="Edit Power Busbar" />
     5445            <space />
     5446            <key key="power" value="line" />
     5447            <key key="line" value="busbar" match="keyvalue" />
     5448            <combo key="cables" text="Amount of Cables" values="3,6,9,12" />
     5449            <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" />
     5450        </item>
     5451        <item name="Power Bay" icon="presets/splice.png" type="way">
     5452            <label text="Edit Power Bay" />
     5453            <space />
     5454            <key key="power" value="line" />
     5455            <key key="line" value="bay" match="keyvalue" />
     5456            <combo key="cables" text="Amount of Cables" values="3,6,9,12" />
     5457            <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" />
     5458        </item>
     5459        <item name="Power Switch" icon="presets/splice.png" type="node">
     5460            <key key="power" value="switch" />
     5461        </item>
     5462        <separator/>
    54125463        <item name="Cable Distribution Cabinet" icon="presets/power.png" type="node">
    54135464            <link href="http://wiki.openstreetmap.org/wiki/Tag:power=cable_distribution_cabinet"
    54145465                  de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:power=cable_distribution_cabinet"
    … …  
    54385489            <text key="height" text="Height in meter (m)" />
    54395490            <combo key="material" text="Material" values="metal,plastic,steel,stone,wood" />
    54405491        </item>
    5441         <item name="Pole" icon="styles/standard/misc/landmark/power/pole.png" type="node">
     5492        <item name="Pole" icon="presets/powerlinepole.png" type="node">
    54425493            <link href="http://wiki.openstreetmap.org/wiki/Tag:power=pole"
    54435494                  de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:power=pole"
    54445495                  es.href="http://wiki.openstreetmap.org/wiki/ES:Tag:power=pole"
    … …  
    54545505            <text key="height" text="Height in meter (m)" />
    54555506            <combo key="material" text="Material" values="metal,plastic,steel,stone,wood" />
    54565507        </item>
    5457         <item name="Power Line" icon="presets/power.png" type="way">
     5508        <item name="Power Line" icon="presets/powerlinepole.png" type="way">
    54585509            <link href="http://wiki.openstreetmap.org/wiki/Tag:power=line"
    54595510                  de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:power=line"
    54605511                  fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:power=line"
    … …  
    57195770            <text key="name" text="Name" />
    57205771            <text key="description" text="Description" />
    57215772            <combo key="opening_hours" text="Opening Hours" delimiter="|" values="24/7|08:30-12:30,15:30-20:00|Sa-Su 00:00-24:00|Mo-Fr 08:30-20:00; Sa,Su 08:00-15:00; PH off|Mo-Fr 08:30-20:00,Tu-Su 08:00-15:00; Sa 08:00-12:00|Mo-Su 08:00-18:00; Apr 10-15 off; Jun 08:00-14:00; Aug off; Dec 25 off|sunrise-sunset|Su 10:00+|week 1-53/2 Fr 09:00-12:00; week 2-52/2 We 09:00-12:00" />
    5722             <text key="phone" text="Phone Number" match="key" />
     5773            <text key="phone" text="Phone Number" />
    57235774            <text key="website" text="Website" />
    57245775            <combo key="organic" text="Organic" values="only,yes,no" />
    57255776        </item>