Index: trunk/data/defaultpresets.xml
===================================================================
--- trunk/data/defaultpresets.xml	(revision 15533)
+++ trunk/data/defaultpresets.xml	(revision 15535)
@@ -1555,22 +1555,15 @@
   <group name="Water" name_context="main group" icon="presets/nautical/waterway_river.svg">
     <group name="Water" name_context="sub group" icon="presets/nautical/waterway_river.svg">
-        <item name="Drain" icon="presets/nautical/waterway_drain.svg" type="way" preset_name_label="true">
-            <link wiki="Tag:waterway=drain" />
-            <space />
-            <key key="waterway" value="drain" />
-            <optional>
-                <text key="name" text="Name" />
-                <reference ref="waterway" />
-            </optional>
-        </item> <!-- Drain -->
-        <item name="Ditch" icon="presets/nautical/waterway_ditch.svg" type="way" preset_name_label="true">
-            <link wiki="Tag:waterway=ditch" />
-            <space />
-            <key key="waterway" value="ditch" />
-            <optional>
-                <text key="name" text="Name" />
-                <reference ref="waterway" />
-            </optional>
-        </item> <!-- Ditch -->
+        <item name="River" icon="presets/nautical/waterway_river.svg" type="way" preset_name_label="true">
+            <link wiki="Tag:waterway=river" />
+            <space />
+            <key key="waterway" value="river" />
+            <text key="name" text="Name" />
+            <optional>
+                <reference ref="waterway_wikipedia" />
+                <check key="lock" text="Lock" disable_off="true" />
+            </optional>
+            <reference ref="water_access" />
+        </item> <!-- River -->
         <item name="Stream" icon="presets/nautical/waterway_stream.svg" type="way" preset_name_label="true">
             <link wiki="Tag:waterway=stream" />
@@ -1583,15 +1576,17 @@
             <reference ref="water_access" />
         </item> <!-- Stream -->
-        <item name="River" icon="presets/nautical/waterway_river.svg" type="way" preset_name_label="true">
-            <link wiki="Tag:waterway=river" />
-            <space />
-            <key key="waterway" value="river" />
-            <text key="name" text="Name" />
-            <optional>
-                <reference ref="waterway_wikipedia" />
-                <check key="lock" text="Lock" disable_off="true" />
-            </optional>
-            <reference ref="water_access" />
-        </item> <!-- River -->
+        <item name="Tidal channel" icon="presets/nautical/tidal_channel.svg" type="way" preset_name_label="true">
+            <link wiki="Tag:waterway=tidal_channel" />
+            <space />
+            <key key="waterway" value="tidal_channel" />
+            <optional>
+                <text key="name" text="Name" />
+                <check key="salt" text="Salt Water" disable_off="true" />
+                <check key="intermittent" text="Intermittent" disable_off="true" />
+                <check key="seasonal" text="Seasonal" disable_off="true" />
+                <text key="width" text="Width (meters)" />
+                <text key="wikipedia" text="Wikipedia" />
+            </optional>
+        </item> <!-- Tidal channel -->
         <item name="Canal" icon="presets/nautical/waterway_canal.svg" type="way" preset_name_label="true">
             <link wiki="Tag:waterway=canal" />
@@ -1609,4 +1604,22 @@
             <reference ref="water_access" />
         </item> <!-- Canal -->
+        <item name="Drain" icon="presets/nautical/waterway_drain.svg" type="way" preset_name_label="true">
+            <link wiki="Tag:waterway=drain" />
+            <space />
+            <key key="waterway" value="drain" />
+            <optional>
+                <text key="name" text="Name" />
+                <reference ref="waterway" />
+            </optional>
+        </item> <!-- Drain -->
+        <item name="Ditch" icon="presets/nautical/waterway_ditch.svg" type="way" preset_name_label="true">
+            <link wiki="Tag:waterway=ditch" />
+            <space />
+            <key key="waterway" value="ditch" />
+            <optional>
+                <text key="name" text="Name" />
+                <reference ref="waterway" />
+            </optional>
+        </item> <!-- Ditch -->
         <separator/>
         <item name="Spring" icon="presets/landmark/spring.svg" type="node,closedway" preset_name_label="true">