Changeset 16296 in josm for trunk

Timestamp:

2020-04-14T07:14:38+02:00 (4 years ago)

Author:

GerdP

Message:

fix #19053:Validator does not find overlapping buildings anymore

• improve handling of ignore action for messages produced by MapCSSTagCheckerTest. This requires a change in the entries stored in preferences.xml.
• partly revert r16247 to re-enable ignore button for groups
• add code to recognize and remove ignore list entries produced with older version of JOSM. Users have to re-add those items by ignoring the errors again.

Location:

trunk

Files:

• src/org/openstreetmap/josm/data/preferences/sources/ValidatorPrefHelper.java (modified) (1 diff)
• src/org/openstreetmap/josm/data/validation/OsmValidator.java (modified) (6 diffs)
• src/org/openstreetmap/josm/data/validation/TestError.java (modified) (3 diffs)
• src/org/openstreetmap/josm/gui/dialogs/ValidatorDialog.java (modified) (2 diffs)
• test/unit/org/openstreetmap/josm/data/validation/tests/MapCSSTagCheckerTest.java (modified) (3 diffs)

trunk/src/org/openstreetmap/josm/data/preferences/sources/ValidatorPrefHelper.java

@@ -47 +47 @@
     /** The preferences key for the ignorelist */
     public static final String PREF_IGNORELIST = PREFIX + ".ignorelist";
+
+    /** The preferences key for the ignorelist format */
+    public static final String PREF_IGNORELIST_FORMAT = PREF_IGNORELIST + ".version";
 
     /**

trunk/src/org/openstreetmap/josm/data/validation/OsmValidator.java

@@ -19 +19 @@
 import java.util.Enumeration;
 import java.util.HashMap;
+import java.util.HashSet;
 import java.util.Iterator;
 import java.util.List;
 import java.util.Map;
 import java.util.Map.Entry;
+import java.util.Set;
 import java.util.SortedMap;
 import java.util.TreeMap;
@@ -224 +226 @@
                         treeSet.addAll(Files.readAllLines(path, StandardCharsets.UTF_8));
                         treeSet.forEach(ignore -> ignoredErrors.putIfAbsent(ignore, ""));
+                        removeLegacyEntries(true);
 
                         saveIgnoredErrors();
@@ -237 +240 @@
                 Logging.log(Logging.LEVEL_ERROR, "Unable to load ignored errors", e);
             }
-            // see #19053: remove invalid entry
-            ignoredErrors.remove("3000");
+            removeLegacyEntries(Config.getPref().get(ValidatorPrefHelper.PREF_IGNORELIST_FORMAT).isEmpty());
+        }
+    }
+
+    private static void removeLegacyEntries(boolean force) {
+        // see #19053:
+        boolean wasChanged = false;
+        if (force) {
+            Iterator<Entry<String, String>> iter = ignoredErrors.entrySet().iterator();
+            while (iter.hasNext()) {
+                Entry<String, String> entry = iter.next();
+                if (entry.getKey().startsWith("3000_")) {
+                    Logging.warn(tr("Cannot handle ignore list entry {0}", entry));
+                    iter.remove();
+                    wasChanged = true;
+                }
+            }
+        }
+        String legacyEntry = ignoredErrors.remove("3000");
+        if (legacyEntry != null) {
+            if (!legacyEntry.isEmpty()) {
+                addIgnoredError("3000_" + legacyEntry, legacyEntry);
+            }
+            wasChanged = true;
+        }
+        if (wasChanged) {
+            saveIgnoredErrors();
         }
     }
@@ -268 +296 @@
      */
     static void cleanupIgnoredErrors() {
+        cleanup3000();
         if (ignoredErrors.size() > 1) {
             List<String> toRemove = new ArrayList<>();
@@ -289 +318 @@
             ignoredErrors.putAll(tmap);
         }
+    }
+
+    private static void cleanup3000() {
+        // see #19053
+        Set<String> toRemove = new HashSet<>();
+        for (Entry<String, String> entry : ignoredErrors.entrySet()) {
+            if (entry.getKey().equals("3000_" + entry.getValue()))
+                toRemove.add(entry.getValue());
+        }
+        ignoredErrors.entrySet()
+                .removeIf(e -> toRemove.contains(e.getValue()) && !e.getKey().equals("3000_" + e.getValue()));
+
     }
 
