Index: trunk/resources/data/defaultpresets.xml
===================================================================
--- trunk/resources/data/defaultpresets.xml	(revision 19165)
+++ trunk/resources/data/defaultpresets.xml	(revision 19169)
@@ -7,5 +7,5 @@
     <!-- Item chunks -->
     <chunk id="surface">
-        <combo key="surface" text="Surface" values="paved,unpaved,asphalt,concrete,concrete:plates,concrete:lanes,paving_stones,sett,cobblestone,unhewn_cobblestone,grass_paver,compacted,fine_gravel,gravel,pebblestone,ground,mud,rock,sand,grass,wood,metal" />
+        <combo key="surface" text="Surface" values="paved,unpaved,asphalt,concrete,concrete:plates,concrete:lanes,paving_stones,sett,cobblestone,unhewn_cobblestone,grass_paver,compacted,fine_gravel,gravel,pebblestone,ground,mud,rock,sand,grass,wood,metal,stone,woodchips" />
     </chunk>
     <chunk id="surface_smoothness">
@@ -23,8 +23,8 @@
     </chunk>
     <chunk id="sport_surface">
-        <combo key="surface" text="Surface" values="artificial_turf,asphalt,clay,concrete,acrylic,grass,sand,tartan,ground" />
+        <combo key="surface" text="Surface" values="artificial_turf,asphalt,clay,concrete,acrylic,grass,sand,tartan,ground,woodchips" />
     </chunk>
     <chunk id="riding_surface">
-        <combo key="surface" text="Surface" values="grass,sand,clay,dirt,fine_gravel,ground,mud,unpaved,compacted" />
+        <combo key="surface" text="Surface" values="grass,sand,clay,dirt,fine_gravel,ground,mud,unpaved,compacted,woodchips" />
     </chunk>
     <chunk id="highway_base">
@@ -195,4 +195,10 @@
         <reference ref="oh_wheelchair" />
     </chunk>
+    <chunk id="toilets">
+        <check key="toilets" />
+        <check key="toilets:unisex" />
+        <combo key="toilets:wheelchair" values="yes,no,limited" values_context="toilets" />
+        <combo key="toilets:access" values="customers,yes,no" />
+    </chunk>
     <chunk id="color">
         <combo key="colour" text="Color (HTML name or hexadecimal code)" values="black,blue,brown,gray,green,orange,purple,red,silver,white,yellow,#CD853F" values_context="color" />
@@ -322,5 +328,5 @@
     </chunk>
     <chunk id="leaf">
-        <combo key="leaf_type" text="Leaf type" values="broadleaved,needleleaved,mixed,leafless" values_searchable="true" />
+        <combo key="leaf_type" text="Leaf type" values="broadleaved,needleleaved,mixed,leafless,palm" values_searchable="true" />
         <combo key="leaf_cycle" text="Leaf cycle" values_searchable="true" >
             <list_entry value="deciduous" short_description="Plants that are leafless for a certain period during the year." />
@@ -332,5 +338,5 @@
     </chunk>
     <chunk id="leaf_without_mixed">
-        <combo key="leaf_type" text="Leaf type" values="broadleaved,needleleaved,leafless" values_searchable="true" />
+        <combo key="leaf_type" text="Leaf type" values="broadleaved,needleleaved,leafless,palm" values_searchable="true" />
         <combo key="leaf_cycle" text="Leaf cycle" values_searchable="true" >
             <list_entry value="deciduous" short_description="Plants that are leafless for a certain period during the year." />
@@ -799,9 +805,10 @@
                 <reference ref="highway_base" />
                 <reference ref="highway_yesno_incline_oneway_lit_width_busbay_sidewalk" />
-                <checkgroup columns="4">
+                <checkgroup columns="3">
                     <check key="motorroad" text="Motorroad" />
                     <check key="dual_carriageway" text="Divided highway" disable_off="true" />
                     <check key="narrow" text="Narrow" disable_off="true" />
                     <check key="trolley_wire" text="Overhead trolley wires" />
+                    <check key="frontage_road" text="Frontage road" disable_off="true" />
                 </checkgroup>
                 <reference ref="placement_shoulder" />
@@ -835,8 +842,9 @@
                 <reference ref="highway_base" />
                 <reference ref="highway_yesno_incline_oneway_lit_width_busbay_sidewalk" />
-                <checkgroup columns="3">
+                <checkgroup columns="2">
                     <check key="dual_carriageway" text="Divided highway" disable_off="true" />
                     <check key="narrow" text="Narrow" disable_off="true" />
                     <check key="trolley_wire" text="Overhead trolley wires" />
+                    <check key="frontage_road" text="Frontage road" disable_off="true" />
                 </checkgroup>
                 <reference ref="placement_shoulder" />
@@ -868,8 +876,9 @@
                 <reference ref="highway_base" />
                 <reference ref="highway_yesno_incline_oneway_lit_width_busbay_sidewalk" />
-                <checkgroup columns="3">
+                <checkgroup columns="2">
                     <check key="dual_carriageway" text="Divided highway" disable_off="true" />
                     <check key="narrow" text="Narrow" disable_off="true" />
                     <check key="trolley_wire" text="Overhead trolley wires" />
