Changeset 6562 in josm for trunk/data/defaultpresets.xml


Ignore:
Timestamp:
2013-12-29T14:14:58+01:00 (10 years ago)
Author:
simon04
Message:

fix #9327 - tagging presets: fix handling of nested <reference>s, refactor railway presets

File:
1 edited

Legend:

Unmodified
Added
Removed

  • trunk/data/defaultpresets.xml

    r6559 r6562  
    183183        <text key="width" text="Width (meters)" />
    184184    </chunk>
     185    <chunk id="railway_service">
     186        <combo key="service" text="Service type" values="yard,siding,spur" />
     187    </chunk>
     188    <chunk id="railway_electrified">
     189        <combo key="electrified" text="Electrified" values="contact_line,no,yes,rail" />
     190        <combo key="voltage" text="Voltage in Volts (V)" values="600,650,750,1500,3000,15000,25000" length="5" />
     191        <combo key="frequency" text="Frequency in Hertz (Hz)" values="0,16.67,16.7" length="5" />
     192    </chunk>
     193    <chunk id="railway_service_gauge_electrified">
     194        <reference ref="railway_service" />
     195        <combo key="gauge" text="Gauge (mm)" values="1668,1676,1674,1600,1524,1520,1495,1435,1067,1000,914,762,760,750" length="4" />
     196        <reference ref="railway_electrified" />
     197    </chunk>
    185198    <chunk id="barrier_5">
    186199        <optional text="Allowed traffic:">
    … …  
    19091922            <optional>
    19101923                <combo key="usage" text="Usage" values="main,branch,industrial,military,tourism,freight" />
    1911                 <combo key="service" text="Service type" values="yard,siding,spur" />
    1912                 <combo key="gauge" text="Gauge (mm)" values="1668,1676,1674,1600,1524,1520,1495,1435,1067,1000,914,762,760,750" length="4" />
    1913                 <combo key="electrified" text="Electrified" values="contact_line,no,yes,rail" />
    1914                 <combo key="voltage" text="Voltage in Volts (V)" values="600,650,750,1500,3000,15000,25000" length="5" />
    1915                 <combo key="frequency" text="Frequency in Hertz (Hz)" values="0,16.67,16.7" length="5" />
     1924                <reference ref="railway_service_gauge_electrified" />
    19161925            </optional>
    19171926        </item>
    … …  
    19221931            <optional>
    19231932                <combo key="usage" text="Usage" values="main,branch,industrial,military,tourism,freight" />
    1924                 <combo key="service" text="Service type" values="yard,siding,spur" />
    1925                 <combo key="gauge" text="Gauge (mm)" values="1668,1676,1674,1600,1524,1520,1495,1435,1067,1000,914,762,760,750" length="4" />
    1926                 <combo key="electrified" text="Electrified" values="contact_line,no,yes,rail" />
    1927                 <combo key="voltage" text="Voltage in Volts (V)" values="600,650,750,1500,3000,15000,25000" length="5" />
    1928                 <combo key="frequency" text="Frequency in Hertz (Hz)" values="0,16.67,16.7" length="5" />
     1933                <reference ref="railway_service_gauge_electrified" />
    19291934            </optional>
    19301935        </item>
    … …  
    19371942            <key key="railway" value="monorail" />
    19381943            <optional>
    1939                 <combo key="service" text="Service type" values="yard,siding,spur" />
    1940                 <combo key="electrified" text="Electrified" values="contact_line,no,yes,rail" />
    1941                 <combo key="voltage" text="Voltage in Volts (V)" values="600,650,750,1500,3000,15000,25000" length="5" />
    1942                 <combo key="frequency" text="Frequency in Hertz (Hz)" values="0,16.67,16.7" length="5" />
     1944                <reference ref="railway_service" />
     1945                <reference ref="railway_electrified" />
    19431946            </optional>
    19441947        </item>
    … …  
    19481951            <key key="railway" value="preserved" />
    19491952            <optional>
    1950                 <combo key="service" text="Service type" values="yard,siding,spur" />
    1951                 <combo key="gauge" text="Gauge (mm)" values="1668,1676,1674,1600,1524,1520,1495,1435,1067,1000,914,762,760,750" length="4" />
    1952                 <combo key="electrified" text="Electrified" values="contact_line,no,yes,rail" />
    1953                 <combo key="voltage" text="Voltage in Volts (V)" values="600,650,750,1500,3000,15000,25000" length="5" />
    1954                 <combo key="frequency" text="Frequency in Hertz (Hz)" values="0,16.67,16.7" length="5" />
     1953                <reference ref="railway_service_gauge_electrified" />
    19551954            </optional>
    19561955        </item>
    … …  
    19601959            <key key="railway" value="light_rail" />
    19611960            <optional>
    1962                 <combo key="service" text="Service type" values="yard,siding,spur" />
    1963                 <combo key="gauge" text="Gauge (mm)" values="1668,1676,1674,1600,1524,1520,1495,1435,1067,1000,914,762,760,750" length="4" />
    1964                 <combo key="electrified" text="Electrified" values="contact_line,no,yes,rail" />
    1965                 <combo key="voltage" text="Voltage in Volts (V)" values="600,650,750,1500,3000,15000,25000" length="5" />
    1966                 <combo key="frequency" text="Frequency in Hertz (Hz)" values="0,16.67,16.7" length="5" />
     1961                <reference ref="railway_service_gauge_electrified" />
    19671962            </optional>
    19681963        </item>
    … …  
    19751970            <key key="railway" value="subway" />
    19761971            <optional>
    1977                 <combo key="service" text="Service type" values="yard,siding,spur" />
    1978                 <combo key="gauge" text="Gauge (mm)" values="1668,1676,1674,1600,1524,1520,1495,1435,1067,1000,914,762,760,750" length="4" />
    1979                 <combo key="electrified" text="Electrified" values="contact_line,no,yes,rail" />
    1980                 <combo key="voltage" text="Voltage in Volts (V)" values="600,650,750,1500,3000,15000,25000" length="5" />
    1981                 <combo key="frequency" text="Frequency in Hertz (Hz)" values="0,16.67,16.7" length="5" />
     1972                <reference ref="railway_service_gauge_electrified" />
    19821973            </optional>
    19831974        </item>
    … …  
    19921983            <key key="railway" value="tram" />
    19931984            <optional>
    1994                 <combo key="service" text="Service type" values="yard,siding,spur" />
    1995                 <combo key="gauge" text="Gauge (mm)" values="1668,1676,1674,1600,1524,1520,1495,1435,1067,1000,914,762,760,750" length="4" />
    1996                 <combo key="electrified" text="Electrified" values="contact_line,no,yes,rail" />
    1997                 <combo key="voltage" text="Voltage in Volts (V)" values="600,650,750,1500,3000,15000,25000" length="5" />
    1998                 <combo key="frequency" text="Frequency in Hertz (Hz)" values="0,16.67,16.7" length="5" />
     1985                <reference ref="railway_service_gauge_electrified" />
    19991986            </optional>
    20001987        </item>
    … …  
    20212008            <key key="railway" value="disused" />
    20222009            <optional>
    2023                 <combo key="service" text="Service type" values="yard,siding,spur" />
     2010                <reference ref="railway_service" />
    20242011            </optional>
    20252012        </item>
    … …  
    20302017            <key key="railway" value="abandoned" />
    20312018            <optional>
    2032                 <combo key="service" text="Service type" values="yard,siding,spur" />
     2019                <reference ref="railway_service" />
    20332020            </optional>
    20342021        </item>
Note: See TracChangeset for help on using the changeset viewer.