Index: /trunk/data/defaultpresets.xml
===================================================================
--- /trunk/data/defaultpresets.xml	(revision 15534)
+++ /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">
Index: /trunk/images/presets/nautical/tidal_channel.svg
===================================================================
--- /trunk/images/presets/nautical/tidal_channel.svg	(revision 15535)
+++ /trunk/images/presets/nautical/tidal_channel.svg	(revision 15535)
@@ -0,0 +1,121 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   width="16"
+   height="16"
+   viewBox="0 0 16 16"
+   id="svg4264"
+   version="1.1"
+   inkscape:version="0.92.3 (2405546, 2018-03-11)"
+   sodipodi:docname="t19.svg">
+  <defs
+     id="defs4266" />
+  <sodipodi:namedview
+     id="base"
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1.0"
+     inkscape:pageopacity="0.0"
+     inkscape:pageshadow="2"
+     inkscape:zoom="64"
+     inkscape:cx="6.5177123"
+     inkscape:cy="5.7120338"
+     inkscape:document-units="px"
+     inkscape:current-layer="layer1"
+     showgrid="false"
+     units="px"
+     inkscape:snap-bbox="true"
+     inkscape:bbox-paths="true"
+     inkscape:bbox-nodes="true"
+     inkscape:snap-bbox-edge-midpoints="false"
+     inkscape:snap-bbox-midpoints="false"
+     inkscape:snap-nodes="true"
+     inkscape:window-width="1680"
+     inkscape:window-height="987"
+     inkscape:window-x="-8"
+     inkscape:window-y="-8"
+     inkscape:window-maximized="1">
+    <inkscape:grid
+       type="xygrid"
+       id="grid4137" />
+  </sodipodi:namedview>
+  <metadata
+     id="metadata4269">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+        <dc:title></dc:title>
+        <cc:license
+           rdf:resource="http://creativecommons.org/publicdomain/zero/1.0/" />
+      </cc:Work>
+      <cc:License
+         rdf:about="http://creativecommons.org/publicdomain/zero/1.0/">
+        <cc:permits
+           rdf:resource="http://creativecommons.org/ns#Reproduction" />
+        <cc:permits
+           rdf:resource="http://creativecommons.org/ns#Distribution" />
+        <cc:permits
+           rdf:resource="http://creativecommons.org/ns#DerivativeWorks" />
+      </cc:License>
+    </rdf:RDF>
+  </metadata>
+  <g
+     inkscape:label="Camada 1"
+     inkscape:groupmode="layer"
+     id="layer1"
+     transform="translate(0,-1036.3621)">
+    <path
+       id="XMLID_164_"
+       class="st0"
+       d="m 15.999938,1048.734 c -2.349253,-0.4988 -4.691597,-1.0417 -7.0201254,-1.6729 -1.2920892,-0.3486 -2.5841799,-0.7282 -3.8555412,-1.1828 -0.2418342,-0.088 -2.9538393,-0.9225 -2.9538393,-1.3728 0,-0.8473 6.6539155,-1.536 7.2895962,-1.6331 1.2851817,-0.1942 2.6118197,-0.3133 3.8693587,-0.715 0.732418,-0.2338 1.924319,-1.0063 0.791149,-1.7567 -0.82915,-0.5472 -2.556542,-1.1924 -3.513519,-1.3249 -1.2417612,-0.2852 -2.3534165,-0.428 -3.5556837,-0.6754 -0.6294583,-0.1633 0.3341731,-1.0564 0.5483691,-1.1447 0.9915272,-0.4104 2.0054261,-0.8428 3.0280426,-1.0811 -0.8291485,0.1288 -5.2063628,0.5871 -4.8159707,2.2113 0.2452902,1.0152 2.4148957,1.333 3.0885794,1.5006 1.3542773,0.34 2.5599973,0.6687 3.9039093,1.0749 -3.081671,0.3309 -5.880047,0.2692 -8.8926203,0.7547 -1.3577306,0.2207 -4.9265226,1.1255 -3.63443503,3.8135 0.62186151,1.2976 2.11778353,1.9201 3.17149443,2.4364 1.4890133,0.7283 3.0194822,1.3109 4.5534056,1.8581 2.6429143,0.9446 5.3169183,1.7612 7.9943743,2.538 0.0035,-1.2093 0.0035,-2.4188 0.0035,-3.6281 z"
+       inkscape:connector-curvature="0"
+       style="fill:#208ece"
+       sodipodi:nodetypes="cccsccccccccccccccccc" />
+    <path
+       id="XMLID_164_-0"
+       class="st0"
+       d="m 9.9632641,1042.3617 c 0.2136469,0.2945 0.5712899,0.5503 0.9357959,0.8252 0.387954,0.1368 0.683663,0.1759 1.161866,0.1594 0.522607,-0.046 1.630371,-0.1844 2.133481,-0.24 0.648309,-0.1085 2.128608,0.2547 2.128608,0.2547 l -0.01366,0.2994 c 0,0 -2.251812,0.5475 -5.065953,0.6854 -1.3588467,0.067 -1.8354988,-0.083 -2.2581712,-0.1786 -0.5959822,-0.1356 -1.0229671,-0.2954 -1.4099005,-0.4603 -0.6686552,-0.2837 -1.1898595,-0.5881 -1.6660073,-0.8978 1.3510078,-0.1503 2.7024715,-0.3005 4.0534773,-0.4507 z"
+       inkscape:connector-curvature="0"
+       style="fill:#208ece;stroke-width:0.38907132"
+       sodipodi:nodetypes="cccccccccccc" />
+    <path
+       id="XMLID_164_-0-3-2"
+       class="st0"
+       d="m 3.7775657,1042.4565 c -0.2536906,-0.3962 -0.5685561,-0.6697 -0.9319851,-1.0882 -0.2003284,-0.2321 -0.5297281,-0.4203 -0.7740692,-0.6256 0,0 -0.5589811,-0.2893 -1.0162687,-0.48 -0.5833358,-0.2934 -1.386699,-0.7276 -1.386699,-0.7276 l -0.0277282,-0.3387 c 0,0 0.43250562,-0.042 2.54852418,0.6343 1.0216972,0.3259 1.432901,0.6362 1.7862596,0.8693 0.4983786,0.3293 0.8745885,0.6363 1.221607,0.937 0.5993238,0.5184 1.0918821,1.0167 1.5515396,1.5077 -0.9902139,-0.2295 -1.9808546,-0.4587 -2.9710114,-0.6885 z"
+       inkscape:connector-curvature="0"
+       style="fill:#208ece;stroke-width:0.3429828"
+       sodipodi:nodetypes="cccccccccccc" />
+    <path
+       id="XMLID_164_-0-0"
+       class="st0"
+       d="m 7.3708268,1048.6896 c -0.2558917,0.4732 -0.9613099,0.8341 -1.5707806,1.1906 -0.4703899,0.2552 -1.8573009,0.5735 -1.8573009,0.5735 -0.071854,0.044 -1.056967,0.2513 -1.5432124,0.2185 -2.07197628,-0.016 -2.8135734,-0.2614 -2.8135734,-0.2614 0,0 0.7890405,1.1544 4.5551151,1.0661 1.3263315,-0.04 1.9126691,-0.1428 2.6558004,-0.2556 0.9510125,-0.2231 2.9373723,-0.6914 3.34375,-0.9843 0.701384,-0.5045 -0.2500602,-1.2566 0.265625,-1.7812 -1.3055277,-0.087 -1.7298151,0.3218 -3.0354232,0.2338 z"
+       inkscape:connector-curvature="0"
+       style="fill:#208ece;stroke-width:0.47480652"
+       sodipodi:nodetypes="cccccccccc" />
+    <path
+       id="XMLID_164_-0-7"
+       class="st0"
+       d="m 10.820645,1043.7072 c 0.178789,0.3942 1.047114,1.0021 1.520385,1.4002 0.638785,0.4153 1.109464,0.3313 1.65226,0.5313 0.719574,0.1123 1.477197,0.4221 1.968844,0.7652 0.767053,0.4585 1.037866,0.9582 1.037866,0.9582 0,0 -1.270796,-0.547 -3.093478,-0.7957 -1.663229,-0.2768 -2.199482,-0.5741 -2.685407,-0.7937 -0.68477,-0.311 -1.158335,-0.6061 -1.5820773,-0.8964 -0.7326303,-0.5006 -1.2810811,-0.9863 -1.7735605,-1.4666 2.0323548,0.4713 1.2403635,0.4348 2.9551678,0.2975 z"
+       inkscape:connector-curvature="0"
+       style="fill:#208ece;stroke-width:0.47056219"
+       sodipodi:nodetypes="cccccccccc" />
+    <path
+       id="XMLID_164_-0-3-2-2"
+       class="st0"
+       d="m 11.953125,1037.8777 c 0.610813,-0.6273 1.503737,-1.929 1.503737,-1.929 v 0 c 0,0 -0.254295,2.1176 -0.995027,2.8629 -0.505643,0.6102 -0.508945,0.6757 -0.990099,1.1457 0.20797,-0.9949 -1.07401,0.1134 -0.864719,-0.8815 z"
+       inkscape:connector-curvature="0"
+       style="fill:#208ece;stroke-width:0.3429828"
+       sodipodi:nodetypes="ccccccc" />
+  </g>
+</svg>
Index: /trunk/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java
===================================================================
--- /trunk/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java	(revision 15534)
+++ /trunk/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java	(revision 15535)
@@ -72,5 +72,5 @@
                 "(aerialway=j-bar & -oneway=no) | "+
                 "(aerialway=platter & -oneway=no) | "+