+                    <check key="frontage_road" text="Frontage road" disable_off="true" />
                 </checkgroup>
                 <reference ref="placement_shoulder" />
@@ -1015,5 +1024,5 @@
             <space />
             <key key="highway" value="service" />
-            <combo key="service" text="Service way type" values="alley,driveway,parking_aisle,drive-through,emergency_access" />
+            <combo key="service" text="Service way type" values="alley,driveway,parking_aisle,drive-through,emergency_access,slipway" />
             <optional>
                 <text key="name" text="Name" />
@@ -1143,5 +1152,5 @@
             <label text="Vehicles per type" />
             <combo key="vehicle" text="All vehicles" values="yes,destination,delivery,permissive,permit,private,agricultural,forestry,no" values_sort="false" match="key" />
-            <combo key="bicycle" text="Bicycle" values="yes,official,designated,permissive,destination,delivery,permit,private,use_sidepath,no" values_sort="false" match="key" />
+            <combo key="bicycle" text="Bicycle" values="yes,official,designated,permissive,destination,delivery,permit,private,use_sidepath,customers,no" values_sort="false" match="key" />
             <check key="cyclestreet" text="Bicycle street" disable_off="true" />
             <combo key="carriage" text="Carriage" values="yes,official,designated,destination,delivery,permissive,permit,private,agricultural,forestry,no" values_sort="false" match="key" />
@@ -1304,4 +1313,9 @@
             <check key="oneway:bicycle" text="Oneway (bicycle)" />
             <space />
+            <optional text="Cycleway Lane Attributes">
+                <combo key="cycleway:both:lane" text="Lane type (both)" values_context="cycleway" values="advisory,exclusive"/>
+                <combo key="cycleway:left:lane" text="Lane type (left)" values_context="cycleway" values="advisory,exclusive"/>
+                <combo key="cycleway:right:lane" text="Lane type (right)" values_context="cycleway" values="advisory,exclusive"/>
+            </optional>
             <optional text="Edit Highway Attributes:">
                 <combo key="highway" text="Highway" values="motorway,motorway_link,trunk,trunk_link,primary,primary_link,secondary,secondary_link,tertiary,tertiary_link,unclassified,residential,living_street,service,bus_guideway,construction" values_context="Highway" values_sort="false" />
@@ -1440,5 +1454,5 @@
             <optional>
                 <reference ref="name_operator" />
-                <check key="toilets" text="Toilets" />
+                <reference ref="toilets" />
             </optional>
         </item> <!-- Services -->
@@ -1448,5 +1462,5 @@
             <optional>
                 <text key="name" text="Name" />
-                <check key="toilets" text="Toilets" />
+                <reference ref="toilets" />
                 <check key="drinking_water" text="Drinking Water" />
             </optional>
@@ -1515,4 +1529,5 @@
                 <list_entry value="traffic_signals" icon="presets/vehicle/crossing_traffic_signals.svg" />
                 <list_entry value="unmarked" icon="presets/vehicle/crossing_unmarked.svg" />
+                <list_entry value="informal" icon="presets/vehicle/crossing_unmarked.svg" />
             </combo>
             <reference ref="crossing_markings" />
@@ -1585,5 +1600,29 @@
             <link wiki="Tag:highway=passing_place" />
             <key key="highway" value="passing_place" />
+            <preset_link preset_name="Emergency Bay" text="Similar but different tags:"/>
         </item> <!-- Passing Place -->
+        <item name="Emergency Bay" icon="presets/vehicle/emergency_bay.svg" type="node,way" preset_name_label="true">
+            <link wiki="Tag:highway=emergency_bay" />
+            <key key="highway" value="emergency_bay" />
+            <optional text="Node attributes">
+                <combo key="direction" text="Direction" values="forward,backward" values_sort="false" />
+            </optional>
+            <optional text="Way attributes">
+                <reference ref="highway_base" />
+                <reference ref="highway_yesno" />
+                <checkgroup columns="2">
+                    <check key="oneway" text="Oneway" />
+                    <check key="oneway:bicycle" text="Oneway for bicycle" />
+                </checkgroup>
+                <reference ref="lit_common_no_times"/>
+                <text key="width" text="Width (meters)" />
+                <combo key="sidewalk" text="Sidewalk" values="both,left,right,no,separate" values_context="sidewalk" />
+                <checkgroup columns="2">
+                    <check key="dual_carriageway" text="Divided highway" disable_off="true" />
+                    <check key="narrow" text="Narrow" disable_off="true" />
+                </checkgroup>
+            </optional>
+            <preset_link preset_name="Passing Place" text="Similar but different tags:"/>
+        </item>
         <item name="Turning Circle" icon="presets/vehicle/turning_circle.svg" type="node" preset_name_label="true">
             <link wiki="Tag:highway=turning_circle" />
@@ -1658,5 +1697,5 @@
                 <text key="website" text="Website" />
                 <check key="drinking_water" text="Drinking Water" />
