From a45be06ddacebd61bdbdb15d33da448aa330d540 Mon Sep 17 00:00:00 2001
From: Klumbumbus <Klumbumbus@0c6e7542-c601-0410-84e7-c038aed88b3b>
Date: Sat, 18 May 2019 17:44:52 +0000
Subject: [PATCH] see #17727, fix #17731 - add natural=strait (icon self
 created, CC0 and PD licensed)

git-svn-id: https://josm.openstreetmap.de/svn/trunk@15093 0c6e7542-c601-0410-84e7-c038aed88b3b
---
 data/defaultpresets.xml                       |   6 +
 images/presets/nautical/strait.svg            | 111 ++++++++++++++++++
 .../data/validation/tests/LongSegment.java    |   2 +-
 .../data/validation/tests/UnclosedWays.java   |   2 +-
 styles/standard/elemstyles.mapcss             |  11 ++
 5 files changed, 130 insertions(+), 2 deletions(-)
 create mode 100644 images/presets/nautical/strait.svg

diff --git a/data/defaultpresets.xml b/data/defaultpresets.xml
index c1d6f0ed57f..a9d05291c4a 100644
--- a/data/defaultpresets.xml
+++ b/data/defaultpresets.xml
@@ -1719,6 +1719,12 @@
             <key key="natural" value="cape" />
             <text key="name" text="Name" />
         </item> <!-- Cape -->
+        <item name="Strait" icon="presets/nautical/strait.svg" type="node,way,closedway,multipolygon" preset_name_label="true">
+            <link wiki="Tag:natural=strait" />
+            <space />
+            <key key="natural" value="strait" />
+            <text key="name" text="Name" />
+        </item> <!-- Strait -->
     </group> <!-- Water -->
     <group name="Shipping" icon="presets/nautical/ferry.svg">
         <item name="Ferry Terminal" icon="presets/nautical/ferry.svg" type="node,closedway,multipolygon" preset_name_label="true">
