Index: /trunk/resources/data/defaultpresets.xml
===================================================================
--- /trunk/resources/data/defaultpresets.xml	(revision 16740)
+++ /trunk/resources/data/defaultpresets.xml	(revision 16741)
@@ -37,5 +37,4 @@
     </chunk>
     <chunk id="highway_base">
-        <space />
         <combo key="lanes" text="Lanes" values="1,2,3,4,5,6" length="3" />
         <combo key="lanes:forward" text="Lanes in way direction" values="1,2,3,4,5" length="3" />
@@ -50,8 +49,8 @@
     </chunk>
     <chunk id="highway_yesno">
-        <checkgroup columns="2">
+        <checkgroup columns="4">
             <check key="bridge" text="Bridge" disable_off="true" />
+            <check key="tunnel" text="Tunnel" disable_off="true" />
             <check key="embankment" text="Embankment" disable_off="true" />
-            <check key="tunnel" text="Tunnel" disable_off="true" />
             <check key="cutting" text="Cutting" disable_off="true" />
         </checkgroup>
@@ -62,7 +61,15 @@
     </chunk>
     <chunk id="highway_yesno_incline_oneway_lit_width">
-        <check key="oneway" text="Oneway" />
-        <reference ref="highway_yesno_incline" />
-        <check key="lit" text="Lit" />
+        <checkgroup columns="4">
+            <check key="bridge" text="Bridge" disable_off="true" />
+            <check key="tunnel" text="Tunnel" disable_off="true" />
+            <check key="embankment" text="Embankment" disable_off="true" />
+            <check key="cutting" text="Cutting" disable_off="true" />
+        </checkgroup>
+        <checkgroup columns="4">
+            <check key="oneway" text="Oneway" />
+            <check key="lit" text="Lit" />
+        </checkgroup>
+        <combo key="incline" text="Incline" values="10%,-10%,10°,-10°,up,down" />
         <text key="width" text="Width (meters)" />
     </chunk>
@@ -70,4 +77,9 @@
         <reference ref="highway_yesno_incline_oneway_lit_width" />
         <combo key="sidewalk" text="Sidewalk" values="both,left,right,no,separate" values_context="sidewalk" />
+    </chunk>
+    <chunk id="placement">
+        <combo key="placement" text="Placement" values="left_of:1,left_of:2,left_of:3,left_of:4,left_of:5,middle_of:1,middle_of:2,middle_of:3,middle_of:4,middle_of:5,right_of:1,right_of:2,right_of:3,right_of:4,right_of:5,transition" />
+        <combo key="placement:forward" text="Placement in way direction" values="left_of:1,left_of:2,left_of:3,left_of:4,left_of:5,middle_of:1,middle_of:2,middle_of:3,middle_of:4,middle_of:5,right_of:1,right_of:2,right_of:3,right_of:4,right_of:5" />
+        <combo key="placement:backward" text="Placement opposed to way direction" values="left_of:1,left_of:2,left_of:3,left_of:4,left_of:5,middle_of:1,middle_of:2,middle_of:3,middle_of:4,middle_of:5,right_of:1,right_of:2,right_of:3,right_of:4,right_of:5" />
     </chunk>
     <chunk id="railway_service">
@@ -546,20 +558,20 @@
             <key key="highway" value="motorway" />
             <text key="ref" text="Reference" />
+            <check key="noref" text="Street has no reference" disable_off="true" />
             <optional>
                 <text key="name" text="Name" />
+                <check key="noname" text="Street has no name" disable_off="true" />
                 <reference ref="highway_base" />
                 <text key="destination" text="Destination" />
                 <text key="destination:ref" text="Destination reference" />
                 <text key="width" text="Width (meters)" />
-                <combo key="placement" text="Placement" values="left_of:1,left_of:2,left_of:3,middle_of:1,middle_of:2,middle_of:3,right_of:1,right_of:2,right_of:3,transition" />
+                <space />
+                <reference ref="highway_yesno" />
                 <checkgroup columns="4">
                     <check key="oneway" text="Oneway" default="on" />