-                <check key="toilets" text="Toilets" />
+                <reference ref="toilets" />
                 <check key="bin" text="Waste Basket/Trash Can" />
             </optional>
@@ -1856,5 +1895,5 @@
             <key key="barrier" value="wall" />
             <reference ref="optional_height" />
-            <combo key="wall" text="Type" values="brick,castle_wall,dry_stone,flood_wall,noise_barrier,seawall,stone" values_searchable="true" />
+            <combo key="wall" text="Type" values="brick,castle_wall,concrete,dry_stone,flood_wall,noise_barrier,seawall,stone" values_searchable="true" />
             <combo key="material" text="Material" values="adobe,brick,concrete,glass,masonry,metal,plastic,reinforced_concrete,steel,stone,wood" />
         </item> <!-- Wall -->
@@ -1912,5 +1951,5 @@
             <preset_link preset_name="Access Restrictions" />
         </item> <!-- Entrance (Barrier Opening) -->
-        <item name="Gate" icon="presets/barrier/gate.svg" type="node" preset_name_label="true">
+        <item name="Gate" icon="presets/barrier/gate.svg" type="node,way" preset_name_label="true">
             <link wiki="Tag:barrier=gate" />
             <key key="barrier" value="gate" />
@@ -1924,5 +1963,5 @@
             <preset_link preset_name="Access Restrictions" />
         </item> <!-- Gate -->
-        <item name="Lift Gate" icon="presets/barrier/lift_gate.svg" type="node" preset_name_label="true">
+        <item name="Lift Gate" icon="presets/barrier/lift_gate.svg" type="node,way" preset_name_label="true">
             <link wiki="Tag:barrier=lift_gate" />
             <key key="barrier" value="lift_gate" />
@@ -1938,5 +1977,5 @@
             <preset_link preset_name="Access Restrictions" />
         </item> <!-- Lift Gate -->
-        <item name="Swing Gate" icon="presets/barrier/swing_gate.svg" type="node" preset_name_label="true">
+        <item name="Swing Gate" icon="presets/barrier/swing_gate.svg" type="node,way" preset_name_label="true">
             <link wiki="Tag:barrier=swing_gate" />
             <key key="barrier" value="swing_gate" />
@@ -1952,5 +1991,5 @@
             <preset_link preset_name="Access Restrictions" />
         </item> <!-- Swing Gate -->
-        <item name="Hampshire Gate" type="node" preset_name_label="true">
+        <item name="Hampshire Gate" type="node,way" preset_name_label="true">
             <link wiki="Tag:barrier=hampshire_gate" />
             <key key="barrier" value="hampshire_gate" />
@@ -1965,5 +2004,5 @@
             <preset_link preset_name="Access Restrictions" />
         </item> <!-- Hampshire Gate -->
-        <item name="Bump Gate" type="node" preset_name_label="true">
+        <item name="Bump Gate" type="node,way" preset_name_label="true">
             <link wiki="Tag:barrier=bump_gate" />
             <key key="barrier" value="bump_gate" />
@@ -1978,5 +2017,5 @@
             <preset_link preset_name="Access Restrictions" />
         </item> <!-- Bump Gate -->
-        <item name="Kissing Gate" icon="presets/barrier/kissing_gate.svg" type="node" preset_name_label="true">
+        <item name="Kissing Gate" icon="presets/barrier/kissing_gate.svg" type="node,way" preset_name_label="true">
             <link wiki="Tag:barrier=kissing_gate" />
             <key key="barrier" value="kissing_gate" />
@@ -1991,4 +2030,18 @@
             <preset_link preset_name="Access Restrictions" />
         </item> <!-- Kissing Gate -->
+        <item name="Wicket Gate" icon="presets/barrier/wicket_gate.svg" type="node,way" preset_name_label="true">
+            <label text="A pedestrian door or gate near a larger gate"/>
+            <link wiki="Tag:barrier=wicket_gate" />
+            <key key="barrier" value="wicket_gate" />
+            <reference ref="optional_maxwidth" />
+            <combo key="material" text="Material" values="concrete,metal,plastic,stone,wood" />
+            <space />
+            <label text="The tag `foot=yes` is implied and does not need to be set." />
+            <space />
+            <reference ref="highway_access_vehicle" />
+            <reference ref="check_access_nomotor" />
+            <check key="locked" text="Usually locked"/>
+            <preset_link preset_name="Access Restrictions" />
+        </item> <!-- Wicket Gate -->
         <item name="Height Restrictor" icon="presets/barrier/height_restrictor.svg" type="node" preset_name_label="true">
             <link wiki="Tag:barrier=height_restrictor" />
@@ -2844,5 +2897,5 @@
             <space />
             <key key="amenity" value="parking_space" />
-            <combo key="parking_space" text="Type of parking space" values="disabled,normal" />
+            <combo key="parking_space" text="Type of parking space" values="disabled,normal,charging" />
             <reference ref="parking_name_ref" />
             <text key="capacity" text="Capacity" />
@@ -2852,4 +2905,10 @@
             <check key="covered" text="Covered (with roof)" />
         </item> <!-- Parking Space -->
