Index: trunk/data/defaultpresets.xml
===================================================================
--- trunk/data/defaultpresets.xml	(revision 8027)
+++ trunk/data/defaultpresets.xml	(revision 8028)
@@ -16,4 +16,17 @@
         <combo key="surface" text="Surface" values="paved,unpaved,asphalt,concrete,metal,wood,paving_stones,cobblestone,gravel,pebblestone,compacted,grass_paver,grass,sand,ground,sett" />
     </chunk>
+    <chunk id="surface_smoothness">
+        <reference ref="surface" />
+        <combo key="smoothness" text="Smoothness" values_searchable="true">
+            <list_entry value="excellent" short_description="Thin Rollers: rollerblade, skateboard" />
+            <list_entry value="good" short_description="Thin Wheels: racing bike" />
+            <list_entry value="intermediate" short_description="Wheels: city bike, wheelchair, scooter" />
+            <list_entry value="bad" short_description="Robust Wheels: trekking bike, car, rickshaw" />
+            <list_entry value="very_bad" short_description="High Clearance: light duty off-road vehicle" />
+            <list_entry value="horrible" short_description="Off-Road: heavy duty off-road vehicle" />
+            <list_entry value="very_horrible" short_description="Specialized off-road: tractor, ATV" />
+            <list_entry value="impassable" short_description="No wheeled vehicle" />
+        </combo>
+    </chunk>
     <chunk id="riding_surface">
         <combo key="leisure" text="Type" values="pitch,sports_centre,stadium,track" values_context="riding" />
@@ -24,5 +37,5 @@
         <combo key="lanes" text="Lanes" values="1,2,3,4,5" length="3"/>
         <text key="maxspeed" text="Max. speed (km/h)"/>
-        <reference ref="surface" />
+        <reference ref="surface_smoothness" />
     </chunk>
     <chunk id="highway_yesno_incline">
@@ -190,10 +203,10 @@
         <text key="ref" text="Reference number" />
     </chunk>
-    <chunk id="parking_access_fee_operator_surface">
+    <chunk id="parking_access_fee_operator_surface_smoothness">
         <space />
         <combo key="access" text="Access" values="yes,private,customers,permissive,no" />
         <reference ref="fee_interval" />
         <text key="operator" text="Operator" />
-        <reference ref="surface" />
+        <reference ref="surface_smoothness" />
     </chunk>
     <chunk id="maxstay">
@@ -584,5 +597,5 @@
                 <combo key="layer" text="Layer" values="5,4,3,2,1,0,-1,-2,-3,-4,-5" />
                 <combo key="lanes" text="Lanes" values="1,2,3,4,5" />
-                <reference ref="surface" />
+                <reference ref="surface_smoothness" />
                 <check key="oneway" text="Oneway" />
                 <check key="oneway:bicycle" text="Oneway for bicycle" />
@@ -608,5 +621,5 @@
                 <combo key="layer" text="Layer" values="5,4,3,2,1,0,-1,-2,-3,-4,-5" length="3" />
                 <combo key="lanes" text="Lanes" values="1,2,3,4,5" length="3" />
-                <reference ref="surface" />
+                <reference ref="surface_smoothness" />
                 <reference ref="highway_yesno_incline_oneway_lit_width" />
             </optional>
@@ -629,5 +642,5 @@
                 <combo key="layer" text="Layer" values="5,4,3,2,1,0,-1,-2,-3,-4,-5" length="3" />
                 <combo key="lanes" text="Lanes" values="1,2,3,4,5" length="3" />
-                <reference ref="surface" />
+                <reference ref="surface_smoothness" />
                 <check key="area" text="Area" />
                 <reference ref="highway_yesno_incline" />
@@ -667,5 +680,5 @@
             <key key="service" value="parking_aisle" />
             <optional>
-                <reference ref="surface" />
+                <reference ref="surface_smoothness" />
                 <check key="oneway" text="Oneway" />
                 <check key="lit" text="Lit" />
@@ -825,5 +838,5 @@
             <optional>
                 <reference ref="name_layer" />