@@ -485 +526 @@
         if (list.isEmpty()) list = null;
         Config.getPref().putListOfMaps(ValidatorPrefHelper.PREF_IGNORELIST, list);
+        Config.getPref().put(ValidatorPrefHelper.PREF_IGNORELIST_FORMAT, "2");
     }
 

trunk/src/org/openstreetmap/josm/data/validation/TestError.java

@@ -339 +339 @@
      */
     public String getIgnoreSubGroup() {
+        if (code == 3000) {
+            // see #19053
+            return "3000_" + (description == null ? message : description);
+        }
         String ignorestring = getIgnoreGroup();
         if (descriptionEn != null) {
@@ -352 +356 @@
      */
     public String getIgnoreGroup() {
+        if (code == 3000) {
+            // see #19053
+            return "3000_" + getMessage();
+        }
         return Integer.toString(code);
     }
@@ -525 +533 @@
         return "TestError [tester=" + tester + ", code=" + code + ", message=" + message + ']';
     }
+
 }

trunk/src/org/openstreetmap/josm/gui/dialogs/ValidatorDialog.java

@@ -411 +411 @@
         lastSelectedNode = node;
         if (node != null) {
-            final Set<String> codes = new HashSet<>();
             ValidatorTreePanel.visitTestErrors(node, error -> {
-                codes.add(error.getIgnoreSubGroup()); // see #19053
                 error.setSelected(true);
 
@@ -425 +423 @@
             selectAction.setEnabled(true);
             if (ignoreAction != null) {
-                ignoreAction.setEnabled(!(node.getUserObject() instanceof Severity) && codes.size() <= 1);
+                ignoreAction.setEnabled(!(node.getUserObject() instanceof Severity));
             }
         }

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

@@ -145 +145 @@
         assertEquals(1, errors.size());
         assertEquals("has alt_name but not name", errors.iterator().next().getMessage());
-        assertEquals("3000_*[.+_name][!name]", errors.iterator().next().getIgnoreSubGroup());
+        assertEquals("3000_has alt_name but not name", errors.iterator().next().getIgnoreSubGroup());
     }
 
@@ -160 +160 @@
         assertEquals(1, errors.size());
         assertEquals("footway used with foot=no", errors.iterator().next().getMessage());
-        assertEquals("3000_way[highway=footway][foot]", errors.iterator().next().getIgnoreSubGroup());
+        assertEquals("3000_footway used with foot=no", errors.iterator().next().getIgnoreSubGroup());
     }
 
@@ -414 +414 @@
     }
 
+    /**
+     * Non-regression test for <a href="https://josm.openstreetmap.de/ticket/19053">Bug #19053</a>.
+     * Mapcss rule with group.
+     * @throws ParseException if a parsing error occurs
+     */
+    @Test
+    public void testTicket19053() throws ParseException {
+        final MapCSSTagChecker test = buildTagChecker(
+                "*[ele][ele =~ /^-?[0-9]+\\.[0-9][0-9][0-9]+$/] {"
+                        + "throwWarning: tr(\"{0}\",\"{0.tag}\");"
+                        + "group: tr(\"Unnecessary amount of decimal places\");" + "}");
+        final OsmPrimitive p = OsmUtils.createPrimitive("node ele=12.123456");
+        final Collection<TestError> errors = test.getErrorsForPrimitive(p, false);
+        assertEquals(1, errors.size());
+        assertEquals("Unnecessary amount of decimal places", errors.iterator().next().getMessage());
+        assertEquals("3000_ele=12.123456", errors.iterator().next().getIgnoreSubGroup());
+        assertEquals("3000_Unnecessary amount of decimal places", errors.iterator().next().getIgnoreGroup());
+    }
+
 }