Index: resources/data/defaultpresets.xml
===================================================================
--- resources/data/defaultpresets.xml	(revision 16718)
+++ resources/data/defaultpresets.xml	(working copy)
@@ -51,8 +51,8 @@
     <chunk id="highway_yesno">
         <checkgroup columns="2">
             <check key="bridge" text="Bridge" disable_off="true" />
-            <check key="embankment" text="Embankment" 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>
     </chunk>
@@ -61,15 +61,27 @@
         <combo key="incline" text="Incline" values="10%,-10%,10°,-10°,up,down" />
     </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="3">
+            <check key="oneway" text="Oneway" />
+            <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" />
+            <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>
     <chunk id="highway_yesno_incline_oneway_lit_width_sidewalk">
         <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">
+        <space />
+        <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,transition" />
+        <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,transition" />
+    </chunk>
     <chunk id="railway_service">
         <combo key="service" text="Service type" values="yard,siding,spur,crossover" />
     </chunk>
@@ -551,7 +563,8 @@
                 <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" />
+                <reference ref="placement" />
+                <space />
                 <checkgroup columns="4">
                     <check key="oneway" text="Oneway" default="on" />
                     <check key="bridge" text="Bridge" disable_off="true" />
@@ -573,7 +586,8 @@
                 <text key="destination:ref" text="Destination reference" />
                 <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" />
+                <reference ref="placement" />
+                <space />
                 <checkgroup columns="4">
                     <check key="oneway" text="Oneway" default="on" />
                     <check key="bridge" text="Bridge" disable_off="true" />
@@ -591,13 +605,16 @@
             <space />
             <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" />
+                <reference ref="placement" />
+                <space />
                 <checkgroup columns="4">
                     <check key="oneway" text="Oneway" default="on" />
                     <check key="motorroad" text="Motorroad" default="on" />
@@ -622,7 +639,8 @@
                 <text key="destination:ref" text="Destination reference" />
                 <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" />
+                <reference ref="placement" />
+                <space />
                 <checkgroup columns="4">
                     <check key="oneway" text="Oneway" default="on" />
                     <check key="motorroad" text="Motorroad" default="on" />
@@ -642,14 +660,18 @@
             <space />
             <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="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" />
         </item> <!-- Primary -->
@@ -663,7 +685,7 @@
                 <text key="junction:ref" text="Junction reference" />
                 <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" />
+                <reference ref="placement" />
             </optional>
             <preset_link preset_name="Road Restrictions" />
         </item> <!-- Primary Link -->
@@ -672,13 +694,17 @@
             <space />
             <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" />
         </item> <!-- Secondary -->
@@ -690,7 +716,7 @@
                 <text key="destination" text="Destination" />
                 <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" />
+                <reference ref="placement" />
             </optional>
             <preset_link preset_name="Road Restrictions" />
         </item> <!-- Secondary Link -->
@@ -699,13 +725,17 @@
             <space />
             <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" />
         </item> <!-- Tertiary -->
@@ -717,6 +747,7 @@
                 <text key="destination" text="Destination" />
                 <text key="destination:ref" text="Destination reference" />
                 <reference ref="highway_yesno_incline_oneway_lit_width_sidewalk" />
+                <reference ref="placement" />
             </optional>
             <preset_link preset_name="Road Restrictions" />
         </item> <!-- Tertiary Link -->
@@ -727,12 +758,15 @@
                 <text key="name" text="Name" />
                 <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" />
         </item> <!-- Unclassified -->
@@ -741,20 +775,25 @@
             <space />
             <key key="highway" value="residential" />
             <text key="name" text="Name" />
+            <check key="noname" text="Street has no name" disable_off="true" />
             <optional>
-                <check key="noname" text="Street has no name" disable_off="true" />
                 <text key="ref" text="Reference" />
                 <reference ref="highway_base" />
                 <checkgroup columns="2">
                     <check key="oneway" text="Oneway" />
                     <check key="oneway:bicycle" text="Oneway for bicycle" />
+                    <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>
-                <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" />
         </item> <!-- Residential -->
@@ -790,8 +829,10 @@
                 <combo key="layer" text="Layer" values="5,4,3,2,1,0,-1,-2,-3,-4,-5" length="3" />
                 <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" />
         </item> <!-- Living Street -->
@@ -1107,7 +1148,9 @@
             <space />
             <key key="highway" value="motorway_junction" />
             <text key="name" text="Name" />
+            <check key="noname" text="Street has no name" disable_off="true" />
             <text key="ref" text="Number" />
+            <check key="noref" text="Street 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">
             <link wiki="Tag:highway=services" />