-                    <check key="bridge" text="Bridge" disable_off="true" />
-                    <check key="tunnel" text="Tunnel" disable_off="true" />
-                    <check key="cutting" text="Cutting" disable_off="true" />
-                    <check key="embankment" text="Embankment" disable_off="true" />
                     <check key="lit" text="Lit" />
                     <check key="toll" text="Toll" />
                 </checkgroup>
+                <reference ref="placement" />
             </optional>
             <preset_link preset_name="Road Restrictions" />
@@ -569,4 +581,6 @@
             <key key="highway" value="motorway_link" />
             <optional>
+                <text key="ref" text="Reference" />
+                <check key="noref" text="Street has no reference" disable_off="true" />
                 <reference ref="highway_base" />
                 <text key="destination" text="Destination" />
@@ -574,14 +588,12 @@
                 <text key="junction:ref" text="Junction reference" />
                 <text key="width" text="Width (meters)" />
-                <combo key="placement" text="Placement" values="left_of:1,left_of:2,left_of:3,middle_of:1,middle_of:2,middle_of:3,right_of:1,right_of:2,right_of:3,transition" />
+                <space />
+                <reference ref="highway_yesno" />
                 <checkgroup columns="4">
                     <check key="oneway" text="Oneway" default="on" />
-                    <check key="bridge" text="Bridge" disable_off="true" />
-                    <check key="tunnel" text="Tunnel" disable_off="true" />
-                    <check key="cutting" text="Cutting" disable_off="true" />
-                    <check key="embankment" text="Embankment" disable_off="true" />
                     <check key="lit" text="Lit" />
                     <check key="toll" text="Toll" />
                 </checkgroup>
+                <reference ref="placement" />
             </optional>
             <preset_link preset_name="Road Restrictions" />
@@ -592,21 +604,21 @@
             <key key="highway" value="trunk" />
             <text key="ref" text="Reference" />
+            <check key="noref" text="Street has no reference" disable_off="true" />
             <optional>
                 <text key="name" text="Name" />
+                <check key="noname" text="Street has no name" disable_off="true" />
                 <reference ref="highway_base" />
                 <text key="destination" text="Destination" />
                 <text key="destination:ref" text="Destination reference" />
                 <text key="width" text="Width (meters)" />
-                <combo key="placement" text="Placement" values="left_of:1,left_of:2,left_of:3,middle_of:1,middle_of:2,middle_of:3,right_of:1,right_of:2,right_of:3,transition" />
+                <space />
+                <reference ref="highway_yesno" />
                 <checkgroup columns="4">
                     <check key="oneway" text="Oneway" default="on" />
-                    <check key="motorroad" text="Motorroad" default="on" />
-                    <check key="bridge" text="Bridge" disable_off="true" />
-                    <check key="tunnel" text="Tunnel" disable_off="true" />
-                    <check key="cutting" text="Cutting" disable_off="true" />
-                    <check key="embankment" text="Embankment" disable_off="true" />
                     <check key="lit" text="Lit" />
                     <check key="toll" text="Toll" />
+                    <check key="motorroad" text="Motorroad" default="on" />
                 </checkgroup>
+                <reference ref="placement" />
             </optional>
             <preset_link preset_name="Road Restrictions" />
@@ -616,6 +628,7 @@
             <space />
             <key key="highway" value="trunk_link" />
-            <text key="ref" text="Reference" />
-            <optional>
+            <optional>
+                <text key="ref" text="Reference" />
+                <check key="noref" text="Street has no reference" disable_off="true" />
                 <reference ref="highway_base" />
                 <text key="destination" text="Destination" />
@@ -623,15 +636,13 @@
                 <text key="junction:ref" text="Junction reference" />
                 <text key="width" text="Width (meters)" />
