Changeset 15074 in josm


Ignore:
Timestamp:
2019-05-12T19:36:38+02:00 (5 months ago)
Author:
Klumbumbus
Message:
  • fix #17650 - add bridge/tunnel/embankement/cutting checks to railway presets
  • better preset layout bridge/tunnel/embankement/cutting checks in two columns
  • remove incline from highway=bus_guideway preset
  • remove incline and oneway from roundabout preset
File:
1 edited

Legend:

Unmodified
Added
Removed
  • trunk/data/defaultpresets.xml

    r15072 r15074  
    4646        <reference ref="surface_smoothness" />
    4747    </chunk>
     48    <chunk id="highway_yesno">
     49        <checkgroup columns="2">
     50            <check key="bridge" text="Bridge" disable_off="true" />
     51            <check key="embankment" text="Embankment" disable_off="true" />
     52            <check key="tunnel" text="Tunnel" disable_off="true" />
     53            <check key="cutting" text="Cutting" disable_off="true" />
     54        </checkgroup>
     55    </chunk>
    4856    <chunk id="highway_yesno_incline">
    49         <check key="bridge" text="Bridge" disable_off="true" />
    50         <check key="tunnel" text="Tunnel" disable_off="true" />
    51         <check key="cutting" text="Cutting" disable_off="true" />
    52         <check key="embankment" text="Embankment" disable_off="true" />
     57        <reference ref="highway_yesno" />
    5358        <combo key="incline" text="Incline" values="10%,-10%,10°,-10°,up,down"/>
    5459    </chunk>
    55     <chunk id="highway_yesno_incline_oneway">
     60    <chunk id="highway_yesno_incline_oneway_lit_width">
    5661        <check key="oneway" text="Oneway" />
    5762        <reference ref="highway_yesno_incline" />
    58     </chunk>
    59     <chunk id="highway_yesno_incline_oneway_lit">
    60         <reference ref="highway_yesno_incline_oneway" />
    6163        <check key="lit" text="Lit" />
    62     </chunk>
    63     <chunk id="highway_yesno_incline_oneway_lit_width">
    64         <reference ref="highway_yesno_incline_oneway_lit" />
    6564        <text key="width" text="Width (meters)" />
    6665    </chunk>
     
    7271        <combo key="service" text="Service type" values="yard,siding,spur,crossover" />
    7372    </chunk>
    74     <chunk id="railway_electrified">
     73    <chunk id="railway_electrified_yesno">
    7574        <combo key="electrified" text="Electrified" values="contact_line,no,yes,rail" values_context="electrified" />
    7675        <combo key="voltage" text="Voltage in Volts (V)" values="600,650,750,1500,3000,15000,25000" length="5" />
    7776        <combo key="frequency" text="Frequency in Hertz (Hz)" values="0,16.67,16.7" length="5" />
     77        <reference ref="highway_yesno" />
    7878    </chunk>
    79     <chunk id="railway_service_gauge_electrified">
     79    <chunk id="railway_service_gauge_electrified_yesno">
    8080        <reference ref="railway_service" />
    8181        <combo key="tracks" text="Tracks" text_context="railway" values="1,2,3,4" length="4" />
    8282        <combo key="gauge" text="Gauge (mm)" values="1668,1676,1674,1600,1524,1520,1495,1435,1067,1000,914,762,760,750" length="4" />
    83         <reference ref="railway_electrified" />
     83        <reference ref="railway_electrified_yesno" />
    8484    </chunk>
    8585    <chunk id="barrier_5">
     
    887887                <reference ref="name_layer" />
    888888                <combo key="lanes" text="Lanes" values="1,2,3" length="3" />
    889                 <reference ref="highway_yesno_incline_oneway" />
     889                <reference ref="highway_yesno" />
    890890                <text key="width" text="Width (meters)" />
    891891            </optional>
     
    18171817            <optional>
    18181818                <combo key="usage" text="Usage" values="main,branch,industrial,military,tourism,freight" />
    1819                 <reference ref="railway_service_gauge_electrified" />
     1819                <reference ref="railway_service_gauge_electrified_yesno" />
    18201820            </optional>
    18211821        </item> <!-- Rail -->
     
    18251825            <optional>
    18261826                <combo key="usage" text="Usage" values="main,branch,industrial,military,tourism,freight" />
    1827                 <reference ref="railway_service_gauge_electrified" />
     1827                <reference ref="railway_service_gauge_electrified_yesno" />
    18281828            </optional>
    18291829        </item> <!-- Narrow Gauge Rail -->
     
    18331833            <optional>
    18341834                <reference ref="railway_service" />
    1835                 <reference ref="railway_electrified" />
     1835                <reference ref="railway_electrified_yesno" />
    18361836            </optional>
    18371837        </item> <!-- Monorail -->
     
    18401840            <key key="railway" value="preserved" />
    18411841            <optional>
    1842                 <reference ref="railway_service_gauge_electrified" />
     1842                <reference ref="railway_service_gauge_electrified_yesno" />
    18431843            </optional>
    18441844        </item> <!-- Preserved -->
     
    18471847            <key key="railway" value="light_rail" />
    18481848            <optional>
    1849                 <reference ref="railway_service_gauge_electrified" />
     1849                <reference ref="railway_service_gauge_electrified_yesno" />
    18501850            </optional>
    18511851        </item> <!-- Light Rail -->
     
    18541854            <key key="railway" value="subway" />
    18551855            <optional>
    1856                 <reference ref="railway_service_gauge_electrified" />
     1856                <reference ref="railway_service_gauge_electrified_yesno" />
    18571857            </optional>
    18581858        </item> <!-- Subway -->
     
    18611861            <key key="railway" value="tram" />
    18621862            <optional>
    1863                 <reference ref="railway_service_gauge_electrified" />
     1863                <reference ref="railway_service_gauge_electrified_yesno" />
    18641864            </optional>
    18651865        </item> <!-- Tram -->
     
    18681868            <key key="railway" value="funicular" />
    18691869            <optional>
    1870                 <reference ref="railway_service_gauge_electrified" />
     1870                <reference ref="railway_service_gauge_electrified_yesno" />
    18711871            </optional>
    18721872        </item> <!-- Funicular -->
     
    18761876            <optional>
    18771877                <text key="name" text="Name" />
    1878                 <reference ref="highway_yesno_incline_oneway" />
     1878                <reference ref="highway_yesno" />
     1879                <check key="oneway" text="Oneway" />
    18791880                <combo key="layer" text="Layer" values="5,4,3,2,1,0,-1,-2,-3,-4,-5" length="3" />
    18801881                <reference ref="surface_smoothness" />
     
    18891890            <optional>
    18901891                <reference ref="railway_service" />
     1892                <reference ref="highway_yesno" />
    18911893            </optional>
    18921894        </item> <!-- Disused Rail -->
     
    18961898            <optional>
    18971899                <reference ref="railway_service" />
     1900                <reference ref="highway_yesno" />
    18981901            </optional>
    18991902        </item> <!-- Abandoned Rail -->
Note: See TracChangeset for help on using the changeset viewer.