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 @@ + + + + + + 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 @@ + + + + + + + + + + + + image/svg+xml + + + + + + + + + + + + + + + + + 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;