-                <combo key="placement" text="Placement" values="left_of:1,left_of:2,left_of:3,middle_of:1,middle_of:2,middle_of:3,right_of:1,right_of:2,right_of:3,transition" />
+                <space />
+                <reference ref="highway_yesno" />
                 <checkgroup columns="4">
                     <check key="oneway" text="Oneway" default="on" />
-                    <check key="motorroad" text="Motorroad" default="on" />
-                    <check key="bridge" text="Bridge" disable_off="true" />
-                    <check key="tunnel" text="Tunnel" disable_off="true" />
-                    <check key="cutting" text="Cutting" disable_off="true" />
-                    <check key="embankment" text="Embankment" disable_off="true" />
                     <check key="lit" text="Lit" />
                     <check key="toll" text="Toll" />
+                    <check key="motorroad" text="Motorroad" default="on" />
                 </checkgroup>
+                <reference ref="placement" />
             </optional>
             <preset_link preset_name="Road Restrictions" />
@@ -643,12 +654,16 @@
             <key key="highway" value="primary" />
             <text key="ref" text="Reference" />
+            <check key="noref" text="Street has no reference" disable_off="true" />
             <optional>
                 <text key="name" text="Name" />
+                <check key="noname" text="Street has no name" disable_off="true" />
                 <reference ref="highway_base" />
-                <check key="motorroad" text="Motorroad" />
                 <reference ref="highway_yesno_incline_oneway_lit_width_sidewalk" />
-                <check key="narrow" text="Narrow" disable_off="true" />
-                <check key="trolley_wire" text="Overhead trolley wires" />
-                <combo key="placement" text="Placement" values="left_of:1,left_of:2,left_of:3,middle_of:1,middle_of:2,middle_of:3,right_of:1,right_of:2,right_of:3,transition" />
+                <checkgroup columns="4">
+                    <check key="motorroad" text="Motorroad" />
+                    <check key="narrow" text="Narrow" disable_off="true" />
+                    <check key="trolley_wire" text="Overhead trolley wires" />
+                </checkgroup>
+                <reference ref="placement" />
             </optional>
             <preset_link preset_name="Road Restrictions" />
@@ -664,5 +679,6 @@
                 <check key="motorroad" text="Motorroad" />
                 <reference ref="highway_yesno_incline_oneway_lit_width_sidewalk" />
-                <combo key="placement" text="Placement" values="left_of:1,left_of:2,left_of:3,middle_of:1,middle_of:2,middle_of:3,right_of:1,right_of:2,right_of:3,transition" />
+                <space />
+                <reference ref="placement" />
             </optional>
             <preset_link preset_name="Road Restrictions" />
@@ -673,11 +689,15 @@
             <key key="highway" value="secondary" />
             <text key="ref" text="Reference" />
+            <check key="noref" text="Street has no reference" disable_off="true" />
             <optional>
                 <text key="name" text="Name" />
+                <check key="noname" text="Street has no name" disable_off="true" />
                 <reference ref="highway_base" />
                 <reference ref="highway_yesno_incline_oneway_lit_width_sidewalk" />
-                <check key="narrow" text="Narrow" disable_off="true" />
-                <check key="trolley_wire" text="Overhead trolley wires" />
-                <combo key="placement" text="Placement" values="left_of:1,left_of:2,left_of:3,middle_of:1,middle_of:2,middle_of:3,right_of:1,right_of:2,right_of:3,transition" />
+                <checkgroup columns="2">
+                    <check key="narrow" text="Narrow" disable_off="true" />
+                    <check key="trolley_wire" text="Overhead trolley wires" />
+                </checkgroup>
+                <reference ref="placement" />
             </optional>
             <preset_link preset_name="Road Restrictions" />
@@ -691,5 +711,6 @@
                 <text key="destination:ref" text="Destination reference" />
                 <reference ref="highway_yesno_incline_oneway_lit_width_sidewalk" />
