Changeset 16247 in josm for trunk

Timestamp:

2020-04-09T17:37:48+02:00 (4 years ago)

Author:

GerdP

Message:

fix #19053: Validator does not find overlapping buildings anymore
Ignore list handling added an invalid entry for key "3000" so that all issues found by the MapCSSTagChecker were ignored

• remove invalid entry when loading the ignore List
• disable the Ignore button when it would produce the invalid entry

Location:

trunk/src/org/openstreetmap/josm

Files:

• data/validation/OsmValidator.java (modified) (1 diff)
• gui/dialogs/ValidatorDialog.java (modified) (2 diffs)

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

@@ -235 +235 @@
                 Logging.log(Logging.LEVEL_ERROR, "Unable to load ignored errors", e);
             }
+            // see #19053: remove invalid entry
+            ignoredErrors.remove("3000");
         }
     }

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);
 
@@ -423 +425 @@
             selectAction.setEnabled(true);
             if (ignoreAction != null) {
-                ignoreAction.setEnabled(!(node.getUserObject() instanceof Severity));
+                ignoreAction.setEnabled(!(node.getUserObject() instanceof Severity) && codes.size() <= 1);
             }
         }