Changeset 16793 in josm for trunk/src/org/openstreetmap

Timestamp:

2020-07-18T06:38:46+02:00 (4 years ago)

Author:

GerdP

Message:

see #19312: detect circular dependencies in relations

• implement preference key validator.relation.allow.complex.dependency to disable warnings from validator or relation editor when multiple relations generate a dependency loop

File:

• trunk/src/org/openstreetmap/josm/data/validation/tests/RelationChecker.java (modified) (4 diffs)

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

@@ -25 +25 @@
 import org.openstreetmap.josm.data.osm.Relation;
 import org.openstreetmap.josm.data.osm.RelationMember;
+import org.openstreetmap.josm.data.preferences.BooleanProperty;
 import org.openstreetmap.josm.data.validation.OsmValidator;
 import org.openstreetmap.josm.data.validation.Severity;
@@ -69 +70 @@
     public static final int RELATION_LOOP    = 1710;
     // CHECKSTYLE.ON: SingleSpaceSeparator
+
+    // see 19312 comment:17
+    private static final BooleanProperty ALLOW_COMPLEX_LOOP = new BooleanProperty("validator.relation.allow.complex.dependency", false);
 
     /**
@@ -405 +409 @@
     @Override
     public void endTest() {
+        if (Boolean.TRUE.equals(ALLOW_COMPLEX_LOOP.get())) {
+            loops.removeIf(loop -> loop.size() > 2);
+        }
         loops.forEach(loop -> errors.add(TestError.builder(this, Severity.ERROR, RELATION_LOOP)
                 .message(loop.size() == 2 ? tr("Relation contains itself as a member")
@@ -465 +472 @@
         path.add(parent);
         test.checkLoop(child, path);
+        if (Boolean.TRUE.equals(ALLOW_COMPLEX_LOOP.get())) {
+            test.loops.removeIf(loop -> loop.size() > 2);
+        }
         if (test.loops.isEmpty())
             return Collections.emptyList();