Changeset 18326 in josm


Ignore:
Timestamp:
2021-11-28T21:43:52+01:00 (3 years ago)
Author:
Klumbumbus
Message:

fix #21447, fix #21610, see #21426 - remove layer=0 from presets and fix default layer=-1 to layer=1 for man_made=bridge (patch by skyper)

File:
1 edited

Legend:

Unmodified
Added
Removed

  • trunk/resources/data/defaultpresets.xml

    r18324 r18326  
    3838        <text key="maxspeed:backward" text="Max. speed opposed to way direction" />
    3939        <space />
    40         <combo key="layer" text="Layer" values="5,4,3,2,1,0,-1,-2,-3,-4,-5" length="3" values_sort="false" />
     40        <combo key="layer" text="Layer" values="5,4,3,2,1,-1,-2,-3,-4,-5" length="3" values_sort="false" />
    4141        <reference ref="surface_smoothness" />
    4242    </chunk>
    … …  
    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" />
     94        <combo key="layer" text="Layer" values="5,4,3,2,1,-1,-2,-3,-4,-5" length="3" values_sort="false" />
    9595    </chunk>
    9696    <chunk id="railway_service_gauge_electrified_yesno">
    … …  
    159159    <chunk id="name_layer">
    160160        <text key="name" text="Name" />
    161         <combo key="layer" text="Layer" values="5,4,3,2,1,0,-1,-2,-3,-4,-5" length="3" values_sort="false" />
     161        <combo key="layer" text="Layer" values="5,4,3,2,1,-1,-2,-3,-4,-5" length="3" values_sort="false" />
    162162    </chunk>
    163163    <chunk id="service_times">
    … …  
    474474            <text key="name" text="Name" />
    475475            <text key="bridge:name" text="Bridge name" />
    476             <combo key="layer" text="Layer" values="5,4,3,2,1,0,-1,-2,-3,-4,-5" default="1" length="3" values_sort="false" />
     476            <combo key="layer" text="Layer" values="5,4,3,2,1,-1,-2,-3,-4,-5" default="1" length="3" values_sort="false" />
    477477            <space />
    478478            <text key="maxspeed" text="Max. speed (km/h)" />
    … …  
    487487    </chunk>
    488488    <chunk id="waterway">
    489         <combo key="layer" text="Layer" values="5,4,3,2,1,0,-1,-2,-3,-4,-5" length="3" values_sort="false" />
     489        <combo key="layer" text="Layer" values="5,4,3,2,1,-1,-2,-3,-4,-5" length="3" values_sort="false" />
    490490        <check key="intermittent" text="Intermittent" disable_off="true" />
    491491        <check key="seasonal" text="Seasonal" disable_off="true" />
    … …  
    892892            <optional>
    893893                <combo key="lanes" text="Lanes" values="1,2,3" length="3" />
    894                 <combo key="layer" text="Layer" values="5,4,3,2,1,0,-1,-2,-3,-4,-5" length="3" values_sort="false" />
     894                <combo key="layer" text="Layer" values="5,4,3,2,1,-1,-2,-3,-4,-5" length="3" values_sort="false" />
    895895                <reference ref="surface_smoothness" />
    896896                <reference ref="highway_yesno_incline" />
    … …  
    914914            <optional>
    915915                <combo key="lanes" text="Lanes" values="1,2,3" length="3" />
    916                 <combo key="layer" text="Layer" values="5,4,3,2,1,0,-1,-2,-3,-4,-5" length="3" values_sort="false" />
     916                <combo key="layer" text="Layer" values="5,4,3,2,1,-1,-2,-3,-4,-5" length="3" values_sort="false" />
    917917                <reference ref="surface_smoothness" />
    918918                <reference ref="highway_yesno_incline_oneway_lit_width_busbay_sidewalk" />
    … …  
    931931            <check key="noname" text="Street has no name" disable_off="true" />
    932932            <optional>
    933                 <combo key="layer" text="Layer" values="5,4,3,2,1,0,-1,-2,-3,-4,-5" length="3" values_sort="false" />
     933                <combo key="layer" text="Layer" values="5,4,3,2,1,-1,-2,-3,-4,-5" length="3" values_sort="false" />
    934934                <reference ref="surface_smoothness" />
    935935                <check key="area" text="Area" />
    … …  
    12931293                <text key="name" text="Name" />
    12941294                <combo key="level" text="Storeys" values="1;2,0;1,-1;0,-2;-1,1.5;2,1;1.5,0.5;1,0;0.5,-0.5;0,-1;-0.5,-1.5;-1,-2;-1.5" values_sort="false" values_no_i18n="true" />
    1295                 <combo key="layer" text="Layer" values="5,4,3,2,1,0,-1,-2,-3,-4,-5" length="3" values_sort="false" />
     1295                <combo key="layer" text="Layer" values="5,4,3,2,1,-1,-2,-3,-4,-5" length="3" values_sort="false" />
    12961296                <reference ref="surface" />
    12971297                <text key="step_count" text="Amount of Steps" />
    … …  
    19351935            <optional>
    19361936                <text key="name" text="Name" />
    1937                 <combo key="layer" text="Layer" values="5,4,3,2,1,0,-1,-2,-3,-4,-5" default="-1" length="3" values_sort="false" />
     1937                <combo key="layer" text="Layer" values="5,4,3,2,1,-1,-2,-3,-4,-5" default="-1" length="3" values_sort="false" />
    19381938                <text key="width" text="Width (meters)" />
    19391939                <text key="maxheight" text="Max. height (meters)" />
    … …  
    20402040            <optional>
    20412041                <combo key="canal" text="Type" values="qanat" values_searchable="true" />
    2042                 <combo key="layer" text="Layer" values="5,4,3,2,1,0,-1,-2,-3,-4,-5" length="3" values_sort="false" />
     2042                <combo key="layer" text="Layer" values="5,4,3,2,1,-1,-2,-3,-4,-5" length="3" values_sort="false" />
    20432043                <combo key="tunnel" text="Tunnel" values="culvert,flooded,yes" values_searchable="true" />
    20442044                <combo key="usage" text="Usage" values="transportation,transmission,irrigation,headrace,tailrace,spillway" values_context="usage" values_searchable="true" />
    … …  
    21182118            <optional>
    21192119                <text key="name" text="Name" />
    2120                 <combo key="layer" text="Layer" values="5,4,3,2,1,0,-1,-2,-3,-4,-5" default="-1" length="3" values_sort="false" />
     2120                <combo key="layer" text="Layer" values="5,4,3,2,1,-1,-2,-3,-4,-5" default="-1" length="3" values_sort="false" />
    21212121                <text key="width" text="Width (meters)" />
    21222122            </optional>
    … …  
    24322432                <reference ref="highway_yesno" />
    24332433                <check key="oneway" text="Oneway" />
    2434                 <combo key="layer" text="Layer" values="5,4,3,2,1,0,-1,-2,-3,-4,-5" length="3" values_sort="false" />
     2434                <combo key="layer" text="Layer" values="5,4,3,2,1,-1,-2,-3,-4,-5" length="3" values_sort="false" />
    24352435                <reference ref="surface_smoothness" />
    24362436                <text key="maxspeed" text="Max. speed (km/h)" />
    … …  
    24542454                <reference ref="railway_service" />
    24552455                <reference ref="highway_yesno" />
    2456                 <combo key="layer" text="Layer" values="5,4,3,2,1,0,-1,-2,-3,-4,-5" length="3" values_sort="false" />
     2456                <combo key="layer" text="Layer" values="5,4,3,2,1,-1,-2,-3,-4,-5" length="3" values_sort="false" />
    24572457            </optional>
    24582458        </item> <!-- Disused Rail -->
    … …  
    24632463                <reference ref="railway_service" />
    24642464                <reference ref="highway_yesno" />
    2465                 <combo key="layer" text="Layer" values="5,4,3,2,1,0,-1,-2,-3,-4,-5" length="3" values_sort="false" />
     2465                <combo key="layer" text="Layer" values="5,4,3,2,1,-1,-2,-3,-4,-5" length="3" values_sort="false" />
    24662466            </optional>
    24672467        </item> <!-- Abandoned Rail -->
    … …  
    58195819                    <check key="tunnel" text="Tunnel" disable_off="true" />
    58205820                </checkgroup>
    5821                 <combo key="layer" text="Layer" values="5,4,3,2,1,0,-1,-2,-3,-4,-5" default="-1" length="3" values_sort="false" />
     5821                <combo key="layer" text="Layer" values="5,4,3,2,1,-1,-2,-3,-4,-5" default="-1" length="3" values_sort="false" />
    58225822            </optional>
    58235823        </item> <!-- Goods conveyor -->
    … …  
    62146214            <optional>
    62156215                <text key="name" text="Name" />
    6216                 <combo key="layer" text="Layer" values="5,4,3,2,1,0,-1,-2,-3,-4,-5" default="-1" length="3" values_sort="false" />
     6216                <combo key="layer" text="Layer" values="5,4,3,2,1,-1,-2,-3,-4,-5" default="1" length="3" values_sort="false" />
    62176217                <combo key="bridge" text="Bridge" values="aqueduct,boardwalk,cantilever,covered,low_water_crossing,movable,trestle,viaduct" />
    62186218                <combo key="bridge:structure" text="Structure" values="arch,beam,cable-stayed,floating,humpback,simple-suspension,suspension,truss" match="key" />
    … …  
    68226822                <reference ref="cables_circuits" />
    68236823                <combo key="wires" text="Number of conductors/wires per cable" values="single,double,triple,quad,fivefold,sixfold,eightfold" values_context="power" values_sort="false" />
    6824                 <combo key="layer" text="Layer" values="5,4,3,2,1,0,-1,-2,-3,-4,-5" length="3" values_sort="false" />
     6824                <combo key="layer" text="Layer" values="5,4,3,2,1,-1,-2,-3,-4,-5" length="3" values_sort="false" />
    68256825                <check key="communication" text="Used for data communications" value_on="line" disable_off="true" />
    68266826            </optional>
    … …  
    68356835                <reference ref="cables_circuits" />
    68366836                <combo key="location" text="Location" values="overground,overhead,underground,underwater" values_context="power cable" />
    6837                 <combo key="layer" text="Layer" values="5,4,3,2,1,0,-1,-2,-3,-4,-5" length="3" values_sort="false" />
     6837                <combo key="layer" text="Layer" values="5,4,3,2,1,-1,-2,-3,-4,-5" length="3" values_sort="false" />
    68386838                <check key="communication" text="Used for data communications" value_on="line" disable_off="true" />
    68396839            </optional>
    … …  
    95669566            <space />
    95679567            <key key="type" value="bridge" />
    9568             <combo key="layer" text="Layer" values="5,4,3,2,1,0,-1,-2,-3,-4,-5" default="1" length="3" values_sort="false" />
     9568            <combo key="layer" text="Layer" values="5,4,3,2,1,-1,-2,-3,-4,-5" default="1" length="3" values_sort="false" />
    95699569            <optional>
    95709570                <combo key="bridge" text="Bridge" values="aqueduct,boardwalk,cantilever,covered,low_water_crossing,movable,trestle,viaduct" />
    … …  
    95879587            <space />
    95889588            <key key="type" value="tunnel" />
    9589             <combo key="layer" text="Layer" values="5,4,3,2,1,0,-1,-2,-3,-4,-5" default="-1" length="3" values_sort="false" />
     9589            <combo key="layer" text="Layer" values="5,4,3,2,1,-1,-2,-3,-4,-5" default="-1" length="3" values_sort="false" />
    95909590            <optional>
    95919591                <reference ref="name_ref" />
Note: See TracChangeset for help on using the changeset viewer.