Ticket #17818: josm_17818_extra.patch

File josm_17818_extra.patch, 130.4 KB (added by skyper, 5 years ago)

rework of some chunks; lots of missing values_* added to combos

  • src/org/openstreetmap/josm/resources/data/defaultpresets.xml

     
    1313
    1414    <!-- Item chunks -->
    1515    <chunk id="surface">
    16         <combo key="surface" text="Surface" values="paved,unpaved,asphalt,concrete,concrete:plates,concrete:lanes,paving_stones,sett,cobblestone,grass_paver,compacted,fine_gravel,gravel,pebblestone,ground,mud,sand,grass,wood,metal" />
     16        <combo key="surface" text="Surface" values="paved,unpaved,asphalt,concrete,concrete:plates,concrete:lanes,paving_stones,sett,cobblestone,grass_paver,compacted,fine_gravel,gravel,pebblestone,ground,mud,sand,grass,wood,metal" values_sort="false" />
    1717    </chunk>
    1818    <chunk id="surface_smoothness">
    1919        <reference ref="surface" />
     
    3333    </chunk>
    3434    <chunk id="riding_surface">
    3535        <combo key="leisure" text="Type" values="horse_riding,pitch,sports_centre,stadium,track" values_context="riding" />
    36         <combo key="surface" text="Surface" values="grass,sand,clay,dirt,fine_gravel,ground,mud,unpaved,compacted" />
     36        <combo key="surface" text="Surface" values="grass,sand,clay,dirt,fine_gravel,ground,mud,unpaved,compacted" values_sort="false" />
    3737    </chunk>
    3838    <chunk id="highway_base">
    3939        <space />
     
    4848        <combo key="layer" text="Layer" values="5,4,3,2,1,0,-1,-2,-3,-4,-5" length="3" />
    4949        <reference ref="surface_smoothness" />
    5050    </chunk>
     51    <chunk id="placement">
     52        <combo key="placement" text="Placement" values="left_of:1,left_of:2,left_of:3,middle_of:1,middle_of:2,middle_of:3,right_of:1,right_of:2,right_of:3,transition" values_i18n="false" values_searchable="true" values_sort="false" />
     53    </chunk> <!-- placement -->
    5154    <chunk id="highway_yesno">
    5255        <checkgroup columns="2">
    5356            <check key="bridge" text="Bridge" disable_off="true" />
     
    5558            <check key="tunnel" text="Tunnel" disable_off="true" />
    5659            <check key="cutting" text="Cutting" disable_off="true" />
    5760        </checkgroup>
     61    <chunk id="incline">
     62    </chunk>
     63        <combo key="incline" text="Incline" values="10%,-10%,10°,-10°,up,down" values_i18n="false" values_sort="false" />
    5864    </chunk>
    5965    <chunk id="highway_yesno_incline">
    6066        <reference ref="highway_yesno" />
    61         <combo key="incline" text="Incline" values="10%,-10%,10°,-10°,up,down"/>
     67        <reference ref="incline" />
    6268    </chunk>
    6369    <chunk id="highway_yesno_incline_oneway_lit_width">
    6470        <check key="oneway" text="Oneway" />
     
    6874    </chunk>
    6975    <chunk id="highway_yesno_incline_oneway_lit_width_sidewalk">
    7076        <reference ref="highway_yesno_incline_oneway_lit_width" />
    71         <combo key="sidewalk" text="Sidewalk" values="both,left,right,no,separate" values_context="sidewalk" />
     77        <combo key="sidewalk" text="Sidewalk" values="both,left,right,no,separate" values_context="sidewalk" values_sort="false" />
    7278    </chunk>
    7379    <chunk id="railway_service">
    74         <combo key="service" text="Service type" values="yard,siding,spur,crossover" />
     80        <combo key="service" text="Service type" values="yard,siding,spur,crossover" values_sort="false" />
    7581    </chunk>
    7682    <chunk id="railway_electrified_yesno">
    77         <combo key="electrified" text="Electrified" values="contact_line,no,yes,rail" values_context="electrified" />
     83        <combo key="electrified" text="Electrified" values="contact_line,no,yes,rail" values_context="electrified" values_sort="false" />
    7884        <combo key="voltage" text="Voltage in Volts (V)" values="600,650,750,1500,3000,15000,25000" length="5" />
    7985        <combo key="frequency" text="Frequency in Hertz (Hz)" values="0,16.67,16.7" length="5" />
    8086        <reference ref="highway_yesno" />
     
    135141        <combo key="layer" text="Layer" values="5,4,3,2,1,0,-1,-2,-3,-4,-5" length="3" />
    136142    </chunk>
    137143    <chunk id="service_times">
    138         <combo key="service_times" text="Service Times" delimiter="|" values="18:00|sunset,sunrise|Su 09:30,11:00|Sa,Su,PH 09:00|Sa 18:00; Su 10:45|Fr 08:00-18:00; Apr 10-15 off; Jun 07:00-20:00; Aug off; Dec 24 08:00-24:00|Sa 10:00+|week 01-53/2 Fr 09:00-12:00; week 02-52/2 We 09:00-12:00" values_no_i18n="true" />
    139     </chunk>
     144        <combo key="service_times" text="Service Times" delimiter="|" values="18:00|sunset,sunrise|Su 09:30,11:00|Sa,Su,PH 09:00|Sa 18:00; Su 10:45|Fr 08:00-18:00; Apr 10-15 off; Jun 07:00-20:00; Aug off; Dec 24 08:00-24:00|Sa 10:00+|week 01-53/2 Fr 09:00-12:00; week 02-52/2 We 09:00-12:00" values_no_i18n="true" values_sort="false" />
     145    </chunk> <!-- service times -->
    140146    <chunk id="oh">
    141         <combo key="opening_hours" text="Opening Hours" delimiter="|" values="24/7|08:30-12:30,15:30-20:00|Sa-Su 00:00-24:00|Mo-Su 09:00-21:00|Mo-Sa 08:00-18:00|Mo-Fr 09:00-17:00|Mo-Fr 08:30-20:00; Sa,Su 08:00-15:00; PH off|Mo-Fr 08:30-20:00; Tu-Su 08:00-15:00; Sa 08:00-12:00|Mo-Su 08:00-18:00; Apr 10-15 off; Jun 08:00-14:00; Aug off; Dec 25 off|sunrise-sunset|Su 10:00+|week 01-53/2 Fr 09:00-12:00; week 02-52/2 We 09:00-12:00" values_no_i18n="true" />
    142     </chunk>
     147        <combo key="opening_hours" text="Opening Hours" delimiter="|" values="24/7|08:30-12:30,15:30-20:00|Sa-Su 00:00-24:00|Mo-Su 09:00-21:00|Mo-Sa 08:00-18:00|Mo-Fr 09:00-17:00|Mo-Fr 08:30-20:00; Sa,Su 08:00-15:00; PH off|Mo-Fr 08:30-20:00; Tu-Su 08:00-15:00; Sa 08:00-12:00|Mo-Su 08:00-18:00; Apr 10-15 off; Jun 08:00-14:00; Aug off; Dec 25 off|sunrise-sunset|Su 10:00+|week 01-53/2 Fr 09:00-12:00; week 02-52/2 We 09:00-12:00" values_no_i18n="true" values_sort="false" />
     148    </chunk> <!-- oh -->
     149    <chunk id="oh_kitchen">
     150        <combo key="opening_hours:kitchen" text="Kitchen Opening Hours" delimiter="|" values="24/7|08:30-12:30,15:30-20:00|Sa-Su 00:00-24:00|Mo-Su 09:00-21:00|Mo-Sa 08:00-18:00|Mo-Fr 09:00-17:00|Mo-Fr 08:30-20:00; Sa,Su 08:00-15:00; PH off|Mo-Fr 08:30-20:00; Tu-Su 08:00-15:00; Sa 08:00-12:00|Mo-Su 08:00-18:00; Apr 10-15 off; Jun 08:00-14:00; Aug off; Dec 25 off|sunrise-sunset|Su 10:00+|week 01-53/2 Fr 09:00-12:00; week 02-52/2 We 09:00-12:00" values_no_i18n="true" values_sort="false" />
     151    </chunk> <!-- oh kitchen -->
     152    <chunk id="op_times">
     153        <combo key="opening_hours" text="Operation times" delimiter="|" values="24/7|Mo-Fr 22:00-05:00" values_no_i18n="true" values_sort="false" />
     154    </chunk> <!-- op times -->
    143155    <chunk id="wheelchair">
    144         <combo key="wheelchair" text="Wheelchairs" values="yes,limited,no" />
     156        <combo key="wheelchair" text="Wheelchairs" values="yes,limited,no" values_sort="false" />
     157    </chunk> <!-- cuisine -->
     158    <chunk id="oh_kitchen_wheelchair">
     159        <reference ref="oh" />
     160        <reference ref="oh_kitchen" />
     161        <reference ref="wheelchair" />
    145162    </chunk>
    146163    <chunk id="oh_wheelchair">
    147164        <reference ref="oh" />
     
    168185    </chunk>
    169186    <chunk id="cuisine">
    170187    <multiselect key="cuisine" text="Cuisine" values="african;american;arab;argentinian;asian;bagel;balkan;barbecue;bavarian;beef_bowl;brazilian;burger;cake;caribbean;chicken;chinese;coffee_shop;crepe;curry;danish;donut;ethiopian;filipino;fish;fish_and_chips;french;friture;frozen_yogurt;german;georgian;greek;heuriger;hot_dog;ice_cream;indian;indonesian;international;italian;japanese;kebab;korean;lebanese;malaysian;mediterranean;mexican;moroccan;noodle;pancake;pasta;persian;peruvian;pizza;polish;portuguese;ramen;regional;russian;sandwich;sausage;seafood;soba;spanish;steak_house;sushi;tex-mex;tapas;thai;turkish;vietnamese;wings" values_searchable="true" />
    171     </chunk>
     188    </chunk> <!-- cuisine -->
     189    <chunk id="reservation">
     190        <combo key="reservation" text="Reservation" values="yes,no,required,recommended,members_only" values_sort="false" />
     191    </chunk> <!-- reservation -->
     192    <chunk id="outdoor_seat_take_delivery">
     193            <check key="outdoor_seating" text="Outdoor seating" />
     194            <combo key="takeaway" text="Takeaway" values="yes,no,only" values_i18n="false" values_sort="false" />
     195            <combo key="delivery" text="Delivery" values="yes,no,only,Mo-Su 12:00-22:00" values_i18n="false" values_sort="false" />
     196    </chunk> <!-- outdoor seat take delivery -->
    172197    <chunk id="internet">
    173         <combo key="internet_access" text="Internet access" values="yes,wlan,wired,terminal,no" />
    174         <combo key="internet_access:fee" text="Internet access fee" values="yes,no" />
    175     </chunk>
     198        <combo key="internet_access" text="Internet access" values="yes,wlan,wired,terminal,no" values_sort="false" />
     199        <combo key="internet_access:fee" text="Internet access fee" values="yes,no" />
     200    </chunk> <!-- internet -->
    176201    <chunk id="internet_smoking">
    177         <reference ref="internet" />
    178         <combo key="smoking" text="Smoking" values="yes,dedicated,separated,isolated,outside,no" />
    179     </chunk>
     202        <reference ref="internet" />
     203        <combo key="smoking" text="Smoking" values="yes,dedicated,separated,isolated,outside,no" values_sort="false" />
     204    </chunk> <!-- internet smoking -->
     205    <chunk id="height">
     206        <text key="height" text="Height (meters)" length="7" />
     207    </chunk> <!-- height -->
    180208    <chunk id="optional_height">
    181         <optional>
    182             <text key="height" text="Height (meters)" length="7" />
    183         </optional>
    184     </chunk>
     209        <optional>
     210            <reference ref="height" />
     211        </optional>
     212    </chunk> <!-- optional height -->
    185213    <chunk id="optional_maxwidth">
    186         <optional>
    187             <text key="maxwidth" text="Max. width (meters)" length="7" />
    188         </optional>
    189     </chunk>
     214        <optional>
     215            <text key="maxwidth" text="Max. width (meters)" length="7" />
     216        </optional>
     217    </chunk> <!-- optional maxwidth -->
    190218    <chunk id="optional_maxheight_maxwidth">
    191         <optional>
    192             <text key="maxheight" text="Max. height (meters)" length="7" />
    193             <text key="maxwidth" text="Max. width (meters)" length="7" />
    194         </optional>
    195     </chunk>
     219        <optional>
     220            <text key="maxheight" text="Max. height (meters)" length="7" />
     221            <text key="maxwidth" text="Max. width (meters)" length="7" />
     222        </optional>
     223    </chunk> <!-- optional maxheight maxwidth -->
    196224    <chunk id="optional_name">
    197         <optional>
    198             <text key="name" text="Name" />
    199         </optional>
    200     </chunk>
     225        <optional>
     226            <text key="name" text="Name" />
     227        </optional>
     228    </chunk> <!-- optional name -->
    201229    <chunk id="optional_name_operator">
    202         <optional>
    203             <text key="name" text="Name" />
    204             <text key="operator" text="Operator" />
    205         </optional>
    206     </chunk>
     230        <optional>
     231            <text key="name" text="Name" />
     232            <text key="operator" text="Operator" />
     233        </optional>
     234    </chunk> <!-- optional name operator -->
    207235    <chunk id="name_leisure_pitch">
    208         <text key="name" text="Name" />
    209         <combo key="leisure" text="Type" values="pitch,sports_centre,stadium" default="pitch" />
    210     </chunk>
     236        <text key="name" text="Name" />
     237        <combo key="leisure" text="Type" values="pitch,sports_centre,stadium" default="pitch" values_sort="false" />
     238    </chunk> <!-- name leisure pitch -->
    211239    <chunk id="sport">
    212         <combo key="sport" text="Sport" values="multi,archery,athletics,american_football,australian_football,baseball,basketball,beachvolleyball,billiards,boules,bowls,canadian_football,canoe,climbing,cricket,croquet,cycling,dog_racing,equestrian,field_hockey,fitness,gaelic_games,golf,gymnastics,handball,horse_racing,ice_hockey,karting,model_aerodrome,motocross,motor,pelota,racquet,rc_car,rowing,rugby_league,rugby_union,running,safety_training,shooting,skateboard,ice_skating,roller_skating,soccer,swimming,table_tennis,tennis,volleyball,9pin,10pin" values_context="sport" />
    213     </chunk>
     240        <combo key="sport" text="Sport" values="multi,archery,athletics,american_football,australian_football,baseball,basketball,beachvolleyball,billiards,boules,bowls,canadian_football,canoe,climbing,cricket,croquet,cycling,dog_racing,equestrian,field_hockey,fitness,gaelic_games,golf,gymnastics,handball,horse_racing,ice_hockey,karting,model_aerodrome,motocross,motor,pelota,racquet,rc_car,rowing,rugby_league,rugby_union,running,safety_training,shooting,skateboard,ice_skating,roller_skating,soccer,swimming,table_tennis,tennis,volleyball,9pin,10pin" values_context="sport" />
     241    </chunk> <!-- sport -->
     242    <chunk id="general_access">
     243        <combo key="access" text="General Access" values="yes,destination,delivery,permissive,private,customers,agricultural,forestry,no" values_sort="false" />
     244    </chunk> <!-- general access -->
     245    <chunk id="site_access">
     246        <combo key="access" text="General Access" values="yes,permissive,customers,private,no" values_sort="false" />
     247    </chunk> <!-- site access -->
    214248    <chunk id="fee">
    215         <combo key="fee" text="Fee" values="yes,no" />
    216     </chunk>
     249        <combo key="fee" text="Fee" values="yes,no" values_sort="false" />
     250    </chunk> <!-- fee -->
    217251    <chunk id="fee_interval">
    218         <combo key="fee" text="Fee" delimiter="|" values="yes|no|06:00-20:00|Mo-Fr 09:00-18:00,Sa 08:00-14:00|May-Sep 09:30-12:30,14:15-19:30" />
    219     </chunk>
     252        <combo key="fee" text="Fee" delimiter="|" values="yes|no|06:00-20:00|Mo-Fr 09:00-18:00,Sa 08:00-14:00|May-Sep 09:30-12:30,14:15-19:30" values_no_i18n="true" values_sort="false" />
     253    </chunk> <!-- fee interval-->
    220254    <chunk id="parking_name_type_ref">
    221255        <text key="name" text="Name" />
    222         <combo key="parking" text="Type" values="multi-storey,surface,underground,rooftop" values_context="parking" />
     256        <combo key="parking" text="Type" values="multi-storey,surface,underground,rooftop" values_context="parking" values_sort="false" />
    223257        <text key="ref" text="Reference number" />
    224     </chunk>
     258    </chunk> <!-- parking name type ref -->
    225259    <chunk id="parking_access_fee_operator_surface_smoothness">
    226260        <space />
    227         <combo key="access" text="Access" values="yes,private,customers,permissive,no" />
     261        <reference ref="site_access" />
    228262        <reference ref="fee_interval" />
    229263        <text key="operator" text="Operator" />
    230264        <reference ref="surface_smoothness" />
    231     </chunk>
     265    </chunk> <!-- parking access fee operator surface smoothness -->
    232266    <chunk id="maxstay">
    233267        <combo key="maxstay" text="Time Limit (minutes)" values="0,30,60,90,120,180" />
    234     </chunk>
     268    </chunk> <!-- maxstay -->
    235269    <chunk id="supervised">
    236         <combo key="supervised" text="Supervised" delimiter="|" values="yes|no|06:00-20:00|Mo-Fr 09:00-18:00,Sa 08:00-14:00|May-Sep 09:30-12:30,14:15-19:30" />
    237     </chunk>
     270        <combo key="supervised" text="Supervised" delimiter="|" values="yes|no|06:00-20:00|Mo-Fr 09:00-18:00,Sa 08:00-14:00|May-Sep 09:30-12:30,14:15-19:30" values_i18n="false" values_sort="false" />
     271    </chunk> <!-- supervised -->
    238272    <chunk id="supervised_lit_oh">
    239273        <reference ref="supervised" />
    240         <combo key="lit" text="Lit" delimiter="|" values="yes|no|06:00-20:00|Mo-Fr 09:00-18:00,Sa 08:00-14:00|May-Sep 09:30-12:30,14:15-19:30" />
     274        <combo key="lit" text="Lit" delimiter="|" values="yes|no|06:00-20:00|Mo-Fr 09:00-18:00,Sa 08:00-14:00|May-Sep 09:30-12:30,14:15-19:30" values_i18n="false" values_sort="false" />
    241275        <reference ref="oh" />
    242     </chunk>
    243     <chunk id="general_access">
    244         <combo key="access" text="General Access" values="yes,destination,delivery,permissive,private,customers,agricultural,forestry,no" values_searchable="true" />
    245     </chunk>
     276    </chunk> <!-- supervised lit oh -->
    246277    <chunk id="name_wikipedia">
    247278        <text key="name" text="Name" />
    248279        <text key="wikipedia" text="Wikipedia" />
     
    255286    <chunk id="route_hikebike_optionals">
    256287        <text key="ref" text="Reference" />
    257288        <text key="operator" text="Operator" />
    258         <text key="distance" text="Distance (km)"/>
    259         <text key="ascent" text="Ascent (m)"/>
    260         <text key="descent" text="Descent (m)"/>
     289        <text key="distance" text="Distance (kilometers)"/>
     290        <text key="ascent" text="Ascent (meters)"/>
     291        <text key="descent" text="Descent (meters)"/>
    261292        <check key="roundtrip" text="Roundtrip"/>
    262293        <text key="symbol" text="Symbol description"/>
    263294        <text key="description" text="Description"/>
     
    268299        <text key="taxon" text="Taxon" />
    269300    </chunk>
    270301    <chunk id="leaf">
    271         <combo key="leaf_type" text="Leaf type" values="broadleaved,needleleaved,mixed,leafless" values_searchable="true" />
    272         <combo key="leaf_cycle" text="Leaf cycle" values_searchable="true" >
     302        <combo key="leaf_type" text="Leaf type" values="broadleaved,needleleaved,mixed,leafless" values_searchable="true" values_sort="false" />
     303        <combo key="leaf_cycle" text="Leaf cycle" values_searchable="true" values_sort="false">
    273304            <list_entry value="deciduous" short_description="Plants that are leafless for a certain period during the year." />
    274305            <list_entry value="evergreen" short_description="Plants that are never entirely without green foliage." />
    275306            <list_entry value="semi_deciduous" short_description="Plants that lose their foliage for a very short period, when old leaves fall off and new foliage growth is starting." />
     
    278309        </combo>
    279310    </chunk>
    280311    <chunk id="leaf_without_mixed">
    281         <combo key="leaf_type" text="Leaf type" values="broadleaved,needleleaved,leafless" values_searchable="true" />
    282         <combo key="leaf_cycle" text="Leaf cycle" values_searchable="true" >
     312        <combo key="leaf_type" text="Leaf type" values="broadleaved,needleleaved,leafless" values_searchable="true" values_sort="false" />
     313        <combo key="leaf_cycle" text="Leaf cycle" values_searchable="true" values_sort="false">
    283314            <list_entry value="deciduous" short_description="Plants that are leafless for a certain period during the year." />
    284315            <list_entry value="evergreen" short_description="Plants that are never entirely without green foliage." />
    285316            <list_entry value="semi_deciduous" short_description="Plants that lose their foliage for a very short period, when old leaves fall off and new foliage growth is starting." />
     
    287318        </combo>
    288319    </chunk>
    289320    <!-- start of religions and denominations -->
    290         <chunk id="religious"> <!-- all religions and denominations -->
    291             <combo key="religion" text="Religion" values="bahai,buddhist,caodaism,christian,confucian,hindu,jain,jewish,muslim,shinto,sikh,spiritualist,taoist,tenrikyo,unitarian_universalist,zoroastrian" values_searchable="true" />
    292             <combo key="denomination" text="Denomination" values="anglican,baptist,catholic,church_of_scotland,conservative,evangelical,greek_catholic,greek_orthodox,ibadi,iglesia_ni_cristo,jehovahs_witness,lutheran,mahayana,methodist,mormon,new_apostolic,nondenominational,old_catholic,orthodox,pentecostal,presbyterian,protestant,quaker,reform,reformed,roman_catholic,romanian_orthodox,russian_orthodox,serbian_orthodox,seventh_day_adventist,shaivism,shaktism,shia,smartism,spiritist,sunni,tibetan,theravada,united,united_methodist,vaishnavism,vajrayana" values_searchable="true" />
    293         </chunk>
    294         <chunk id="religious_catholic_christian"> <!-- special case for wayside_shrine and wayside_cross: all religions and catholic denominations with default to catholic christian -->
    295             <combo key="religion" text="Religion" values="bahai,buddhist,caodaism,christian,confucian,hindu,jain,jewish,muslim,shinto,sikh,spiritualist,taoist,tenrikyo,unitarian_universalist,zoroastrian" default="christian" values_searchable="true" />
    296             <combo key="denomination" text="Denomination" values="catholic,greek_catholic,old_catholic,orthodox,roman_catholic" default="catholic" values_searchable="true" />
    297         </chunk>
    298         <chunk id="other_religions"> <!-- religions which don't have an own preset -->
    299             <combo key="religion" text="Religion" values="bahai,caodaism,confucian,jain,sikh,spiritualist,taoist,tenrikyo,unitarian_universalist,zoroastrian" match="keyvalue!" values_searchable="true" />
    300         </chunk>
    301         <chunk id="christian_denominations"> <!-- christian denominations -->
    302             <combo key="denomination" text="Denomination" values="anglican,baptist,catholic,church_of_scotland,evangelical,greek_catholic,greek_orthodox,iglesia_ni_cristo,jehovahs_witness,lutheran,methodist,mormon,new_apostolic,nondenominational,old_catholic,orthodox,pentecostal,presbyterian,protestant,quaker,reformed,roman_catholic,romanian_orthodox,russian_orthodox,serbian_orthodox,seventh_day_adventist,spiritist,united,united_methodist" values_searchable="true" />
    303         </chunk>
    304         <chunk id="muslim_denominations"> <!-- muslim denominations -->
    305             <combo key="denomination" text="Denomination" values="ibadi,nondenominational,shia,sunni" values_searchable="true" />
    306         </chunk>
    307         <chunk id="jewish_denominations"> <!-- jewish denominations -->
    308             <combo key="denomination" text="Denomination" values="orthodox,conservative,nondenominational,reform" values_context="jewish" values_searchable="true" /> <!-- values_context because of orthodox, #9629 -->
    309         </chunk>
    310         <chunk id="buddhist_denominations"> <!-- buddhist denominations -->
    311             <combo key="denomination" text="Denomination" values="tibetan,theravada,mahayana,vajrayana" values_searchable="true" />
    312         </chunk>
    313         <chunk id="hindu_denominations"> <!-- hindu denominations -->
    314             <combo key="denomination" text="Denomination" values="vaishnavism,shaivism,shaktism,smartism" values_searchable="true" />
    315         </chunk>
    316         <!-- shinto and the religions which don't have an own preset don't have denominations (yet) -->
     321    <chunk id="religious"> <!-- all religions and denominations -->
     322        <combo key="religion" text="Religion" values="bahai,buddhist,caodaism,christian,confucian,hindu,jain,jewish,muslim,shinto,sikh,spiritualist,taoist,tenrikyo,unitarian_universalist,zoroastrian" values_searchable="true" />
     323        <combo key="denomination" text="Denomination" values="anglican,baptist,catholic,church_of_scotland,conservative,evangelical,greek_catholic,greek_orthodox,ibadi,iglesia_ni_cristo,jehovahs_witness,lutheran,mahayana,methodist,mormon,new_apostolic,nondenominational,old_catholic,orthodox,pentecostal,presbyterian,protestant,quaker,reform,reformed,roman_catholic,romanian_orthodox,russian_orthodox,serbian_orthodox,seventh_day_adventist,shaivism,shaktism,shia,smartism,spiritist,sunni,tibetan,theravada,united,united_methodist,vaishnavism,vajrayana" values_searchable="true" />
     324    </chunk>
     325    <chunk id="religious_catholic_christian"> <!-- special case for wayside_shrine and wayside_cross: all religions and catholic denominations with default to catholic christian -->
     326        <combo key="religion" text="Religion" values="bahai,buddhist,caodaism,christian,confucian,hindu,jain,jewish,muslim,shinto,sikh,spiritualist,taoist,tenrikyo,unitarian_universalist,zoroastrian" default="christian" values_searchable="true" />
     327        <combo key="denomination" text="Denomination" values="catholic,greek_catholic,old_catholic,orthodox,roman_catholic" default="catholic" values_searchable="true" />
     328    </chunk>
     329    <chunk id="other_religions"> <!-- religions which don't have an own preset -->
     330        <combo key="religion" text="Religion" values="bahai,caodaism,confucian,jain,sikh,spiritualist,taoist,tenrikyo,unitarian_universalist,zoroastrian" match="keyvalue!" values_searchable="true" />
     331    </chunk>
     332    <chunk id="christian_denominations"> <!-- christian denominations -->
     333        <combo key="denomination" text="Denomination" values="anglican,baptist,catholic,church_of_scotland,evangelical,greek_catholic,greek_orthodox,iglesia_ni_cristo,jehovahs_witness,lutheran,methodist,mormon,new_apostolic,nondenominational,old_catholic,orthodox,pentecostal,presbyterian,protestant,quaker,reformed,roman_catholic,romanian_orthodox,russian_orthodox,serbian_orthodox,seventh_day_adventist,spiritist,united,united_methodist" values_searchable="true" />
     334    </chunk>
     335    <chunk id="muslim_denominations"> <!-- muslim denominations -->
     336        <combo key="denomination" text="Denomination" values="ibadi,nondenominational,shia,sunni" values_searchable="true" />
     337    </chunk>
     338    <chunk id="jewish_denominations"> <!-- jewish denominations -->
     339        <combo key="denomination" text="Denomination" values="orthodox,conservative,nondenominational,reform" values_context="jewish" values_searchable="true" /> <!-- values_context because of orthodox, #9629 -->
     340    </chunk>
     341    <chunk id="buddhist_denominations"> <!-- buddhist denominations -->
     342        <combo key="denomination" text="Denomination" values="tibetan,theravada,mahayana,vajrayana" values_searchable="true" />
     343    </chunk>
     344    <chunk id="hindu_denominations"> <!-- hindu denominations -->
     345        <combo key="denomination" text="Denomination" values="vaishnavism,shaivism,shaktism,smartism" values_searchable="true" />
     346    </chunk>
     347    <!-- shinto and the religions which don't have an own preset don't have denominations (yet) -->
    317348    <!-- end of religions and denominations -->
    318349    <chunk id="voltage">
    319         <combo key="voltage" text="Voltage in Volts (V)" values="1150000,765000,750000,735000,500000,450000,420000,400000,380000,350000,345000,330000,315000,300000,275000,238000,230000,225000,220000,200000,161000,154000,150000,138000,132000,120000,115000,110000,100000,90000,69000,66000,65000,63000,60000,55000,49000,45000,35000,33000,30000,22000,20000,15000,110000;20000" />
     350        <combo key="voltage" text="Voltage in Volts (V)" values="1150000,765000,750000,735000,500000,450000,420000,400000,380000,350000,345000,330000,315000,300000,275000,238000,230000,225000,220000,200000,161000,154000,150000,138000,132000,120000,115000,110000,100000,90000,69000,66000,65000,63000,60000,55000,49000,45000,35000,33000,30000,22000,20000,15000,110000;20000" values_sort="false" />
    320351    </chunk>
    321352    <chunk id="frequency">
    322         <combo key="frequency" text="Frequency in Hertz (Hz)" values="0,16.67,16.7,50,60" length="5" />
     353        <combo key="frequency" text="Frequency in Hertz (Hz)" values="0,16.67,16.7,50,60" length="5" values_sort="false" />
    323354    </chunk>
    324355    <chunk id="voltage_frequency">
    325356        <reference ref="voltage" />
    326357        <reference ref="frequency" />
    327358    </chunk>
    328359    <chunk id="transformer_voltage_frequency">
    329         <combo key="voltage:primary" text="Primary voltage in Volts (V)" values="765000,750000,735000,500000,450000,420000,400000,380000,350000,345000,330000,315000,300000,275000,238000,230000,225000,220000,200000,161000,154000,150000,138000,132000,120000,115000,110000,100000,90000,69000,66000,65000,63000,60000,55000,49000,45000,35000,33000,30000,20000,15000" />
    330         <combo key="voltage:secondary" text="Secondary voltage in Volts (V)" values="765000,750000,735000,500000,450000,420000,400000,380000,350000,345000,330000,315000,300000,275000,238000,230000,225000,220000,200000,161000,154000,150000,138000,132000,120000,115000,110000,100000,90000,69000,66000,65000,63000,60000,55000,49000,45000,35000,33000,30000,20000,15000" />
    331         <combo key="voltage:tertiary" text="Tertiary voltage in Volts (V)" values="765000,750000,735000,500000,450000,420000,400000,380000,350000,345000,330000,315000,300000,275000,238000,230000,225000,220000,200000,161000,154000,150000,138000,132000,120000,115000,110000,100000,90000,69000,66000,65000,63000,60000,55000,49000,45000,35000,33000,30000,20000,15000" />
     360        <combo key="voltage:primary" text="Primary voltage in Volts (V)" values="765000,750000,735000,500000,450000,420000,400000,380000,350000,345000,330000,315000,300000,275000,238000,230000,225000,220000,200000,161000,154000,150000,138000,132000,120000,115000,110000,100000,90000,69000,66000,65000,63000,60000,55000,49000,45000,35000,33000,30000,20000,15000" values_sort="false" />
     361        <combo key="voltage:secondary" text="Secondary voltage in Volts (V)" values="765000,750000,735000,500000,450000,420000,400000,380000,350000,345000,330000,315000,300000,275000,238000,230000,225000,220000,200000,161000,154000,150000,138000,132000,120000,115000,110000,100000,90000,69000,66000,65000,63000,60000,55000,49000,45000,35000,33000,30000,20000,15000" values_sort="false" />
     362        <combo key="voltage:tertiary" text="Tertiary voltage in Volts (V)" values="765000,750000,735000,500000,450000,420000,400000,380000,350000,345000,330000,315000,300000,275000,238000,230000,225000,220000,200000,161000,154000,150000,138000,132000,120000,115000,110000,100000,90000,69000,66000,65000,63000,60000,55000,49000,45000,35000,33000,30000,20000,15000" values_sort="false" />
    332363        <reference ref="frequency" />
    333364    </chunk>
    334365    <chunk id="cables">
     
    339370        <combo key="circuits" text="Amount of circuits" values="1,2,3,4" />
    340371    </chunk>
    341372    <chunk id="power_loc">
    342         <combo key="location" text="Location" values="outdoor,indoor,underground,platform,roof" values_context="power" />
     373        <combo key="location" text="Location" values="outdoor,indoor,underground,platform,roof" values_context="power" values_sort="false" />
    343374    </chunk>
    344375    <chunk id="power_extra">
    345376        <reference ref="power_loc" />
     
    359390    </chunk>
    360391    <chunk id="power_output">
    361392        <optional text="Output forms of energy:">
    362             <combo key="generator:output:biogas" text="biogas" values="yes,2 W,3 kW,5 MW,7 GW" />
    363             <combo key="generator:output:electricity" text="electricity" values="yes,2 W,3 kW,5 MW,7 GW" />
    364             <combo key="generator:output:hot_water" text="hot water" values="yes,2 W,3 kW,5 MW,7 GW" />
    365             <combo key="generator:output:hot_air" text="hot air" values="yes,2 W,3 kW,5 MW,7 GW" />
    366             <combo key="generator:output:cold_water" text="cold water" values="yes,2 W,3 kW,5 MW,7 GW" />
    367             <combo key="generator:output:cold_air" text="cold air" values="yes,2 W,3 kW,5 MW,7 GW" />
    368             <combo key="generator:output:compressed_air" text="compressed air" values="yes,2 W,3 kW,5 MW,7 GW" />
    369             <combo key="generator:output:steam" text="steam" values="yes,2 W,3 kW,5 MW,7 GW" />
    370             <combo key="generator:output:vacuum" text="vacuum" values="yes,2 W,3 kW,5 MW,7 GW" />
     393            <combo key="generator:output:biogas" text="biogas" values="yes,2 W,3 kW,5 MW,7 GW" values_i18n="false" values_sort="false" />
     394            <combo key="generator:output:electricity" text="electricity" values="yes,2 W,3 kW,5 MW,7 GW" values_i18n="false" values_sort="false" />
     395            <combo key="generator:output:hot_water" text="hot water" values="yes,2 W,3 kW,5 MW,7 GW" values_i18n="false" values_sort="false" />
     396            <combo key="generator:output:hot_air" text="hot air" values="yes,2 W,3 kW,5 MW,7 GW" values_i18n="false" values_sort="false" />
     397            <combo key="generator:output:cold_water" text="cold water" values="yes,2 W,3 kW,5 MW,7 GW" values_i18n="false" values_sort="false" />
     398            <combo key="generator:output:cold_air" text="cold air" values="yes,2 W,3 kW,5 MW,7 GW" values_i18n="false" values_sort="false" />
     399            <combo key="generator:output:compressed_air" text="compressed air" values="yes,2 W,3 kW,5 MW,7 GW" values_i18n="false" values_sort="false" />
     400            <combo key="generator:output:steam" text="steam" values="yes,2 W,3 kW,5 MW,7 GW" values_i18n="false" values_sort="false" />
     401            <combo key="generator:output:vacuum" text="vacuum" values="yes,2 W,3 kW,5 MW,7 GW" values_i18n="false" values_sort="false" />
    371402            <space />
    372403            <reference ref="voltage_frequency" />
    373404        </optional>
    374405    </chunk>
    375406    <chunk id="power_pole">
    376         <text key="height" text="Height (meters)" />
     407        <reference ref="height" />
    377408        <combo key="material" text="Material" values="concrete,metal,plastic,steel,stone,wood" />
    378409        <combo key="line_attachment" text="Line attachment" values="anchor,pin,pulley,suspension" values_context="power" />
    379410        <check key="location:transition" text="Location transition" disable_off="true" />
    380411        <reference ref="ref_operator" />
    381412    </chunk>
    382413    <chunk id="rating_phases">
    383         <combo key="rating" text="Power rating (kVA/MVA)" values="2700 kVA,12500 kVA,15 MVA,50 MVA,100 MVA" />
     414        <combo key="rating" text="Power rating (kVA/MVA)" values="2700 kVA,12500 kVA,15 MVA,50 MVA,100 MVA" values_i18n="false" values_sort="false" />
    384415        <combo key="phases" text="Phases" values="1,3" length="1" />
    385416    </chunk>
    386417    <chunk id="optional_rating_phases">
     
    394425            <combo key="devices" text="Number of devices" values="1,2,3,4" />
    395426            <combo key="windings" text="Number of windings" values="1,2,3,4" />
    396427            <!-- #16364: don't use simple "power" context to avoid conflict with "delta" used for power towers -->
    397             <combo key="windings:configuration" text="Windings configuration" values="star,delta,open-delta,zigzag,open,scott,leblanc" values_context="power_windings" />
     428            <combo key="windings:configuration" text="Windings configuration" values="star,delta,open-delta,zigzag,open,scott,leblanc" values_context="power_windings" values_sort="false" />
    398429        </optional>
    399430    </chunk>
    400431    <chunk id="telecom_medium">
    401         <combo key="telecom:medium" text="Local loop type" values="copper,fibre,coaxial" />
     432        <combo key="telecom:medium" text="Local loop type" values="copper,fibre,coaxial" values_sort="false" />
    402433    </chunk>
    403434    <chunk id="optional_bridge">
    404435        <optional>
     
    411442            <text key="maxspeed:backward" text="Max. speed opposed to way direction" />
    412443            <space />
    413444            <text key="maxweight" text="Max. weight (tonnes)" />
    414             <combo key="incline" text="Incline" values="10%,-10%,10°,-10°,up,down" />
     445            <reference ref="incline" />
    415446            <text key="width" text="Width (meters)" />
    416447            <check key="toll" text="Toll" />
    417448        </optional>
     
    430461    </chunk>
    431462    <chunk id="water_access">
    432463        <optional text="Water access rules:">
    433             <combo key="ship" text="Ship" values="yes,designated,destination,delivery,permissive,private,no" />
    434             <combo key="boat" text="Boat" values="yes,designated,destination,delivery,permissive,private,no" />
    435             <combo key="motorboat" text="Motorboat" values="yes,designated,destination,delivery,permissive,private,no" />
    436             <combo key="canoe" text="Canoe" values="yes,designated,destination,delivery,permissive,private,no" />
     464            <combo key="ship" text="Ship" values="yes,designated,destination,delivery,permissive,private,no" values_sort="false" />
     465            <combo key="boat" text="Boat" values="yes,designated,destination,delivery,permissive,private,no" values_sort="false" />
     466            <combo key="motorboat" text="Motorboat" values="yes,designated,destination,delivery,permissive,private,no" values_sort="false" />
     467            <combo key="canoe" text="Canoe" values="yes,designated,destination,delivery,permissive,private,no" values_sort="false" />
    437468        </optional>
    438469    </chunk>
    439470    <chunk id="operator_substance">
     
    441472        <combo key="substance" text="Substance" values="water,gas,heat,oil,sewage" />
    442473    </chunk>
    443474    <chunk id="support">
    444         <combo key="support" text="Support" values="pole,wall_mounted,billboard,ground" values_context="mounting/support" />
     475        <combo key="support" text="Support" values="pole,wall_mounted,billboard,ground" values_context="mounting/support" values_sort="false" />
    445476    </chunk>
    446477    <chunk id="aerodrome">
    447478        <key key="aeroway" value="aerodrome" match="keyvalue" />
     
    454485    </chunk>
    455486    <chunk id="car_brands">
    456487    <multiselect key="brand" text="Car brand" values="Alfa Romeo;Aston Martin;Audi;Bentley;BMW;Buick;Cadillac;Chevrolet;Chrysler;Citroën;Dacia;Daewoo;Daihatsu;Dodge;Ferrari;Fiat;Ford;GMC;Great Wall;Holden;Honda;Hyundai;Infiniti;Isuzu;Jaguar;Jeep;Kia;Lada;Lancia;Land Rover;Lexus;Lincoln;Lotus;Maserati;Mazda;Mercedes-Benz;Mini;Mitsubishi;Nissan;Opel;Peugeot;Porsche;Renault;Saab;Seat;Škoda;Smart;SsangYong;Subaru;Suzuki;Tata;Toyota;Vauxhall;Volkswagen;Volvo" values_no_i18n="true" />
    457   </chunk>
    458   <chunk id="motorcycle_brands">
    459     <multiselect key="brand" text="Motorcycle brand" values="Aprillia;BMW;Ducati;Gilera;Harley-Davidson;Honda;Kawasaki;KTM;Kymco;Piaggio;Peugeot;Piaggio;Suzuki;Triumph;Vespa;Yamaha" values_no_i18n="true" />
    460   </chunk>
    461   <chunk id="walking_routes_roles">
    462      <roles>
    463          <role key="" text="route segment" requisite="required" type="way,closedway" member_expression="highway|route=ferry"/>
    464          <role key="" text="infrastructure" requisite="optional" type="node,closedway" member_expression="tourism OR amenity"/>
    465          <role key="" text="natural" requisite="optional" type="node,closedway" member_expression="natural=peak OR natural=volcano OR mountain_pass=yes OR natural=water OR tourism=viewpoint OR amenity=drinking_water OR natural=spring OR place=locality"/>
    466          <role key="guidepost" text="guidepost" requisite="optional" type="node" member_expression="information=guidepost"/>
    467      </roles>
    468   </chunk>
    469   <chunk id="route_segment_roles">
    470      <role key="" text="route segment" requisite="optional" type="way,closedway" member_expression="highway|route=ferry|leisure=track"/>
    471      <role key="forward" text="forward segment" requisite="optional" type="way,closedway" />
    472      <role key="backward" text="backward segment" requisite="optional" type="way,closedway" />
    473      <role key="guidepost" text="guidepost" requisite="optional" type="node" member_expression="information=guidepost"/>
    474   </chunk>
    475   <chunk id="route_start_stop_roles">
    476      <role key="start" text="start endpoint" requisite="optional" type="node" />
    477      <role key="stop" text="stop endpoint" requisite="optional" type="node" />
    478      <role key="start_stop" text="start and stop endpoint" requisite="optional" type="node" />
    479   </chunk>
    480   <!-- Link chunks -->
    481   <chunk id="link_contact_address">
    482     <preset_link preset_name="Contact (Common Schema)" />
    483     <preset_link preset_name="Address" />
    484   </chunk>
    485   <chunk id="link_contact_address_payment">
    486     <preset_link preset_name="Contact (Common Schema)" />
    487     <preset_link preset_name="Address" />
    488     <preset_link preset_name="Payment Methods" />
    489   </chunk>
    490   <chunk id="public_transport_route_optionals">
    491     <text key="from" text="From (initial stop)" />
    492     <text key="to" text="To (terminal stop)" />
    493     <text key="via" text="Via (intermediate stops)" />
    494     <text key="operator" text="Operator" />
    495     <text key="network" text="Network" />
    496     <text key="description" text="Description" />
    497     <combo key="colour" text="Color (HTML name or hexadecimal code)" values_context="color" values="black,blue,brown,gray,green,orange,purple,red,silver,white,yellow,#CD853F" />
    498     <combo key="duration" text="Duration (M, MM, HH:MM, or HH:MM:SS)" values="5,10,15,20,30,60,120,10:30" values_no_i18n="true" />
    499     <combo key="interval" text="Interval (M, MM, HH:MM, or HH:MM:SS)" values="5,10,15,20,30,60,120,10:30" values_no_i18n="true" />
    500   </chunk>
    501   <chunk id="climbing_styles">
    502     <label text="Climbing styles:" />
    503     <checkgroup columns="2">
    504       <check key="climbing:boulder" text="Boulders" />
    505       <check key="climbing:sport" text="Sport climbing" />
    506          <check key="climbing:toprope" text="Top rope (approach at the route top + letting the rope down)" />
    507          <check key="climbing:trad" text="Traditional climbing (no fixed anchors)" />
    508       <check key="climbing:multipitch" text="Multi-pitch climbing" />
    509       <check key="climbing:ice" text="Ice climbing" />
    510       <check key="climbing:mixed" text="Mixed climbing" />
    511       <check key="climbing:deepwater" text="Deep Water Soloing" />
    512     </checkgroup>
    513   </chunk>
    514   <chunk id="climbing_optional_attributes">
    515     <optional>
    516       <combo key="climbing:orientation" text="Orientation" values="N,NE,E,SE,S,SW,W,NW" values_no_i18n="true" values_sort="false"/>
    517       <combo key="climbing:quality" text="Rock/ice quality" values="fragile,medium,solid" />
    518       <combo key="climbing:rock" text="Rock type" rows="3" values="limestone,sandstone,granite,basalt,slate" />
    519       <check key="climbing:summit_log" text="Summit/route log/register" />
    520       <check key="indoor" text="Climbing routes indoor" />
    521       <check key="outdoor" text="Climbing routes outdoor" />           
    522       <text key="website" text="Official web site (e.g. operator)" />
    523       <text key="url" text="Unofficial web site" />
    524       <combo key="opening_hours" text="Opening Hours" delimiter="|" values="24/7|sunset-sunrise open; sunrise-sunset closed|Mar-Jun closed; Jul-Feb Mo-Su,PH sunrise-sunset|Mo-Fr 15:00-22:00; Sa-Su 11:00-22:00" values_no_i18n="true"/>
    525       <combo key="fee" text="Fee" values="yes,no,Sa-Su 08:00-20:00"/>
    526       <combo key="access" text="Access" values="yes,no,customers,private" />
    527     </optional>
    528   </chunk>
    529   <chunk id="nudism">
    530     <combo key="nudism" text="Nudism" values="yes,no,obligatory,designated,customary,permissive" />
    531   </chunk>
    532   <chunk id="wall_material">
    533     <combo key="material" text="Material" values="adobe,brick,concrete,masonry,reinforced_concrete,stone" />
    534   </chunk>
     488    </chunk>
     489    <chunk id="motorcycle_brands">
     490        <multiselect key="brand" text="Motorcycle brand" values="Aprillia;BMW;Ducati;Gilera;Harley-Davidson;Honda;Kawasaki;KTM;Kymco;Piaggio;Peugeot;Piaggio;Suzuki;Triumph;Vespa;Yamaha" values_no_i18n="true" />
     491    </chunk>
     492    <chunk id="walking_routes_roles">
     493        <roles>
     494            <role key="" text="route segment" requisite="required" type="way,closedway" member_expression="highway|route=ferry"/>
     495            <role key="" text="infrastructure" requisite="optional" type="node,closedway" member_expression="tourism OR amenity"/>
     496            <role key="" text="natural" requisite="optional" type="node,closedway" member_expression="natural=peak OR natural=volcano OR mountain_pass=yes OR natural=water OR tourism=viewpoint OR amenity=drinking_water OR natural=spring OR place=locality"/>
     497            <role key="guidepost" text="guidepost" requisite="optional" type="node" member_expression="information=guidepost"/>
     498        </roles>
     499    </chunk>
     500    <chunk id="route_segment_roles">
     501        <role key="" text="route segment" requisite="optional" type="way,closedway" member_expression="highway|route=ferry|leisure=track"/>
     502        <role key="forward" text="forward segment" requisite="optional" type="way,closedway" />
     503        <role key="backward" text="backward segment" requisite="optional" type="way,closedway" />
     504        <role key="guidepost" text="guidepost" requisite="optional" type="node" member_expression="information=guidepost"/>
     505    </chunk>
     506    <chunk id="route_start_stop_roles">
     507        <role key="start" text="start endpoint" requisite="optional" type="node" />
     508        <role key="stop" text="stop endpoint" requisite="optional" type="node" />
     509        <role key="start_stop" text="start and stop endpoint" requisite="optional" type="node" />
     510    </chunk>
     511    <!-- Link chunks -->
     512    <chunk id="link_contact_address">
     513        <preset_link preset_name="Contact (Common Schema)" />
     514        <preset_link preset_name="Address" />
     515    </chunk>
     516    <chunk id="link_contact_address_payment">
     517        <preset_link preset_name="Contact (Common Schema)" />
     518        <preset_link preset_name="Address" />
     519        <preset_link preset_name="Payment Methods" />
     520    </chunk>
     521    <chunk id="public_transport_route_optionals">
     522        <text key="from" text="From (initial stop)" />
     523        <text key="to" text="To (terminal stop)" />
     524        <text key="via" text="Via (intermediate stops)" />
     525        <text key="operator" text="Operator" />
     526        <text key="network" text="Network" />
     527        <text key="description" text="Description" />
     528        <combo key="colour" text="Color (HTML name or hexadecimal code)" values_context="color" values="black,blue,brown,gray,green,orange,purple,red,silver,white,yellow,#CD853F" />
     529        <combo key="duration" text="Duration (M, MM, HH:MM, or HH:MM:SS)" values="5,10,15,20,30,60,120,10:30" values_no_i18n="true" values_sort="false" />
     530        <combo key="interval" text="Interval (M, MM, HH:MM, or HH:MM:SS)" values="5,10,15,20,30,60,120,10:30" values_no_i18n="true" values_sort="false" />
     531    </chunk>
     532    <chunk id="climbing_styles">
     533        <label text="Climbing styles:" />
     534        <checkgroup columns="2">
     535            <check key="climbing:boulder" text="Boulders" />
     536            <check key="climbing:sport" text="Sport climbing" />
     537                 <check key="climbing:toprope" text="Top rope (approach at the route top + letting the rope down)" />
     538                 <check key="climbing:trad" text="Traditional climbing (no fixed anchors)" />
     539            <check key="climbing:multipitch" text="Multi-pitch climbing" />
     540            <check key="climbing:ice" text="Ice climbing" />
     541            <check key="climbing:mixed" text="Mixed climbing" />
     542            <check key="climbing:deepwater" text="Deep Water Soloing" />
     543        </checkgroup>
     544    </chunk>
     545    <chunk id="climbing_optional_attributes">
     546        <optional>
     547            <combo key="climbing:orientation" text="Orientation" values="N,NE,E,SE,S,SW,W,NW" values_no_i18n="true" values_sort="false" />
     548            <combo key="climbing:quality" text="Rock/ice quality" values="fragile,medium,solid" values_sort="false" />
     549            <combo key="climbing:rock" text="Rock type" rows="3" values="limestone,sandstone,granite,basalt,slate" values_sort="false" />
     550            <check key="climbing:summit_log" text="Summit/route log/register" />
     551            <check key="indoor" text="Climbing routes indoor" />
     552            <check key="outdoor" text="Climbing routes outdoor" />           
     553            <text key="website" text="Official web site (e.g. operator)" />
     554            <text key="url" text="Unofficial web site" />
     555            <reference ref="oh" />
     556            <reference ref="fee_interval" />
     557            <reference ref="site_access" />
     558        </optional>
     559    </chunk>
     560    <chunk id="nudism">
     561        <combo key="nudism" text="Nudism" values="yes,no,obligatory,designated,customary,permissive" values_sort="false" />
     562    </chunk> <!-- Nudism -->
     563    <chunk id="wall_material">
     564        <combo key="material" text="Material" values="adobe,brick,concrete,glass,masonry,metal,plastic,reinforced_concrete,steel,stone,wood" values_searchable="true" />
     565    </chunk> <!-- Wall material -->
     566    <chunk id="ele">
     567        <text key="ele" text="Elevation from sea level (meters)" lenght="10" />
     568    </chunk> <!-- Elevation -->
     569    <chunk id="optional_public_building">
     570        <optional>
     571            <reference ref="name_ref_operator" />
     572            <reference ref="height" />
     573            <reference ref="ele" />
     574            <reference ref="wall_material" />
     575            <reference ref="site_access" />
     576            <reference ref="oh" />
     577            <reference ref="fee_interval" />
     578        </optional>
    535579  <!--  Groups -->
    536580  <group name="Highways" icon="presets/transport/way/way_secondary.svg">
    537581    <group name="Streets" icon="presets/transport/way/way_secondary.svg">
     
    546590                <text key="destination" text="Destination" />
    547591                <text key="destination:ref" text="Destination reference" />
    548592                <text key="width" text="Width (meters)" />
    549                 <combo key="placement" text="Placement" values="left_of:1,left_of:2,left_of:3,middle_of:1,middle_of:2,middle_of:3,right_of:1,right_of:2,right_of:3,transition" />
     593                <reference ref="placement" />
    550594                <checkgroup columns="4">
    551595                    <check key="oneway" text="Oneway" default="on" />
    552596                    <check key="bridge" text="Bridge" disable_off="true" />
     
    568612                <text key="destination:ref" text="Destination reference" />
    569613                <text key="junction:ref" text="Junction reference" />
    570614                <text key="width" text="Width (meters)" />
    571                 <combo key="placement" text="Placement" values="left_of:1,left_of:2,left_of:3,middle_of:1,middle_of:2,middle_of:3,right_of:1,right_of:2,right_of:3,transition" />
     615                <reference ref="placement" />
    572616                <checkgroup columns="4">
    573617                    <check key="oneway" text="Oneway" default="on" />
    574618                    <check key="bridge" text="Bridge" disable_off="true" />
     
    592636                <text key="destination" text="Destination" />
    593637                <text key="destination:ref" text="Destination reference" />
    594638                <text key="width" text="Width (meters)" />
    595                 <combo key="placement" text="Placement" values="left_of:1,left_of:2,left_of:3,middle_of:1,middle_of:2,middle_of:3,right_of:1,right_of:2,right_of:3,transition" />
     639                <reference ref="placement" />
    596640                <checkgroup columns="4">
    597641                    <check key="oneway" text="Oneway" default="on" />
    598642                    <check key="motorroad" text="Motorroad" default="on" />
     
    617661                <text key="destination:ref" text="Destination reference" />
    618662                <text key="junction:ref" text="Junction reference" />
    619663                <text key="width" text="Width (meters)" />
    620                 <combo key="placement" text="Placement" values="left_of:1,left_of:2,left_of:3,middle_of:1,middle_of:2,middle_of:3,right_of:1,right_of:2,right_of:3,transition" />
     664                <reference ref="placement" />
    621665                <checkgroup columns="4">
    622666                    <check key="oneway" text="Oneway" default="on" />
    623667                    <check key="motorroad" text="Motorroad" default="on" />
     
    644688                <reference ref="highway_yesno_incline_oneway_lit_width_sidewalk" />
    645689                <check key="narrow" text="Narrow" disable_off="true" />
    646690                <check key="trolley_wire" text="Overhead trolley wires" />
    647                 <combo key="placement" text="Placement" values="left_of:1,left_of:2,left_of:3,middle_of:1,middle_of:2,middle_of:3,right_of:1,right_of:2,right_of:3,transition" />
     691                <reference ref="placement" />
    648692            </optional>
    649693            <preset_link preset_name="Road Restrictions" />
    650694        </item> <!-- Primary -->
     
    658702                <text key="junction:ref" text="Junction reference" />
    659703                <check key="motorroad" text="Motorroad" />
    660704                <reference ref="highway_yesno_incline_oneway_lit_width_sidewalk" />
    661                 <combo key="placement" text="Placement" values="left_of:1,left_of:2,left_of:3,middle_of:1,middle_of:2,middle_of:3,right_of:1,right_of:2,right_of:3,transition" />
     705                <reference ref="placement" />
    662706            </optional>
    663707            <preset_link preset_name="Road Restrictions" />
    664708        </item> <!-- Primary Link -->
     
    673717                <reference ref="highway_yesno_incline_oneway_lit_width_sidewalk" />
    674718                <check key="narrow" text="Narrow" disable_off="true" />
    675719                <check key="trolley_wire" text="Overhead trolley wires" />
    676                 <combo key="placement" text="Placement" values="left_of:1,left_of:2,left_of:3,middle_of:1,middle_of:2,middle_of:3,right_of:1,right_of:2,right_of:3,transition" />
     720                <reference ref="placement" />
    677721            </optional>
    678722            <preset_link preset_name="Road Restrictions" />
    679723        </item> <!-- Secondary -->
     
    685729                <text key="destination" text="Destination" />
    686730                <text key="destination:ref" text="Destination reference" />
    687731                <reference ref="highway_yesno_incline_oneway_lit_width_sidewalk" />
    688                 <combo key="placement" text="Placement" values="left_of:1,left_of:2,left_of:3,middle_of:1,middle_of:2,middle_of:3,right_of:1,right_of:2,right_of:3,transition" />
     732                <reference ref="placement" />
    689733            </optional>
    690734            <preset_link preset_name="Road Restrictions" />
    691735        </item> <!-- Secondary Link -->
     
    700744                <reference ref="highway_yesno_incline_oneway_lit_width_sidewalk" />
    701745                <check key="narrow" text="Narrow" disable_off="true" />
    702746                <check key="trolley_wire" text="Overhead trolley wires" />
    703                 <combo key="placement" text="Placement" values="left_of:1,left_of:2,left_of:3,middle_of:1,middle_of:2,middle_of:3,right_of:1,right_of:2,right_of:3,transition" />
     747                <reference ref="placement" />
    704748            </optional>
    705749            <preset_link preset_name="Road Restrictions" />
    706750        </item> <!-- Tertiary -->
     
    726770                <reference ref="highway_yesno_incline_oneway_lit_width_sidewalk" />
    727771                <check key="narrow" text="Narrow" disable_off="true" />
    728772                <check key="trolley_wire" text="Overhead trolley wires" />
    729                 <combo key="placement" text="Placement" values="left_of:1,left_of:2,left_of:3,middle_of:1,middle_of:2,middle_of:3,right_of:1,right_of:2,right_of:3,transition" />
     773                <reference ref="placement" />
    730774                <check key="passing_places" text="Passing Places" />
    731775            </optional>
    732776            <preset_link preset_name="Road Restrictions" />
     
    747791                <reference ref="highway_yesno_incline" />
    748792                <check key="lit" text="Lit" />
    749793                <text key="width" text="Width (meters)" />
    750                 <combo key="sidewalk" text="Sidewalk" values="both,left,right,no,separate" values_context="sidewalk" />
     794                <combo key="sidewalk" text="Sidewalk" values="both,left,right,no,separate" values_context="sidewalk" values_sort="false" />
    751795                <check key="narrow" text="Narrow" disable_off="true" />
    752796                <check key="trolley_wire" text="Overhead trolley wires" />
    753797            </optional>
     
    758802            <space />
    759803            <key key="bicycle_road" value="yes" />
    760804            <key key="bicycle" value="designated" />
    761             <combo key="highway" text="Highway type" values="residential,service,unclassified,path,cycleway" values_context="Highway" default="residential" />
     805            <combo key="highway" text="Highway type" values="residential,service,unclassified,path,cycleway" values_context="Highway" default="residential" values_sort="false" />
    762806            <text key="name" text="Name" />
    763807            <combo key="vehicle" text="Vehicle access" values="yes,no,destination" default="no" />
    764808            <text key="maxspeed" text="Max. speed (km/h)" default="30" />
     
    771815                <reference ref="highway_yesno_incline" />
    772816                <check key="lit" text="Lit" />
    773817                <text key="width" text="Width (meters)" />
    774                 <combo key="sidewalk" text="Sidewalk" values="both,left,right,no,separate" values_context="sidewalk" />
     818                <combo key="sidewalk" text="Sidewalk" values="both,left,right,no,separate" values_context="sidewalk" values_sort="false" />
    775819            </optional>
    776820            <preset_link preset_name="Road Restrictions" />
    777821        </item> <!-- Bicycle Road -->
     
    809853            <link wiki="Tag:highway=service" />
    810854            <space />
    811855            <key key="highway" value="service" />
    812             <combo key="service" text="Service way type" values="alley,driveway,parking_aisle,drive-through,emergency_access" />
     856            <combo key="service" text="Service way type" values="alley,driveway,parking_aisle,drive-through,emergency_access" values_sort="false" />
    813857            <optional>
    814858                <text key="name" text="Name" />
    815859                <reference ref="highway_base" />
     
    860904        <item name="Construction" icon="presets/transport/way/way_construction.svg" type="way,closedway" preset_name_label="true">
    861905            <link wiki="Key:construction" />
    862906            <key key="highway" value="construction" />
    863             <combo key="construction" text="Highway type" values="motorway,motorway_link,trunk,trunk_link,primary,primary_link,secondary,secondary_link,tertiary,tertiary_link,unclassified,residential,service,bus_guideway,bridleway,living_street,pedestrian,track,path,footway,cycleway,steps" values_context="Highway" />
     907            <combo key="construction" text="Highway type" values="motorway,motorway_link,trunk,trunk_link,primary,primary_link,secondary,secondary_link,tertiary,tertiary_link,unclassified,residential,service,bus_guideway,bridleway,living_street,pedestrian,track,path,footway,cycleway,steps" values_context="Highway" values_sort="false" />
    864908            <optional>
    865909                <text key="name" text="Name" />
    866910                <reference ref="highway_base" />
    867911                <reference ref="highway_yesno_incline_oneway_lit_width_sidewalk" />
    868912                <check key="trolley_wire" text="Overhead trolley wires" />
    869                 <combo key="junction" text="Junction" values="roundabout,jughandle" />
     913                <combo key="junction" text="Junction" values="roundabout,jughandle" values_sort="false" />
    870914            </optional>
    871915            <preset_link preset_name="Road Restrictions" />
    872916        </item> <!-- Construction -->
     
    885929            </checkgroup>
    886930            <space />
    887931            <label text="Transport mode restrictions" />
    888             <combo key="access" text="General Access" values="yes,destination,delivery,permissive,private,customers,agricultural,forestry,no" match="key" values_searchable="true" />
    889             <combo key="foot" text="Foot" values="yes,official,designated,permissive,destination,delivery,private,no" match="key" />
    890             <combo key="horse" text="Horse" values="yes,official,designated,permissive,destination,delivery,private,no" match="key" />
     932            <combo key="access" text="General Access" values="yes,destination,delivery,permissive,private,customers,agricultural,forestry,no" values_searchable="true" values_sort="false" match="key" />
     933            <combo key="foot" text="Foot" values="yes,official,designated,permissive,destination,delivery,private,no" values_sort="false" match="key" />
     934            <combo key="horse" text="Horse" values="yes,official,designated,permissive,destination,delivery,private,no" values_sort="false" match="key" />
    891935            <space />
    892936            <label text="Vehicles per type" />
    893             <combo key="vehicle" text="All vehicles" values="yes,destination,delivery,permissive,private,agricultural,forestry,no" match="key" />
    894             <combo key="bicycle" text="Bicycle" values="yes,official,designated,permissive,destination,delivery,private,use_sidepath,no" match="key" />
    895             <combo key="motor_vehicle" text="Motor vehicles" values="yes,destination,delivery,permissive,private,agricultural,forestry,no" match="key" />
    896             <combo key="motorcycle" text="Motorcycle" values="yes,official,designated,destination,delivery,permissive,private,agricultural,forestry,no" match="key" />
    897             <combo key="motorcar" text="Motorcar" values="yes,official,designated,destination,delivery,permissive,private,agricultural,forestry,no" match="key" />
    898             <combo key="goods" text="Light Commercial Vehicles (goods)" values="yes,official,designated,destination,delivery,permissive,private,agricultural,forestry,no" match="key" />
    899             <combo key="hgv" text="Heavy Goods Vehicles (hgv)" values="yes,official,designated,destination,delivery,permissive,private,agricultural,forestry,no" match="key" />
    900             <combo key="agricultural" text="Agricultural Vehicles (with restrictions e.g. max. 25 km/h)" values="yes,official,designated,destination,permissive,private,no" match="key" />
    901             <combo key="4wd_only" text="4WD only" values="yes,recommended,no" match="key" />
     937            <combo key="vehicle" text="All vehicles" values="yes,destination,delivery,permissive,private,agricultural,forestry,no" values_sort="false" match="key" />
     938            <combo key="bicycle" text="Bicycle" values="yes,official,designated,permissive,destination,delivery,private,use_sidepath,no" values_sort="false" match="key" />
     939            <combo key="motor_vehicle" text="Motor vehicles" values="yes,destination,delivery,permissive,private,agricultural,forestry,no" values_sort="false" match="key" />
     940            <combo key="motorcycle" text="Motorcycle" values="yes,official,designated,destination,delivery,permissive,private,agricultural,forestry,no" values_sort="false" match="key" />
     941            <combo key="motorcar" text="Motorcar" values="yes,official,designated,destination,delivery,permissive,private,agricultural,forestry,no" values_sort="false" match="key" />
     942            <combo key="goods" text="Light Commercial Vehicles (goods)" values="yes,official,designated,destination,delivery,permissive,private,agricultural,forestry,no" values_sort="false" match="key" />
     943            <combo key="hgv" text="Heavy Goods Vehicles (hgv)" values="yes,official,designated,destination,delivery,permissive,private,agricultural,forestry,no" values_sort="false" match="key" />
     944            <combo key="agricultural" text="Agricultural Vehicles (with restrictions e.g. max. 25 km/h)" values="yes,official,designated,destination,permissive,private,no" values_sort="false" match="key" />
     945            <combo key="4wd_only" text="4WD only" values="yes,recommended,no" values_sort="false" match="key" />
    902946            <space />
    903947            <label text="Vehicles per use" />
    904             <combo key="emergency" text="Emergency vehicles" values="yes,official,designated,destination,no" match="keyvalue" />
    905             <combo key="hov" text="High-occupancy vehicles (hov)" values="yes,official,designated,destination,permissive,private,no" match="key" />
    906             <combo key="psv" text="Public Service Vehicles (psv)" values="yes,official,designated,destination,permissive,private,no" match="key" />
    907             <combo key="tourist_bus" text="Tourist buses" values="yes,no" match="key" />
     948            <combo key="emergency" text="Emergency vehicles" values="yes,official,designated,destination,no" values_sort="false" match="keyvalue" />
     949            <combo key="hov" text="High-occupancy vehicles (hov)" values="yes,official,designated,destination,permissive,private,no" values_sort="false" match="key" />
     950            <combo key="psv" text="Public Service Vehicles (psv)" values="yes,official,designated,destination,permissive,private,no" values_sort="false" match="key" />
     951            <combo key="tourist_bus" text="Tourist buses" values="yes,official,designated,destination,permissive,private,no" values_sort="false" match="key" />
    908952            <space />
    909953            <text key="maxspeed" text="Max. speed (km/h)" />
    910954            <text key="maxspeed:forward" text="Max. speed in way direction" />
     
    916960            <text key="maxheight" text="Max. height (meters)" match="key" />
    917961            <text key="maxwidth" text="Max. width (meters)" match="key" />
    918962            <text key="maxlength" text="Max. length (meters)" match="key" />
    919             <combo key="overtaking" text="Overtaking" values="yes,both,forward,backward,no" values_context="overtaking" match="key" />
     963            <combo key="overtaking" text="Overtaking" values="yes,both,forward,backward,no" values_context="overtaking" values_sort="false" match="key" />
    920964        </item> <!-- Road Restrictions -->
    921965        <separator/>
    922966        <item name="Roundabout" icon="presets/vehicle/restriction/roundabout_right.svg" type="node,way,closedway" preset_name_label="true">
    923967            <link wiki="Tag:junction=roundabout" />
    924968            <space />
    925969            <key key="junction" value="roundabout" />
    926             <combo key="highway" text="Type" values="motorway,motorway_link,trunk,trunk_link,primary,primary_link,secondary,tertiary,unclassified,residential,living_street,service,bus_guideway,construction" values_context="Highway" />
     970            <combo key="highway" text="Type" values="motorway,motorway_link,trunk,trunk_link,primary,primary_link,secondary,tertiary,unclassified,residential,living_street,service,bus_guideway,construction" values_context="Highway" values_sort="false" />
    927971            <optional>
    928972                <reference ref="name_layer" />
    929973                <combo key="lanes" text="Lanes" values="1,2,3" length="3" />
     
    934978        </item> <!-- Roundabout -->
    935979        <item name="Ford" icon="presets/vehicle/ford.svg" type="node,way" preset_name_label="true">
    936980            <link wiki="Tag:ford=yes" />
    937             <combo key="ford" text="Ford" values="yes,stepping_stones" default="yes" values_searchable="true" match="keyvalue!" />
     981            <combo key="ford" text="Ford" values="yes,stepping_stones" default="yes" values_searchable="true" match="keyvalue!" values_sort="false" />
    938982            <optional>
    939983                <text key="name" text="Name" />
    940984            </optional>
     
    9581002                <reference ref="highway_yesno_incline_oneway_lit_width" />
    9591003                <combo key="mtb:scale" text="MTB Scale" values="0,1,2,3,4,5" />
    9601004                <reference ref="general_access" />
    961                 <combo key="vehicle" text="All vehicles" values="yes,destination,delivery,permissive,private,agricultural,forestry,no" />
    962                 <combo key="motor_vehicle" text="Motor vehicles" values="yes,official,designated,destination,delivery,permissive,private,agricultural,forestry,no" />
    963                 <combo key="motorcycle" text="Motorcycle" values="yes,official,designated,destination,delivery,permissive,private,agricultural,forestry,no" />
    964                 <combo key="motorcar" text="Motorcar" values="yes,official,designated,destination,delivery,permissive,private,agricultural,forestry,no" />
    965                 <combo key="horse" text="Horse" values="yes,official,designated,permissive,destination,delivery,private,no" />
     1005                <combo key="vehicle" text="All vehicles" values="yes,destination,delivery,permissive,private,agricultural,forestry,no" values_sort="false" />
     1006                <combo key="motor_vehicle" text="Motor vehicles" values="yes,official,designated,destination,delivery,permissive,private,agricultural,forestry,no" values_sort="false" />
     1007                <combo key="motorcycle" text="Motorcycle" values="yes,official,designated,destination,delivery,permissive,private,agricultural,forestry,no" values_sort="false" />
     1008                <combo key="motorcar" text="Motorcar" values="yes,official,designated,destination,delivery,permissive,private,agricultural,forestry,no" values_sort="false" />
     1009                <combo key="horse" text="Horse" values="yes,official,designated,permissive,destination,delivery,private,no" values_sort="false" />
    9661010            </optional>
    9671011            <preset_link preset_name="Road Restrictions" />
    9681012        </item> <!-- Track -->
     
    9731017                <reference ref="name_layer" />
    9741018                <reference ref="surface_smoothness" />
    9751019                <reference ref="highway_yesno_incline_oneway_lit_width" />
    976                 <combo key="sac_scale" text="SAC Scale" values_searchable="true">
     1020                <combo key="sac_scale" text="SAC Scale" values_searchable="true" values_sort="false">
    9771021                    <list_entry value="hiking" display_value="T1 - hiking trail" short_description="Trail well cleared. Area flat or slightly sloped, no fall hazard" />
    9781022                    <list_entry value="mountain_hiking" display_value="T2 - mountain hiking trail" short_description="Trail with continuous line and balanced ascent. Terrain partially steep, fall hazard possible" />
    9791023                    <list_entry value="demanding_mountain_hiking" display_value="T3 - difficult, exposed hiking trail" short_description="exposed sites may be secured with ropes or chains, possible need to use hands for balance. Partly exposed sites with fall hazard, scree, pathless jagged rocks" />
     
    9831027                </combo>
    9841028                <combo key="mtb:scale" text="MTB Scale" values="0,1,2,3,4,5" />
    9851029                <combo key="trail_visibility" text="Visibility" values="excellent,good,intermediate,bad,horrible,no" values_context="trail_visibility" values_sort="false" />
    986                 <combo key="foot" text="Foot" values="yes,official,designated,permissive,destination,delivery,private,no" />
    987                 <combo key="bicycle" text="Bicycle" values="yes,official,designated,permissive,destination,delivery,private,use_sidepath,no" />
    988                 <combo key="horse" text="Horse" values="yes,official,designated,permissive,destination,delivery,private,no" />
    989                 <combo key="wheelchair" text="Wheelchairs" values="yes,designated,limited,no" />
    990                 <combo key="ski" text="Ski" values="yes,official,designated,permissive,private,no" />
    991                 <combo key="snowmobile" text="Snowmobile" values="yes,official,designated,permissive,destination,delivery,private,no" />
     1030                <combo key="foot" text="Foot" values="yes,official,designated,permissive,destination,delivery,private,no" values_sort="false" />
     1031                <combo key="bicycle" text="Bicycle" values="yes,official,designated,permissive,destination,delivery,private,use_sidepath,no" values_sort="false" />
     1032                <combo key="horse" text="Horse" values="yes,official,designated,permissive,destination,delivery,private,no" values_sort="false" />
     1033                <combo key="wheelchair" text="Wheelchairs" values="yes,designated,limited,no" values_sort="false" />
     1034                <combo key="ski" text="Ski" values="yes,official,designated,permissive,private,no" values_sort="false" />
     1035                <combo key="snowmobile" text="Snowmobile" values="yes,official,designated,permissive,destination,delivery,private,no" values_sort="false" />
    9921036                <check key="segregated" text="Segregated" />
    9931037            </optional>
    9941038        </item> <!-- Path -->
     
    10061050        <item name="Cycle Lane/Track" icon="presets/transport/way/cycle_lane_track.svg" type="way,closedway" preset_name_label="true">
    10071051            <link wiki="Bicycle" />
    10081052            <space />
    1009             <combo key="cycleway" text="Cycleway" values_context="cycleway" values="lane,track,opposite_lane,opposite_track,opposite,share_busway,shared_lane" match="key" />
    1010             <combo key="cycleway:left" text="Cycleway left" values_context="cycleway" values="lane,track,opposite_lane,opposite_track,opposite,share_busway,shared_lane" match="key" />
    1011             <combo key="cycleway:right" text="Cycleway right" values_context="cycleway" values="lane,track,opposite_lane,opposite_track,opposite,share_busway,shared_lane" match="key" />
     1053            <combo key="cycleway" text="Cycleway" values_context="cycleway" values="lane,track,opposite_lane,opposite_track,opposite,share_busway,shared_lane" match="key" values_sort="false" />
     1054            <combo key="cycleway:left" text="Cycleway left" values_context="cycleway" values="lane,track,opposite_lane,opposite_track,opposite,share_busway,shared_lane" match="key" values_sort="false" />
     1055            <combo key="cycleway:right" text="Cycleway right" values_context="cycleway" values="lane,track,opposite_lane,opposite_track,opposite,share_busway,shared_lane" match="key" values_sort="false" />
    10121056            <check key="oneway:bicycle" text="Oneway (bicycle)" />
    10131057            <space />
    10141058            <optional text="Edit Highway Attributes:">
    1015                 <combo key="highway" text="Highway" values="motorway,motorway_link,trunk,trunk_link,primary,primary_link,secondary,tertiary,unclassified,residential,living_street,service,bus_guideway,construction" values_context="Highway" />
     1059                <combo key="highway" text="Highway" values="motorway,motorway_link,trunk,trunk_link,primary,primary_link,secondary,tertiary,unclassified,residential,living_street,service,bus_guideway,construction" values_context="Highway" values_sort="false" />
    10161060                <check key="oneway" text="Oneway" />
    10171061            </optional>
    10181062        </item> <!-- Cycle Lane/Track -->
     
    10791123                    <check key="ramp:stroller" text="Stroller ramp" />
    10801124                    <check key="ramp:bicycle" text="Bicycle ramp" />
    10811125                </checkgroup>
    1082                 <combo key="ramp:wheelchair" text="Wheelchair ramp" values="yes,limited,no" />
    1083                 <combo key="ramp:luggage" text="Luggage ramp" values="yes,automatic,manual,no" />
     1126                <combo key="ramp:wheelchair" text="Wheelchair ramp" values="yes,limited,no" values_sort="false" />
     1127                <combo key="ramp:luggage" text="Luggage ramp" values="yes,automatic,manual,no" values_sort="false" />
    10841128                <space />
    10851129                <check key="handrail" text="Handrail" />
    10861130                <checkgroup columns="3" >
     
    10891133                    <check key="handrail:right" text="Right handrail" />
    10901134                </checkgroup>
    10911135                <space />
    1092                 <combo key="conveying" text="Escalator" values="yes,forward,backward,reversible" />
     1136                <combo key="conveying" text="Escalator" values="yes,forward,backward,reversible" values_sort="false" />
    10931137                <space />
    10941138                <reference ref="highway_yesno_incline_oneway_lit_width" />
    10951139            </optional>
     
    11261170            <link wiki="Tag:highway=traffic_signals" />
    11271171            <key key="highway" value="traffic_signals" />
    11281172            <optional>
    1129                 <combo key="traffic_signals:direction" text="Direction" values="forward,backward,both" />
     1173                <combo key="traffic_signals:direction" text="Direction" values="forward,backward,both" values_sort="false" />
     1174                <reference ref="op_times" />
    11301175            </optional>
    11311176            <optional text="Optional crossing attributes:">
    1132                 <combo key="crossing" text="Pedestrian crossing type" values="uncontrolled,traffic_signals,unmarked,no" />
     1177                <combo key="crossing" text="Pedestrian crossing type" values="uncontrolled,traffic_signals,unmarked,no" values_sort="false" />
    11331178                <combo key="crossing_ref" text="Crossing type name (UK)" values="zebra,pelican,toucan,puffin,pegasus,tiger" />
    1134                 <combo key="kerb" text="Kerb" values="flush,lowered,no,raised,rolled,yes" values_context="kerb" />
     1179                <combo key="kerb" text="Kerb" values="flush,lowered,no,raised,rolled,yes" values_context="kerb" values_sort="false" />
    11351180                <check key="crossing:island" text="With island" />
    11361181                <check key="button_operated" text="Button operated" />
    11371182                <check key="traffic_signals:sound" text="Sound signals" />
    1138                 <combo key="supervised" text="Crossing attendant" delimiter="|" values="yes|no|06:00-20:00|Mo-Fr 09:00-18:00,Sa 08:00-14:00|May-Sep 09:30-12:30,14:15-19:30" />
     1183                <combo key="supervised" text="Crossing attendant" delimiter="|" values="yes|no|06:00-20:00|Mo-Fr 09:00-18:00,Sa 08:00-14:00|May-Sep 09:30-12:30,14:15-19:30" values_i18n="false" values_sort="false" />
    11391184                <check key="bicycle" text="Cross by bicycle" />
    11401185                <check key="horse" text="Cross on horseback" />
    11411186            </optional>
     
    11781223            </combo>
    11791224            <combo key="crossing_ref" text="Crossing type name (UK)" values="zebra,pelican,toucan,puffin,pegasus,tiger" values_searchable="true" />
    11801225            <combo key="kerb" text="Kerb" values="flush,lowered,no,raised,rolled,yes" values_context="kerb" />
    1181             <combo key="supervised" text="Crossing attendant" delimiter="|" values="yes|no|06:00-20:00|Mo-Fr 09:00-18:00,Sa 08:00-14:00|May-Sep 09:30-12:30,14:15-19:30" />
    1182             <combo key="tactile_paving" text="Tactile Paving" values="yes,no,incorrect" />
     1226            <combo key="supervised" text="Crossing attendant" delimiter="|" values="yes|no|06:00-20:00|Mo-Fr 09:00-18:00,Sa 08:00-14:00|May-Sep 09:30-12:30,14:15-19:30" values_i18n="false" values_sort="false" />
     1227            <combo key="tactile_paving" text="Tactile Paving" values="yes,no,incorrect" values_sort="false" />
    11831228            <check key="crossing:island" text="With island" />
    11841229            <check key="bicycle" text="Cross by bicycle" />
    11851230            <check key="horse" text="Cross on horseback" />
    11861231            <label text="In case of traffic signals:" />
    11871232            <check key="button_operated" text="Button operated" />
    11881233            <check key="traffic_signals:sound" text="Sound signals" />
     1234            <reference ref="op_times" />
    11891235        </item> <!-- Pedestrian Crossing -->
    11901236        <group name="Traffic Calming" icon="presets/vehicle/choker.svg">
    11911237            <item name="Bump" icon="presets/vehicle/bump.svg" type="node,way" preset_name_label="true">
     
    12541300            <text key="name" text="Name" />
    12551301            <optional>
    12561302                <text key="alt_name" text="Second Name" />
    1257                 <combo key="direction" text="Direction" values="N,E,S,W,0,90,180,270,forward,backward" values_sort="false" />
     1303                <combo key="direction" text="Direction" values="N,E,S,W,0,90,180,270,forward,backward" values_i18n="false" values_sort="false" />
    12581304            </optional>
    12591305        </item> <!-- City Limit -->
    12601306        <item name="Speed Limit Sign" icon="presets/vehicle/restriction/maxspeed.svg" type="node" preset_name_label="true">
     
    12631309            <key key="traffic_sign" value="maxspeed" />
    12641310            <text key="maxspeed" text="Max. speed (km/h)" />
    12651311            <optional>
    1266                 <combo key="direction" text="Direction" values="N,E,S,W,0,90,180,270,forward,backward" values_sort="false" />
     1312                <combo key="direction" text="Direction" values="N,E,S,W,0,90,180,270,forward,backward" values_i18n="false" values_sort="false" />
    12671313            </optional>
    12681314        </item> <!-- Speed Limit -->
    12691315        <item name="Speed Camera" icon="presets/vehicle/restriction/speed_camera.svg" type="node" preset_name_label="true">
     
    13121358                <check key="indoor" text="Indoor" />
    13131359                <reference ref="fee" />
    13141360                <combo key="goods" text="Freight elevator" values="yes,designated,no" />
    1315                 <combo key="access" text="Access" values="yes,no,customers,private" />
     1361                <reference ref="site_access" />
    13161362                <combo key="surveillance" text="Surveillance Camera" values="indoor,outdoor" />
    13171363            </optional>
    13181364        </item> <!-- Elevator -->
     
    13271373            <key key="mountain_pass" value="yes" />
    13281374            <optional>
    13291375                <text key="name" text="Name" />
    1330                 <text key="ele" text="Elevation" />
     1376                <reference ref="ele" />
    13311377                <text key="wikipedia" text="Wikipedia" />
    13321378            </optional>
    13331379        </item> <!-- Mountain Pass -->
     
    13951441            <reference ref="leaf" />
    13961442            <optional>
    13971443                <reference ref="genus_species_taxon" />
    1398                 <text key="height" text="Height (meters)" length="7" />
     1444                <reference ref="height" />
    13991445            </optional>
    14001446        </item> <!-- Hedge -->
    14011447        <item name="Fence" icon="presets/barrier/fence.svg" type="way,closedway" preset_name_label="true">
     
    14031449            <key key="barrier" value="fence" />
    14041450            <optional>
    14051451                <combo key="fence_type" text="Type" values="barbed_wire,bars,chain_link,concrete,electric,metal,pole,railing,split_rail,wire,wood" />
    1406                 <text key="height" text="Height (meters)" length="7" />
     1452                <reference ref="height" />
    14071453            </optional>
    14081454        </item> <!-- Fence -->
    14091455        <item name="Handrail" icon="presets/barrier/handrail.svg" type="way,closedway" preset_name_label="true">
     
    15511597                <text key="maxspeed:forward" text="Max. speed in way direction" />
    15521598                <text key="maxspeed:backward" text="Max. speed opposed to way direction" />
    15531599                <space />
    1554                 <combo key="incline" text="Incline" values="10%,-10%,10°,-10°,up,down" />
     1600                <reference ref="incline" />
    15551601                <check key="toll" text="Toll" />
    15561602            </optional>
    15571603        </item> <!-- Tunnel -->
     
    15631609                <text key="width" text="Width (meters)" />
    15641610                <text key="maxheight" text="Max. height (meters)" />
    15651611                <text key="maxspeed" text="Max. speed (km/h)" />
    1566                 <combo key="incline" text="Incline" values="10%,-10%,10°,-10°,up,down" />
     1612                <reference ref="incline" />
    15671613            </optional>
    15681614        </item> <!-- Building Passage -->
    15691615        <item name="Arcade" icon="presets/transport/passage/arcade.svg" type="way" preset_name_label="true">
     
    15971643            <optional>
    15981644                <reference ref="name_layer" />
    15991645                <text key="width" text="Width (meters)" />
    1600                 <combo key="incline" text="Incline" values="10%,-10%,10°,-10°,up,down" />
     1646                <reference ref="incline" />
    16011647            </optional>
    16021648        </item> <!-- Avalanche Protector -->
    16031649    </group> <!-- Passageways -->
     
    16461692            <optional>
    16471693                <combo key="layer" text="Layer" values="5,4,3,2,1,0,-1,-2,-3,-4,-5" length="3" />
    16481694                <combo key="tunnel" text="Tunnel" values="culvert,flooded,yes" />
    1649                 <combo key="usage" text="Usage" values="transportation,transmission,irrigation,headrace,tailrace,spillway" values_context="usage" />
     1695                <combo key="usage" text="Usage" values="transportation,transmission,irrigation,headrace,tailrace,spillway" values_context="usage" values_sort="false" />
    16501696                <text key="width" text="Width (meters)" />
    16511697                <text key="wikipedia" text="Wikipedia" />
    16521698                <check key="lock" text="Lock" disable_off="true" />
     
    16851731            <space />
    16861732            <key key="waterway" value="waterfall" />
    16871733            <reference ref="name_wikipedia" />
    1688             <text key="height" text="Height (meters)" />
     1734            <reference ref="height" />
    16891735        </item> <!-- Waterfall -->
    16901736        <item name="Weir" icon="presets/nautical/weir.svg" type="node,way" preset_name_label="true">
    16911737            <link wiki="Tag:waterway=weir" />
     
    17351781            <optional>
    17361782                <text key="name" text="Name" />
    17371783                <text key="operator" text="Operator" />
    1738                 <combo key="diameter" text="Diameter (mm)" values="800,1000,1200,1500,1600,1800,2200,2300,2400,2500,2600,2800,3200,3300,3400,3500,4000,4200,4300,4800" />
     1784                <combo key="diameter" text="Diameter (mm)" values="800,1000,1200,1500,1600,1800,2200,2300,2400,2500,2600,2800,3200,3300,3400,3500,4000,4200,4300,4800" values_sort="false" />
    17391785                <text key="pressure" text="Pressure (bar)" />
    17401786                <combo key="material" text="Material" values="metal,steel" />
    17411787            </optional>
     
    17451791            <link wiki="Tag:landuse=basin" />
    17461792            <space />
    17471793            <key key="landuse" value="basin" />
    1748             <combo key="basin" text="Type" values="retention,infiltration,detention" />
     1794            <combo key="basin" text="Type" values="retention,infiltration,detention" values_sort="false" />
    17491795            <reference ref="optional_name" />
    17501796        </item> <!-- Basin -->
    17511797        <item name="Reservoir" icon="presets/landuse/reservoir.svg" type="node,closedway,multipolygon" preset_name_label="true">
     
    17721818            <check key="salt" text="Salt Water" disable_off="true" />
    17731819            <check key="intermittent" text="Intermittent (contains not permanently water)" disable_off="true" />
    17741820            <check key="tidal" text="In the tidal range" disable_off="true" />
    1775             <text key="ele" text="Elevation" />
     1821            <reference ref="ele" />
    17761822            <text key="wikipedia" text="Wikipedia" />
    17771823            <reference ref="water_access" />
    17781824        </item> <!-- Water -->
     
    18171863            <optional>
    18181864                <reference ref="supervised" />
    18191865                <reference ref="oh_wheelchair" />
    1820                 <reference ref="general_access" />
     1866                <reference ref="site_access" />
    18211867                <combo key="surface" text="Surface" values="gravel,pebblestone,sand" />
    18221868                <combo key="sport" text="Sport" values="swimming,surfing" />
    18231869                <reference ref="nudism" />
     
    18651911                <combo key="duration" text="Duration (M, MM, HH:MM, or HH:MM:SS)" values="5,10,15,20,30,60,120,10:30" values_no_i18n="true" />
    18661912                <combo key="interval" text="Interval (M, MM, HH:MM, or HH:MM:SS)" values="5,10,15,20,30,60,120,10:30" values_no_i18n="true" />
    18671913                <reference ref="fee" />
    1868                 <combo key="ferry" text="Highway type the ferry connects" values="trunk,primary,secondary,tertiary,unclassified" values_context="Highway" />
     1914                <combo key="ferry" text="Highway type the ferry connects" values="trunk,primary,secondary,tertiary,unclassified" values_context="Highway" values_sort="false" />
    18691915                <check key="ferry:cable" text="Reaction ferry" />
    18701916            </optional>
    18711917            <preset_link preset_name="Road Restrictions" />
     
    18761922            <space />
    18771923            <key key="leisure" value="marina" />
    18781924            <text key="name" text="Name" />
    1879             <combo key="sanitary_dump_station" text="Dump Station" values="yes,public,customers,no" />
     1925            <combo key="sanitary_dump_station" text="Dump Station" values="yes,public,customers,no" values_sort="false" />
    18801926        </item> <!-- Marina -->
    18811927        <item name="Marine Fuel" icon="presets/nautical/marine_fuel.svg" type="node,closedway,multipolygon" preset_name_label="true">
    18821928            <link wiki="Tag:waterway=fuel"/>
     
    19121958            <space />
    19131959            <key key="man_made" value="pier" />
    19141960            <text key="name" text="Name" />
    1915             <combo key="mooring" text="Mooring" values="yes,no,private,commercial" />
     1961            <combo key="mooring" text="Mooring" values="yes,no,private,commercial" values_sort="false" />
    19161962            <check key="floating" text="Floating" />
    19171963        </item> <!-- Pier -->
    19181964        <item name="Lock Gate" icon="presets/nautical/lock_gate.svg" type="node,way" preset_name_label="true">
     
    19511997            <link wiki="Tag:railway=rail" />
    19521998            <key key="railway" value="rail" />
    19531999            <optional>
    1954                 <combo key="usage" text="Usage" values="main,branch,industrial,military,tourism,freight" />
     2000                <combo key="usage" text="Usage" values="main,branch,industrial,military,tourism,freight" values_sort="false" />
    19552001                <reference ref="railway_service_gauge_electrified_yesno" />
    19562002            </optional>
    19572003        </item> <!-- Rail -->
     
    19592005            <link wiki="Tag:railway=narrow_gauge" />
    19602006            <key key="railway" value="narrow_gauge" />
    19612007            <optional>
    1962                 <combo key="usage" text="Usage" values="main,branch,industrial,military,tourism,freight" />
     2008                <combo key="usage" text="Usage" values="main,branch,industrial,military,tourism,freight" values_sort="false" />
    19632009                <reference ref="railway_service_gauge_electrified_yesno" />
    19642010            </optional>
    19652011        </item> <!-- Narrow Gauge Rail -->
     
    20232069        <item name="Railway construction" icon="presets/transport/railway/railway_construction.svg" type="way" preset_name_label="true">
    20242070            <link wiki="Key:construction" />
    20252071            <key key="railway" value="construction" />
    2026             <combo key="construction" text="Railway type" values="rail,narrow_gauge,monorail,preserved,light_rail,subway,tram,funicular" />
     2072            <combo key="construction" text="Railway type" values="rail,narrow_gauge,monorail,preserved,light_rail,subway,tram,funicular" values_sort="false" />
    20272073            <optional>
    2028                 <combo key="usage" text="Usage" values="main,branch,industrial,military,tourism,freight" />
     2074                <combo key="usage" text="Usage" values="main,branch,industrial,military,tourism,freight" values_sort="false" />
    20292075                <reference ref="railway_service_gauge_electrified_yesno" />
    20302076            </optional>
    20312077        </item> <!-- Railway construction -->
     
    20532099                <reference ref="supervised" />
    20542100                <check key="crossing:light" text="Traffic lights" />
    20552101                <check key="crossing:bell" text="Sound signals" />
    2056                 <combo key="crossing:barrier" text="Barrier" values="yes,no,half,full,double_half" values_context="crossing:barrier" />
     2102                <combo key="crossing:barrier" text="Barrier" values="yes,no,half,full,double_half" values_context="crossing:barrier" values_sort="false" />
    20572103            </optional>
    20582104        </item> <!-- Level Crossing -->
    20592105        <item name="Crossing" icon="presets/transport/railway/crossing.svg" type="node" preset_name_label="true">
     
    20662112                <check key="bicycle" text="Cross by bicycle" />
    20672113                <check key="crossing:light" text="Traffic lights" />
    20682114                <check key="crossing:bell" text="Sound signals" />
    2069                 <combo key="crossing:barrier" text="Barrier" values="yes,no,half,full,double_half" values_context="crossing:barrier" />
     2115                <combo key="crossing:barrier" text="Barrier" values="yes,no,half,full,double_half" values_context="crossing:barrier" values_sort="false" />
    20702116            </optional>
    20712117        </item> <!-- Crossing -->
    20722118        <item name="Turntable" icon="presets/transport/railway/turntable.svg" type="node,closedway" preset_name_label="true">
     
    22172263            <key key="amenity" value="parking" />
    22182264            <reference ref="parking_name_type_ref" />
    22192265            <text key="maxheight" text="Max. height (meters)" />
    2220             <combo key="park_ride" text="Park and Ride" values="yes,no,bus,train,tram,metro,ferry" />
     2266            <combo key="park_ride" text="Park and Ride" values="yes,no,bus,train,tram,metro,ferry" values_sort="false" />
    22212267            <reference ref="parking_access_fee_operator_surface_smoothness" />
    22222268            <space />
    22232269            <text key="capacity" text="Capacity (overall)" />
    2224             <combo key="capacity:disabled" text="Spaces for Disabled" values="yes,no,1,2,3" />
    2225             <combo key="capacity:women" text="Spaces for Women" values="yes,no,1,2,3" />
    2226             <combo key="capacity:parent" text="Spaces for Parents" values="yes,no,1,2,3" />
     2270            <combo key="capacity:disabled" text="Spaces for Disabled" values="yes,no,1,2,3" values_sort="false" />
     2271            <combo key="capacity:women" text="Spaces for Women" values="yes,no,1,2,3" values_sort="false" />
     2272            <combo key="capacity:parent" text="Spaces for Parents" values="yes,no,1,2,3" values_sort="false" />
    22272273            <label text="See the Wiki for other capacity:[types]=*." />
    22282274            <space />
    22292275            <reference ref="maxstay" />
     
    22602306                <text key="name" text="Name" />
    22612307                <text key="operator" text="Operator" />
    22622308                <reference ref="oh_wheelchair" />
    2263                 <combo key="shop" text="With shop" values="yes,convenience,kiosk,no" />
     2309                <combo key="shop" text="With shop" values="yes,convenience,kiosk,no" values_sort="false" />
    22642310                <space />
    22652311                <label text="Fuel types:" />
    22662312                <checkgroup columns="2">
     
    23592405            <key key="shop" value="car" />
    23602406            <reference ref="car_brands" />
    23612407            <reference ref="name_operator_oh_wheelchair" />
    2362             <combo key="second_hand" text="Second hand" values="yes,no,only" />
     2408            <combo key="second_hand" text="Second hand" values="yes,no,only" values_sort="false" />
    23632409            <reference ref="link_contact_address_payment" />
    23642410        </item> <!-- Car Dealer -->
    23652411        <item name="Repair" icon="presets/vehicle/repair_shop.svg" type="node,closedway,multipolygon" preset_name_label="true">
     
    24332479            <reference ref="motorcycle_brands" />
    24342480            <text key="operator" text="Operator" />
    24352481            <reference ref="oh_wheelchair" />
    2436             <combo key="second_hand" text="Second hand" values="yes,no,only" />
     2482            <combo key="second_hand" text="Second hand" values="yes,no,only" values_sort="false" />
    24372483            <optional text="Services:">
    2438                 <combo key="sale" text="Sale" values="yes,brand,no" />
    2439                 <combo key="rental" text="Rental" values="yes,brand,no" />
    2440                 <combo key="repair" text="Repair" values="yes,brand,oldtimer,no" />
    2441                 <combo key="safety_inspection" text="Safety inspection" values="yes,DEKRA,GTÜ,MOT,TÜV,no" />
    2442                 <combo key="parts" text="Parts" values="yes,brand,oldtimer,no" />
    2443                 <combo key="clothes" text="Clothes" values="yes,brand,no" />
     2484                <combo key="sale" text="Sale" values="yes,brand,no" values_sort="false" />
     2485                <combo key="rental" text="Rental" values="yes,brand,no" values_sort="false" />
     2486                <combo key="repair" text="Repair" values="yes,brand,oldtimer,no" values_sort="false" />
     2487                <combo key="safety_inspection" text="Safety inspection" values="yes,DEKRA,GTÜ,MOT,TÜV,no" values_i18n="false" values_sort="false" />
     2488                <combo key="parts" text="Parts" values="yes,brand,oldtimer,no" values_sort="false" />
     2489                <combo key="clothes" text="Clothes" values="yes,brand,no" values_sort="false" />
    24442490                <text key="services" text="Other" />
    24452491            </optional>
    24462492            <reference ref="link_contact_address_payment" />
     
    24982544            <link wiki="Public_transport#Service_routes" />
    24992545            <space />
    25002546            <key key="type" value="route" />
    2501             <combo key="route" text="Route type" values="train,subway,monorail,tram,light_rail" values_searchable="true" match="keyvalue!" />
     2547            <combo key="route" text="Route type" values="train,subway,monorail,tram,light_rail" values_searchable="true" values_sort="false" match="keyvalue!" />
    25022548            <key key="public_transport:version" value="2" /> <!-- only validate marked relations in order to avoid false positives -->
    25032549            <reference ref="name_ref" />
    25042550            <optional>
     
    25392585            <link wiki="Public_transport#Route_Master_relations" />
    25402586            <space />
    25412587            <key key="type" value="route_master" />
    2542             <combo key="route_master" text="Route type" values="train,subway,monorail,tram,bus,trolleybus,share_taxi,aerialway,ferry" />
     2588            <combo key="route_master" text="Route type" values="train,subway,monorail,tram,bus,trolleybus,share_taxi,aerialway,ferry" values_sort="false" />
    25432589            <reference ref="name_ref" />
    25442590            <optional>
    25452591                <text key="operator" text="Operator" />
     
    26442690    <group name="Public Transport (Legacy)" icon="presets/transport/bus_old.svg">
    26452691        <item name="Public transport route (Legacy)" icon="presets/misc/route.svg" type="relation" preset_name_label="true">
    26462692            <key key="type" value="route" />
    2647             <combo key="route" text="Route type" values="train,subway,monorail,tram,bus,trolleybus,share_taxi,aerialway,ferry" values_searchable="true" match="keyvalue!" />
     2693            <combo key="route" text="Route type" values="train,subway,monorail,tram,bus,trolleybus,share_taxi,aerialway,ferry" values_searchable="true" values_sort="false" match="keyvalue!" />
    26482694            <key key="public_transport:version" value="1" /> <!-- only validate marked relations in order to avoid false positives -->
    26492695            <reference ref="name_ref" />
    26502696            <optional>
     
    27852831        <item name="Hangar" icon="presets/transport/airport/hangar.svg" type="node,closedway,multipolygon" preset_name_label="true">
    27862832            <link wiki="Tag:aeroway=hangar" />
    27872833            <key key="aeroway" value="hangar" />
    2788             <combo key="building" text="Building" values="hangar,yes" values_context="building" default="hangar" values_searchable="true" />
     2834            <combo key="building" text="Building" values="hangar,yes" values_context="building" default="hangar" values_searchable="true" values_sort="false" />
    27892835        </item> <!-- Hangar -->
    27902836        <item name="Beacon" icon="presets/transport/airport/airmark_beacon.svg" name_context="airmark" type="node" preset_name_label="true">
    27912837            <link wiki="Tag:airmark=beacon" />
     
    27942840        <item name="Navigation aid" icon="presets/transport/airport/navigationaid.svg" type="node" preset_name_label="true">
    27952841            <link wiki="Tag:aeroway=navigationaid" />
    27962842            <key key="aeroway" value="navigationaid" />
    2797             <combo key="navigationaid" text="Type" values_searchable="true">
     2843            <combo key="navigationaid" text="Type" values_searchable="true" values_sort="false">
    27982844                <list_entry value="als" icon="presets/transport/airport/navigationaid.svg" short_description="Approach lighting system" />
    27992845                <list_entry value="papi" icon="presets/transport/airport/papi.svg" short_description="Precision approach path indicator" />
    28002846                <list_entry value="vasi" icon="presets/transport/airport/vasi.svg" short_description="Visual approach slope indicator" />
     
    28312877            <combo key="stars" text="Stars" values="1,2,3,4,5,6,7" />
    28322878            <text key="rooms" text="Rooms" />
    28332879            <text key="beds" text="Beds" />
    2834             <reference ref="wheelchair" />
     2880            <reference ref="cuisine" />
     2881            <reference ref="oh_kitchen_wheelchair" />
     2882            <reference ref="reservation" />
    28352883            <space />
    28362884            <reference ref="internet_smoking" />
    28372885            <space />
     
    28462894            <combo key="stars" text="Stars" values="1,2,3,4,5,6,7" />
    28472895            <text key="rooms" text="Rooms" />
    28482896            <text key="beds" text="Beds" />
    2849             <reference ref="wheelchair" />
     2897            <reference ref="oh_wheelchair" />
     2898            <reference ref="reservation" />
    28502899            <space />
    28512900            <reference ref="internet_smoking" />
    28522901            <space />
     
    28622911            <text key="rooms" text="Rooms" />
    28632912            <text key="beds" text="Beds" />
    28642913            <combo key="guest_house" text="Type" values="agritourism,bed_and_breakfast" />
    2865             <reference ref="wheelchair" />
     2914            <reference ref="cuisine" />
     2915            <reference ref="oh_kitchen_wheelchair" />
     2916            <reference ref="reservation" />
    28662917            <space />
    28672918            <reference ref="internet_smoking" />
    28682919            <space />
     
    28762927            <reference ref="name_operator" />
    28772928            <combo key="number_of_apartments" text="Number of apartments" values="1,2,3,4,5,6,7,8,9,10" />
    28782929            <combo key="stars" text="Stars" values="1,2,3,4,5,6,7" />
    2879             <reference ref="wheelchair" />
     2930            <reference ref="oh_wheelchair" />
     2931            <reference ref="reservation" />
    28802932            <space />
    28812933            <reference ref="internet_smoking" />
    28822934            <space />
     
    28902942            <combo key="stars" text="Stars" values="1,2,3,4,5,6,7" />
    28912943            <text key="rooms" text="Rooms" />
    28922944            <text key="beds" text="Beds" />
    2893             <reference ref="wheelchair" />
     2945            <reference ref="oh_wheelchair" />
     2946            <reference ref="reservation" />
    28942947            <space />
    28952948            <reference ref="internet_smoking" />
    28962949            <space />
     
    29052958            <combo key="stars" text="Stars" values="1,2,3,4,5,6,7" />
    29062959            <text key="rooms" text="Rooms" />
    29072960            <text key="beds" text="Beds" />
    2908             <reference ref="wheelchair" />
     2961            <reference ref="oh_wheelchair" />
     2962            <reference ref="reservation" />
    29092963            <space />
    29102964            <reference ref="internet_smoking" />
    29112965            <space />
     
    29172971            <space />
    29182972            <key key="tourism" value="alpine_hut" />
    29192973            <reference ref="name_operator" />
    2920             <text key="ele" text="Elevation" />
     2974            <reference ref="ele" />
    29212975            <text key="rooms" text="Rooms" />
    29222976            <text key="beds" text="Beds" />
    2923             <combo key="reservation" text="Reservation" values="yes,no,required,recommended,members_only" />
     2977            <reference ref="reservation" />
     2978            <reference ref="oh" />
     2979            <reference ref="oh_kitchen" />
     2980            <reference ref="cuisine" />
    29242981            <space />
    29252982            <reference ref="internet_smoking" />
    29262983            <space />
     
    29322989            <space />
    29332990            <key key="tourism" value="wilderness_hut" />
    29342991            <reference ref="name_operator" />
    2935             <combo key="access" text="Access rights" values="yes,permissive,customers,private" />
     2992            <reference ref="site_access" />
    29362993            <text key="capacity" text="Capacity" />
    29372994            <reference ref="fee" />
    29382995            <check key="toilets" text="Toilets" />
    29392996            <check key="shower" text="Shower" />
    29402997            <combo key="drinking_water" text="Drinking Water" values="yes,no,seasonal" />
    2941             <combo key="reservation" text="Reservation" values="yes,no,required,recommended,members_only" />
    2942             <text key="ele" text="Elevation" />
     2998            <reference ref="reservation" />
     2999            <reference ref="ele" />
    29433000            <text key="description" text="Closer description" />
    29443001            <space />
    29453002            <reference ref="link_contact_address_payment" />
     
    29523009            <key key="tourism" value="caravan_site" />
    29533010            <reference ref="name_operator" />
    29543011            <combo key="stars" text="Stars" values="1,2,3,4,5" />
    2955             <reference ref="wheelchair" />
     3012            <reference ref="oh_wheelchair" />
     3013            <reference ref="reservation" />
    29563014            <space />
    29573015            <text key="capacity" text="Number of places" />
    2958             <reference ref="fee_interval" />
    29593016            <combo key="sanitary_dump_station" text="Dump Station" values="yes,public,customers,no" />
    29603017            <check key="power_supply" text="Power supply" />
    29613018            <check key="tents" text="Tents allowed" />
     
    29793036                <check key="group_only" text="Group only access" />
    29803037            </checkgroup>
    29813038            <combo key="sanitary_dump_station" text="Dump Station" values="yes,public,customers,no" />
    2982             <reference ref="wheelchair" />
     3039            <reference ref="oh_wheelchair" />
     3040            <text key="capacity" text="Number of places" />
     3041            <reference ref="fee_interval" />
     3042            <reference ref="reservation" />
    29833043            <reference ref="internet" />
    29843044            <space />
    29853045            <reference ref="nudism" />
     
    29923052            <text key="ref" text="Reference" />
    29933053            <text key="addr:unit" text="Unit number" />
    29943054            <text key="capacity" text="Number of places" />
     3055            <reference ref="fee_interval" />
     3056            <reference ref="reservation" />
    29953057            <reference ref="surface" />
    29963058            <checkgroup columns="2">
    29973059                <check key="tents" text="Tents allowed" />
     
    30103072            <reference ref="name_operator" />
    30113073            <reference ref="cuisine" />
    30123074            <check key="microbrewery" text="Microbrewery" />
    3013             <check key="outdoor_seating" text="Outdoor seating" />
    3014             <combo key="takeaway" text="Takeaway" values="yes,no,only" />
    3015             <combo key="delivery" text="Delivery" values="yes,no,only,Mo-Su 12:00-22:00" />
    3016             <combo key="reservation" text="Reservation" values="yes,no,required,recommended,members_only" />
    3017             <reference ref="oh" />
    3018             <combo key="opening_hours:kitchen" text="Kitchen Opening Hours" delimiter="|" values="24/7|08:30-12:30,15:30-20:00|Sa-Su 00:00-24:00|Mo-Su 09:00-21:00|Mo-Sa 08:00-18:00|Mo-Fr 09:00-17:00|Mo-Fr 08:30-20:00; Sa,Su 08:00-15:00; PH off|Mo-Fr 08:30-20:00; Tu-Su 08:00-15:00; Sa 08:00-12:00|Mo-Su 08:00-18:00; Apr 10-15 off; Jun 08:00-14:00; Aug off; Dec 25 off|sunrise-sunset|Su 10:00+|week 01-53/2 Fr 09:00-12:00; week 02-52/2 We 09:00-12:00" values_no_i18n="true" />
    3019             <reference ref="wheelchair" />
     3075            <reference ref="outdoor_seat_take_delivery" />
     3076            <reference ref="reservation" />
     3077            <reference ref="oh_kitchen_wheelchair" />
    30203078            <combo key="stars" text="Stars" values="1,2,3,4,5,6,7" />
    30213079            <space />
    30223080            <reference ref="internet_smoking" />
     
    30303088            <key key="amenity" value="fast_food" />
    30313089            <reference ref="name_operator" />
    30323090            <reference ref="cuisine" />
    3033             <check key="outdoor_seating" text="Outdoor seating" />
    3034             <combo key="takeaway" text="Takeaway" values="yes,no,only" />
    3035             <combo key="delivery" text="Delivery" values="yes,no,only,Mo-Su 12:00-22:00" />
    3036             <reference ref="oh_wheelchair" />
     3091            <reference ref="outdoor_seat_take_delivery" />
    30373092            <space />
    30383093            <reference ref="internet_smoking" />
    30393094            <space />
     
    30463101            <space />
    30473102            <key key="amenity" value="food_court" />
    30483103            <reference ref="name_operator" />
    3049             <check key="outdoor_seating" text="Outdoor seating" />
     3104            <reference ref="cuisine" />
     3105            <reference ref="outdoor_seat_take_delivery" />
    30503106            <reference ref="oh_wheelchair" />
    30513107            <space />
    30523108            <reference ref="internet_smoking" />
     
    30593115            <key key="amenity" value="cafe" />
    30603116            <reference ref="name_operator" />
    30613117            <combo key="cuisine" text="Cuisine" values="ice_cream" />
    3062             <check key="outdoor_seating" text="Outdoor seating" />
    3063             <combo key="takeaway" text="Takeaway" values="yes,no,only" />
    3064             <combo key="delivery" text="Delivery" values="yes,no,only,Mo-Su 12:00-22:00" />
     3118            <reference ref="outdoor_seat_take_delivery" />
     3119            <reference ref="reservation" />
    30653120            <reference ref="oh_wheelchair" />
    30663121            <space />
    30673122            <reference ref="internet_smoking" />
     
    30743129            <space />
    30753130            <key key="amenity" value="ice_cream" />
    30763131            <reference ref="name_operator" />
    3077             <check key="outdoor_seating" text="Outdoor seating" />
    3078             <combo key="takeaway" text="Takeaway" values="yes,no,only" />
    3079             <combo key="delivery" text="Delivery" values="yes,no,only,Mo-Su 12:00-22:00" />
     3132            <reference ref="outdoor_seat_take_delivery" />
    30803133            <reference ref="oh_wheelchair" />
    30813134            <space />
    30823135            <reference ref="internet_smoking" />
     
    30903143            <key key="amenity" value="pub" />
    30913144            <reference ref="name_operator" />
    30923145            <check key="microbrewery" text="Microbrewery" />
    3093             <check key="outdoor_seating" text="Outdoor seating" />
    3094             <combo key="takeaway" text="Takeaway" values="yes,no,only" />
    3095             <combo key="delivery" text="Delivery" values="yes,no,only,Mo-Su 12:00-22:00" />
    3096             <reference ref="oh_wheelchair" />
     3146            <reference ref="outdoor_seat_take_delivery" />
     3147            <reference ref="oh_kitchen_wheelchair" />
    30973148            <space />
    30983149            <reference ref="internet_smoking" />
    30993150            <space />
     
    31063157            <key key="amenity" value="biergarten" />
    31073158            <reference ref="name_operator" />
    31083159            <check key="microbrewery" text="Microbrewery" />
    3109             <reference ref="oh_wheelchair" />
     3160            <reference ref="oh_kitchen_wheelchair" />
    31103161            <space />
    31113162            <reference ref="internet_smoking" />
    31123163            <space />
     
    31303181        <item name="Diet" icon="presets/food/diet.svg" type="node,closedway,multipolygon" preset_name_label="true">
    31313182            <link wiki="Key:diet" />
    31323183            <space />
    3133             <combo key="diet:vegetarian" text="Vegetarian" values="yes,no,only" />
    3134             <combo key="diet:vegan" text="Vegan" values="yes,no,only" />
    3135             <combo key="diet:lacto_vegetarian" text="Lacto-vegetarian" values="yes,no,only" />
    3136             <combo key="diet:ovo_vegetarian" text="Ovo-vegetarian" values="yes,no,only" />
    3137             <combo key="diet:pescetarian" text="Pescetarian" values="yes,no,only" />
    3138             <combo key="diet:fruitarian" text="Fruitarian" values="yes,no,only" />
    3139             <combo key="diet:raw" text="Raw" values="yes,no,only" />
    3140             <space />
    3141             <combo key="diet:dairy_free" text="Dairy free" values="yes,no,only" />
    3142             <combo key="diet:gluten_free" text="Gluten free" values="yes,no,only" />
    3143             <combo key="diet:lactose_free" text="Lactose free" values="yes,no,only" />
     3184            <combo key="diet:vegetarian" text="Vegetarian" values="yes,no,only" values_sort="false" />
     3185            <combo key="diet:vegan" text="Vegan" values="yes,no,only" values_sort="false" />
     3186            <combo key="diet:lacto_vegetarian" text="Lacto-vegetarian" values="yes,no,only" values_sort="false" />
     3187            <combo key="diet:ovo_vegetarian" text="Ovo-vegetarian" values="yes,no,only" values_sort="false" />
     3188            <combo key="diet:pescetarian" text="Pescetarian" values="yes,no,only" values_sort="false" />
     3189            <combo key="diet:fruitarian" text="Fruitarian" values="yes,no,only" values_sort="false" />
     3190            <combo key="diet:raw" text="Raw" values="yes,no,only" values_sort="false" />
     3191            <space />
     3192            <combo key="diet:dairy_free" text="Dairy free" values="yes,no,only" values_sort="false" />
     3193            <combo key="diet:gluten_free" text="Gluten free" values="yes,no,only" values_sort="false" />
     3194            <combo key="diet:lactose_free" text="Lactose free" values="yes,no,only" values_sort="false" />
    31443195            <space />
    3145             <combo key="diet:halal" text="Halal" values="yes,no,only" />
    3146             <combo key="diet:kosher" text="Kosher" values="yes,no,only" />
     3196            <combo key="diet:halal" text="Halal" values="yes,no,only" values_sort="false" />
     3197            <combo key="diet:kosher" text="Kosher" values="yes,no,only" values_sort="false" />
    31473198        </item> <!-- Diet -->
    31483199    </group> <!-- Food+Drinks -->
    31493200    <group name="Tourism" icon="presets/sightseeing/attraction.svg">
     
    31523203            <space />
    31533204            <key key="tourism" value="attraction" />
    31543205            <text key="name" text="Name" />
    3155             <combo key="reservation" text="Reservation" values="yes,no,required,recommended,members_only" />
     3206            <reference ref="reservation" />
    31563207            <reference ref="oh_wheelchair" />
    31573208        </item> <!-- Attraction -->
    31583209        <item name="Viewpoint" icon="presets/sightseeing/viewpoint.svg" type="node,closedway,multipolygon" preset_name_label="true">
     
    31833234            <key key="tourism" value="information" />
    31843235            <key key="information" value="map" />
    31853236            <text key="name" text="Name" />
    3186             <combo key="map_type" text="Detail Grade" values="topo,street,scheme,toposcope" />
     3237            <combo key="map_type" text="Detail Grade" values="topo,street,scheme,toposcope" values_sort="false" />
    31873238            <combo key="map_size" text="Shown Area" values="site,city,region" values_sort="false" />
    31883239            <text key="description" text="Closer description" />
    31893240            <optional text="Routes shown for:">
     
    32133264            <key key="tourism" value="information" />
    32143265            <key key="information" value="guidepost" />
    32153266            <reference ref="name_ref_operator" />
    3216             <text key="ele" text="Elevation" />
     3267            <reference ref="ele" />
    32173268            <optional text="Routes shown for:">
    32183269                <check key="hiking" text="Hiking" />
    32193270                <check key="bicycle" text="Cycling" />
     
    32963347            <space />
    32973348            <key key="leisure" value="bandstand" />
    32983349            <reference ref="name_operator_oh_wheelchair" />
    3299             <combo key="access" text="Access" values="yes,permissive,private" />
     3350            <reference ref="site_access" />
    33003351        </item> <!-- Bandstand -->
    33013352        <item name="Zoo" icon="presets/leisure/zoo.svg" type="node,closedway,multipolygon" preset_name_label="true">
    33023353            <link wiki="Tag:tourism=zoo" />
     
    33653416            <space />
    33663417            <label text="Used for the water area only." />
    33673418            <space />
    3368             <combo key="access" text="Access" values="yes,customers,private" />
     3419            <reference ref="site_access" />
    33693420        </item> <!-- Swimming Pool -->
    33703421        <item name="Dive centre" icon="presets/leisure/dive_centre.svg" type="node,closedway,multipolygon" preset_name_label="true">
    33713422            <link wiki="Tag:amenity=dive_centre" />
     
    33883439            <space />
    33893440            <key key="leisure" value="sauna" />
    33903441            <reference ref="name_operator_oh_wheelchair" />
    3391             <combo key="access" text="Access" values="yes,permissive,private" />
     3442            <reference ref="site_access" />
    33923443            <space />
    33933444            <reference ref="link_contact_address_payment" />
    33943445        </item> <!-- Sauna -->
     
    38603911            <text key="defibrillator:location" text="Location description" />
    38613912            <text key="phone" text="Phone number" />
    38623913            <label text="Use E.123 format, e.g. +49 11223 456 7890" />
    3863             <combo key="access" text="Access" values="yes,private,customers,permissive,no" />
     3914            <reference ref="site_access" />
    38643915            <check key="indoor" text="Located inside a building?" />
    38653916            <!-- lastcheck is in use for aed devices, but not yet well discussed or documented
    38663917            <optional>
     
    40434094            <space />
    40444095            <key key="amenity" value="toilets" />
    40454096            <optional>
    4046                 <combo key="access" text="Access rights" values="yes,permissive,customers" />
     4097                <reference ref="site_access" />
    40474098                <checkgroup columns="3">
    40484099                    <check key="female" text="Female" text_context="restroom" />
    40494100                    <check key="male" text="Male" text_context="restroom" />
     
    40634114            <link wiki="Tag:amenity=shower" />
    40644115            <space />
    40654116            <key key="amenity" value="shower" />
    4066             <combo key="access" text="Access rights" values="yes,permissive,customers" />
     4117            <reference ref="site_access" />
    40674118            <optional>
    40684119                <checkgroup columns="3">
    40694120                    <check key="female" text="Female" text_context="restroom" />
     
    42284279            <check key="sanitary_dump_station:pump-out" text="Suction pumpout" />
    42294280            <check key="sanitary_dump_station:round_drain" text="Gravity drain for hose" />
    42304281            <check key="sanitary_dump_station:basin" text="Casette or Elsan Disposal" />
    4231             <combo key="access" text="Access" values="yes,customers,no" />
     4282            <reference ref="site_access" />
    42324283            <reference ref="fee" />
    42334284            <text key="operator" text="Operator" />
    4234             <combo key="opening_hours" text="Operation times" values="24/7" values_no_i18n="true" />
     4285            <reference ref="op_times" />
    42354286        </item> <!-- Sanitary Dump Station -->
    42364287        <separator/>
    42374288        <item name="Bench" icon="presets/leisure/bench.svg" type="node,way" preset_name_label="true">
     
    42624313            <link wiki="Tag:amenity=hunting_stand" />
    42634314            <space />
    42644315            <key key="amenity" value="hunting_stand" />
    4265             <text key="height" text="Height (meters)" />
     4316            <reference ref="height" />
    42664317            <check key="shelter" text="Shelter" />
    42674318            <check key="hide" text="Hide" text_context="hunting stand" />
    42684319            <check key="lockable" text="Lockable" />
     
    43014352            <link wiki="Tag:amenity=compressed_air" />
    43024353            <space />
    43034354            <key key="amenity" value="compressed_air" />
    4304             <reference ref="name_ref" />
    4305             <text key="operator" text="Operator" />
     4355            <reference ref="name_ref_operator" />
    43064356            <reference ref="fee" />
    43074357            <multiselect key="valves" text="Valves" values="dunlop;schrader;sclaverand;regina" display_values="Dunlop (Woods);Schrader;Sclaverand (Presta);Regina" values_searchable="true" />
    43084358        </item> <!-- Compressed Air -->
     
    45064556            <combo key="leisure" text="Type" values="sports_centre" />
    45074557            <reference ref="climbing_styles" />
    45084558            <text key="climbing:routes" text="Number of routes" />
    4509             <text key="ele" text="Usual elevation at the bottom of the routes" />
     4559            <text key="ele" text="Usual elevation at the bottom of the routes" lenght="10" />
    45104560            <space />
    45114561            <combo key="climbing:length" text="Usual route length (m)" values="8,10,12,15,20,25,30,35,40" values_no_i18n="true" />
    45124562            <combo key="climbing:length:min" text="Minimal climbing length (m)" values="8,10,12,15,20,25,30,35,40" values_no_i18n="true" />
     
    48794929            <optional>
    48804930                <text key="name" text="Name" />
    48814931                <combo key="building:levels" text="Levels" values="1,2,3,4,5,6,7,8,9,10,11" text_context="building" />
    4882                 <text key="height" text="Height (meters)" />
     4932                <reference ref="height" />
    48834933            </optional>
    48844934            <preset_link preset_name="Address" />
    48854935        </item> <!-- Building -->
     
    48904940            <optional>
    48914941                <text key="name" text="Name" />
    48924942                <combo key="building:levels" text="Levels" values="1,2,3,4,5,6,7,8,9,10,11" text_context="building" />
    4893                 <text key="height" text="Height (meters)" />
     4943                <reference ref="height" />
    48944944            </optional>
    48954945            <preset_link preset_name="Address" />
    48964946        </item> <!-- Residential Building -->
     
    48994949            <space />
    49004950            <combo key="building:part" text="Building part" values="allotment_house,bakehouse,barn,college,commercial,construction,cowshed,farm_auxiliary,garage,garages,greenhouse,hangar,hospital,industrial,office,retail,roof,ruins,school,shed,supermarket,toilets,transportation,university,warehouse,yes" values_context="building" default="yes" match="keyvalue!" values_searchable="true" />
    49014951            <text key="name" text="Name" />
    4902             <combo key="building:levels" text="Levels" values="1,2,3,4,5,6,7,8,9,10,11" text_context="building" />
    4903             <combo key="building:min_level" text="Skipped Levels" values="1,2,3,4,5,6,7,8,9,10" text_context="building" />
    4904             <text key="height" text="Height (meters)" />
     4952            <combo key="building:levels" text="Levels" values="1,2,3,4,5,6,7,8,9,10,11" text_context="building" values_searchable="false" />
     4953            <combo key="building:min_level" text="Skipped Levels" values="1,2,3,4,5,6,7,8,9,10" text_context="building" values_searchable="false" />
     4954            <reference ref="height" />
    49054955            <text key="min_height" text="Skipped height (meters)" />
    49064956        </item> <!-- Building part -->
    49074957        <item name="Entrance" icon="presets/misc/entrance_yes.svg" type="node" preset_name_label="true">
     
    49164966                <list_entry value="staircase" icon="presets/misc/entrance_yes.svg" />
    49174967                <list_entry value="home" icon="presets/misc/entrance_yes.svg" />
    49184968            </combo>
    4919             <combo key="access" text="Access" values="yes,delivery,private,no" />
     4969            <combo key="access" text="Access" values="yes,delivery,permissive,customers,private,no" values_sort="false" />
    49204970            <reference ref="wheelchair" />
    49214971            <optional>
    49224972                <text key="ref" text="Entrance number" />
     
    49645014            <space />
    49655015            <key key="man_made" value="chimney" />
    49665016            <reference ref="name_operator" />
    4967             <text key="height" text="Height (meters)" />
     5017            <reference ref="height" />
    49685018        </item> <!-- Chimney -->
    49695019        <item name="Kiln" icon="presets/misc/kiln.svg" type="node,closedway" preset_name_label="true">
    49705020            <link wiki="Tag:man_made=kiln" />
     
    49865036            <optional>
    49875037                <reference ref="name_operator" />
    49885038                <combo key="building" text="Building" values="gasometer" values_context="building" />
    4989                 <text key="height" text="Height (meters)" length="7" />
     5039                <reference ref="height" />
    49905040            </optional>
    49915041        </item> <!-- Gasometer -->
    49925042        <item name="Silo" icon="presets/landmark/silo.svg" type="node,closedway" preset_name_label="true">
     
    49965046            <optional>
    49975047                <reference ref="name_operator" />
    49985048                <combo key="building" text="Building" values="silo" values_context="building" />
    4999                 <text key="height" text="Height (meters)" length="7" />
     5049                <reference ref="height" />
    50005050            </optional>
    50015051        </item> <!-- Silo -->
    50025052        <item name="Storage Tank" icon="presets/landmark/storage_tank.svg" type="node,closedway">
     
    50065056                <reference ref="name_operator" />
    50075057                <combo key="building" text="Building" values="storage_tank" values_context="building" />
    50085058                <combo key="content"  text="Content" values="fuel,manure,oil,sewage,silage,slurry,water,wine" values_context="content" />
    5009                 <text key="height" text="Height (meters)" length="7" />
     5059                <reference ref="height" />
    50105060            </optional>
    50115061        </item> <!-- Storage Tank -->
    50125062        <item name="Bunker Silo" icon="presets/landmark/bunker_silo.svg" type="node,closedway" preset_name_label="true">
     
    51025152            <key key="man_made" value="water_tower" />
    51035153             <optional>
    51045154                <reference ref="name_operator" />
    5105                 <text key="height" text="Height (meters)" length="7" />
     5155                <reference ref="height" />
    51065156            </optional>
    51075157        </item> <!-- Water Tower -->
    51085158        <item name="Water Works" icon="presets/landmark/water_works.svg" type="node,closedway,multipolygon" preset_name_label="true">
     
    51605210            <key key="highway" value="street_lamp" />
    51615211            <combo key="lamp_type" text="Type" values="electric,floodlight,sodium,solar_lamp" values_context="lamp_type" match="key" />
    51625212            <combo key="lamp_mount" text="Mounted on" values="bent_mast,straight_mast,suspended,wall" values_context="lamp_mount" match="key" />
    5163             <combo key="opening_hours" text="Operation times" values="Mo-Fr 22:00-05:00" values_no_i18n="true" />
     5213            <reference ref="op_times" />
    51645214        </item> <!-- Street Lamp -->
    51655215        <item name="Street cabinet" icon="presets/misc/street_cabinet.svg" type="node" preset_name_label="true">
    51665216            <link wiki="Tag:man_made=street_cabinet" />
     
    52085258            <link wiki="Tag:man_made=survey_point" />
    52095259            <space />
    52105260            <key key="man_made" value="survey_point" />
    5211             <text key="name" text="Name" />
    5212             <text key="ref" text="Reference" />
    5213             <text key="ele" text="Elevation" />
     5261            <reference ref="name_ref" />
     5262            <reference ref="ele" />
    52145263            <combo key="material" text="Material" values="andesite,brass,bronze,concrete,granite,metal,steel,stone" />
    52155264        </item> <!-- Survey Point -->
    52165265        <item name="Surveillance Camera" icon="presets/service/surveillance.svg" type="node" preset_name_label="true">
     
    52335282            <optional>
    52345283                <text key="camera:direction" text="Direction in degrees" match="key" />
    52355284                <text key="camera:angle" text="Inclination in degrees" match="key" />
    5236                 <text key="height" text="Height (meters)" />
     5285                <reference ref="height" />
    52375286            </optional>
    52385287        </item> <!-- Surveillance Camera -->
    52395288    </group> <!-- Man Made -->
     
    55755624            <link wiki="Tag:building=transformer_tower" />
    55765625            <space />
    55775626            <key key="building" value="transformer_tower" />
    5578             <text key="height" text="Height (meters)" />
     5627            <reference ref="height" />
    55795628            <reference ref="ref_operator" />
    55805629            <preset_link preset_name="Power Substation" />
    55815630        </item> <!-- Transformer Tower -->
     
    55935642            <link wiki="Tag:power=portal" />
    55945643            <space />
    55955644            <key key="power" value="portal" />
    5596             <text key="height" text="Height (meters)" />
     5645            <reference ref="height" />
    55975646            <combo key="structure" text="Type of construction" values="lattice,tubular,solid" />
    55985647            <combo key="material" text="Material" values="concrete,metal,plastic,steel,stone,wood" />
    55995648            <combo key="colour" text="Color (HTML name or hexadecimal code)" values="black,red,white,gray,red/white" values_context="color" />
     
    56055654            <link wiki="Tag:power=tower" />
    56065655            <space />
    56075656            <key key="power" value="tower" />
    5608             <text key="height" text="Height (meters)" />
     5657            <reference ref="height" />
    56095658            <combo key="structure" text="Type of construction" values="lattice,tubular,solid" />
    56105659            <combo key="material" text="Material" values="concrete,metal,plastic,steel,stone,wood" />
    56115660            <combo key="colour" text="Color (HTML name or hexadecimal code)" values="black,red,white,gray,red/white" values_context="color" />
     
    71377186            <space />
    71387187            <key key="natural" value="peak" />
    71397188            <reference ref="name_wikipedia" />
    7140             <text key="ele" text="Elevation" />
     7189            <reference ref="ele" />
    71417190        </item> <!-- Peak -->
    71427191        <item name="Saddle" icon="presets/landmark/saddle.svg" type="node" preset_name_label="true">
    71437192            <link wiki="Tag:natural=saddle" />
     
    71457194            <space/>
    71467195            <key key="natural" value="saddle" />
    71477196            <reference ref="name_wikipedia" />
    7148             <text key="ele" text="Elevation" />
     7197            <reference ref="ele" />
    71497198        </item> <!-- Saddle -->
    71507199        <item name="Glacier" icon="presets/landmark/glacier.svg" type="closedway,multipolygon" preset_name_label="true">
    71517200            <link wiki="Tag:natural=glacier" />
     
    71537202            <space />
    71547203            <key key="natural" value="glacier" />
    71557204            <reference ref="name_wikipedia" />
    7156             <text key="ele" text="Elevation" />
     7205            <reference ref="ele" />
    71577206        </item> <!-- Glacier -->
    71587207        <item name="Volcano" icon="presets/landmark/volcano.svg" type="node" preset_name_label="true">
    71597208            <link wiki="Tag:natural=volcano" />
     
    71617210            <space />
    71627211            <key key="natural" value="volcano" />
    71637212            <reference ref="name_wikipedia" />
    7164             <text key="ele" text="Elevation" />
     7213            <reference ref="ele" />
    71657214            <optional>
    71667215                <combo key="volcano:status" text="Current Status" values="active,dormant,extinct" />
    71677216                <combo key="volcano:type" text="Type" values="stratovolcano,shield,scoria" />
     
    71737222            <space />
    71747223            <key key="natural" value="ridge" />
    71757224            <reference ref="name_wikipedia" />
    7176             <text key="ele" text="Elevation" />
     7225            <reference ref="ele" />
    71777226        </item> <!-- Ridge -->
    71787227        <item name="Valley" icon="presets/landmark/valley.svg" type="way" preset_name_label="true">
    71797228            <link wiki="Tag:natural=valley" />
     
    71887237            <space />
    71897238            <key key="natural" value="cliff" />
    71907239            <text key="name" text="Name" />
    7191             <text key="height" text="Height (meters)" />
     7240            <reference ref="height" />
    71927241        </item> <!-- Cliff -->
    71937242        <item name="Cave Entrance" icon="presets/landmark/cave_entrance.svg" type="node,closedway" preset_name_label="true">
    71947243            <link wiki="Tag:natural=cave_entrance" />
     
    71977246            <key key="natural" value="cave_entrance" />
    71987247            <reference ref="name_wikipedia" />
    71997248            <reference ref="oh_wheelchair" />
    7200             <reference ref="general_access" />
     7249            <reference ref="site_access" />
    72017250            <reference ref="fee" />
    72027251        </item> <!-- Cave Entrance -->
    72037252        <separator/>
     
    72387287            <optional>
    72397288                <reference ref="genus_species_taxon" />
    72407289                <space />
    7241                 <text key="height" text="Height (meters)" />
     7290                <reference ref="height" />
    72427291                <text key="diameter_crown" text="Diameter crown (meters)" />
    72437292                <text key="circumference" text="Circumference (meters)" />
    72447293                <space />
     
    72547303            <reference ref="leaf" />
    72557304            <optional>
    72567305                <reference ref="genus_species_taxon" />
    7257                 <text key="height" text="Height (meters)" />
     7306                <reference ref="height" />
    72587307            </optional>
    72597308        </item> <!-- Tree Row -->
    72607309        <item name="Wood" icon="presets/landmark/forest.svg" type="closedway,multipolygon" name_context="natural" preset_name_label="true">
     
    73627411            <key key="natural" value="stone" />
    73637412            <reference ref="name_wikipedia" />
    73647413            <optional>
    7365                 <text key="height" text="Height (meters)" length="7" />
     7414                <reference ref="height" />
    73667415                <text key="width" text="Width (meters)" />
    73677416            </optional>
    73687417        </item> <!-- Stone -->
     
    76427691            <space />
    76437692            <text key="wikipedia" text="Wikipedia" />
    76447693            <text key="image" text="Image" />
     7694            <space />
     7695            <preset_link preset_name="Contact (Schema with 'contact:*' Prefix)" text="Similar tags but different tagging scheme" text_context="Contact" />
    76457696        </item> <!-- Contact (Common Schema) -->
    76467697        <item name="Contact (Schema with 'contact:*' Prefix)" icon="presets/misc/contact.svg" type="node,way,closedway,multipolygon,relation" preset_name_label="true">
    76477698            <link wiki="Key:contact" />
     
    76557706            <space />
    76567707            <text key="wikipedia" text="Wikipedia" />
    76577708            <text key="image" text="Image" />
     7709            <space />
     7710            <preset_link preset_name="Contact (Common Schema)" text="Similar tags but different tagging scheme" text_context="Contact" />
    76587711        </item> <!-- Contact (Schema with 'contact:*' Prefix) -->
    76597712        <item name="Description" icon="presets/misc/description.svg" type="node,way,closedway,multipolygon,relation" preset_name_label="true">
    76607713            <link wiki="Key:description" />
     
    80758128            <key key="type" value="bridge" />
    80768129            <combo key="layer" text="Layer" values="5,4,3,2,1,0,-1,-2,-3,-4,-5" length="3" />
    80778130            <reference ref="name_ref" />
    8078             <text key="height" text="Height (meters)" />
     8131            <reference ref="height" />
    80798132            <text key="length" text="Length (meters)" />
    80808133            <text key="operator" text="Operator" />
    80818134            <roles>