-                <combo key="placement" text="Placement" values="left_of:1,left_of:2,left_of:3,middle_of:1,middle_of:2,middle_of:3,right_of:1,right_of:2,right_of:3,transition" />
+                <space />
+                <reference ref="placement" />
             </optional>
             <preset_link preset_name="Road Restrictions" />
@@ -700,11 +721,15 @@
             <key key="highway" value="tertiary" />
             <text key="ref" text="Reference" />
+            <check key="noref" text="Street has no reference" disable_off="true" />
             <optional>
                 <text key="name" text="Name" />
+                <check key="noname" text="Street has no name" disable_off="true" />
                 <reference ref="highway_base" />
                 <reference ref="highway_yesno_incline_oneway_lit_width_sidewalk" />
-                <check key="narrow" text="Narrow" disable_off="true" />
-                <check key="trolley_wire" text="Overhead trolley wires" />
-                <combo key="placement" text="Placement" values="left_of:1,left_of:2,left_of:3,middle_of:1,middle_of:2,middle_of:3,right_of:1,right_of:2,right_of:3,transition" />
+                <checkgroup columns="2">
+                    <check key="narrow" text="Narrow" disable_off="true" />
+                    <check key="trolley_wire" text="Overhead trolley wires" />
+                </checkgroup>
+                <reference ref="placement" />
             </optional>
             <preset_link preset_name="Road Restrictions" />
@@ -718,4 +743,6 @@
                 <text key="destination:ref" text="Destination reference" />
                 <reference ref="highway_yesno_incline_oneway_lit_width_sidewalk" />
+                <space />
+                <reference ref="placement" />
             </optional>
             <preset_link preset_name="Road Restrictions" />
@@ -728,10 +755,13 @@
                 <check key="noname" text="Street has no name" disable_off="true" />
                 <text key="ref" text="Reference" />
+                <check key="noref" text="Street has no reference" disable_off="true" />
                 <reference ref="highway_base" />
                 <reference ref="highway_yesno_incline_oneway_lit_width_sidewalk" />
-                <check key="narrow" text="Narrow" disable_off="true" />
-                <check key="trolley_wire" text="Overhead trolley wires" />
-                <combo key="placement" text="Placement" values="left_of:1,left_of:2,left_of:3,middle_of:1,middle_of:2,middle_of:3,right_of:1,right_of:2,right_of:3,transition" />
-                <check key="passing_places" text="Passing Places" />
+                <checkgroup columns="3">
+                    <check key="narrow" text="Narrow" disable_off="true" />
+                    <check key="trolley_wire" text="Overhead trolley wires" />
+                    <check key="passing_places" text="Passing Places" />
+                </checkgroup> 
+                <reference ref="placement" />
             </optional>
             <preset_link preset_name="Road Restrictions" />
@@ -742,18 +772,20 @@
             <key key="highway" value="residential" />
             <text key="name" text="Name" />
-            <optional>
-                <check key="noname" text="Street has no name" disable_off="true" />
+            <check key="noname" text="Street has no name" disable_off="true" />
+            <optional>
                 <text key="ref" text="Reference" />
                 <reference ref="highway_base" />
-                <checkgroup columns="2">
+                <reference ref="highway_yesno" />
+                <checkgroup columns="4">
                     <check key="oneway" text="Oneway" />
                     <check key="oneway:bicycle" text="Oneway for bicycle" />
+                    <check key="lit" text="Lit" />
                 </checkgroup>
-                <reference ref="highway_yesno_incline" />
-                <check key="lit" text="Lit" />
                 <text key="width" text="Width (meters)" />
                 <combo key="sidewalk" text="Sidewalk" values="both,left,right,no,separate" values_context="sidewalk" />
