Changeset 17680 in josm for trunk

Timestamp:

2021-03-28T17:02:13+02:00 (4 years ago)

Author:

GerdP

Message:

fix #20674: Water area inside water area not detected for waterway=riverbank

• add checks for waterway=riverbank
• remove check for :areaStyle where obsolete or wrong

File:

• trunk/resources/data/validator/geometry.mapcss (modified) (2 diffs)

trunk/resources/data/validator/geometry.mapcss

@@ -189 +189 @@
 }
 
-/* area:closed:areaStyle.water_area ⧉ area:closed:areaStyle.water_area -- does not work for now -- see ticket#10215 */
-area:closed:areaStyle[natural =~ /^(water|wetland|coastline)$/] ⧉ area:closed:areaStyle.water_area,
-area:closed:areaStyle[waterway=riverbank]                       ⧉ area:closed:areaStyle.water_area,
-area:closed:areaStyle[landuse=reservoir]                        ⧉ area:closed:areaStyle.water_area {
+/* area:closed.water_area ⧉ area:closed.water_area -- does not work for now -- see ticket#10215 */
+area:closed[natural =~ /^(water|wetland|coastline)$/] ⧉ area:closed.water_area,
+area:closed[waterway=riverbank]                       ⧉ area:closed.water_area,
+area:closed[landuse=reservoir]                        ⧉ area:closed.water_area {
   throwWarning: tr("Overlapping Water Areas");
 }
 
 /* Water area inside water area (spatial test) */
-area:closed:areaStyle[natural =~ /^(water|wetland|coastline)$/] ⊆  area:closed:areaStyle.water_area,
-area:closed:areaStyle[landuse=reservoir]                        ⊆  area:closed:areaStyle.water_area,
-area:closed:areaStyle[natural =~ /^(water|wetland|coastline)$/] ⊇  area:closed:areaStyle.water_area,
-area:closed:areaStyle[landuse=reservoir]                        ⊇  area:closed:areaStyle.water_area {
+area:closed[natural =~ /^(water|wetland|coastline)$/] ⊆  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[waterway=riverbank]                       ⊇  area:closed.water_area,
+area:closed[landuse=reservoir]                        ⊇  area:closed.water_area {
   throwWarning: tr("Water area inside water area");
 }
@@ -219 +221 @@
 }
 
-area:closed:areaStyle[tag("landuse") = parent_tag("landuse")] ⧉ area:closed:areaStyle[landuse] {
+area:closed[tag("landuse") = parent_tag("landuse")] ⧉ area:closed[landuse] {
   throwWarning: tr("Overlapping Identical Landuses");
 }