Refactor: Simplify util connection visitor

CityDoctorParent/CityDoctorValidation/src/main/java/de/hft/stuttgart/citydoctor2/checks/topology/MisalignedUtilityConnectionCheck.java

@@ -91,6 +91,7 @@ public class MisalignedUtilityConnectionCheck extends Check {
     @Override
     public void init(Map<CheckId, Map<String, String>> params, ParserConfiguration config, CityObjectCache cache) {
         Map<String, String> localParameters = params.get(getCheckId());
+        this.cache = cache;
         if (localParameters == null) {
             // no parameters
             return;
@@ -99,7 +100,6 @@ public class MisalignedUtilityConnectionCheck extends Check {
         if (epsilonString != null) {
             epsilon = Double.parseDouble(epsilonString);
         }
-        this.cache = cache;
     }
 
 
@@ -140,16 +140,22 @@ public class MisalignedUtilityConnectionCheck extends Check {
         boolean misalignedConnections = false;
         boolean freeFloating = false;
         for (Geometry sGeo : subjGeoms) {
-            final boolean[] connected = {false};
-            final boolean[] misalignment = {false};
+            boolean connected = false;
+            boolean misalignment = false;
             for (CityObject candidate : candidates) {
 
+                List<Geometry> candGeoms = new ArrayList<>();
                 candidate.accept(new CheckableUtilsVisitor() {
                     @Override
                     public void check(Geometry cGeo) {
-                        if(sGeo.getLod() != cGeo.getLod()){
-                            return;
+                        if (sGeo.getLod() == cGeo.getLod()) {
+                            candGeoms.add(cGeo);
+                        }
                     }
+                });
+
+
+                for (Geometry cGeo: candGeoms){
                     List<PolygonIntersection> intersections = SelfIntersectionUtil.calculateGeometryIntersections(sGeo, cGeo, epsilon);
                     intersections = intersections.stream()
                             .filter(isect -> isect.getType() != PolygonIntersection.IntersectionType.NONE)
@@ -161,44 +167,44 @@ public class MisalignedUtilityConnectionCheck extends Check {
                     List<Pair<Vertex, Vertex>> pairs = getVertexPairs(sGeo, cGeo);
                     if (pairs.size() < 3) {
                         if (!pairs.isEmpty()) {
-                               subject.addCheckResult(new CheckResult(CheckId.C_TO_UTILITY_CONNECTION_MISALIGNED,
+                            subject.addCheckResult(new CheckResult(this,
                                     ResultStatus.ERROR, new MisalignedConnectionError(sGeo, subject, candidate.getGmlId(),
                                     MisalignedConnectionError.MisalignmentType.HANGING, ErrorType.ERROR)));
                         }
                     } else {
-                            switch(checkConnectionAlignment(sGeo, cGeo, pairs)) {
+                        ConnectionAlignmentType alignment = checkConnectionAlignment(sGeo, cGeo, pairs);
+                        switch(alignment) {
                             case ALIGNED:
-                                    connected[0] = true;
+                                connected = true;
                                 break;
                             case ASYMMETRIC_ROTATION:
-                                    subject.addCheckResult(new CheckResult(CheckId.C_TO_UTILITY_CONNECTION_MISALIGNED,
+                                subject.addCheckResult(new CheckResult(this,
                                         ResultStatus.ERROR, new MisalignedConnectionError(sGeo, subject, candidate.getGmlId(),
                                         MisalignmentType.ASYMMETRIC_ROTATION, ErrorType.ERROR)));
-                                    misalignment[0] = true;
+                                misalignment = true;
                                 break;
                             case SHEARED:
-                                    subject.addCheckResult(new CheckResult(CheckId.C_TO_UTILITY_CONNECTION_MISALIGNED,
+                                subject.addCheckResult(new CheckResult(this,
                                         ResultStatus.ERROR, new MisalignedConnectionError(sGeo, subject, candidate.getGmlId(),
                                         MisalignmentType.SHEARED, ErrorType.ERROR)));
-                                    misalignment[0] = true;
+                                misalignment = true;
                                 break;
                             case UNKNOWN:
-                                    subject.addCheckResult(new CheckResult(CheckId.C_TO_UTILITY_CONNECTION_MISALIGNED,
+                                subject.addCheckResult(new CheckResult(this,
                                         ResultStatus.WARNING, new MisalignedConnectionError(sGeo, subject, candidate.getGmlId(),
                                         MisalignmentType.UNKNOWN, ErrorType.WARNING)));
-                                    misalignment[0] = true;
+                                misalignment = true;
                                 break;
                         }
 
                     }
                 }
-                });
-                if (!connected[0]) {
+                if (!connected) {
                     // Geometry has no connections and is "floating in space"
                     freeFloating = true;
                     FloatingUtilityError err = new FloatingUtilityError(subject, sGeo);
                     subject.addCheckResult(new CheckResult(this, ResultStatus.ERROR, err));
-                } else if (misalignment[0]) {
+                } else if (misalignment) {
                     misalignedConnections = true;
                 }
             }