Changeset 8028 in josm for trunk


Ignore:
Timestamp:
2015-02-09T19:10:26+01:00 (5 years ago)
Author:
Klumbumbus
Message:

fix #6881 - add smoothness combos to presets. (descriptions from https://github.com/openstreetmap/iD/blob/master/data/presets/fields/smoothness.json)

File:
1 edited

Legend:

Unmodified
Added
Removed
  • trunk/data/defaultpresets.xml

    r8027 r8028  
    1616        <combo key="surface" text="Surface" values="paved,unpaved,asphalt,concrete,metal,wood,paving_stones,cobblestone,gravel,pebblestone,compacted,grass_paver,grass,sand,ground,sett" />
    1717    </chunk>
     18    <chunk id="surface_smoothness">
     19        <reference ref="surface" />
     20        <combo key="smoothness" text="Smoothness" values_searchable="true">
     21            <list_entry value="excellent" short_description="Thin Rollers: rollerblade, skateboard" />
     22            <list_entry value="good" short_description="Thin Wheels: racing bike" />
     23            <list_entry value="intermediate" short_description="Wheels: city bike, wheelchair, scooter" />
     24            <list_entry value="bad" short_description="Robust Wheels: trekking bike, car, rickshaw" />
     25            <list_entry value="very_bad" short_description="High Clearance: light duty off-road vehicle" />
     26            <list_entry value="horrible" short_description="Off-Road: heavy duty off-road vehicle" />
     27            <list_entry value="very_horrible" short_description="Specialized off-road: tractor, ATV" />
     28            <list_entry value="impassable" short_description="No wheeled vehicle" />
     29        </combo>
     30    </chunk>
    1831    <chunk id="riding_surface">
    1932        <combo key="leisure" text="Type" values="pitch,sports_centre,stadium,track" values_context="riding" />
     
    2437        <combo key="lanes" text="Lanes" values="1,2,3,4,5" length="3"/>
    2538        <text key="maxspeed" text="Max. speed (km/h)"/>
    26         <reference ref="surface" />
     39        <reference ref="surface_smoothness" />
    2740    </chunk>
    2841    <chunk id="highway_yesno_incline">
     
    190203        <text key="ref" text="Reference number" />
    191204    </chunk>
    192     <chunk id="parking_access_fee_operator_surface">
     205    <chunk id="parking_access_fee_operator_surface_smoothness">
    193206        <space />
    194207        <combo key="access" text="Access" values="yes,private,customers,permissive,no" />
    195208        <reference ref="fee_interval" />
    196209        <text key="operator" text="Operator" />
    197         <reference ref="surface" />
     210        <reference ref="surface_smoothness" />
    198211    </chunk>
    199212    <chunk id="maxstay">
     
    584597                <combo key="layer" text="Layer" values="5,4,3,2,1,0,-1,-2,-3,-4,-5" />
    585598                <combo key="lanes" text="Lanes" values="1,2,3,4,5" />
    586                 <reference ref="surface" />
     599                <reference ref="surface_smoothness" />
    587600                <check key="oneway" text="Oneway" />
    588601                <check key="oneway:bicycle" text="Oneway for bicycle" />
     
    608621                <combo key="layer" text="Layer" values="5,4,3,2,1,0,-1,-2,-3,-4,-5" length="3" />
    609622                <combo key="lanes" text="Lanes" values="1,2,3,4,5" length="3" />
    610                 <reference ref="surface" />
     623                <reference ref="surface_smoothness" />
    611624                <reference ref="highway_yesno_incline_oneway_lit_width" />
    612625            </optional>
     
    629642                <combo key="layer" text="Layer" values="5,4,3,2,1,0,-1,-2,-3,-4,-5" length="3" />
    630643                <combo key="lanes" text="Lanes" values="1,2,3,4,5" length="3" />
    631                 <reference ref="surface" />
     644                <reference ref="surface_smoothness" />
    632645                <check key="area" text="Area" />
    633646                <reference ref="highway_yesno_incline" />
     
    667680            <key key="service" value="parking_aisle" />
    668681            <optional>
    669                 <reference ref="surface" />
     682                <reference ref="surface_smoothness" />
    670683                <check key="oneway" text="Oneway" />
    671684                <check key="lit" text="Lit" />
     
    825838            <optional>
    826839                <reference ref="name_layer" />
    827                 <combo key="surface" text="Surface" values="paved,concrete,cobblestone,gravel,ground,grass,sand" />
     840                <reference ref="surface_smoothness" />
    828841                <reference ref="highway_yesno_incline_oneway_lit_width" />
    829842                <combo key="mtb:scale" text="MTB Scale" values="0,1,2,3,4,5" />
     
    849862            <optional>
    850863                <reference ref="name_layer" />
    851                 <reference ref="surface" />
     864                <reference ref="surface_smoothness" />
    852865                <reference ref="highway_yesno_incline_oneway_lit_width" />
    853866                <combo key="sac_scale" text="SAC Scale" values_searchable="true">
     
    883896                <reference ref="name_layer" />
    884897                <text key="maxspeed" text="Max. speed (km/h)" />
    885                 <reference ref="surface" />
     898                <reference ref="surface_smoothness" />
    886899                <reference ref="highway_yesno_incline_oneway_lit_width" />
    887900            </optional>
     
    924937            <optional>
    925938                <reference ref="name_layer" />
    926                 <reference ref="surface" />
     939                <reference ref="surface_smoothness" />
    927940                <reference ref="highway_yesno_incline_oneway_lit_width" />
    928941                <combo key="foot" text="Pedestrians" values="yes,no" />
     
    939952            <optional>
    940953                <reference ref="name_layer" />
    941                 <reference ref="surface" />
     954                <reference ref="surface_smoothness" />
    942955                <reference ref="highway_yesno_incline_oneway_lit_width" />
    943956            </optional>
     
    953966            <optional>
    954967                <reference ref="name_layer" />
    955                 <reference ref="surface" />
     968                <reference ref="surface_smoothness" />
    956969                <reference ref="highway_yesno_incline_oneway_lit_width" />
    957970                <check key="passing_places" text="Passing Places" />
     
    973986            <optional>
    974987                <reference ref="name_layer" />
    975                 <reference ref="surface" />
     988                <reference ref="surface_smoothness" />
    976989                <reference ref="highway_yesno_incline" />
    977990                <check key="lit" text="Lit" />
     
    21332146                <reference ref="highway_yesno_incline_oneway" />
    21342147                <combo key="layer" text="Layer" values="5,4,3,2,1,0,-1,-2,-3,-4,-5" length="3" />
    2135                 <reference ref="surface" />
     2148                <reference ref="surface_smoothness" />
    21362149                <text key="maxspeed" text="Max. speed (km/h)" />
    21372150                <text key="width" text="Width (meters)" />
     
    23412354            <text key="maxheight" text="Max. height (meters)" />
    23422355            <combo key="park_ride" text="Park and Ride" values="yes,no,bus,train,tram,metro,ferry" />
    2343             <reference ref="parking_access_fee_operator_surface" />
     2356            <reference ref="parking_access_fee_operator_surface_smoothness" />
     2357            <space />
    23442358            <text key="capacity" text="Capacity (overall)" />
    23452359            <combo key="capacity:disabled" text="Spaces for Disabled" values="yes,no,1,2,3" />
     
    23622376            <reference ref="parking_name_type_ref" />
    23632377            <text key="capacity" text="Capacity" />
    2364             <reference ref="parking_access_fee_operator_surface" />
     2378            <reference ref="parking_access_fee_operator_surface_smoothness" />
    23652379            <reference ref="maxstay" />
    23662380            <reference ref="supervised_lit_oh" />
     
    23782392            <reference ref="parking_name_type_ref" />
    23792393            <text key="maxheight" text="Max. height (meters)" />
    2380             <reference ref="parking_access_fee_operator_surface" />
     2394            <reference ref="parking_access_fee_operator_surface_smoothness" />
    23812395            <reference ref="supervised_lit_oh" />
    23822396            <check key="covered" text="Covered (with roof)" />
     
    25332547            <reference ref="parking_name_type_ref" />
    25342548            <text key="capacity" text="Capacity" />
    2535             <reference ref="parking_access_fee_operator_surface" />
     2549            <reference ref="parking_access_fee_operator_surface_smoothness" />
    25362550            <reference ref="supervised_lit_oh" />
    25372551            <check key="covered" text="Covered (with roof)" />
Note: See TracChangeset for help on using the changeset viewer.