+        <item name="Trolley Bay/Cart Corral" icon="presets/vehicle/parking/trolley_bay.svg" type="node,closedway" preset_name_label="true">
+            <link wiki="Tag:amenity=trolley_bay" />
+            <label text="This is for shopping carts, not public transport vehicles." text_context="Tag:amenity=trolley_bay" />
+            <space />
+            <key key="amenity" value="trolley_bay" />
+        </item>
         <item name="Parking Entrance/Exit" icon="presets/vehicle/parking/parking.svg" type="node" preset_name_label="true">
             <link wiki="Tag:amenity=parking_entrance" />
@@ -2986,5 +3045,29 @@
             <reference ref="car_brands" />
             <reference ref="name_operator_oh_wheelchair" />
-            <multiselect key="service" text="Service" text_context="shop=car_repair" values="dealer;repair;parts;tyres" rows="4" />
+            <multiselect key="service" text="Service" text_context="shop=car_repair" values="dealer;repair;parts;tyres;inspection" rows="4" />
+            <optional text="Alternate service tagging">
+                <checkgroup columns="4">
+                    <check key="service:vehicle:car_repair" text="Car repair" text_context="shop=car_repair"/> <!-- If it doesn't repair cars, we want to know -->
+                    <check key="service:vehicle:truck_repair" text="Truck repair" text_context="shop=car_repair"/> <!-- If it doesn't repair trucks, we want to know -->
+                    <check key="service:vehicle:new_car_sales" text="Sells new cars" text_context="shop=car_repair" disable_off="true"/>
+                    <check key="service:vehicle:used_car_sales" text="Sells used cars" text_context="shop=car_repair" disable_off="true"/>
+                    <check key="service:vehicle:air_conditioning" text="Repairs AC" text_context="shop=car_repair" disable_off="true"/>
+                    <check key="service:vehicle:alignment" text="Aligns tyres" text_context="shop=car_repair" disable_off="true"/>
+                    <check key="service:vehicle:batteries" text="Repairs/replaces batteries" text_context="shop=car_repair" disable_off="true"/>
+                    <check key="service:vehicle:body_repair" text="Repairs body" text_context="shop=car_repair" disable_off="true"/>
+                    <check key="service:vehicle:brakes" text="Services brakes" text_context="shop=car_repair" disable_off="true"/>
+                    <check key="service:vehicle:car_parts" text="Sells car parts" text_context="shop=car_repair" disable_off="true"/>
+                    <check key="service:vehicle:diagnostics" text="Performs diagnostics" text_context="shop=car_repair" disable_off="true"/>
+                    <check key="service:vehicle:electrical" text="Repairs electrical" text_context="shop=car_repair" disable_off="true"/>
+                    <check key="service:vehicle:glass" text="Repairs glass" text_context="shop=car_repair" disable_off="true"/>
+                    <check key="service:vehicle:inspection" text="State mandated inspections" text_context="shop=car_repair" disable_off="true"/>
+                    <check key="service:vehicle:motor" text="Repairs motor" text_context="shop=car_repair" disable_off="true"/>
+                    <check key="service:vehicle:muffler" text="Repairs muffler" text_context="shop=car_repair" disable_off="true"/>
+                    <check key="service:vehicle:oil_change" text="Performs oil changes" text_context="shop=car_repair" disable_off="true"/>
+                    <check key="service:vehicle:painting" text="Paints exterior" text_context="shop=car_repair" disable_off="true"/>
+                    <check key="service:vehicle:transmission" text="Repairs transmission" text_context="shop=car_repair" disable_off="true"/>
+                    <check key="service:vehicle:tyres" text="Replaces tires" text_context="shop=car_repair" disable_off="true"/>
+                </checkgroup>
+            </optional>
             <reference ref="link_contact_address_payment" />
         </item> <!-- Repair -->
@@ -3012,4 +3095,12 @@
             <reference ref="link_contact_address_payment" />
         </item> <!-- Rental -->
+        <item name="Vehicle Inspection" icon="presets/vehicle/vehicle_inspection.svg" type="node,closedway,multipolygon" preset_name_label="true">
+            <link wiki="Tag:amenity=vehicle_inspection" />
+            <space />
+            <key key="amenity" value="vehicle_inspection" />
+            <reference ref="name_brand_operator_oh_wheelchair" />
+            <reference ref="link_contact_address_payment" />
+            <preset_link preset_name="Repair" text="Similar but different tags:"/>
+        </item> <!-- Vehicle Inspection -->
         <item name="Pooling" icon="presets/vehicle/car_pooling.svg" type="node,closedway,multipolygon" preset_name_label="true">
             <link wiki="Tag:amenity=car_pooling" />
@@ -3673,5 +3764,5 @@
             <text key="capacity" text="Capacity" />
             <reference ref="fee" />
-            <check key="toilets" text="Toilets" />
+            <reference ref="toilets" />
             <check key="shower" text="Shower" />
             <combo key="drinking_water" text="Drinking Water" values="yes,no,seasonal" />
@@ -3760,4 +3851,5 @@
             <reference ref="internet_smoking" />
             <preset_link preset_name="Diet" />
