Index: /trunk/data/defaultpresets.xml
===================================================================
--- /trunk/data/defaultpresets.xml	(revision 11280)
+++ /trunk/data/defaultpresets.xml	(revision 11281)
@@ -2410,5 +2410,5 @@
             <check key="floating" text="Floating" />
         </item> <!-- Pier -->
-        <item name="Lock Gate" icon="presets/nautical/lock_gate.svg" type="node" preset_name_label="true">
+        <item name="Lock Gate" icon="presets/nautical/lock_gate.svg" type="node,way" preset_name_label="true">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:waterway=lock_gate"
                   cs.href="http://wiki.openstreetmap.org/wiki/Cs:Tag:waterway=lock_gate"
Index: /trunk/styles/standard/elemstyles.mapcss
===================================================================
--- /trunk/styles/standard/elemstyles.mapcss	(revision 11280)
+++ /trunk/styles/standard/elemstyles.mapcss	(revision 11281)
@@ -4205,4 +4205,10 @@
     color: water#0000ff;
 }
+way[waterway=river][lock=yes],
+way[waterway=canal][lock=yes] {
+    casing-width: 2;
+    casing-color: lock#303030;
+    casing-dashes: 5,20;
+}
 way[waterway=stream] {
     width: 1;
@@ -4228,4 +4234,8 @@
     icon-image: "presets/nautical/boatyard.svg";
     set icon_z17;
+}
+way[waterway=lock_gate] {
+    width: 3;
+    color: lock_gate#303030;
 }
 node[waterway=lock_gate] {