Changeset 18921 in josm

Timestamp:

2023-12-20T19:04:18+01:00 (15 months ago)

Author:

taylor.smock

Message:

Fix #23308: Fix a false positive for "Water area inside water area" validation (patch by gaben, modified)

A coastline as an area follows the right-side rule like coastlines as a way.
This means that a water area inside the area, as defined for almost every other
area tag, may be valid, depending upon the directionality of the coastline way.

Modifications are as follows:

• Look for water areas inside oceans (coastline is drawn in clockwise direction)
  • This is anticipated to be a rare occurrence since most coastlines are expected to be part of a large area.
• Add non-regression test
• Keep previous spacing for easier svn blame usage

Location:

trunk

Files:

• resources/data/validator/geometry.mapcss (modified) (2 diffs)
• test/unit/org/openstreetmap/josm/data/validation/tests/MapCSSTagCheckerTest.java (modified) (4 diffs)

trunk/resources/data/validator/geometry.mapcss

@@ -199 +199 @@
 
 /* Overlapping areas (spatial test) */
-area[natural =~ /^(water|wetland|coastline)$/], area[waterway=riverbank], area[landuse=reservoir] {
+area[natural =~ /^(water|wetland)$/],
+area[natural=coastline]:clockwise,
+area[waterway=riverbank],
+area[landuse=reservoir] {
   set water_area;
 }
@@ -211 +214 @@
 
 /* Water area inside water area (spatial test) */
-area:closed[natural =~ /^(water|wetland|coastline)$/] ⊆  area:closed.water_area,
+area:closed[natural =~ /^(water|wetland)$/]           ⊆  area:closed.water_area,
+area:closed[natural=coastline]:clockwise              ⊆  area:closed.water_area,
 area:closed[waterway=riverbank]                       ⊆  area:closed.water_area,
 area:closed[landuse=reservoir]                        ⊆  area:closed.water_area,
-area:closed[natural =~ /^(water|wetland|coastline)$/] ⊇  area:closed.water_area,
+area:closed[natural =~ /^(water|wetland)$/]           ⊇  area:closed.water_area,
+area:closed[natural=coastline]:clockwise              ⊇  area:closed.water_area,
 area:closed[waterway=riverbank]                       ⊇  area:closed.water_area,
 area:closed[landuse=reservoir]                        ⊇  area:closed.water_area {

trunk/test/unit/org/openstreetmap/josm/data/validation/tests/MapCSSTagCheckerTest.java

@@ -2 +2 @@
 package org.openstreetmap.josm.data.validation.tests;
 
+import static org.junit.jupiter.api.Assertions.assertDoesNotThrow;
 import static org.junit.jupiter.api.Assertions.assertEquals;
 import static org.junit.jupiter.api.Assertions.assertFalse;
@@ -31 +32 @@
 import org.openstreetmap.josm.data.osm.OsmPrimitive;
 import org.openstreetmap.josm.data.osm.OsmUtils;
+import org.openstreetmap.josm.data.osm.Way;
 import org.openstreetmap.josm.data.preferences.sources.ExtendedSourceEntry;
 import org.openstreetmap.josm.data.preferences.sources.ValidatorPrefHelper;
@@ -41 +43 @@
 import org.openstreetmap.josm.gui.mappaint.mapcss.MapCSSStyleSource;
 import org.openstreetmap.josm.gui.mappaint.mapcss.parsergen.ParseException;
+import org.openstreetmap.josm.gui.progress.NullProgressMonitor;
 import org.openstreetmap.josm.io.OsmReader;
 import org.openstreetmap.josm.testutils.annotations.BasicPreferences;
@@ -447 +450 @@
     }
 
+    /**
+     * A water area inside a coastline, where the coastline way is oriented away from the water area
+     * (the water area is not inside the ocean).
+     */
+    @Test
+    void testTicket23308() {
+        final MapCSSTagChecker test = new MapCSSTagChecker();
+        final Way innerWay = TestUtils.newWay("natural=water",
+                new Node(new LatLon(32.775, -117.238)),
+                new Node(new LatLon(32.774, -117.238)),
+                new Node(new LatLon(32.774, -117.237)),
+                new Node(new LatLon(32.775, -117.237)));
+        final Way outerWay = TestUtils.newWay("natural=coastline",
+                new Node(new LatLon(32.779, -117.232)),
+                new Node(new LatLon(32.777, -117.241)),
+                new Node(new LatLon(32.771, -117.240)),
+                new Node(new LatLon(32.771, -117.235)));
+        final DataSet ds = new DataSet();
+        ds.addPrimitiveRecursive(innerWay);
+        ds.addPrimitiveRecursive(outerWay);
+        innerWay.addNode(innerWay.firstNode());
+        outerWay.addNode(outerWay.firstNode());
+        assertDoesNotThrow(test::initialize);
+        test.startTest(NullProgressMonitor.INSTANCE);
+        test.visit(ds.allPrimitives());
+        test.endTest();
+        assertTrue(test.getErrors().isEmpty());
+    }
 }