+            <reference ref="toilets" />
             <reference ref="link_contact_address_payment" />
         </item> <!-- Restaurant -->
@@ -3775,4 +3867,5 @@
             <reference ref="internet_smoking" />
             <preset_link preset_name="Diet" />
+            <reference ref="toilets" />
             <reference ref="link_contact_address_payment" />
             <preset_link preset_name="Building" />
@@ -3802,4 +3895,5 @@
             <reference ref="internet_smoking" />
             <preset_link preset_name="Diet" />
+            <reference ref="toilets" />
             <reference ref="link_contact_address_payment" />
         </item> <!-- Cafe -->
@@ -3816,4 +3910,5 @@
             <reference ref="internet_smoking" />
             <preset_link preset_name="Diet" />
+            <reference ref="toilets" />
             <reference ref="link_contact_address_payment" />
         </item> <!-- Ice cream -->
@@ -3831,4 +3926,5 @@
             <reference ref="internet_smoking" />
             <preset_link preset_name="Diet" />
+            <reference ref="toilets" />
             <reference ref="link_contact_address_payment" />
         </item> <!-- Pub -->
@@ -3843,4 +3939,5 @@
             <reference ref="internet_smoking" />
             <preset_link preset_name="Diet" />
+            <reference ref="toilets" />
             <reference ref="link_contact_address_payment" />
         </item> <!-- Beer Garden -->
@@ -3861,4 +3958,5 @@
             <reference ref="internet_smoking" />
             <preset_link preset_name="Diet" />
+            <reference ref="toilets" />
             <reference ref="link_contact_address_payment" />
         </item> <!-- Bar -->
@@ -4654,4 +4752,12 @@
             <reference ref="link_contact_address" />
         </item> <!-- Language school -->
+        <item name="Music school" icon="presets/education/music_school.svg" type="node,closedway,multipolygon" preset_name_label="true">
+            <link wiki="Tag:amenity=music_school" />
+            <space />
+            <key key="amenity" value="music_school" />
+            <reference ref="name_operator_oh_wheelchair" />
+            <reference ref="school_common"/>
+            <reference ref="link_contact_address" />
+        </item> <!-- Music school -->
     </group> <!-- Education -->
     <group name="Animal" icon="presets/health/animal_shelter.svg">   
@@ -4970,4 +5076,11 @@
             <reference ref="link_contact_address" />
         </item> <!-- Food Bank -->
+        <item name="Social Centre" icon="presets/social_facility/social_centre.svg" type="node,closedway,multipolygon" preset_name_label="true">
+            <link wiki="Tag:amenity=social_centre" />
+            <space />
+            <key key="amenity" value="social_centre" />
+            <reference ref="name_operator_oh_wheelchair" />
+            <reference ref="link_contact_address" />
+        </item>
     </group> <!-- Social Facility -->
     <group name="Facilities" icon="presets/service/telephone.svg">
@@ -5464,48 +5577,60 @@
             <reference ref="sport_surface" />
         </item> <!-- Running -->
