Changeset 18921 in josm for trunk/resources/data/validator

Timestamp:

2023-12-20T19:04:18+01:00 (13 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

File:

• trunk/resources/data/validator/geometry.mapcss (modified) (2 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 {