Ticket #21426: josm_21426.patch

File josm_21426.patch, 7.2 KB (added by skyper, 4 years ago)

patch

  • resources/data/defaultpresets.xml

     
    9191        <combo key="voltage" text="Voltage in Volts (V)" values="600,650,750,1500,3000,15000,25000" length="5" />
    9292        <combo key="frequency" text="Frequency in Hertz (Hz)" values="0,16.67,16.7,25" length="5" values_sort="false" />
    9393        <reference ref="highway_yesno" />
     94        <combo key="layer" text="Layer" values="5,4,3,2,1,0,-1,-2,-3,-4,-5" length="3" values_sort="false" />
    9495    </chunk>
    9596    <chunk id="railway_service_gauge_electrified_yesno">
    9697        <reference ref="railway_service" />
    … …  
    24182419            <optional>
    24192420                <reference ref="railway_service" />
    24202421                <reference ref="highway_yesno" />
     2422                <combo key="layer" text="Layer" values="5,4,3,2,1,0,-1,-2,-3,-4,-5" length="3" values_sort="false" />
    24212423            </optional>
    24222424        </item> <!-- Disused Rail -->
    24232425        <item name="Abandoned Rail" icon="presets/transport/railway/abandoned_rail.svg" type="way" preset_name_label="true">
    … …  
    24262428            <optional>
    24272429                <reference ref="railway_service" />
    24282430                <reference ref="highway_yesno" />
     2431                <combo key="layer" text="Layer" values="5,4,3,2,1,0,-1,-2,-3,-4,-5" length="3" values_sort="false" />
    24292432            </optional>
    24302433        </item> <!-- Abandoned Rail -->
    24312434        <separator/>
    … …  
    57815784                    <check key="bridge" text="Bridge" disable_off="true" />
    57825785                    <check key="tunnel" text="Tunnel" disable_off="true" />
    57835786                </checkgroup>
     5787                <combo key="layer" text="Layer" values="5,4,3,2,1,0,-1,-2,-3,-4,-5" default="-1" length="3" values_sort="false" />
    57845788            </optional>
    57855789        </item> <!-- Goods conveyor -->
    57865790        <item name="Pumping station" icon="presets/misc/pumping_station.svg" type="node,closedway,multipolygon" preset_name_label="true">
    … …  
    61746178            <space />
    61756179            <key key="man_made" value="bridge" />
    61766180            <optional>
    6177                 <reference ref="name_layer" />
     6181                <text key="name" text="Name" />
     6182                <combo key="layer" text="Layer" values="5,4,3,2,1,0,-1,-2,-3,-4,-5" default="-1" length="3" values_sort="false" />
     6183                <combo key="bridge" text="Bridge" values="aqueduct,boardwalk,cantilever,covered,low_water_crossing,movable,trestle,viaduct" />
     6184                <combo key="bridge:structure" text="Structure" values="arch,beam,cable-stayed,floating,humpback,simple-suspension,suspension,truss" match="key" />
     6185                <combo key="bridge:movable" text="Type" values="bascule,drawbridge,lift,submersible,swing,transporter,retractable,tilt" match="key" />
    61786186            </optional>
    61796187        </item> <!-- Bridge outline -->
    61806188    </group> <!-- Bridges -->
    … …  
    61946202            <link wiki="Tag:military=bunker" />
    61956203            <key key="military" value="bunker" />
    61966204            <optional>
    6197                <combo key="bunker_type" text="Type" values="command,foxhole,gun_emplacement,hardened_aircraft_shelter,mg_nest,munitions,observation,personnel_shelter,pillbox,technical,tobruk" values_context="bunker" values_searchable="true" />
    6198                <combo key="location" text="Location" values="overground,underground,underwater" values_context="bunker" />
    6199                <combo key="building" text="Building" values="bunker,yes" values_context="building" />
    6200                <text key="name" text="Name" />
    6201                <reference ref="POI_access" />
    6202                <check key="historic" text="Historic" />
    6203                <check key="ruins" text="Ruins" />
     6205                <combo key="bunker_type" text="Type" values="command,foxhole,gun_emplacement,hardened_aircraft_shelter,mg_nest,munitions,observation,personnel_shelter,pillbox,technical,tobruk" values_context="bunker" values_searchable="true" />
     6206                <combo key="location" text="Location" values="overground,underground,underwater" values_context="bunker" />
     6207                <combo key="building" text="Building" values="bunker,yes" values_context="building" />
     6208                <text key="name" text="Name" />
     6209                <reference ref="POI_access" />
     6210                <check key="historic" text="Historic" />
     6211                <check key="ruins" text="Ruins" />
    62046212            </optional>
    62056213        </item> <!-- Bunker -->
    62066214        <item name="Range" icon="presets/sport/range.svg" type="node,closedway,multipolygon" preset_name_label="true">
    … …  
    95149522            <link wiki="Relations/Proposed/Bridges_and_Tunnels" />
    95159523            <space />
    95169524            <key key="type" value="bridge" />
    9517             <combo key="layer" text="Layer" values="5,4,3,2,1,0,-1,-2,-3,-4,-5" length="3" values_sort="false" />
    9518             <reference ref="name_ref" />
    9519             <text key="height" text="Height (meters)" length="7" />
    9520             <text key="length" text="Length (meters)" />
    9521             <text key="operator" text="Operator" />
     9525            <combo key="layer" text="Layer" values="5,4,3,2,1,0,-1,-2,-3,-4,-5" default="1" length="3" values_sort="false" />
     9526            <optional>
     9527                <combo key="bridge" text="Bridge" values="aqueduct,boardwalk,cantilever,covered,low_water_crossing,movable,trestle,viaduct" />
     9528                <combo key="bridge:structure" text="Structure" values="arch,beam,cable-stayed,floating,humpback,simple-suspension,suspension,truss" match="key" />
     9529                <combo key="bridge:movable" text="Type" values="bascule,drawbridge,lift,submersible,swing,transporter,retractable,tilt" match="key" />
     9530                <reference ref="name_ref" />
     9531                <text key="height" text="Height (meters)" length="7" />
     9532                <text key="length" text="Length (meters)" />
     9533                <text key="operator" text="Operator" />
     9534            </optional>
    95229535            <roles>
    95239536                <role key="across" text="ways supported by (on top of) the bridge" requisite="optional" type="way" />
    95249537                <role key="under" text="ways passing under the bridge" requisite="optional" type="way" />
    … …  
    95309543            <link wiki="Relations/Proposed/Bridges_and_Tunnels" />
    95319544            <space />
    95329545            <key key="type" value="tunnel" />
    9533             <combo key="layer" text="Layer" values="5,4,3,2,1,0,-1,-2,-3,-4,-5" length="3" values_sort="false" />
    9534             <reference ref="name_ref" />
    9535             <text key="length" text="Length (meters)" />
    9536             <text key="operator" text="Operator" />
     9546            <combo key="layer" text="Layer" values="5,4,3,2,1,0,-1,-2,-3,-4,-5" default="-1" length="3" values_sort="false" />
     9547            <optional>
     9548                <reference ref="name_ref" />
     9549                <text key="length" text="Length (meters)" />
     9550                <text key="operator" text="Operator" />
     9551            </optional>
    95379552            <roles>
    95389553                <role key="through" text="ways passing through the tunnel" requisite="required" type="way" />
    95399554                <role key="outline" text="way forming the outline footprint" requisite="optional" count="1" type="closedway,multipolygon" />