Changeset 6001 in josm for trunk


Ignore:
Timestamp:
2013-06-11T00:25:24+02:00 (7 years ago)
Author:
Don-vip
Message:

fix #8773 - Internal presets: update railway tags (patch by skyper)

File:
1 edited

Legend:

Unmodified
Added
Removed
  • trunk/data/defaultpresets.xml

    r5999 r6001  
    19881988        <item name="Rail" icon="presets/railway.png" type="way">
    19891989            <link href="http://wiki.openstreetmap.org/wiki/Tag:railway=rail"
     1990                  fr.href="http://wiki.openstreetmap.org/wiki/FR:Tag:railway=rail"
    19901991                  ja.href="http://wiki.openstreetmap.org/wiki/JA:Tag:railway=rail"
    19911992                  pt_BR.href="http://wiki.openstreetmap.org/wiki/Pt-br:Tag:railway=rail"
     
    19961997            <key key="railway" value="rail" />
    19971998            <optional>
    1998                 <combo key="usage" text="Usage" values="main,branch,industrial,military,tourism" />
     1999                <combo key="usage" text="Usage" values="main,branch,industrial,military,tourism,freight" />
    19992000                <combo key="service" text="Service/Type" values="yard,siding,spur" />
    2000                 <combo key="gauge" text="Gauge (mm)" values="1668,1676,1674,1600,1524,1520,1495,1435,1067,1000,914,762,760,750" />
     2001                <combo key="gauge" text="Gauge (mm)" values="1668,1676,1674,1600,1524,1520,1495,1435,1067,1000,914,762,760,750" length="4" />
    20012002                <combo key="electrified" text="Electrified" values="contact_line,no,yes,rail" />
    2002                 <combo key="voltage" text="Voltage" values="600,650,750,1500,3000,15000,25000" />
    2003                 <combo key="frequency" text="Frequency (Hz)" values="0,16.7,50,60" />
     2003                <combo key="voltage" text="Voltage" values="600,650,750,1500,3000,15000,25000" lenght="5" />
     2004                <combo key="frequency" text="Frequency (Hz)" values="0,16.7,50,60" length="4"/>
    20042005            </optional>
    20052006        </item>
    20062007        <item name="Narrow Gauge Rail" icon="presets/railway.png" type="way">
     2008            <link href="http://wiki.openstreetmap.org/wiki/Tag:railway=light_rail"
     2009                  ru.href="http://wiki.openstreetmap.org/wiki/RU:Tag:railway=light_rail" />
    20072010            <label text="Edit Narrow Gauge Rail" />
    20082011            <space />
    20092012            <key key="railway" value="narrow_gauge" />
    20102013            <optional>
    2011                 <combo key="gauge" text="Gauge (mm)" values="1668,1676,1674,1600,1524,1520,1495,1435,1067,1000,914,762,760,750" />
     2014                <combo key="usage" text="Usage" values="main,branch,industrial,military,tourism,freight" />
    20122015                <combo key="service" text="Types" values="yard,siding,spur" />
     2016                <combo key="gauge" text="Gauge (mm)" values="1668,1676,1674,1600,1524,1520,1495,1435,1067,1000,914,762,760,750" length="4" />
    20132017                <combo key="electrified" text="Electrified" values="contact_line,no,yes,rail" />
    2014                 <combo key="voltage" text="Voltage" values="600,650,750,1500,3000,15000,25000" />
    2015                 <combo key="frequency" text="Frequency (Hz)" values="0,16.7,50,60" />
     2018                <combo key="voltage" text="Voltage" values="600,650,750,1500,3000,15000,25000" length="5" />
     2019                <combo key="frequency" text="Frequency (Hz)" values="0,16.7,50,60" length="4" />
    20162020            </optional>
    20172021        </item>
     
    20192023            <link href="http://wiki.openstreetmap.org/wiki/Tag:railway=monorail"
    20202024                  de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:railway=monorail"
     2025                  ja.href="http://wiki.openstreetmap.org/wiki/JA:Tag:railway=monorail"
    20212026                  pt_BR.href="http://wiki.openstreetmap.org/wiki/Pt-br:Tag:railway=monorail" />
    20222027            <label text="Edit Monorail" />
     
    20262031                <combo key="service" text="Types" values="yard,siding,spur" />
    20272032                <combo key="electrified" text="Electrified" values="contact_line,no,yes,rail" />
    2028                 <combo key="voltage" text="Voltage" values="600,650,750,1500,3000,15000,25000" />
    2029                 <combo key="frequency" text="Frequency (Hz)" values="0,16.7,50,60" />
     2033                <combo key="voltage" text="Voltage" values="600,650,750,1500,3000,15000,25000" length="5" />
     2034                <combo key="frequency" text="Frequency (Hz)" values="0,16.7,50,60" length="4" />
    20302035            </optional>
    20312036        </item>
    20322037        <item name="Preserved" icon="presets/rail_preserved.png" type="way">
     2038            <link href="http://wiki.openstreetmap.org/wiki/Tag:railway=preserved" />
    20332039            <label text="Edit Preserved Railway" />
    20342040            <space />
    20352041            <key key="railway" value="preserved" />
    20362042            <optional>
    2037                 <combo key="gauge" text="Gauge (mm)" values="1668,1676,1674,1600,1524,1520,1495,1435,1067,1000,914,762,760,750" />
    20382043                <combo key="service" text="Types" values="yard,siding,spur" />
     2044                <combo key="gauge" text="Gauge (mm)" values="1668,1676,1674,1600,1524,1520,1495,1435,1067,1000,914,762,760,750" length="4" />
    20392045                <combo key="electrified" text="Electrified" values="contact_line,no,yes,rail" />
    2040                 <combo key="voltage" text="Voltage" values="600,650,750,1500,3000,15000,25000" />
    2041                 <combo key="frequency" text="Frequency (Hz)" values="0,16.7,50,60" />
     2046                <combo key="voltage" text="Voltage" values="600,650,750,1500,3000,15000,25000" length="5" />
     2047                <combo key="frequency" text="Frequency (Hz)" values="0,16.7,50,60" length="4" />
    20422048            </optional>
    20432049        </item>
    20442050        <item name="Light Rail" icon="presets/rail_light.png" type="way">
     2051            <link href="http://wiki.openstreetmap.org/wiki/Tag:railway=light_rail" />
    20452052            <label text="Edit Light Rail" />
    20462053            <space />
    20472054            <key key="railway" value="light_rail" />
    20482055            <optional>
    2049                 <combo key="gauge" text="Gauge (mm)" values="1668,1676,1674,1600,1524,1520,1495,1435,1067,1000,914,762,760,750" />
    20502056                <combo key="service" text="Types" values="yard,siding,spur" />
     2057                <combo key="gauge" text="Gauge (mm)" values="1668,1676,1674,1600,1524,1520,1495,1435,1067,1000,914,762,760,750" length="4" />
    20512058                <combo key="electrified" text="Electrified" values="contact_line,no,yes,rail" />
    2052                 <combo key="voltage" text="Voltage" values="600,650,750,1500,3000,15000,25000" />
    2053                 <combo key="frequency" text="Frequency (Hz)" values="0,16.7,50,60" />
     2059                <combo key="voltage" text="Voltage" values="600,650,750,1500,3000,15000,25000" length="5" />
     2060                <combo key="frequency" text="Frequency (Hz)" values="0,16.7,50,60" length="4" />
    20542061            </optional>
    20552062        </item>
    20562063        <item name="Subway" icon="presets/rail_light.png" type="way">
     2064            <link href="http://wiki.openstreetmap.org/wiki/Tag:railway=subway"
     2065                  ja.href="http://wiki.openstreetmap.org/wiki/JA:Tag:railway=subway"
     2066                  pt_BR.href="http://wiki.openstreetmap.org/wiki/Pt-br:Tag:railway=subway"
     2067                  ru.href="http://wiki.openstreetmap.org/wiki/RU:Tag:railway=subway" />
     2068            <label text="Edit Tram" />
    20572069            <label text="Edit Subway" />
    20582070            <space />
    20592071            <key key="railway" value="subway" />
    20602072            <optional>
    2061                 <combo key="gauge" text="Gauge (mm)" values="1668,1676,1674,1600,1524,1520,1495,1435,1067,1000,914,762,760,750" />
    20622073                <combo key="service" text="Types" values="yard,siding,spur" />
     2074                <combo key="gauge" text="Gauge (mm)" values="1668,1676,1674,1600,1524,1520,1495,1435,1067,1000,914,762,760,750" length="4" />
    20632075                <combo key="electrified" text="Electrified" values="contact_line,no,yes,rail" />
    2064                 <combo key="voltage" text="Voltage" values="600,650,750,1500,3000,15000,25000" />
    2065                 <combo key="frequency" text="Frequency (Hz)" values="0,16.7,50,60" />
     2076                <combo key="voltage" text="Voltage" values="600,650,750,1500,3000,15000,25000" length="5" />
     2077                <combo key="frequency" text="Frequency (Hz)" values="0,16.7,50,60" length="4" />
    20662078            </optional>
    20672079        </item>
    20682080        <item name="Tram" icon="presets/tram.png" type="way">
     2081            <link href="http://wiki.openstreetmap.org/wiki/Tag:railway=tram"
     2082                  de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:railway=tram"
     2083                  ja.href="http://wiki.openstreetmap.org/wiki/JA:Tag:railway=tram"
     2084                  pt_BR.href="http://wiki.openstreetmap.org/wiki/Pt-br:Tag:railway=tram"
     2085                  ru.href="http://wiki.openstreetmap.org/wiki/RU:Tag:railway=tram"
     2086                  uk.href="http://wiki.openstreetmap.org/wiki/UK:Tag:railway=tram" />
    20692087            <label text="Edit Tram" />
    20702088            <space />
    20712089            <key key="railway" value="tram" />
    20722090            <optional>
    2073                 <combo key="gauge" text="Gauge (mm)" values="1668,1676,1674,1600,1524,1520,1495,1435,1067,1000,914,762,760,750" />
    20742091                <combo key="service" text="Types" values="yard,siding,spur" />
     2092                <combo key="gauge" text="Gauge (mm)" values="1668,1676,1674,1600,1524,1520,1495,1435,1067,1000,914,762,760,750" length="4" />
    20752093                <combo key="electrified" text="Electrified" values="contact_line,no,yes,rail" />
    2076                 <combo key="voltage" text="Voltage" values="600,650,750,1500,3000,15000,25000" />
    2077                 <combo key="frequency" text="Frequency (Hz)" values="0,16.7,50,60" />
     2094                <combo key="voltage" text="Voltage" values="600,650,750,1500,3000,15000,25000" length="5" />
     2095                <combo key="frequency" text="Frequency (Hz)" values="0,16.7,50,60" length="4" />
    20782096            </optional>
    20792097        </item>
     
    21012119        <separator/>
    21022120        <item name="Disused Rail" icon="presets/railway.png" type="way">
     2121            <link href="http://wiki.openstreetmap.org/wiki/Tag:railway=disused" />
    21032122            <label text="Edit Disused Railway" />
    21042123            <space />
    21052124            <key key="railway" value="disused" />
    2106             <combo key="service" text="Optional Types" values="yard,siding,spur" />
     2125            <optional>
     2126                <combo key="service" text="Types" values="yard,siding,spur" />
     2127            </optional>
    21072128        </item>
    21082129        <item name="Abandoned Rail" icon="presets/railway.png" type="way">
     2130            <link href="http://wiki.openstreetmap.org/wiki/Tag:railway=abandoned"
     2131                  de.href="http://wiki.openstreetmap.org/wiki/Tag:railway=abandoned" />
     2132            <label text="Edit Abandoned Railway" />
     2133            <space />
    21092134            <key key="railway" value="abandoned" />
     2135            <optional>
     2136                <combo key="service" text="Types" values="yard,siding,spur" />
     2137            </optional>
    21102138        </item>
    21112139        <separator/>
     
    21232151            <key key="railway" value="level_crossing" />
    21242152            <optional>
     2153                <check key="supervised" text="Supervised" default="off" />
    21252154                <check key="crossing:light" text="Traffic lights" default="off" />
    21262155                <check key="crossing:bell" text="Sound signals" default="off" />
     2156                <combo key="crossing:barrier" text="Barrier" values="yes,no,half,full,double_half" />
     2157            </optional>
     2158        </item>
     2159        <item name="Crossing" icon="presets/crossing.png" type="node">
     2160            <link href="http://wiki.openstreetmap.org/wiki/Key:crossing"
     2161                  bg.href="http://wiki.openstreetmap.org/wiki/Bg:Key:crossing"
     2162                  de.href="http://wiki.openstreetmap.org/wiki/DE:Key:crossing"
     2163                  fi.href="http://wiki.openstreetmap.org/wiki/Fi:Key:crossing"
     2164                  ja.href="http://wiki.openstreetmap.org/wiki/JA:Key:crossing"
     2165                  pt_BR.href="http://wiki.openstreetmap.org/wiki/Pt-br:Key:crossing"
     2166                  ru.href="http://wiki.openstreetmap.org/wiki/RU:Key:crossing" />
     2167            <key key="railway" value="crossing" />
     2168            <optional>
     2169                <combo key="crossing" text="Crossing type" values="uncontrolled,traffic_signals,island,unmarked,no,unknown" />
     2170                <check key="horse" text="Cross on horseback" default="off" />
     2171                <check key="bicycle" text="Cross by bicycle" default="off" />
    21272172                <check key="supervised" text="Supervised" default="off" />
     2173                <check key="crossing:light" text="Traffic lights" default="off" />
     2174                <check key="crossing:bell" text="Sound signals" default="off" />
    21282175                <combo key="crossing:barrier" text="Barrier" values="yes,no,half,full,double_half" />
    2129             </optional>
    2130         </item>
    2131         <item name="Crossing" icon="presets/crossing.png" type="node">
    2132             <link href="http://wiki.openstreetmap.org/wiki/Key:crossing" />
    2133             <key key="railway" value="crossing" />
    2134             <optional>
    2135                  <combo key="crossing" text="Crossing type" values="uncontrolled,traffic_signals,island,unmarked,no,unknown" />
    2136                  <check key="horse" text="Cross on horseback" default="off" />
    2137                  <check key="bicycle" text="Cross by bicycle" default="off" />
    2138                  <check key="supervised" text="Crossing attendant" default="off" />
    21392176            </optional>
    21402177        </item>
Note: See TracChangeset for help on using the changeset viewer.