see #17727, fix #17731 - add natural=strait (icon self created, CC0 a…

…nd PD licensed) git-svn-id: https://josm.openstreetmap.de/svn/trunk@15093 0c6e7542-c601-0410-84e7-c038aed88b3b
JOSM · May 18, 2019 · a45be06 · a45be06
1 parent 70ee352
commit a45be06
Show file tree

Hide file tree

Showing 5 changed files with 130 additions and 2 deletions.
diff --git 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
diff --git 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
@@ -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
@@ -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;