Index: trunk/data/defaultpresets.xml
===================================================================
--- trunk/data/defaultpresets.xml	(revision 8958)
+++ trunk/data/defaultpresets.xml	(revision 8983)
@@ -34,7 +34,14 @@
     </chunk>
     <chunk id="highway_base">
-        <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"/>
-        <text key="maxspeed" text="Max. speed (km/h)"/>
+        <space />
+        <combo key="lanes" text="Lanes" values="1,2,3,4,5" length="3" />
+        <combo key="lanes:forward" text="Lanes in way direction" values="1,2,3,4,5" length="3" />
+        <combo key="lanes:backward" text="Lanes opposed to way direction" values="1,2,3,4,5" length="3" />
+        <space />
+        <text key="maxspeed" text="Max. speed (km/h)" />
+        <text key="maxspeed:forward" text="Max. speed in way direction" />
+        <text key="maxspeed:backward" text="Max. speed opposed to way direction" />
+        <space />
+        <combo key="layer" text="Layer" values="5,4,3,2,1,0,-1,-2,-3,-4,-5" length="3" />
         <reference ref="surface_smoothness" />
     </chunk>
@@ -308,5 +315,9 @@
             <text key="name" text="Name" />
             <combo key="layer" text="Layer" values="5,4,3,2,1,0,-1,-2,-3,-4,-5" default="1" length="3" />
+            <space />
             <text key="maxspeed" text="Max. speed (km/h)" />
+            <text key="maxspeed:forward" text="Max. speed in way direction" />
+            <text key="maxspeed:backward" text="Max. speed opposed to way direction" />
+            <space />
             <text key="maxweight" text="Max. weight (tonnes)" />
             <combo key="incline" text="Incline" values="10%,-10%,10°,-10°,up,down" />
@@ -642,6 +653,6 @@
             <text key="maxspeed" text="Max. speed (km/h)" default="30" />
             <optional>
+                <combo key="lanes" text="Lanes" values="1,2,3,4,5" length="3" />
                 <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_smoothness" />
                 <check key="oneway" text="Oneway" />
@@ -667,6 +678,6 @@
             <text key="name" text="Name" />
             <optional>
+                <combo key="lanes" text="Lanes" values="1,2,3,4,5" length="3" />
                 <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_smoothness" />
                 <reference ref="highway_yesno_incline_oneway_lit_width" />
@@ -690,5 +701,4 @@
             <optional>
                 <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_smoothness" />
                 <check key="area" text="Area" />
@@ -843,5 +853,8 @@
             <combo key="psv" text="Public Service Vehicles (psv)" values="yes,official,designated,destination,permissive,private,no" match="key" />
             <combo key="tourist_bus" text="Tourist buses" values="yes,no" match="key" />
+            <space />
             <text key="maxspeed" text="Max. speed (km/h)" />
+            <text key="maxspeed:forward" text="Max. speed in way direction" />
+            <text key="maxspeed:backward" text="Max. speed opposed to way direction" />
             <text key="minspeed" text="Min. speed (km/h)" match="key" />
             <text key="maxweight" text="Max. weight (tonnes)" match="key" />
@@ -1671,5 +1684,9 @@
                 <text key="width" text="Width (meters)" />
                 <text key="maxheight" text="Max. height (meters)" />
+                <space />
                 <text key="maxspeed" text="Max. speed (km/h)" />
+                <text key="maxspeed:forward" text="Max. speed in way direction" />
+                <text key="maxspeed:backward" text="Max. speed opposed to way direction" />
+                <space />
                 <combo key="incline" text="Incline" values="10%,-10%,10°,-10°,up,down" />
                 <check key="toll" text="Toll" />