diff --git a/images/presets/nautical/strait.svg b/images/presets/nautical/strait.svg
new file mode 100644
index 00000000000..55b1d23f774
--- /dev/null
+++ b/images/presets/nautical/strait.svg
@@ -0,0 +1,111 @@
+<?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="strait5.svg">
+  <defs
+     id="defs4266" />
+  <sodipodi:namedview
+     id="base"
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1.0"
+     inkscape:pageopacity="0.0"
+     inkscape:pageshadow="2"
+     inkscape:zoom="16"
+     inkscape:cx="1.6186154"
+     inkscape:cy="14.510771"
+     inkscape:document-units="px"
+     inkscape:current-layer="layer1"
+     showgrid="true"
+     units="px"
+     inkscape:snap-bbox="true"
+     inkscape:bbox-paths="true"
+     inkscape:bbox-nodes="true"
+     inkscape:snap-bbox-edge-midpoints="true"
+     inkscape:snap-bbox-midpoints="true"
+     inkscape:snap-nodes="true"
+     inkscape:object-paths="false"
+     inkscape:snap-intersection-paths="true"
+     inkscape:object-nodes="true"
+     inkscape:snap-smooth-nodes="true"
+     inkscape:snap-midpoints="true"
+     inkscape:snap-object-midpoints="true"
+     inkscape:snap-others="true"
+     inkscape:snap-global="false"
+     inkscape:snap-center="true"
+     inkscape:snap-grids="true"
+     inkscape:snap-to-guides="true"
+     inkscape:snap-page="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 />
+        <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)">
+    <rect
+       x="3.3786003e-007"
+       y="1036.3622"
+       class="st1"
+       width="16.000008"
+       height="16.000044"
+       id="rect25"
+       style="fill:#2090cf" />
+    <path
+       style="fill:#ffbe34;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1.00000012;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       d="m 0.99609325,1036.3721 c 0,0 0.98077825,0.3395 1.02554325,1.6313 0.044765,1.2919 0.9228601,3.1002 1.9199562,3.2805 1.3121978,0.2885 2.3430696,-0.6038 2.9414029,-0.4447 1.084137,0.2884 1.8723132,2.0093 2.8109623,2.023 1.5066211,0.022 1.5976531,-1.3712 2.3489551,-2.4316 1.020786,-1.3419 2.671879,-3.8495 3.972712,-4.0637 -5.006504,-0.01 -10.0130247,10e-4 -15.01953175,0.01 z"
+       id="path4269"
+       inkscape:connector-curvature="0"
+       sodipodi:nodetypes="czcssccc" />
+    <path
+       style="fill:#ffbe34;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1.00000012;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       d="m 0.99282615,1052.3621 c -0.66750384,0 15.01719585,0.01 15.01719585,0.01 0,0 -1.396317,0 -1.464844,-2.952 -0.06853,-2.9492 0.386364,-5.2771 -0.511295,-5.4574 -1.749698,-0.6672 -3.795847,2.7734 -5.3164032,2.4461 -1.3948011,-0.3001 -1.6417488,-2.0999 -3.1013646,-2.0809 -0.9133381,0.012 -1.993181,0.041 -2.611899,1.0568 -1.020786,1.3419 -0.9545927,3.056 -1.020428,4.9779 -0.085825,0.8225 -0.5216258,1.9245 -0.99096205,2.0034 z"
+       id="path4269-65"
+       inkscape:connector-curvature="0"
+       sodipodi:nodetypes="cczcsscccc" />
+  </g>
+</svg>
diff --git a/src/org/openstreetmap/josm/data/validation/tests/LongSegment.java b/src/org/openstreetmap/josm/data/validation/tests/LongSegment.java
index fd5247b4ef2..2a08a83bb60 100644
--- a/src/org/openstreetmap/josm/data/validation/tests/LongSegment.java
+++ b/src/org/openstreetmap/josm/data/validation/tests/LongSegment.java
@@ -83,7 +83,7 @@ private void testWay(Way w) {
     }
 
     private boolean ignoreWay(Way w) {
-        return visitedWays.contains(w) || w.hasTag("route", "ferry") || w.hasTag("bay", "fjord");
+        return visitedWays.contains(w) || w.hasTag("route", "ferry") || w.hasTag("bay", "fjord") || w.hasTag("natural", "strait");
     }
 
     private void visitWaySegment(Way w, int i) {
diff --git a/src/org/openstreetmap/josm/data/validation/tests/UnclosedWays.java b/src/org/openstreetmap/josm/data/validation/tests/UnclosedWays.java
index 73cae3fecbb..446044eac7d 100644
--- a/src/org/openstreetmap/josm/data/validation/tests/UnclosedWays.java
+++ b/src/org/openstreetmap/josm/data/validation/tests/UnclosedWays.java
@@ -138,7 +138,7 @@ protected boolean isValueErroneous(String value) {
         // duplicate warnings
         new UnclosedWaysCheck(1101, "natural", marktr("natural type {0}"),
             new HashSet<>(Arrays.asList("arete", "bay", "cave", "cliff", "coastline", "gorge", "gully", "peak",
-                            "ridge", "saddle", "tree", "tree_row", "valley", "volcano"))),
+                            "ridge", "saddle", "strait", "tree", "tree_row", "valley", "volcano"))),
 
         new UnclosedWaysCheck(1102, "landuse", marktr("landuse type {0}")),
         new UnclosedWaysCheck(1103, "amenities", marktr("amenities type {0}")),
diff --git a/styles/standard/elemstyles.mapcss b/styles/standard/elemstyles.mapcss
index a347fdb5208..291f6f318ee 100644
--- a/styles/standard/elemstyles.mapcss
+++ b/styles/standard/elemstyles.mapcss
@@ -4307,6 +4307,17 @@ node[natural=bay] {
     icon-image: "presets/nautical/bay.svg";
     set icon_z17;
 }
+area[natural=strait]:closed {
+    fill-color: natural#002f00;
+}
+way[natural=strait] {
+    width: 2;
+    color: natural#002f00;
+}
+node[natural=strait] {
+    icon-image: "presets/nautical/strait.svg";
+    set icon_z17;
+}
 area[natural=cape],
 area[natural=cave_entrance] {
     fill-color: natural#002f00;