Index: trunk/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java
===================================================================
--- trunk/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java	(revision 9537)
+++ trunk/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java	(revision 9538)
@@ -804,5 +804,5 @@
 
         String directionDefault = "oneway? | (aerialway=* aerialway!=station) | "+
-                "waterway=stream | waterway=river | waterway=canal | waterway=drain | "+
+                "waterway=stream | waterway=river | waterway=ditch | waterway=wadi | waterway=drain | "+
                 "\"piste:type\"=downhill | \"piste:type\"=sled | man_made=\"piste:halfpipe\" | "+
                 "junction=roundabout | (highway=motorway & -oneway=no & -oneway=reversible) | "+