Index: /trunk/data/defaultpresets.xml
===================================================================
--- /trunk/data/defaultpresets.xml	(revision 15080)
+++ /trunk/data/defaultpresets.xml	(revision 15081)
@@ -1703,5 +1703,5 @@
             </optional>
         </item> <!-- Beach -->
-        <item name="Bay" icon="presets/nautical/bay.svg" type="node,closedway,multipolygon" preset_name_label="true">
+        <item name="Bay" icon="presets/nautical/bay.svg" type="node,way,closedway,multipolygon" preset_name_label="true">
             <link wiki="Tag:natural=bay" />
             <label text="An area of water mostly surrounded by land but with level connection to the ocean or a lake." />
@@ -1709,4 +1709,7 @@
             <key key="natural" value="bay" />
             <text key="name" text="Name" />
+            <optional>
+                <check key="bay" text="Fjord" value_on="fjord" disable_off="true" />
+            </optional>
         </item> <!-- Bay -->
         <item name="Cape" icon="presets/nautical/cape.svg" type="node,closedway,multipolygon" preset_name_label="true">
Index: /trunk/src/org/openstreetmap/josm/data/validation/tests/LongSegment.java
===================================================================
--- /trunk/src/org/openstreetmap/josm/data/validation/tests/LongSegment.java	(revision 15080)
+++ /trunk/src/org/openstreetmap/josm/data/validation/tests/LongSegment.java	(revision 15081)
@@ -84,5 +84,5 @@
 
     private boolean ignoreWay(Way w) {
-        return visitedWays.contains(w) || w.hasTag("route", "ferry");
+        return visitedWays.contains(w) || w.hasTag("route", "ferry") || w.hasTag("bay", "fjord");
     }
 
Index: /trunk/src/org/openstreetmap/josm/data/validation/tests/UnclosedWays.java
===================================================================
--- /trunk/src/org/openstreetmap/josm/data/validation/tests/UnclosedWays.java	(revision 15080)
+++ /trunk/src/org/openstreetmap/josm/data/validation/tests/UnclosedWays.java	(revision 15081)
@@ -138,5 +138,5 @@
         // duplicate warnings
         new UnclosedWaysCheck(1101, "natural", marktr("natural type {0}"),
-            new HashSet<>(Arrays.asList("arete", "cave", "cliff", "coastline", "gorge", "gully", "peak",
+            new HashSet<>(Arrays.asList("arete", "bay", "cave", "cliff", "coastline", "gorge", "gully", "peak",
                             "ridge", "saddle", "tree", "tree_row", "valley", "volcano"))),
 
Index: /trunk/styles/standard/elemstyles.mapcss
===================================================================
--- /trunk/styles/standard/elemstyles.mapcss	(revision 15080)
+++ /trunk/styles/standard/elemstyles.mapcss	(revision 15081)
@@ -4293,17 +4293,27 @@
     set icon_z17;
 }
-area[natural=bay],
+area[natural=bay]:closed {
+    fill-color: natural#002f00;
+}
+way[natural=bay] {
+    width: 2;
+    color: natural#002f00;
+}
+node[natural=bay] {
+    icon-image: "presets/nautical/bay.svg";
+    set icon_z17;
+}
 area[natural=cape],
 area[natural=cave_entrance] {
     fill-color: natural#002f00;
 }
-node[natural=bay] {
-    icon-image: "presets/nautical/bay.svg";
-    set icon_z17;
-}
 node[natural=cape] {
     icon-image: "presets/nautical/cape.svg";
     set icon_z17;
 }
+node[natural=cave_entrance] {
+    icon-image: "presets/landmark/cave_entrance.svg";
+    set icon_z17;
+}
 area[natural=reef] {
     fill-color: reef#80c9ff;
@@ -4311,8 +4321,4 @@
 node[natural=reef] {
     icon-image: "presets/landmark/reef.svg";
-    set icon_z17;
-}
-node[natural=cave_entrance] {
-    icon-image: "presets/landmark/cave_entrance.svg";
     set icon_z17;
 }