Index: trunk/resources/data/defaultpresets.xml
===================================================================
--- trunk/resources/data/defaultpresets.xml	(revision 17790)
+++ trunk/resources/data/defaultpresets.xml	(revision 17791)
@@ -67,6 +67,7 @@
         <text key="width" text="Width (meters)" />
     </chunk>
-    <chunk id="highway_yesno_incline_oneway_lit_width_sidewalk">
+    <chunk id="highway_yesno_incline_oneway_lit_width_busbay_sidewalk">
         <reference ref="highway_yesno_incline_oneway_lit_width" />
+		<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" />
     </chunk>
@@ -689,5 +690,5 @@
                 <check key="noname" text="Street has no name" disable_off="true" />
                 <reference ref="highway_base" />
-                <reference ref="highway_yesno_incline_oneway_lit_width_sidewalk" />
+                <reference ref="highway_yesno_incline_oneway_lit_width_busbay_sidewalk" />
                 <checkgroup columns="4">
                     <check key="motorroad" text="Motorroad" />
@@ -708,5 +709,5 @@
                 <text key="junction:ref" text="Junction reference" />
                 <check key="motorroad" text="Motorroad" />
-                <reference ref="highway_yesno_incline_oneway_lit_width_sidewalk" />
+                <reference ref="highway_yesno_incline_oneway_lit_width_busbay_sidewalk" />
                 <space />
                 <reference ref="placement_shoulder" />
@@ -724,5 +725,5 @@
                 <check key="noname" text="Street has no name" disable_off="true" />
                 <reference ref="highway_base" />
-                <reference ref="highway_yesno_incline_oneway_lit_width_sidewalk" />
+                <reference ref="highway_yesno_incline_oneway_lit_width_busbay_sidewalk" />
                 <checkgroup columns="2">
                     <check key="narrow" text="Narrow" disable_off="true" />
@@ -740,5 +741,5 @@
                 <text key="destination" text="Destination" />
                 <text key="destination:ref" text="Destination reference" />
-                <reference ref="highway_yesno_incline_oneway_lit_width_sidewalk" />
+                <reference ref="highway_yesno_incline_oneway_lit_width_busbay_sidewalk" />
                 <space />
                 <reference ref="placement_shoulder" />
@@ -756,5 +757,5 @@
                 <check key="noname" text="Street has no name" disable_off="true" />
                 <reference ref="highway_base" />
-                <reference ref="highway_yesno_incline_oneway_lit_width_sidewalk" />
+                <reference ref="highway_yesno_incline_oneway_lit_width_busbay_sidewalk" />
                 <checkgroup columns="2">
                     <check key="narrow" text="Narrow" disable_off="true" />
@@ -772,5 +773,5 @@
                 <text key="destination" text="Destination" />
                 <text key="destination:ref" text="Destination reference" />
-                <reference ref="highway_yesno_incline_oneway_lit_width_sidewalk" />
+                <reference ref="highway_yesno_incline_oneway_lit_width_busbay_sidewalk" />
                 <space />
                 <reference ref="placement_shoulder" />
@@ -787,5 +788,5 @@
                 <check key="noref" text="Street has no reference" disable_off="true" />
                 <reference ref="highway_base" />
-                <reference ref="highway_yesno_incline_oneway_lit_width_sidewalk" />
+                <reference ref="highway_yesno_incline_oneway_lit_width_busbay_sidewalk" />
                 <checkgroup columns="3">
                     <check key="narrow" text="Narrow" disable_off="true" />
@@ -813,4 +814,5 @@
                 </checkgroup>
                 <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" />
                 <checkgroup columns="2">
@@ -842,4 +844,5 @@
                 </checkgroup>
                 <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" />
             </optional>
@@ -856,5 +859,5 @@
                 <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_oneway_lit_width" />
+                <reference ref="highway_yesno_incline_oneway_lit_width_busbay_sidewalk" />
                 <checkgroup columns="2">
                     <check key="narrow" text="Narrow" disable_off="true" />
@@ -889,5 +892,5 @@
                 <space />
                 <reference ref="highway_base" />
-                <reference ref="highway_yesno_incline_oneway_lit_width_sidewalk" />
+                <reference ref="highway_yesno_incline_oneway_lit_width_busbay_sidewalk" />
                 <check key="passing_places" text="Passing Places" />
             </optional>
@@ -929,5 +932,5 @@
                 <space />
                 <reference ref="highway_base" />
-                <reference ref="highway_yesno_incline_oneway_lit_width_sidewalk" />
+                <reference ref="highway_yesno_incline_oneway_lit_width_busbay_sidewalk" />
                 <check key="trolley_wire" text="Overhead trolley wires" />
             </optional>
@@ -942,5 +945,5 @@
                 <space />
                 <reference ref="highway_base" />
-                <reference ref="highway_yesno_incline_oneway_lit_width_sidewalk" />
+                <reference ref="highway_yesno_incline_oneway_lit_width_busbay_sidewalk" />
                 <check key="trolley_wire" text="Overhead trolley wires" />
                 <combo key="junction" text="Junction" values="roundabout,jughandle" />