Changeset 15081 in josm

Timestamp:

2019-05-17T21:21:36+02:00 (6 years ago)

Author:

Klumbumbus

Message:

fix #17727

• allow lines for natural=bay
• add bay=fjord checkbox in natural=bay preset
• don't warn about long way segments of bay=fjord ways

Location:

trunk

Files:

• data/defaultpresets.xml (modified) (2 diffs)
• src/org/openstreetmap/josm/data/validation/tests/LongSegment.java (modified) (1 diff)
• src/org/openstreetmap/josm/data/validation/tests/UnclosedWays.java (modified) (1 diff)
• styles/standard/elemstyles.mapcss (modified) (2 diffs)

trunk/data/defaultpresets.xml

@@ -1703 +1703 @@
             </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 +1709 @@
             <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">

trunk/src/org/openstreetmap/josm/data/validation/tests/LongSegment.java

@@ -84 +84 @@
 
     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");
     }
 

trunk/src/org/openstreetmap/josm/data/validation/tests/UnclosedWays.java

@@ -138 +138 @@
         // 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"))),
 

trunk/styles/standard/elemstyles.mapcss

@@ -4293 +4293 @@
     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 +4321 @@
 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;
 }