Changeset 16944 in josm for trunk


Ignore:
Timestamp:
2020-08-27T22:15:19+02:00 (4 years ago)
Author:
Klumbumbus
Message:
  • fix #19718 - add level=* to emergency=defibrillator preset, reorder preset
  • add level values in the presets
  • don't sort values of level and layer in presets
File:
1 edited

Legend:

Unmodified
Added
Removed

  • trunk/resources/data/defaultpresets.xml

    r16943 r16944  
    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" />
     40        <combo key="layer" text="Layer" values="5,4,3,2,1,0,-1,-2,-3,-4,-5" length="3" values_sort="false" />
    4141        <reference ref="surface_smoothness" />
    4242    </chunk>
    … …  
    138138    <chunk id="name_layer">
    139139        <text key="name" text="Name" />
    140         <combo key="layer" text="Layer" values="5,4,3,2,1,0,-1,-2,-3,-4,-5" length="3" />
     140        <combo key="layer" text="Layer" values="5,4,3,2,1,0,-1,-2,-3,-4,-5" length="3" values_sort="false" />
    141141    </chunk>
    142142    <chunk id="service_times">
    … …  
    432432            <text key="name" text="Name" />
    433433            <text key="bridge:name" text="Bridge name" />
    434             <combo key="layer" text="Layer" values="5,4,3,2,1,0,-1,-2,-3,-4,-5" default="1" length="3" />
     434            <combo key="layer" text="Layer" values="5,4,3,2,1,0,-1,-2,-3,-4,-5" default="1" length="3" values_sort="false" />
    435435            <space />
    436436            <text key="maxspeed" text="Max. speed (km/h)" />
    … …  
    445445    </chunk>
    446446    <chunk id="waterway">
    447         <combo key="layer" text="Layer" values="5,4,3,2,1,0,-1,-2,-3,-4,-5" length="3" />
     447        <combo key="layer" text="Layer" values="5,4,3,2,1,0,-1,-2,-3,-4,-5" length="3" values_sort="false" />
    448448        <check key="intermittent" text="Intermittent" disable_off="true" />
    449449        <check key="seasonal" text="Seasonal" disable_off="true" />
    … …  
    825825            <optional>
    826826                <combo key="lanes" text="Lanes" values="1,2,3" length="3" />
    827                 <combo key="layer" text="Layer" values="5,4,3,2,1,0,-1,-2,-3,-4,-5" />
     827                <combo key="layer" text="Layer" values="5,4,3,2,1,0,-1,-2,-3,-4,-5" length="3" values_sort="false" />
    828828                <reference ref="surface_smoothness" />
    829829                <reference ref="highway_yesno_incline" />
    … …  
    846846            <optional>
    847847                <combo key="lanes" text="Lanes" values="1,2,3" length="3" />
    848                 <combo key="layer" text="Layer" values="5,4,3,2,1,0,-1,-2,-3,-4,-5" length="3" />
     848                <combo key="layer" text="Layer" values="5,4,3,2,1,0,-1,-2,-3,-4,-5" length="3" values_sort="false" />
    849849                <reference ref="surface_smoothness" />
    850850                <reference ref="highway_yesno_incline_oneway_lit_width" />
    … …  
    863863            <check key="noname" text="Street has no name" disable_off="true" />
    864864            <optional>
    865                 <combo key="layer" text="Layer" values="5,4,3,2,1,0,-1,-2,-3,-4,-5" length="3" />
     865                <combo key="layer" text="Layer" values="5,4,3,2,1,0,-1,-2,-3,-4,-5" length="3" values_sort="false" />
    866866                <reference ref="surface_smoothness" />
    867867                <check key="area" text="Area" />
    … …  
    12041204            <optional>
    12051205                <text key="name" text="Name" />
    1206                 <text key="level" text="Storey" />
    1207                 <combo key="layer" text="Layer" values="5,4,3,2,1,0,-1,-2,-3,-4,-5" length="3" />
     1206                <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" />
     1207                <combo key="layer" text="Layer" values="5,4,3,2,1,0,-1,-2,-3,-4,-5" length="3" values_sort="false" />
    12081208                <reference ref="surface" />
    12091209                <text key="step_count" text="Amount of Steps" />
    … …  
    14391439            <text key="capacity:persons" text="Capacity (persons)" />
    14401440            <text key="maxweight" text="Max. weight (tonnes)" />
    1441             <text key="level" text="Storey" />
     1441            <combo key="level" text="Storeys" values="0;1;2;3;4;5;6;7,-2;-1;0;1;2;3;4;5;6;7;8;9" values_sort="false" />
    14421442            <optional>
    14431443                <text key="manufacturer" text="Manufacturer" />
    … …  
    17991799            <optional>
    18001800                <text key="name" text="Name" />
    1801                 <combo key="layer" text="Layer" values="5,4,3,2,1,0,-1,-2,-3,-4,-5" default="-1" length="3" />
     1801                <combo key="layer" text="Layer" values="5,4,3,2,1,0,-1,-2,-3,-4,-5" default="-1" length="3" values_sort="false" />
    18021802                <text key="width" text="Width (meters)" />
    18031803                <text key="maxheight" text="Max. height (meters)" />
    … …  
    19021902            <text key="name" text="Name" />
    19031903            <optional>
    1904                 <combo key="layer" text="Layer" values="5,4,3,2,1,0,-1,-2,-3,-4,-5" length="3" />
     1904                <combo key="layer" text="Layer" values="5,4,3,2,1,0,-1,-2,-3,-4,-5" length="3" values_sort="false" />
    19051905                <combo key="tunnel" text="Tunnel" values="culvert,flooded,yes" />
    19061906                <combo key="usage" text="Usage" values="transportation,transmission,irrigation,headrace,tailrace,spillway" values_context="usage" />
    … …  
    19791979            <optional>
    19801980                <text key="name" text="Name" />
    1981                 <combo key="layer" text="Layer" values="5,4,3,2,1,0,-1,-2,-3,-4,-5" default="-1" length="3" />
     1981                <combo key="layer" text="Layer" values="5,4,3,2,1,0,-1,-2,-3,-4,-5" default="-1" length="3" values_sort="false" />
    19821982                <text key="width" text="Width (meters)" />
    19831983            </optional>
    … …  
    22722272                <reference ref="highway_yesno" />
    22732273                <check key="oneway" text="Oneway" />
    2274                 <combo key="layer" text="Layer" values="5,4,3,2,1,0,-1,-2,-3,-4,-5" length="3" />
     2274                <combo key="layer" text="Layer" values="5,4,3,2,1,0,-1,-2,-3,-4,-5" length="3" values_sort="false" />
    22752275                <reference ref="surface_smoothness" />
    22762276                <text key="maxspeed" text="Max. speed (km/h)" />
    … …  
    42404240            <space />
    42414241            <key key="emergency" value="defibrillator" />
     4242            <text key="defibrillator:location" text="Location description" />
     4243            <reference ref="POI_access" />
     4244            <space />
     4245            <check key="indoor" text="Located inside a building?" />
     4246            <combo key="level" text="Storey" values="5,4,3,2,1,0,-1,-2,-3,-4,-5" values_sort="false" />
     4247            <space />
    42424248            <reference ref="oh_wheelchair" />
    42434249            <text key="operator" text="Operator" />
    4244             <text key="defibrillator:location" text="Location description" />
    42454250            <text key="phone" text="Phone number" />
    42464251            <label text="Use E.123 format, e.g. +49 11223 456 7890" />
    4247             <reference ref="POI_access" />
    4248             <check key="indoor" text="Located inside a building?" />
    4249             <!-- lastcheck is in use for aed devices, but not yet well discussed or documented
    4250             <optional>
    4251                 <text key="lastcheck"      text="Last check date (YYYY-MM-DD)" />
    4252                 <text key="lastcheck:note" text="Last check note" />
    4253             </optional>
    4254             -->
    42554252        </item> <!-- Automated Defibrillator -->
    42564253        <separator />
    … …  
    62186215                <reference ref="cables_circuits" />
    62196216                <combo key="wires" text="Number of conductors/wires per cable" values="single,double,triple,quad,fivefold,sixfold,eightfold" values_context="power" values_sort="false" />
    6220                 <combo key="layer" text="Layer" values="5,4,3,2,1,0,-1,-2,-3,-4,-5" length="3" />
     6217                <combo key="layer" text="Layer" values="5,4,3,2,1,0,-1,-2,-3,-4,-5" length="3" values_sort="false" />
    62216218                <check key="communication" text="Used for data communications" value_on="line" disable_off="true" />
    62226219            </optional>
    … …  
    62316228                <reference ref="cables_circuits" />
    62326229                <combo key="location" text="Location" values="underground,underwater,overground" values_context="power cable" />
    6233                 <combo key="layer" text="Layer" values="5,4,3,2,1,0,-1,-2,-3,-4,-5" length="3" />
     6230                <combo key="layer" text="Layer" values="5,4,3,2,1,0,-1,-2,-3,-4,-5" length="3" values_sort="false" />
    62346231                <check key="communication" text="Used for data communications" value_on="line" disable_off="true" />
    62356232            </optional>
    … …  
    87528749            <space />
    87538750            <key key="type" value="bridge" />
    8754             <combo key="layer" text="Layer" values="5,4,3,2,1,0,-1,-2,-3,-4,-5" length="3" />
     8751            <combo key="layer" text="Layer" values="5,4,3,2,1,0,-1,-2,-3,-4,-5" length="3" values_sort="false" />
    87558752            <reference ref="name_ref" />
    87568753            <text key="height" text="Height (meters)" length="7" />
    … …  
    87688765            <space />
    87698766            <key key="type" value="tunnel" />
    8770             <combo key="layer" text="Layer" values="5,4,3,2,1,0,-1,-2,-3,-4,-5" length="3" />
     8767            <combo key="layer" text="Layer" values="5,4,3,2,1,0,-1,-2,-3,-4,-5" length="3" values_sort="false" />
    87718768            <reference ref="name_ref" />
    87728769            <text key="length" text="Length (meters)" />
Note: See TracChangeset for help on using the changeset viewer.