-                "waterway=stream | waterway=river | waterway=ditch | waterway=drain | "+
+                "waterway=stream | waterway=river | waterway=ditch | waterway=drain | waterway=tidal_channel | "+
                 "(\"piste:type\"=downhill & -area=yes) | (\"piste:type\"=sled & -area=yes) | (man_made=\"piste:halfpipe\" & -area=yes) | "+
                 "junction=circular | junction=roundabout | (highway=motorway & -oneway=no & -oneway=reversible) | "+
Index: /trunk/styles/standard/elemstyles.mapcss
===================================================================
--- /trunk/styles/standard/elemstyles.mapcss	(revision 15534)
+++ /trunk/styles/standard/elemstyles.mapcss	(revision 15535)
@@ -4579,4 +4579,8 @@
     color: water#0000ff;
 }
+way[waterway=tidal_channel] {
+    width: 1;
+    color: tidal_channel#0000ff;
+}
 way[waterway=river][intermittent=yes],
 area[waterway=riverbank][intermittent=yes],
@@ -4584,5 +4588,6 @@
 way[waterway=stream][intermittent=yes],
 way[waterway=ditch][intermittent=yes],
-way[waterway=drain][intermittent=yes] {
+way[waterway=drain][intermittent=yes],
+way[waterway=tidal_channel][intermittent=yes] {
     dashes: 15, 5;
 }