-        <item name="Climbing site" icon="presets/sport/climbing.svg" type="node,way,closedway,multipolygon" preset_name_label="true">
-            <link wiki="Tag:sport=climbing" />
-            <space />
-            <key key="sport" value="climbing" />
-            <text key="name" text="Name" />
-            <combo key="leisure" text="Type" values="sports_centre" />
-            <reference ref="climbing_styles" />
-            <text key="climbing:routes" text="Number of routes" />
-            <text key="ele" text="Usual elevation at the bottom of the routes" length="10" />
-            <space />
-            <combo key="climbing:length" text="Usual route length (m)" values="8,10,12,15,20,25,30,35,40" values_no_i18n="true" />
-            <combo key="climbing:length:min" text="Minimal climbing length (m)" values="8,10,12,15,20,25,30,35,40" values_no_i18n="true" />
-            <combo key="climbing:length:max" text="Maximum climbing length (m)" values="8,10,12,15,20,25,30,35,40" values_no_i18n="true" />
-            <space />
-            <combo key="climbing:grade:uiaa:min" text="UIAA: Simplest route" values="3,4,4+,5-,5,5+,6-,6,6+,7-,7,7+,8-,8,8+,9-,9,9+,10-,10,10+,11-,11,11+,12-" values_no_i18n="true" />
-            <combo key="climbing:grade:uiaa:max" text="UIAA: Most difficult route" values="3,4,4+,5-,5,5+,6-,6,6+,7-,7,7+,8-,8,8+,9-,9,9+,10-,10,10+,11-,11,11+,12-" values_no_i18n="true" />
-            <combo key="climbing:grade:uiaa:mean" text="UIAA: Main difficulty" values="3,4,4+,5-,5,5+,6-,6,6+,7-,7,7+,8-,8,8+,9-,9,9+,10-,10,10+,11-,11,11+,12-" values_no_i18n="true" />
-            <space />
-            <combo key="climbing:grade:french:min" text="French: Simplest route" values="3,3a,3b,3c,4,4a,4b,4c,5a,5b,5c,6a,6a+,6b,6b+,6c,6c+,7a,7a+,7b,7b+,7c,7c+,8a,8a+,8b,8b+,8c,8c+,9a,9a+,9b,9b+" values_no_i18n="true" />
-            <combo key="climbing:grade:french:max" text="French: Most difficult route" values="3,3a,3b,3c,4,4a,4b,4c,5a,5b,5c,6a,6a+,6b,6b+,6c,6c+,7a,7a+,7b,7b+,7c,7c+,8a,8a+,8b,8b+,8c,8c+,9a,9a+,9b,9b+" values_no_i18n="true" />
-            <combo key="climbing:grade:french:mean" text="French: Main difficulty" values="3,3a,3b,3c,4,4a,4b,4c,5a,5b,5c,6a,6a+,6b,6b+,6c,6c+,7a,7a+,7b,7b+,7c,7c+,8a,8a+,8b,8b+,8c,8c+,9a,9a+,9b,9b+" values_no_i18n="true" />
-            <space />
-            <combo key="climbing:grade:saxon:min" text="Saxon: Simplest route" values="III,IV,V,VI,VIIa,VIIb,VIIc,VIIIa,VIIIb,VIIIc,IXa,IXb,IXc,Xa,Xb,Xc,XIa,XIb,XIc" values_no_i18n="true" />
-            <combo key="climbing:grade:saxon:max" text="Saxon: Most difficult route" values="III,IV,V,VI,VIIa,VIIb,VIIc,VIIIa,VIIIb,VIIIc,IXa,IXb,IXc,Xa,Xb,Xc,XIa,XIb,XIc" values_no_i18n="true" />
-            <combo key="climbing:grade:saxon:mean" text="Saxon: Main difficulty" values="III,IV,V,VI,VIIa,VIIb,VIIc,VIIIa,VIIIb,VIIIc,IXa,IXb,IXc,Xa,Xb,Xc,XIa,XIb,XIc" values_no_i18n="true" />
-            <reference ref="climbing_optional_attributes" />
-            <space />
-        </item> <!-- Climbing site -->
-        <item name="Climbing route" icon="presets/sport/climbing.svg" type="node,way" preset_name_label="true">
-            <link wiki="Tag:sport=climbing" />
-            <space />
-            <key key="sport" value="climbing" />
-            <key key="climbing" value="route" />
-            <text key="name" text="Name" />
-            <reference ref="climbing_styles" />
-            <combo key="climbing:bolted" text="Bolts" values="yes,no,1,2,3,4,5,6" values_sort="false" values_no_i18n="true" />
-            <combo key="climbing:pitches" text="Pitches" values="1,2,3,4,5,6,7,8" default="1" values_no_i18n="true" />
-            <combo key="climbing:length" text="Route length (m)" values="8,10,12,15,20,25,30,35,40" values_no_i18n="true" />
-            <space />
-            <combo key="climbing:grade:uiaa" text="UIAA grading" values="4,4+,5-,5,5+,6-,6,6+,7-,7,7+,8-,8,8+,9-,9,9+,10-,10,10+,11-,11,11+,12-" values_no_i18n="true" />
-            <combo key="climbing:grade:french" text="French grading" values="4,5a,5b,5c,6a,6a+,6b,6b+,6c,6c+,7a,7a+,7b,7b+,7c,7c+,8a,8a+,8b,8b+,8c,8c+,9a,9a+,9b,9b+" values_no_i18n="true" />
-            <combo key="climbing:grade:saxon" text="Saxon grading" values="IV,V,VI,VIIa,VIIb,VIIc,VIIIa,VIIIb,VIIIc,IXa,IXb,IXc,Xa,Xb,Xc,XIa,XIb,XIc" values_no_i18n="true" />
-            <reference ref="climbing_optional_attributes" />
-        </item> <!-- Climbing route -->
+        <group name="Climbing" icon="presets/sport/climbing.svg">
+            <item name="Climbing site" icon="presets/sport/climbing.svg" type="node,way,closedway,multipolygon" preset_name_label="true">
+                <link wiki="Tag:sport=climbing" />
+                <space />
+                <key key="sport" value="climbing" />
+                <text key="name" text="Name" />
+                <combo key="leisure" text="Type" values="sports_centre" />
+                <reference ref="climbing_styles" />
+                <text key="climbing:routes" text="Number of routes" />
+                <text key="ele" text="Usual elevation at the bottom of the routes" length="10" />
+                <space />
+                <combo key="climbing:length" text="Usual route length (m)" values="8,10,12,15,20,25,30,35,40" values_no_i18n="true" />
+                <combo key="climbing:length:min" text="Minimal climbing length (m)" values="8,10,12,15,20,25,30,35,40" values_no_i18n="true" />
+                <combo key="climbing:length:max" text="Maximum climbing length (m)" values="8,10,12,15,20,25,30,35,40" values_no_i18n="true" />
+                <space />
+                <combo key="climbing:grade:uiaa:min" text="UIAA: Simplest route" values="3,4,4+,5-,5,5+,6-,6,6+,7-,7,7+,8-,8,8+,9-,9,9+,10-,10,10+,11-,11,11+,12-" values_no_i18n="true" />
+                <combo key="climbing:grade:uiaa:max" text="UIAA: Most difficult route" values="3,4,4+,5-,5,5+,6-,6,6+,7-,7,7+,8-,8,8+,9-,9,9+,10-,10,10+,11-,11,11+,12-" values_no_i18n="true" />
+                <combo key="climbing:grade:uiaa:mean" text="UIAA: Main difficulty" values="3,4,4+,5-,5,5+,6-,6,6+,7-,7,7+,8-,8,8+,9-,9,9+,10-,10,10+,11-,11,11+,12-" values_no_i18n="true" />
+                <space />
+                <combo key="climbing:grade:french:min" text="French: Simplest route" values="3,3a,3b,3c,4,4a,4b,4c,5a,5b,5c,6a,6a+,6b,6b+,6c,6c+,7a,7a+,7b,7b+,7c,7c+,8a,8a+,8b,8b+,8c,8c+,9a,9a+,9b,9b+" values_no_i18n="true" />
+                <combo key="climbing:grade:french:max" text="French: Most difficult route" values="3,3a,3b,3c,4,4a,4b,4c,5a,5b,5c,6a,6a+,6b,6b+,6c,6c+,7a,7a+,7b,7b+,7c,7c+,8a,8a+,8b,8b+,8c,8c+,9a,9a+,9b,9b+" values_no_i18n="true" />
+                <combo key="climbing:grade:french:mean" text="French: Main difficulty" values="3,3a,3b,3c,4,4a,4b,4c,5a,5b,5c,6a,6a+,6b,6b+,6c,6c+,7a,7a+,7b,7b+,7c,7c+,8a,8a+,8b,8b+,8c,8c+,9a,9a+,9b,9b+" values_no_i18n="true" />
+                <space />
+                <combo key="climbing:grade:saxon:min" text="Saxon: Simplest route" values="III,IV,V,VI,VIIa,VIIb,VIIc,VIIIa,VIIIb,VIIIc,IXa,IXb,IXc,Xa,Xb,Xc,XIa,XIb,XIc" values_no_i18n="true" />
+                <combo key="climbing:grade:saxon:max" text="Saxon: Most difficult route" values="III,IV,V,VI,VIIa,VIIb,VIIc,VIIIa,VIIIb,VIIIc,IXa,IXb,IXc,Xa,Xb,Xc,XIa,XIb,XIc" values_no_i18n="true" />
+                <combo key="climbing:grade:saxon:mean" text="Saxon: Main difficulty" values="III,IV,V,VI,VIIa,VIIb,VIIc,VIIIa,VIIIb,VIIIc,IXa,IXb,IXc,Xa,Xb,Xc,XIa,XIb,XIc" values_no_i18n="true" />
+                <reference ref="climbing_optional_attributes" />
+                <space />
+            </item> <!-- Climbing site -->
+            <item name="Climbing route bottom" icon="presets/sport/climbing_route_bottom.svg" type="node" preset_name_label="true">
+                <link wiki="Tag:climbing=route_bottom" />
+                <space />
+                <key key="climbing" value="route_bottom" />
+            </item> <!-- Climbing route bottom -->
+            <item name="Climbing route" icon="presets/sport/climbing.svg" type="node,way" preset_name_label="true">
+                <link wiki="Tag:sport=climbing" />
+                <space />
+                <key key="sport" value="climbing" />
+                <key key="climbing" value="route" />
+                <text key="name" text="Name" />
+                <reference ref="climbing_styles" />
+                <combo key="climbing:bolted" text="Bolts" values="yes,no,1,2,3,4,5,6" values_sort="false" values_no_i18n="true" />
+                <combo key="climbing:pitches" text="Pitches" values="1,2,3,4,5,6,7,8" default="1" values_no_i18n="true" />
+                <combo key="climbing:length" text="Route length (m)" values="8,10,12,15,20,25,30,35,40" values_no_i18n="true" />
+                <space />
+                <combo key="climbing:grade:uiaa" text="UIAA grading" values="4,4+,5-,5,5+,6-,6,6+,7-,7,7+,8-,8,8+,9-,9,9+,10-,10,10+,11-,11,11+,12-" values_no_i18n="true" />
+                <combo key="climbing:grade:french" text="French grading" values="4,5a,5b,5c,6a,6a+,6b,6b+,6c,6c+,7a,7a+,7b,7b+,7c,7c+,8a,8a+,8b,8b+,8c,8c+,9a,9a+,9b,9b+" values_no_i18n="true" />
+                <combo key="climbing:grade:saxon" text="Saxon grading" values="IV,V,VI,VIIa,VIIb,VIIc,VIIIa,VIIIb,VIIIc,IXa,IXb,IXc,Xa,Xb,Xc,XIa,XIb,XIc" values_no_i18n="true" />
+                <reference ref="climbing_optional_attributes" />
+            </item> <!-- Climbing route -->
+            <item name="Climbing route top" icon="presets/sport/climbing_route_top.svg" type="node" preset_name_label="true">
+                <link wiki="Tag:climbing=route_top" />
+                <space />
+                <key key="climbing" value="route_top" />
+            </item> <!-- Climbing route top -->
+        </group>
         <item name="Canoeing/Kayaking" icon="presets/sport/canoe.svg" type="node,way,closedway,multipolygon" preset_name_label="true">
             <link wiki="Tag:sport=canoe" />
