Index: /trunk/resources/data/defaultpresets.xml
===================================================================
--- /trunk/resources/data/defaultpresets.xml	(revision 19168)
+++ /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/>
Index: /trunk/resources/data/validator/deprecated.mapcss
===================================================================
--- /trunk/resources/data/validator/deprecated.mapcss	(revision 19168)
+++ /trunk/resources/data/validator/deprecated.mapcss	(revision 19169)
@@ -2530,4 +2530,25 @@
   suggestAlternative: "{1.key}";
 }
+/* From the canvec import */
+*[natural=landform][landform=esker] {
+  throwWarning: tr("{0} should be replaced by {1}", "{1.tag}", "geological=esker";
+  group: tr("deprecated tagging");
+  suggestAlternative: "natural=ridge or geological=esker";
+}
+*[natural=landform][landform=moraine] {
+  throwWarning: tr("{0} should be replaced by {1}", "{1.tag}", "geological=moraine";
+  group: tr("deprecated tagging");
+  suggestAlternative: "geological=moraine";
+}
+*[natural=landform][landform=beach] {
+  throwWarning: tr("{0} should be replaced by {1}", "{1.tag}", "natural=beach";
+  group: tr("deprecated tagging");
+  suggestAlternative: "natural=beach";
+}
+*[natural=landform][landform=tundra_polygon] {
+  throwWarning: tr("{0} should be replaced by {1}", "{1.tag}", "natural=tundra";
+  group: tr("deprecated tagging");
+  suggestAlternative: "natural=tundra or natural=fell";
+}
 
 /* When tags are deprecated they should be added to ignoretags.cfg too. */
Index: /trunk/resources/data/validator/ignoretags.cfg
===================================================================
--- /trunk/resources/data/validator/ignoretags.cfg	(revision 19168)
+++ /trunk/resources/data/validator/ignoretags.cfg	(revision 19169)
@@ -802,4 +802,5 @@
 ; orchard=meadow_orchard seems to be more of a boolean value, "also happens to be a meadow". Don't know how we want to handle it.
 K:orchard=meadow_orchard
+K:meadow=meadow_orchard
 ; boundary=religious_administration is not well documented (2023-09-21)
 K:boundary=religious_administration
@@ -815,4 +816,12 @@
 K:road_marking=solid_stop_line
 K:service=irrigation
+; canvec import
+K:natural=landform
+K:landform=esker
+K:landform=moraine
+K:landform=beach
+K:landform=tundra_polygon
+; This seems to be a region specific tag.
+K:valley=balka
 
 ; These tags should probably have better software support, but maybe they can be in the appropriate section in this file.
Index: /trunk/resources/data/validator/unnecessary.mapcss
===================================================================
--- /trunk/resources/data/validator/unnecessary.mapcss	(revision 19168)
+++ /trunk/resources/data/validator/unnecessary.mapcss	(revision 19169)
@@ -68,5 +68,6 @@
 
 /* see ticket #7639 -- Warn when a node has the same tags as its parent way. */
-way >:sameTags node:tagged {
+/* But don't warn on barrier tags -- a common mapping method will have a barrier on the routable way and then the micromapped barrier */
+way[!barrier] >:sameTags node:tagged {
   throwWarning: tr("Nodes duplicating parent way tags");
 }
Index: /trunk/resources/images/presets/barrier/wicket_gate.svg
===================================================================
--- /trunk/resources/images/presets/barrier/wicket_gate.svg	(revision 19169)
+++ /trunk/resources/images/presets/barrier/wicket_gate.svg	(revision 19169)
@@ -0,0 +1,45 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
+<svg
+   width="16"
+   height="16"
+   viewBox="0 0 16 16"
+   version="1.1"
+   id="svg1"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:svg="http://www.w3.org/2000/svg">
+  <defs
+     id="defs1" />
+  <g
+     id="layer1">
+    <rect
+       style="fill:#000000"
+       id="rect1"
+       width="14"
+       height="14"
+       x="1"
+       y="1" />
+    <rect
+       style="fill:#b3b3b3"
+       id="rect2"
+       width="7"
+       height="9"
+       x="7"
+       y="3" />
+    <rect
+       style="fill:#ffffff"
+       id="rect3"
+       width="3"
+       height="6"
+       x="2"
+       y="8" />
+    <rect
+       style="fill:#ffffff"
+       id="rect4"
+       width="7"
+       height="2"
+       x="7"
+       y="12" />
+  </g>
+</svg>
Index: /trunk/resources/images/presets/education/music_school.svg
===================================================================
--- /trunk/resources/images/presets/education/music_school.svg	(revision 19169)
+++ /trunk/resources/images/presets/education/music_school.svg	(revision 19169)
@@ -0,0 +1,122 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
+<svg
+   width="16"
+   height="16"
+   viewBox="0 0 16 16"
+   version="1.1"
+   id="svg1"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:svg="http://www.w3.org/2000/svg">
+  <defs
+     id="defs1" />
+  <g
+     id="layer1">
+    <path
+       d="m 2.178916,0.565894 c -1.075935,0 -1.68076,0.5527597 -1.68076,1.6821522 V 13.890451 c 0,1.056427 0.54389,1.609549 1.618835,1.609549 h 11.766018 c 1.075206,0 1.619798,-0.525446 1.619798,-1.609549 V 2.2480463 c 0,-1.1018724 -0.544592,-1.6821523 -1.653429,-1.6821523 z"
+       style="fill:#ffffff;fill-opacity:1;stroke:#0e232e;stroke-width:1.0292;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       id="path1329" />
+    <g
+       id="g3"
+       transform="translate(0,-1.25)"
+       style="fill:#808080">
+      <rect
+         style="fill:#808080"
+         id="rect3"
+         width="14"
+         height="1"
+         x="1"
+         y="10.5" />
+      <rect
+         style="fill:#808080"
+         id="rect3-9"
+         width="14"
+         height="1"
+         x="1"
+         y="12.5" />
+      <rect
+         style="fill:#808080"
+         id="rect3-99"
+         width="14"
+         height="1"
+         x="1"
+         y="14.25" />
+      <rect
+         style="fill:#808080"
+         id="rect3-5"
+         width="14"
+         height="1"
+         x="1"
+         y="8.5" />
+    </g>
+    <g
+       id="g4"
+       style="fill:#000000">
+      <circle
+         style="fill:#000000"
+         id="path1"
+         cx="4"
+         cy="11"
+         r="1" />
+      <rect
+         style="fill:#000000"
+         id="rect2"
+         width="1"
+         height="4"
+         x="4"
+         y="7" />
+      <circle
+         style="fill:#000000"
+         id="path1-5"
+         cx="7"
+         cy="13"
+         r="1" />
+      <rect
+         style="fill:#000000"
+         id="rect2-7"
+         width="1"
+         height="4"
+         x="7"
+         y="9" />
+      <circle
+         style="fill:#000000"
+         id="path1-58"
+         cx="10"
+         cy="11"
+         r="1" />
+      <rect
+         style="fill:#000000"
+         id="rect2-8"
+         width="1"
+         height="4"
+         x="10"
+         y="7" />
+      <circle
+         style="fill:#000000"
+         id="path1-0"
+         cx="12"
+         cy="13"
+         r="1" />
+      <rect
+         style="fill:#000000"
+         id="rect2-4"
+         width="1"
+         height="4"
+         x="12"
+         y="9" />
+    </g>
+    <path
+       style="fill:#000000;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:20;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       d="M 4.0467025,4.7291014 3.3275387,4.7395404 C 3.2271908,4.9065111 3.1549086,5.1161623 3.0775965,5.3655609 2.9661795,5.724953 2.8718882,6.1555923 2.8164212,6.5847383 c -0.2090299,1.617144 -0.209539,2.365141 -0.209539,2.365141 h 0.4789451 c 0,0 -8.628e-4,-0.704859 0.2057946,-2.303885 0.051852,-0.401141 0.1414153,-0.8108752 0.2432126,-1.1392424 0.1017973,-0.3283586 0.2437216,-0.586195 0.27988,-0.6215337 0.084723,-0.082825 0.1584376,-0.1243499 0.2065452,-0.1456774 0.010698,-0.00518 0.018722,-0.00776 0.025451,-0.010439 z"
+       id="path2666" />
+    <path
+       style="fill:#000000;fill-rule:evenodd;stroke:#000000;stroke-width:0.239262;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       d="M 7.3666536,1.2723163 1.4198167,4.2537023 8.8311143,4.3529113 14.230218,1.5427749 Z"
+       id="path2662" />
+    <path
+       style="fill:#000000;fill-rule:evenodd;stroke:#000000;stroke-width:0.239262;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       d="M 3.8794734,6.7677903 4.5220498,4.8725269 9,5 11.981498,3.3797245 13.174293,4.7623263 c 0,0 -1.505882,0.1656935 -2.162073,0.5726324 -0.656191,0.4069389 -1.5073492,1.3866566 -1.5073492,1.3866566 0,0 -1.8531175,-0.6407989 -2.7100127,-0.6551898 C 5.1588285,6.0389897 3.981055,6.7458763 3.8794734,6.7677903 Z"
+       id="path2664" />
+  </g>
+</svg>
Index: /trunk/resources/images/presets/shop/agrarian.svg
===================================================================
--- /trunk/resources/images/presets/shop/agrarian.svg	(revision 19169)
+++ /trunk/resources/images/presets/shop/agrarian.svg	(revision 19169)
@@ -0,0 +1,118 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
+<svg
+   width="16"
+   height="16"
+   viewBox="0 0 16 16"
+   version="1.1"
+   id="svg1"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:svg="http://www.w3.org/2000/svg">
+  <defs
+     id="defs1" />
+  <g
+     id="layer1">
+    <rect
+       style="fill:#ffffff;fill-opacity:1;stroke:none;stroke-width:2;stroke-dasharray:none;stroke-opacity:1"
+       id="rect13"
+       width="16"
+       height="16"
+       x="0"
+       y="0"
+       ry="2" />
+    <g
+       id="g13">
+      <circle
+         style="fill:none;stroke:#000000;stroke-width:2;stroke-dasharray:none;stroke-opacity:1"
+         id="path1"
+         cx="5"
+         cy="11.5"
+         r="3" />
+      <circle
+         style="fill:none;stroke:#000000;stroke-width:2;stroke-dasharray:none;stroke-opacity:1"
+         id="path2"
+         cx="12.625"
+         cy="12.625"
+         r="1.625" />
+      <rect
+         style="fill:#000000;fill-opacity:1;stroke:none;stroke-width:2;stroke-dasharray:none;stroke-opacity:1"
+         id="rect3"
+         width="7"
+         height="1"
+         x="8"
+         y="10"
+         ry="0" />
+      <rect
+         style="fill:#000000;fill-opacity:1;stroke:none;stroke-width:2;stroke-dasharray:none;stroke-opacity:1"
+         id="rect4"
+         width="1"
+         height="3"
+         x="14"
+         y="7"
+         ry="0" />
+      <rect
+         style="fill:#000000;fill-opacity:1;stroke:none;stroke-width:2;stroke-dasharray:none;stroke-opacity:1"
+         id="rect5"
+         width="4"
+         height="1"
+         x="10"
+         y="7"
+         ry="0" />
+      <rect
+         style="fill:#000000;fill-opacity:1;stroke:none;stroke-width:2;stroke-dasharray:none;stroke-opacity:1"
+         id="rect6"
+         width="1"
+         height="3"
+         x="12"
+         y="4"
+         ry="0" />
+      <rect
+         style="fill:#000000;fill-opacity:1;stroke:none;stroke-width:2;stroke-dasharray:none;stroke-opacity:1"
+         id="rect7"
+         width="1"
+         height="1"
+         x="13"
+         y="4"
+         ry="0" />
+      <rect
+         style="fill:#000000;fill-opacity:1;stroke:none;stroke-width:2;stroke-dasharray:none;stroke-opacity:1"
+         id="rect8"
+         width="3"
+         height="1"
+         x="2"
+         y="1"
+         ry="0" />
+      <rect
+         style="fill:#000000;fill-opacity:1;stroke:none;stroke-width:2;stroke-dasharray:none;stroke-opacity:1"
+         id="rect9"
+         width="1"
+         height="5.25"
+         x="2"
+         y="2"
+         ry="0" />
+      <rect
+         style="fill:#000000;fill-opacity:1;stroke:none;stroke-width:2;stroke-dasharray:none;stroke-opacity:1"
+         id="rect10"
+         width="1.40125"
+         height="8.4874315"
+         x="1.4077309"
+         y="4.2447963"
+         transform="rotate(-45.087524)" />
+      <rect
+         style="fill:#000000;fill-opacity:1;stroke:none;stroke-width:2;stroke-dasharray:none;stroke-opacity:1"
+         id="rect11"
+         width="8"
+         height="2.25"
+         x="2"
+         y="7" />
+      <rect
+         style="fill:#000000;fill-opacity:1;stroke:none;stroke-width:2;stroke-dasharray:none;stroke-opacity:1"
+         id="rect12"
+         width="6"
+         height="2"
+         x="8"
+         y="8" />
+    </g>
+  </g>
+</svg>
Index: /trunk/resources/images/presets/shop/craft.svg
===================================================================
--- /trunk/resources/images/presets/shop/craft.svg	(revision 19169)
+++ /trunk/resources/images/presets/shop/craft.svg	(revision 19169)
@@ -0,0 +1,65 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
+<svg
+   width="16"
+   height="16"
+   viewBox="0 0 16 16"
+   version="1.1"
+   id="svg1"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:svg="http://www.w3.org/2000/svg">
+  <defs
+     id="defs1" />
+  <g
+     id="layer1">
+    <rect
+       style="fill:#e6e6e6"
+       id="rect4"
+       width="16"
+       height="16"
+       x="0"
+       y="0"
+       ry="2" />
+    <g
+       id="g2"
+       transform="translate(-0.125,1)">
+      <circle
+         style="fill:#000000"
+         id="path1"
+         cy="2.625"
+         cx="2.625"
+         r="2" />
+      <circle
+         style="fill:#ffffff"
+         id="path2"
+         cx="2.625"
+         cy="2.625"
+         r="0.625" />
+    </g>
+    <g
+       id="g2-0"
+       transform="translate(-0.125,9.75)">
+      <circle
+         style="fill:#000000"
+         id="path1-1"
+         cx="2.625"
+         cy="2.625"
+         r="2" />
+      <circle
+         style="fill:#ffffff"
+         id="path2-8"
+         cx="2.625"
+         cy="2.625"
+         r="0.625" />
+    </g>
+    <path
+       style="fill:#000000"
+       d="M 4.25,12.240991 14.25,2.25 V 1 H 13 L 3,11 Z"
+       id="path3" />
+    <path
+       style="fill:#000000"
+       d="M 4.25,4 14,13.75 V 15 H 12.75 L 3,5.25 Z"
+       id="path4" />
+  </g>
+</svg>
Index: /trunk/resources/images/presets/social_facility/social_centre.svg
===================================================================
--- /trunk/resources/images/presets/social_facility/social_centre.svg	(revision 19169)
+++ /trunk/resources/images/presets/social_facility/social_centre.svg	(revision 19169)
@@ -0,0 +1,107 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
+<svg
+   width="16"
+   height="16"
+   viewBox="0 0 16 16"
+   version="1.1"
+   id="svg1"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:svg="http://www.w3.org/2000/svg">
+  <defs
+     id="defs1" />
+  <g
+     id="layer1">
+    <rect
+       style="fill:#ffffff"
+       id="rect1"
+       width="14"
+       height="14"
+       x="1"
+       y="1" />
+    <rect
+       style="fill:#000000"
+       id="rect2"
+       width="6"
+       height="6"
+       x="5"
+       y="5" />
+    <g
+       id="g13"
+       style="fill:#4d4d4d">
+      <circle
+         style="fill:#4d4d4d"
+         id="path2-7"
+         cx="13"
+         cy="5"
+         r="1" />
+      <circle
+         style="fill:#4d4d4d"
+         id="path2-8"
+         cx="13"
+         cy="8"
+         r="1" />
+      <circle
+         style="fill:#4d4d4d"
+         id="path2-6"
+         cx="13"
+         cy="11"
+         r="1" />
+      <circle
+         style="fill:#4d4d4d"
+         id="path2-39"
+         cx="11"
+         cy="13"
+         r="1" />
+      <circle
+         style="fill:#4d4d4d"
+         id="path2-72"
+         cx="8"
+         cy="13"
+         r="1" />
+      <circle
+         style="fill:#4d4d4d"
+         id="path2-58"
+         cx="5"
+         cy="13"
+         r="1" />
+      <circle
+         style="fill:#4d4d4d"
+         id="path2-1"
+         cx="3"
+         cy="11"
+         r="1" />
+      <circle
+         style="fill:#4d4d4d"
+         id="path2-80"
+         cx="3"
+         cy="8"
+         r="1" />
+      <circle
+         style="fill:#4d4d4d"
+         id="path2-32"
+         cx="3"
+         cy="5"
+         r="1" />
+      <circle
+         style="fill:#4d4d4d"
+         id="path2"
+         cx="5"
+         cy="3"
+         r="1" />
+      <circle
+         style="fill:#4d4d4d"
+         id="path2-3"
+         cx="8"
+         cy="3"
+         r="1" />
+      <circle
+         style="fill:#4d4d4d"
+         id="path2-35"
+         cx="11"
+         cy="3"
+         r="1" />
+    </g>
+  </g>
+</svg>
Index: /trunk/resources/images/presets/sport/climbing_route_bottom.svg
===================================================================
--- /trunk/resources/images/presets/sport/climbing_route_bottom.svg	(revision 19169)
+++ /trunk/resources/images/presets/sport/climbing_route_bottom.svg	(revision 19169)
@@ -0,0 +1,71 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
+<svg
+   width="168.57144"
+   height="346.87723"
+   id="svg2"
+   version="1.0"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:dc="http://purl.org/dc/elements/1.1/">
+  <defs
+     id="defs4" />
+  <metadata
+     id="metadata7">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <g
+     id="layer1"
+     transform="translate(-308.57141,-286.64789)">
+    <path
+       style="fill:#ff8080;fill-rule:evenodd;stroke:#004e00;stroke-width:7.15445232;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       d="M 391.85111,310.49076 L 346.85686,543.98461 L 330.29175,629.94789"
+       id="path3163" />
+    <circle
+       style="opacity:1;fill:#ffd42a;fill-opacity:1;stroke:none;stroke-width:16.7;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
+       id="path3155"
+       cx="332.85715"
+       cy="409.505"
+       r="21.428572" />
+    <rect
+       y="464.79568"
+       x="-349.42709"
+       height="99.711678"
+       width="18.253916"
+       id="rect3159"
+       style="opacity:1;fill:#ff2a2a;fill-opacity:1;stroke:none;stroke-width:16.7;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
+       transform="matrix(0.35537742,-0.93472289,0.96371458,0.26693484,0,0)" />
+    <rect
+       transform="rotate(-0.00237542)"
+       style="opacity:1;fill:#d38d5f;fill-opacity:1;stroke:none;stroke-width:16.7;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
+       id="rect3161"
+       width="17.142857"
+       height="105.71428"
+       x="322.26376"
+       y="529.09418" />
+    <rect
+       style="opacity:1;fill:#784421;fill-opacity:1;stroke:none;stroke-width:16.8806;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
+       id="rect2383"
+       width="86.285728"
+       height="347.26559"
+       x="390.85712"
+       y="286.4537" />
+    <rect
+       style="opacity:1;fill:#ff2a2a;fill-opacity:1;stroke:none;stroke-width:16.7;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
+       id="rect3157"
+       width="37.142857"
+       height="105.71429"
+       x="311.42856"
+       y="433.79074" />
+  </g>
+</svg>
Index: /trunk/resources/images/presets/sport/climbing_route_top.svg
===================================================================
--- /trunk/resources/images/presets/sport/climbing_route_top.svg	(revision 19169)
+++ /trunk/resources/images/presets/sport/climbing_route_top.svg	(revision 19169)
@@ -0,0 +1,71 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
+<svg
+   width="168.57144"
+   height="346.87723"
+   id="svg2"
+   version="1.0"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:dc="http://purl.org/dc/elements/1.1/">
+  <defs
+     id="defs4" />
+  <metadata
+     id="metadata7">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <g
+     id="layer1"
+     transform="translate(-308.57141,-286.64789)">
+    <path
+       style="fill:#ff8080;fill-rule:evenodd;stroke:#004e00;stroke-width:7.15445;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       d="M 387.34936,535.98762 363.63363,633.7193"
+       id="path3163" />
+    <circle
+       style="opacity:1;fill:#ffd42a;fill-opacity:1;stroke:none;stroke-width:16.7;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
+       id="path3155"
+       cx="434.43317"
+       cy="309.9964"
+       r="21.428572" />
+    <rect
+       y="-340.79898"
+       x="476.47256"
+       height="99.711678"
+       width="18.253916"
+       id="rect3159"
+       style="opacity:1;fill:#ff2a2a;fill-opacity:1;stroke:none;stroke-width:16.7;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
+       transform="matrix(0.26000288,0.96560784,-0.93725243,0.34865151,0,0)" />
+    <rect
+       transform="rotate(-0.00237542)"
+       style="opacity:1;fill:#d38d5f;fill-opacity:1;stroke:none;stroke-width:16.7;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
+       id="rect3161"
+       width="17.142857"
+       height="105.71428"
+       x="423.8439"
+       y="429.58978" />
+    <rect
+       style="opacity:1;fill:#784421;fill-opacity:1;stroke:none;stroke-width:8.98727;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
+       id="rect2383"
+       width="86.285728"
+       height="98.433228"
+       x="390.85712"
+       y="535.28607" />
+    <rect
+       style="opacity:1;fill:#ff2a2a;fill-opacity:1;stroke:none;stroke-width:16.7;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
+       id="rect3157"
+       width="37.142857"
+       height="105.71429"
+       x="413.00458"
+       y="334.28214" />
+  </g>
+</svg>
Index: /trunk/resources/images/presets/vehicle/emergency_bay.svg
===================================================================
--- /trunk/resources/images/presets/vehicle/emergency_bay.svg	(revision 19169)
+++ /trunk/resources/images/presets/vehicle/emergency_bay.svg	(revision 19169)
@@ -0,0 +1,70 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
+<svg
+   width="16"
+   height="16"
+   viewBox="0 0 16 16"
+   version="1.1"
+   id="svg1"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:svg="http://www.w3.org/2000/svg">
+  <defs
+     id="defs1" />
+  <g
+     id="layer1">
+    <rect
+       style="fill:#ffffff"
+       id="rect1"
+       width="14"
+       height="14"
+       x="1"
+       y="1" />
+    <rect
+       style="fill:#000000"
+       id="rect2"
+       width="1"
+       height="2"
+       x="2"
+       y="2" />
+    <rect
+       style="fill:#000000"
+       id="rect2-1"
+       width="1"
+       height="2"
+       x="2"
+       y="6" />
+    <rect
+       style="fill:#000000"
+       id="rect2-11"
+       width="1"
+       height="2"
+       x="2"
+       y="10" />
+    <rect
+       style="fill:#000000"
+       id="rect2-13"
+       width="1"
+       height="1"
+       x="2"
+       y="14" />
+    <path
+       style="fill:#000000"
+       d="m 11,1 v 2 l 3,3 v 4 l -3,3 v 2 h -1 v -2.5 l 3,-3 v -3 l -3,-3 V 1 Z"
+       id="path2" />
+    <rect
+       style="fill:#000000"
+       id="rect2-1-4"
+       width="1"
+       height="2"
+       x="10"
+       y="5.5" />
+    <rect
+       style="fill:#000000"
+       id="rect2-1-5"
+       width="1"
+       height="2"
+       x="10"
+       y="8.5" />
+  </g>
+</svg>
Index: /trunk/resources/images/presets/vehicle/parking/trolley_bay.svg
===================================================================
--- /trunk/resources/images/presets/vehicle/parking/trolley_bay.svg	(revision 19169)
+++ /trunk/resources/images/presets/vehicle/parking/trolley_bay.svg	(revision 19169)
@@ -0,0 +1,116 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
+<svg
+   width="16"
+   height="16.000114"
+   id="svg2"
+   version="1.1"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:dc="http://purl.org/dc/elements/1.1/">
+  <defs
+     id="defs4" />
+  <metadata
+     id="metadata7">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <g
+     id="layer1"
+     transform="translate(-390,-551.36218)">
+    <rect
+       style="fill:#808080;fill-opacity:1;stroke:none"
+       id="rect2987"
+       width="16"
+       height="16"
+       x="390"
+       y="551.36218" />
+    <rect
+       style="fill:#ffffff;fill-opacity:1;stroke:none"
+       id="rect2989"
+       width="2"
+       height="12"
+       x="392"
+       y="555.36218"
+       ry="0" />
+    <rect
+       style="fill:#ffffff;fill-opacity:1;stroke:none"
+       id="rect2991"
+       width="1.9999964"
+       height="12.000114"
+       x="402"
+       y="555.36218" />
+    <rect
+       style="fill:#ffffff;fill-opacity:1;stroke:none"
+       id="rect2993"
+       width="4"
+       height="2"
+       x="391"
+       y="555.36218" />
+    <rect
+       style="fill:#ffffff;fill-opacity:1;stroke:none"
+       id="rect2995"
+       width="4"
+       height="2"
+       x="401"
+       y="555.36218" />
+    <rect
+       style="fill:#000000"
+       id="rect1"
+       width="1"
+       height="8"
+       x="395"
+       y="558.3623" />
+    <rect
+       style="fill:#000000"
+       id="rect2"
+       width="1"
+       height="8"
+       x="400"
+       y="558.3623" />
+    <rect
+       style="fill:#000000;stroke-width:0.790569"
+       id="rect3"
+       width="2.5"
+       height="1.0000026"
+       x="396"
+       y="565.3623" />
+    <rect
+       style="fill:#000000;stroke-width:0.92582"
+       id="rect4"
+       width="1"
+       height="6.0000048"
+       x="397.5"
+       y="559.3623" />
+    <rect
+       style="fill:#000000"
+       id="rect5"
+       width="2.5"
+       height="1"
+       x="397.5"
+       y="558.3623" />
+    <rect
+       style="fill:#1a1a1a"
+       id="rect6"
+       width="1"
+       height="0.5"
+       x="399"
+       y="565.6123" />
+    <rect
+       style="fill:#1a1a1a"
+       id="rect7"
+       width="1"
+       height="0.5"
+       x="396"
+       y="558.6123" />
+  </g>
+</svg>
Index: /trunk/resources/images/presets/vehicle/vehicle_inspection.svg
===================================================================
--- /trunk/resources/images/presets/vehicle/vehicle_inspection.svg	(revision 19169)
+++ /trunk/resources/images/presets/vehicle/vehicle_inspection.svg	(revision 19169)
@@ -0,0 +1,31 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   viewBox="0 0 14 14"
+   height="14"
+   width="14"
+   id="svg109"
+   version="1.1">
+  <metadata
+     id="metadata115">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+        <dc:title></dc:title>
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <defs
+     id="defs113" />
+  <path
+     id="rental-car"
+     d="M 2.5 0 C 2.223 0 2 0.223 2 0.5 C 2 0.777 2.223 1 2.5 1 L 6.5 1 C 6.777 1 7 0.777 7 0.5 C 7 0.223 6.777 0 6.5 0 L 2.5 0 z M 11 0 L 9.5449219 3.6367188 L 9 2 L 8 2 L 9 5 L 10 5 L 12 0 L 11 0 z M 2.5 2 C 2.223 2 2 2.223 2 2.5 C 2 2.777 2.223 3 2.5 3 L 6.5 3 C 6.777 3 7 2.777 7 2.5 C 7 2.223 6.777 2 6.5 2 L 2.5 2 z M 2.5 4 C 2.223 4 2 4.223 2 4.5 C 2 4.777 2.223 5 2.5 5 L 6.5 5 C 6.777 5 7 4.777 7 4.5 C 7 4.223 6.777 4 6.5 4 L 2.5 4 z M 4 6 L 3 9 C 2.527334 9 2 9.384295 2 10 L 2 13 L 3 13 C 3 13 3 14 4 14 C 5 14 5 13 5 13 L 9 13 C 9 13 9 14 10 14 C 11 14 11 13 11 13 L 12 13 L 12 10 C 12 9.479394 11.544575 9 11 9 L 10 6 L 4 6 z M 5 7 L 9 7 L 9.625 9 L 4.375 9 L 5 7 z M 4 10.25 C 4.414214 10.25 4.75 10.585786 4.75 11 C 4.75 11.414214 4.414214 11.75 4 11.75 C 3.585786 11.75 3.25 11.414214 3.25 11 C 3.25 10.585786 3.585786 10.25 4 10.25 z M 10 10.25 C 10.414214 10.25 10.75 10.585786 10.75 11 C 10.75 11.414214 10.414214 11.75 10 11.75 C 9.585786 11.75 9.25 11.414214 9.25 11 C 9.25 10.585786 9.585786 10.25 10 10.25 z " 
+     style="fill:#734a08;fill-opacity:1" transform="translate(1,1)"/>
+</svg>
Index: /trunk/resources/styles/standard/elemstyles.mapcss
===================================================================
--- /trunk/resources/styles/standard/elemstyles.mapcss	(revision 19168)
+++ /trunk/resources/styles/standard/elemstyles.mapcss	(revision 19169)
@@ -413,4 +413,14 @@
     icon-image: "presets/barrier/gate.svg";
     set icon_z17;
+}
+way[barrier=gate],
+way[barrier=lift_gate],
+way[barrier=swing_gate],
+way[barrier=hampshire_gate],
+way[barrier=bump_gate],
+way[barrier=kissing_gate],
+way[barrier=wicket_gate] {
+    width: 2;
+    color: barrier-opening#88F050;
 }
 way[barrier=yes],
@@ -502,4 +512,8 @@
     set icon_z17;
 }
+node[barrier=wicket_gate] {
+    icon-image: "presets/barrier/wicket_gate.svg";
+    set icon_z17;
+}
 node[barrier=height_restrictor] {
     icon-image: "presets/barrier/height_restrictor.svg";
@@ -616,5 +630,6 @@
     color: street#c0c0c0;
 }
-way[highway=escape] {
+way[highway=escape],
+way[highway=emergency_bay] {
     width: 3;
     color: street#c0c0c0;
@@ -830,5 +845,6 @@
     set icon_z17;
 }
-node[highway=crossing][crossing=unmarked] {
+node[highway=crossing][crossing=unmarked],
+node[highway=crossing][crossing=informal] {
     icon-image: "presets/vehicle/crossing_unmarked.svg";
     set icon_z17;
@@ -947,4 +963,8 @@
 node[highway=passing_place] {
     icon-image: "presets/vehicle/passing_place.svg";
+    set icon_z17;
+}
+node[highway=emergency_bay] {
+    icon-image: "presets/vehicle/emergency_bay.svg";
     set icon_z17;
 }
@@ -2378,4 +2398,5 @@
 area[shop=pastry],
 area[shop=copyshop],
+area[shop=craft],
 area[shop=curtain],
 area[shop=cycle_repair],
@@ -2454,4 +2475,5 @@
 area[shop=weapons],
 area[shop=funeral_directors],
+area[shop=agrarian],
 area[shop=wine],
 area[shop=farm],
@@ -2566,4 +2588,8 @@
     set icon_z17;
 }
+node[shop=craft] {
+    icon-image: "presets/shop/craft.svg";
+    set icon_z17;
+}
 node[shop=curtain] {
     icon-image: "presets/shop/curtain.svg";
@@ -2868,4 +2894,8 @@
 node[shop=funeral_directors] {
     icon-image: "presets/shop/funeral_directors.svg";
+    set icon_z17;
+}
+node[shop=agrarian] {
+    icon-image: "presets/shop/agrarian.svg";
     set icon_z17;
 }
@@ -3082,4 +3112,7 @@
     fill-color: parking_space#f7efb8;
 }
+area[amenity=trolley_bay] {
+    fill-color: trolley_bay#b8d8f7;
+}
 area[amenity=parking],
 area[amenity=motorcycle_parking],
@@ -3097,4 +3130,8 @@
 node[amenity=parking_space] {
     icon-image: "presets/vehicle/parking/parking_space.svg";
+    set icon_z17;
+}
+node[amenity=trolley_bay] {
+    icon-image: "presets/vehicle/parking/trolley_bay.svg";
     set icon_z17;
 }
@@ -3277,4 +3314,5 @@
 area[amenity=kindergarten],
 area[amenity=language_school],
+area[amenity=music_school],
 area[amenity=driving_school] {
     fill-color: amenity_light#f7efb7;
@@ -3406,4 +3444,8 @@
 node[amenity=driving_school] {
     icon-image: "presets/education/driving_school.svg";
+    set icon_z17;
+}
+node[amenity=music_school] {
+    icon-image: "presets/education/music_school.svg";
     set icon_z17;
 }
@@ -4754,4 +4796,12 @@
 node[sport=climbing] {
     icon-image: "presets/sport/climbing.svg";
+    set icon_z17;
+}
+node[climbing=route_bottom] {
+    icon-image: "presets/sport/climbing_route_bottom.svg";
+    set icon_z17;
+}
+node[climbing=route_top] {
+    icon-image: "presets/sport/climbing_route_top.svg";
     set icon_z17;
 }