Ticket #19312: 19312-allow.complex.dependency.patch

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

@@ -24 +24 @@
 import org.openstreetmap.josm.data.osm.OsmPrimitiveType;
 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;
 import org.openstreetmap.josm.data.validation.Test;
@@ -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);
+
     /**
      * Error message used to group errors related to role problems.
      * @since 6731
@@ -404 +408 @@
 
     @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")
                         : tr("Relations generate circular dependency of parent/child elements"))
@@ -464 +471 @@
         LinkedList<Relation> path = new LinkedList<>();
         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();
         else