@@ -5871,5 +5996,5 @@
             <link wiki="Key:building" />
             <space />
-            <combo key="building" text="Building" values="allotment_house,bakehouse,barn,basilica,boathouse,bunker,cabin,carport,cathedral,chapel,church,college,commercial,construction,cowshed,digester,farm_auxiliary,fire_station,garage,garages,gasometer,gatehouse,grandstand,greenhouse,hangar,hospital,industrial,kindergarten,kiosk,manufacture,monastery,mosque,office,pavilion,parking,public,retail,riding_hall,roof,ruins,school,service,shed,silo,sports_centre,sports_hall,stable,stadium,storage_tank,sty,supermarket,synagogue,temple,tent,toilets,train_station,transformer_tower,transportation,university,warehouse,yes" values_context="building" default="yes" match="keyvalue!" values_searchable="true" />
+            <combo key="building" text="Building" values="allotment_house,bakehouse,barn,basilica,boathouse,bunker,cabin,carport,cathedral,chapel,church,college,commercial,construction,container,cowshed,digester,farm_auxiliary,fire_station,garage,garages,gasometer,gatehouse,grandstand,greenhouse,hangar,hospital,industrial,kindergarten,kiosk,manufacture,monastery,mosque,office,pavilion,parking,public,retail,riding_hall,roof,ruins,school,service,shed,silo,sports_centre,sports_hall,stable,stadium,storage_tank,sty,supermarket,synagogue,temple,tent,toilets,train_station,transformer_tower,transportation,university,warehouse,yes" values_context="building" default="yes" match="keyvalue!" values_searchable="true" />
             <optional>
                 <reference ref="name_operator" />