-                <combo key="surface" text="Surface" values="paved,concrete,cobblestone,gravel,ground,grass,sand" />
+                <reference ref="surface_smoothness" />
                 <reference ref="highway_yesno_incline_oneway_lit_width" />
                 <combo key="mtb:scale" text="MTB Scale" values="0,1,2,3,4,5" />
@@ -849,5 +862,5 @@
             <optional>
                 <reference ref="name_layer" />
-                <reference ref="surface" />
+                <reference ref="surface_smoothness" />
                 <reference ref="highway_yesno_incline_oneway_lit_width" />
                 <combo key="sac_scale" text="SAC Scale" values_searchable="true">
@@ -883,5 +896,5 @@
                 <reference ref="name_layer" />
                 <text key="maxspeed" text="Max. speed (km/h)" />
-                <reference ref="surface" />
+                <reference ref="surface_smoothness" />
                 <reference ref="highway_yesno_incline_oneway_lit_width" />
             </optional>
@@ -924,5 +937,5 @@
             <optional>
                 <reference ref="name_layer" />
-                <reference ref="surface" />
+                <reference ref="surface_smoothness" />
                 <reference ref="highway_yesno_incline_oneway_lit_width" />
                 <combo key="foot" text="Pedestrians" values="yes,no" />
@@ -939,5 +952,5 @@
             <optional>
                 <reference ref="name_layer" />
-                <reference ref="surface" />
+                <reference ref="surface_smoothness" />
                 <reference ref="highway_yesno_incline_oneway_lit_width" />
             </optional>
@@ -953,5 +966,5 @@
             <optional>
                 <reference ref="name_layer" />
-                <reference ref="surface" />
+                <reference ref="surface_smoothness" />
                 <reference ref="highway_yesno_incline_oneway_lit_width" />
                 <check key="passing_places" text="Passing Places" />
@@ -973,5 +986,5 @@
             <optional>
                 <reference ref="name_layer" />
-                <reference ref="surface" />
+                <reference ref="surface_smoothness" />
                 <reference ref="highway_yesno_incline" />
                 <check key="lit" text="Lit" />
@@ -2133,5 +2146,5 @@
                 <reference ref="highway_yesno_incline_oneway" />
                 <combo key="layer" text="Layer" values="5,4,3,2,1,0,-1,-2,-3,-4,-5" length="3" />
-                <reference ref="surface" />
+                <reference ref="surface_smoothness" />
                 <text key="maxspeed" text="Max. speed (km/h)" />
                 <text key="width" text="Width (meters)" />
@@ -2341,5 +2354,6 @@
             <text key="maxheight" text="Max. height (meters)" />
             <combo key="park_ride" text="Park and Ride" values="yes,no,bus,train,tram,metro,ferry" />
-            <reference ref="parking_access_fee_operator_surface" />
+            <reference ref="parking_access_fee_operator_surface_smoothness" />
+            <space />
             <text key="capacity" text="Capacity (overall)" />
             <combo key="capacity:disabled" text="Spaces for Disabled" values="yes,no,1,2,3" />
@@ -2362,5 +2376,5 @@
             <reference ref="parking_name_type_ref" />
             <text key="capacity" text="Capacity" />
-            <reference ref="parking_access_fee_operator_surface" />
+            <reference ref="parking_access_fee_operator_surface_smoothness" />
             <reference ref="maxstay" />
             <reference ref="supervised_lit_oh" />
@@ -2378,5 +2392,5 @@
             <reference ref="parking_name_type_ref" />
             <text key="maxheight" text="Max. height (meters)" />
-            <reference ref="parking_access_fee_operator_surface" />
+            <reference ref="parking_access_fee_operator_surface_smoothness" />
             <reference ref="supervised_lit_oh" />
             <check key="covered" text="Covered (with roof)" />
@@ -2533,5 +2547,5 @@
             <reference ref="parking_name_type_ref" />
             <text key="capacity" text="Capacity" />
-            <reference ref="parking_access_fee_operator_surface" />
+            <reference ref="parking_access_fee_operator_surface_smoothness" />
             <reference ref="supervised_lit_oh" />
             <check key="covered" text="Covered (with roof)" />