-                <check key="narrow" text="Narrow" disable_off="true" />
-                <check key="trolley_wire" text="Overhead trolley wires" />
+                <checkgroup columns="2">
+                    <check key="narrow" text="Narrow" disable_off="true" />
+                    <check key="trolley_wire" text="Overhead trolley wires" />
+                </checkgroup>
             </optional>
             <preset_link preset_name="Road Restrictions" />
@@ -766,4 +798,5 @@
             <combo key="highway" text="Highway type" values="residential,service,unclassified,path,cycleway" values_context="Highway" default="residential" />
             <text key="name" text="Name" />
+            <check key="noname" text="Street has no name" disable_off="true" />
             <combo key="vehicle" text="Vehicle access" values="yes,no,destination" default="no" />
             <text key="maxspeed" text="Max. speed (km/h)" default="30" />
@@ -772,8 +805,10 @@
                 <combo key="layer" text="Layer" values="5,4,3,2,1,0,-1,-2,-3,-4,-5" />
                 <reference ref="surface_smoothness" />
-                <check key="oneway" text="Oneway" />
-                <check key="oneway:bicycle" text="Oneway for bicycle" />
                 <reference ref="highway_yesno_incline" />
-                <check key="lit" text="Lit" />
+                <checkgroup columns="4">
+                    <check key="oneway" text="Oneway" />
+                    <check key="oneway:bicycle" text="Oneway for bicycle" />
+                    <check key="lit" text="Lit" />
+                </checkgroup>
                 <text key="width" text="Width (meters)" />
                 <combo key="sidewalk" text="Sidewalk" values="both,left,right,no,separate" values_context="sidewalk" />
@@ -786,4 +821,5 @@
             <key key="highway" value="living_street" />
             <text key="name" text="Name" />
+            <check key="noname" text="Street has no name" disable_off="true" />
             <optional>
                 <combo key="lanes" text="Lanes" values="1,2,3" length="3" />
@@ -791,6 +827,8 @@
                 <reference ref="surface_smoothness" />
                 <reference ref="highway_yesno_incline_oneway_lit_width" />
-                <check key="narrow" text="Narrow" disable_off="true" />
-                <check key="trolley_wire" text="Overhead trolley wires" />
+                <checkgroup columns="2">
+                    <check key="narrow" text="Narrow" disable_off="true" />
+                    <check key="trolley_wire" text="Overhead trolley wires" />
+                </checkgroup>
             </optional>
             <preset_link preset_name="Road Restrictions" />
@@ -801,4 +839,5 @@
             <key key="highway" value="pedestrian" />
             <text key="name" text="Name" />
+            <check key="noname" text="Street has no name" disable_off="true" />
             <optional>
                 <combo key="layer" text="Layer" values="5,4,3,2,1,0,-1,-2,-3,-4,-5" length="3" />
@@ -818,4 +857,5 @@
             <optional>
                 <text key="name" text="Name" />
+                <space />
                 <reference ref="highway_base" />
                 <reference ref="highway_yesno_incline_oneway_lit_width_sidewalk" />
@@ -857,4 +897,5 @@
             <optional>
                 <text key="name" text="Name" />
+                <space />
                 <reference ref="highway_base" />
                 <reference ref="highway_yesno_incline_oneway_lit_width_sidewalk" />
@@ -869,4 +910,5 @@
             <optional>
                 <text key="name" text="Name" />
+                <space />
                 <reference ref="highway_base" />
                 <reference ref="highway_yesno_incline_oneway_lit_width_sidewalk" />
@@ -1108,5 +1150,7 @@
             <key key="highway" value="motorway_junction" />
             <text key="name" text="Name" />
+            <check key="noname" text="Junction has no name" disable_off="true" />
             <text key="ref" text="Number" />
+            <check key="noref" text="Junction has no reference" disable_off="true" />
         </item> <!-- Motorway Junction -->
         <item name="Services" icon="presets/vehicle/services.svg" type="node,closedway,multipolygon" preset_name_label="true">