@@ -5921,4 +6046,5 @@
                 <list_entry value="yes" icon="presets/misc/entrance_yes.svg" />
                 <list_entry value="main" icon="presets/misc/entrance_main.svg" />
+                <list_entry value="secondary" icon="presets/misc/entrance_yes.svg" />
                 <list_entry value="service" icon="presets/misc/entrance_service.svg" />
                 <list_entry value="shop" icon="presets/misc/entrance_yes.svg" />
@@ -7399,4 +7525,5 @@
             <key key="shop" value="supermarket" />
             <reference ref="name_oh_wheelchair" />
+            <reference ref="toilets" />
             <reference ref="link_contact_address_payment" />
         </item> <!-- Supermarket -->
@@ -7406,4 +7533,5 @@
             <key key="shop" value="convenience" />
             <reference ref="name_oh_wheelchair" />
+            <reference ref="toilets" />
             <reference ref="link_contact_address_payment" />
         </item> <!-- Convenience Store -->
@@ -7513,4 +7641,5 @@
             <key key="amenity" value="marketplace" />
             <reference ref="name_operator_oh_wheelchair" />
+            <reference ref="toilets" />
             <text key="website" text="Website" />
             <combo key="organic" text="Organic" values="yes,no,only" />
@@ -7624,4 +7753,5 @@
             <check key="self_service" text="Self Service" />
             <check key="laundry_service" text="Laundry Service" />
+            <reference ref="toilets" />
             <reference ref="link_contact_address_payment" />
         </item> <!-- Laundry -->
@@ -8068,4 +8198,12 @@
             <reference ref="link_contact_address_payment" />
         </item> <!-- Paint -->
+        <item name="Craft" icon="presets/shop/craft.svg" type="node,closedway,multipolygon" preset_name_label="true">
+            <link wiki="Tag:shop=craft" />
+            <space />
+            <key key="shop" value="craft" />
+            <reference ref="name_operator_oh_wheelchair" />
+            <check key="training" text="Provides classes" text_context="Tag:shop=craft" />
+            <reference ref="link_contact_address_payment" />
+        </item>
         <item name="Gas" icon="presets/shop/gas.svg" type="node,closedway,multipolygon" preset_name_label="true">
             <link wiki="Tag:shop=gas" />
@@ -8244,4 +8382,14 @@
             <reference ref="link_contact_address_payment" />
         </item> <!-- Funeral Directors -->
+        <item name="Farm Store" icon="presets/shop/agrarian.svg" type="node,closedway,multipolygon" preset_name_label="true">
+            <link wiki="Tag:shop=agrarian" />
+            <space />
+            <key key="shop" value="agrarian" />
+            <reference ref="name_oh_wheelchair" />
+            <optional>
+                <combo key="agrarian" values="yes,pesticide,fertilizer,seed,feed,tools,machine_parts,agricultural_machinery" values_context="Tag:shop=agrarian" />
+            </optional>
+            <reference ref="link_contact_address_payment" />
+        </item>
     </group> <!-- Other -->
         <separator/>