Index: resources/data/defaultpresets.xml
===================================================================
--- resources/data/defaultpresets.xml	(revision 18080)
+++ resources/data/defaultpresets.xml	(working copy)
@@ -53,14 +53,14 @@
         <combo key="incline" text="Incline" values="10%,-10%,10°,-10°,up,down" />
     </chunk>
     <chunk id="highway_yesno_incline_oneway_lit_width">
-        <checkgroup columns="4">
+        <checkgroup columns="5">
             <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="oneway" text="Oneway" />
             <check key="lit" text="Lit" />
         </checkgroup>
+        <combo key="oneway" text="Oneway" values="yes,no,reversible,alternating" />
         <combo key="incline" text="Incline" values="10%,-10%,10°,-10°,up,down" />
         <text key="width" text="Width (meters)" />
     </chunk>
@@ -599,11 +599,11 @@
                 <text key="width" text="Width (meters)" />
                 <space />
                 <reference ref="highway_yesno" />
-                <checkgroup columns="4">
-                    <check key="oneway" text="Oneway" default="on" />
+                <checkgroup columns="2">
                     <check key="lit" text="Lit" />
                     <check key="toll" text="Toll" />
                 </checkgroup>
+                <combo key="oneway" text="Oneway" values="yes,no,reversible,alternating" default="yes"/>
                 <reference ref="placement_shoulder" />
             </optional>
             <reference ref="link_road_access_restrictions" />
@@ -621,11 +621,11 @@
                 <text key="width" text="Width (meters)" />
                 <space />
                 <reference ref="highway_yesno" />
-                <checkgroup columns="4">
-                    <check key="oneway" text="Oneway" default="on" />
+                <checkgroup columns="2">
                     <check key="lit" text="Lit" />
                     <check key="toll" text="Toll" />
                 </checkgroup>
+                <combo key="oneway" text="Oneway" values="yes,no,reversible,alternating" default="yes"/>
                 <reference ref="placement_shoulder" />
             </optional>
             <reference ref="link_road_access_restrictions" />
@@ -645,12 +645,12 @@
                 <text key="width" text="Width (meters)" />
                 <space />
                 <reference ref="highway_yesno" />
-                <checkgroup columns="4">
-                    <check key="oneway" text="Oneway" default="on" />
+                <checkgroup columns="3">
                     <check key="lit" text="Lit" />
                     <check key="toll" text="Toll" />
                     <check key="motorroad" text="Motorroad" default="on" />
                 </checkgroup>
+                <combo key="oneway" text="Oneway" values="yes,no,reversible,alternating" default="yes"/>
                 <reference ref="placement_shoulder" />
             </optional>
             <reference ref="link_road_access_restrictions" />
@@ -669,12 +669,12 @@
                 <text key="width" text="Width (meters)" />
                 <space />
                 <reference ref="highway_yesno" />
-                <checkgroup columns="4">
-                    <check key="oneway" text="Oneway" default="on" />
+                <checkgroup columns="3">
                     <check key="lit" text="Lit" />
                     <check key="toll" text="Toll" />
                     <check key="motorroad" text="Motorroad" default="on" />
                 </checkgroup>
+                <combo key="oneway" text="Oneway" values="yes,no,reversible,alternating" default="yes"/>
                 <reference ref="placement_shoulder" />
             </optional>
             <reference ref="link_road_access_restrictions" />
@@ -808,11 +808,11 @@
                 <text key="ref" text="Reference" />
                 <reference ref="highway_base" />
                 <reference ref="highway_yesno" />
-                <checkgroup columns="4">
-                    <check key="oneway" text="Oneway" />
+                <checkgroup columns="2">
                     <check key="oneway:bicycle" text="Oneway for bicycle" />
                     <check key="lit" text="Lit" />
                 </checkgroup>
+                <combo key="oneway" text="Oneway" values="yes,no,reversible,alternating" />
                 <text key="width" text="Width (meters)" />
                 <combo key="bus_bay" text="Bus bay" values="both,left,right" />
                 <combo key="sidewalk" text="Sidewalk" values="both,left,right,no,separate" values_context="sidewalk" />
@@ -838,11 +838,11 @@
                 <combo key="layer" text="Layer" values="5,4,3,2,1,0,-1,-2,-3,-4,-5" length="3" values_sort="false" />
                 <reference ref="surface_smoothness" />
                 <reference ref="highway_yesno_incline" />
-                <checkgroup columns="4">
-                    <check key="oneway" text="Oneway" />
+                <checkgroup columns="2">
                     <check key="oneway:bicycle" text="Oneway for bicycle" />
                     <check key="lit" text="Lit" />
                 </checkgroup>
+                <combo key="oneway" text="Oneway" values="yes,no,reversible,alternating" />
                 <text key="width" text="Width (meters)" />
                 <combo key="bus_bay" text="Bus bay" values="both,left,right" />
                 <combo key="sidewalk" text="Sidewalk" values="both,left,right,no,separate" values_context="sidewalk" />
@@ -903,7 +903,7 @@
             <key key="service" value="parking_aisle" />
             <optional>
                 <reference ref="surface_smoothness" />
-                <check key="oneway" text="Oneway" />
+                <combo key="oneway" text="Oneway" values="yes,no,reversible,alternating" />
                 <check key="lit" text="Lit" />
             </optional>
             <reference ref="link_road_access_restrictions" />
@@ -955,13 +955,13 @@
         <item name="Road Restrictions" icon="presets/vehicle/restriction/maxspeed.svg" type="node,way,closedway" preset_name_label="true">
             <link wiki="Key:access" />
             <space />
-            <checkgroup columns="3" >
-                <check key="oneway" text="Oneway" />
+            <checkgroup columns="4" >
                 <check key="toll" text="Toll" />
                 <check key="noexit" text="No exit (cul-de-sac)" disable_off="true" />
                 <check key="winter_road" text="Winter road" disable_off="true" />
                 <check key="ice_road" text="Ice road" disable_off="true" />
             </checkgroup>
+            <combo key="oneway" text="Oneway" values="yes,no,reversible,alternating" />
             <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" />
@@ -1045,7 +1045,7 @@
                 <reference ref="name_layer" />
                 <combo key="lanes" text="Lanes" values="1,2,3" length="3" />
                 <reference ref="highway_yesno" />
-                <check key="oneway" text="Oneway" />
+                <combo key="oneway" text="Oneway" values="yes,no,reversible,alternating" />
                 <text key="width" text="Width (meters)" />
             </optional>
             <reference ref="link_road_access_restrictions" />
@@ -1154,7 +1154,7 @@
             <space />
             <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" />
-                <check key="oneway" text="Oneway" />
+                <combo key="oneway" text="Oneway" values="yes,no,reversible,alternating" />
             </optional>
         </item> <!-- Cycle Lane/Track -->
         <item name="Dedicated Cycleway" icon="presets/transport/way/dedicated_cycleway.svg" type="way,closedway" preset_name_label="true">
@@ -2337,7 +2337,7 @@
             <optional>
                 <text key="name" text="Name" />
                 <reference ref="highway_yesno" />
-                <check key="oneway" text="Oneway" />
+                <combo key="oneway" text="Oneway" values="yes,no,reversible,alternating" />
                 <combo key="layer" text="Layer" values="5,4,3,2,1,0,-1,-2,-3,-4,-5" length="3" values_sort="false" />
                 <reference ref="surface_smoothness" />
                 <text key="maxspeed" text="Max. speed (km/h)" />