Refactor: Rename check

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

@@ -24,6 +24,7 @@ import java.util.List;
 import java.util.Map;
 import java.util.ServiceLoader;
 
+import de.hft.stuttgart.citydoctor2.checks.topology.DisconnectedIslandCheck;
 import de.hft.stuttgart.citydoctor2.checks.topology.FeatureCollisionCheck;
 import de.hft.stuttgart.citydoctor2.checks.topology.MisalignedUtilityConnectionCheck;
 import org.apache.logging.log4j.LogManager;
@@ -117,6 +118,7 @@ public class Checks {
 
 		//topology checks
 		publish(new FeatureCollisionCheck());
+		publish(new DisconnectedIslandCheck());
 		publish(new MisalignedUtilityConnectionCheck());
 		// load checks from service loader
 		ServiceLoader<Check> checkLoader = ServiceLoader.load(Check.class);

CityDoctorParent/CityDoctorValidation/src/main/java/de/hft/stuttgart/citydoctor2/checks/topology/FloatingUtilityCheck.java → CityDoctorParent/CityDoctorValidation/src/main/java/de/hft/stuttgart/citydoctor2/checks/topology/DisconnectedIslandCheck.java

@@ -3,34 +3,21 @@ package de.hft.stuttgart.citydoctor2.checks.topology;
 import de.hft.stuttgart.citydoctor2.check.Check;
 import de.hft.stuttgart.citydoctor2.check.CheckId;
 import de.hft.stuttgart.citydoctor2.check.CheckResult;
-import de.hft.stuttgart.citydoctor2.check.Checkable;
 import de.hft.stuttgart.citydoctor2.check.CheckableUtilsVisitor;
-import de.hft.stuttgart.citydoctor2.check.CheckableVisitor;
-import de.hft.stuttgart.citydoctor2.check.ErrorType;
 import de.hft.stuttgart.citydoctor2.check.GlobalParameters;
 import de.hft.stuttgart.citydoctor2.check.Requirement;
 import de.hft.stuttgart.citydoctor2.check.RequirementType;
 import de.hft.stuttgart.citydoctor2.check.ResultStatus;
 import de.hft.stuttgart.citydoctor2.check.error.FloatingUtilityError;
-import de.hft.stuttgart.citydoctor2.check.error.MisalignedConnectionError;
 import de.hft.stuttgart.citydoctor2.checks.Checks;
 import de.hft.stuttgart.citydoctor2.checks.util.CollectionUtils;
-import de.hft.stuttgart.citydoctor2.checks.util.ConnectionAlignmentType;
 import de.hft.stuttgart.citydoctor2.checks.util.SelfIntersectionUtil;
-import de.hft.stuttgart.citydoctor2.checks.util.UtilityNetworkUtils;
 import de.hft.stuttgart.citydoctor2.database.CityObjectCache;
-import de.hft.stuttgart.citydoctor2.datastructure.AbstractLinearRing;
 import de.hft.stuttgart.citydoctor2.datastructure.Building;
 import de.hft.stuttgart.citydoctor2.datastructure.CityObject;
-import de.hft.stuttgart.citydoctor2.datastructure.ConcretePolygon;
 import de.hft.stuttgart.citydoctor2.datastructure.Geometry;
-import de.hft.stuttgart.citydoctor2.datastructure.GeometryType;
-import de.hft.stuttgart.citydoctor2.datastructure.LinearRing;
 import de.hft.stuttgart.citydoctor2.datastructure.OtherConstructionObject;
-import de.hft.stuttgart.citydoctor2.datastructure.Vertex;
-import de.hft.stuttgart.citydoctor2.math.Plane;
 import de.hft.stuttgart.citydoctor2.parser.ParserConfiguration;
-import de.hft.stuttgart.citydoctor2.utils.Pair;
 import de.hft.stuttgart.citydoctor2.utils.PolygonIntersection;
 
 import java.util.ArrayList;
@@ -40,14 +27,13 @@ import java.util.List;
 import java.util.Map;
 import java.util.Set;
 
-public class FloatingUtilityCheck extends Check{
+public class DisconnectedIslandCheck extends Check{
 
     private static final List<CheckId> dependencies;
 
     static {
         ArrayList<CheckId> deps = new ArrayList<>();
         deps.add(CheckId.C_GE_S_ALL_POLYGONS_WRONG_ORIENTATION);
-        deps.add(CheckId.C_TO_FLOATING_UTILITY);
         dependencies = Collections.unmodifiableList(deps);
     }
 
@@ -73,7 +59,7 @@ public class FloatingUtilityCheck extends Check{
 
     @Override
     public Check createNewInstance() {
-        return new FloatingUtilityCheck();
+        return new DisconnectedIslandCheck();
     }
 
     @Override
@@ -84,6 +70,7 @@ public class FloatingUtilityCheck 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;
@@ -92,7 +79,6 @@ public class FloatingUtilityCheck extends Check{
         if (epsilonString != null) {
             epsilon = Double.parseDouble(epsilonString);
         }
-        this.cache = cache;
     }
 
 
@@ -136,15 +122,9 @@ public class FloatingUtilityCheck extends Check{
                         }
                         List<PolygonIntersection> polygonIntersections =
                                 SelfIntersectionUtil.calculateGeometryIntersections(sGeo, cGeo, epsilon);
-                        if(!polygonIntersections.isEmpty()){
-                        } else{
-                            for(PolygonIntersection pi : polygonIntersections){
-                                if(pi.getType() != PolygonIntersection.IntersectionType.NONE){
-                                    connected[0] = true;
-                                }
-                            }
+                        if (!polygonIntersections.isEmpty()) {
+                            connected[0] = true;
                         }
-
                     }
                 });
             }