Changeset 19273 in josm for trunk

Timestamp:

2024-12-30T17:54:07+01:00 (3 months ago)

Author:

stoecker

Message:

fix #24054 - no longer silently ignore identical or mismatching asserts in mapcss tag checker

Location:

trunk

Files:

• resources/data/validator/combinations.mapcss (modified) (1 diff)
• resources/data/validator/highway.mapcss (modified) (1 diff)
• src/org/openstreetmap/josm/data/validation/tests/MapCSSTagCheckerRule.java (modified) (1 diff)

trunk/resources/data/validator/combinations.mapcss

@@ -1074 +1074 @@
   throwWarning: tr("{0} together with {1}", "{0.tag}", "{3.tag}");
   group: tr("suspicious tag combination");
-  assertMatch: "way cycleway:right=separate cycleway:right:buffer=yes";
   assertMatch: "way cycleway:left=shared_lane cycleway:buffer=no";
   assertMatch: "way cycleway:both=track cycleway:left:buffer=yes";

trunk/resources/data/validator/highway.mapcss

@@ -92 +92 @@
 way[highway=cycleway][cycleway=lane] {
   throwWarning: tr("{0} together with {1}", "{0.tag}", "{1.tag}");
+  assertMatch: "way highway=cycleway cycleway=lane";
+  assertMatch: "way highway=footway maxspeed=20";
   assertNoMatch: "way highway=cycleway bicycle=yes";
   assertNoMatch: "way highway=cycleway";
   assertNoMatch: "way highway=footway foot=yes";
   assertNoMatch: "way highway=footway";
-  assertMatch: "way highway=cycleway cycleway=lane";
-  assertNoMatch: "way highway=cycleway";
   assertNoMatch: "way highway=residential cycleway=lane";
-  assertMatch: "way highway=footway maxspeed=20";
   assertNoMatch: "way highway=residential maxspeed=20";
-  assertNoMatch: "way highway=footway";
 }
 

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

@@ -151 +151 @@
                     } else if (val != null && "suggestAlternative".equals(ai.key)) {
                         check.alternatives.add(val);
-                    } else if (val != null && "assertMatch".equals(ai.key)) {
+                    } else if (val != null && "assertMatch".equals(ai.key) && !assertions.containsKey(val)) {
                         assertions.put(val, Boolean.TRUE);
-                    } else if (val != null && "assertNoMatch".equals(ai.key)) {
+                    } else if (val != null && "assertNoMatch".equals(ai.key) && !assertions.containsKey(val)) {
                         assertions.put(val, Boolean.FALSE);
                     } else if (val != null && "group".equals(ai.key)) {