Merge branch 'cleanup' into 'dev'

cleanup code

See merge request !24

CityDoctorParent/CityDoctorCheckResult/pom.xml

 <?xml version="1.0" encoding="utf-8"?>
-<project xmlns="http://maven.apache.org/POM/4.0.0">
+<project xmlns="http://maven.apache.org/POM/4.0.0"
+	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+	xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
 	<modelVersion>4.0.0</modelVersion>
 	<parent>
 		<groupId>de.hft.stuttgart</groupId>

CityDoctorParent/CityDoctorEdge/pom.xml

 <?xml version="1.0" encoding="utf-8"?>
-<project xmlns="http://maven.apache.org/POM/4.0.0">
+<project xmlns="http://maven.apache.org/POM/4.0.0"
+	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+	xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
 	<modelVersion>4.0.0</modelVersion>
 	<parent>
 		<groupId>de.hft.stuttgart</groupId>

CityDoctorParent/CityDoctorEdge/src/main/java/de/hft/stuttgart/citydoctor2/edge/Vector2d.java

@@ -29,7 +29,6 @@ public class Vector2d {
 		this.y = y;
 	}
 
-	@SuppressWarnings("SuspiciousNameCombination")
     public Vector2d getPerpendicularVector() {
 		return new Vector2d(y, -x);
 	}

CityDoctorParent/CityDoctorModel/pom.xml

 <?xml version="1.0" encoding="utf-8"?>
-<project xmlns="http://maven.apache.org/POM/4.0.0">
+<project xmlns="http://maven.apache.org/POM/4.0.0"
+	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+	xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
 	<modelVersion>4.0.0</modelVersion>
 	<parent>
 		<groupId>de.hft.stuttgart</groupId>
@@ -92,7 +94,8 @@
 					<prefix>git</prefix>
 					<verbose>false</verbose>
 					<generateGitPropertiesFile>true</generateGitPropertiesFile>
-					<generateGitPropertiesFilename>${project.build.outputDirectory}/git.properties</generateGitPropertiesFilename>
+					<generateGitPropertiesFilename>
+						${project.build.outputDirectory}/git.properties</generateGitPropertiesFilename>
 					<gitDescribe>
 						<skip>false</skip>
 						<always>false</always>

CityDoctorParent/CityDoctorModel/src/main/java/de/hft/stuttgart/citydoctor2/check/HealingMethod.java

@@ -60,10 +60,8 @@ import de.hft.stuttgart.citydoctor2.check.error.UnknownCheckError;
  * @author Matthias Betz
  *
  */
-@SuppressWarnings("unused")
 public interface HealingMethod {
 	
-	
 	public HealingID getID();
 
 	default boolean visit(CheckError e, ModificationListener l) {

CityDoctorParent/CityDoctorModel/src/main/java/de/hft/stuttgart/citydoctor2/datastructure/AbstractFurniture.java

@@ -124,7 +124,10 @@ public abstract class AbstractFurniture extends CityObject {
     public void setParent(CityObject co) {
         parent = co;
     }
-
+    
+    public CityObject getParent() {
+		return parent;
+	}
 
     @Override
     public void unsetGmlGeometries() {

CityDoctorParent/CityDoctorModel/src/main/java/de/hft/stuttgart/citydoctor2/datastructure/ImplicitGeometryHolder.java

 package de.hft.stuttgart.citydoctor2.datastructure;
 
+import java.io.Serial;
+import java.util.List;
+
+import org.citygml4j.core.model.core.ImplicitGeometry;
+
 import de.hft.stuttgart.citydoctor2.check.Check;
 import de.hft.stuttgart.citydoctor2.check.CheckError;
 import de.hft.stuttgart.citydoctor2.check.CheckId;
 import de.hft.stuttgart.citydoctor2.math.TransformationMatrix;
-import org.apache.logging.log4j.LogManager;
-import org.apache.logging.log4j.Logger;
-import org.citygml4j.core.model.core.ImplicitGeometry;
-
-import java.io.Serial;
-import java.util.List;
 
 /**
  * Datastructure for representation and resolving of implicit geometries
@@ -18,7 +17,6 @@ import java.util.List;
  */
 public class ImplicitGeometryHolder extends Geometry {
 
-    private static final Logger logger = LogManager.getLogger(ImplicitGeometryHolder.class);
     @Serial
     private static final long serialVersionUID = -8938931081577196349L;
 

CityDoctorParent/CityDoctorModel/src/main/java/de/hft/stuttgart/citydoctor2/datastructure/LibraryObject.java

@@ -14,68 +14,66 @@ import java.util.Map;
 import java.util.concurrent.ConcurrentHashMap;
 
 /**
- * Reference object for handling of implicit geometries with a library object contained in an external file
+ * Reference object for handling of implicit geometries with a library object
+ * contained in an external file
  *
  * @author Riegel
  */
 public class LibraryObject extends Geometry {
 
-    private static final Logger logger = LogManager.getLogger(LibraryObject.class);
-    @Serial
-    private static final long serialVersionUID = -50293435187454911L;
-    private final String filepath;
-    private final ParserConfiguration config;
-    private static Map<String, LibraryObject> libraryObjects = new ConcurrentHashMap<>();
+	private static final Logger logger = LogManager.getLogger(LibraryObject.class);
+	@Serial
+	private static final long serialVersionUID = -50293435187454911L;
 
-    public static LibraryObject of(Path path, ParserConfiguration config) {
-        if (libraryObjects.containsKey(path.toString())) {
-            return libraryObjects.get(path.toString());
-        }
-        Geometry protoGeom = parseFile(path, config);
-        if (protoGeom == null) {
-            return null;
-        }
-        LibraryObject libOb = new LibraryObject(protoGeom.getType(), protoGeom.getLod(), path, config);
-        protoGeom.getPolygons().forEach(libOb::addPolygon);
-        libOb.updateEdgesAndVertices();
-        libraryObjects.put(path.toString(), libOb);
-        return libOb;
-    }
+	private static Map<String, LibraryObject> libraryObjects = new ConcurrentHashMap<>();
 
-    private LibraryObject(GeometryType type, Lod lod, Path path, ParserConfiguration config) {
-        super(type, lod);
-        this.filepath = path.toString();
-        this.config = config;
-    }
+	public static LibraryObject of(Path path, ParserConfiguration config) {
+		if (libraryObjects.containsKey(path.toString())) {
+			return libraryObjects.get(path.toString());
+		}
+		Geometry protoGeom = parseFile(path, config);
+		if (protoGeom == null) {
+			return null;
+		}
+		LibraryObject libOb = new LibraryObject(protoGeom.getType(), protoGeom.getLod());
+		protoGeom.getPolygons().forEach(libOb::addPolygon);
+		libOb.updateEdgesAndVertices();
+		libraryObjects.put(path.toString(), libOb);
+		return libOb;
+	}
 
+	private LibraryObject(GeometryType type, Lod lod) {
+		super(type, lod);
+	}
 
-    private static Geometry parseFile(Path path, ParserConfiguration config) {
-        Geometry geo = null;
-        if (path.toFile().exists()) {
-            try {
-                CityGmlParser.gagLogger(true);
-                CityDoctorModel model = CityGmlParser.parseCityGmlFile(path.toString(), config);
-                List<CityObject> objects = model.createFeatureStream().toList();
-                if (objects.isEmpty()) {
-                    throw new InvalidGmlFileException("Referenced library-object's gml file does not contain a CityGML object!");
-                } else if (objects.size() > 1) {
-                    throw new InvalidGmlFileException("Referenced library-object's gml file contains more than one CityGML object!");
-                }
-                geo = objects.get(0).getHighestLodGeometry();
-            } catch (CityGmlParseException e) {
-                logger.error(String.format(
-                        "Encountered an error while parsing library object %s", path));
-                logger.error(e.getStackTrace());
-            } catch (InvalidGmlFileException e) {
-                logger.error(e.getStackTrace());
-            } finally {
-                // Failsafe to remove gag should parsing fail
-                CityGmlParser.gagLogger(false);
-            }
-        } else {
-            logger.error(String.format("Implicit geometry references non-existing library object file %s.", path));
-        }
-        return geo;
-    }
+	private static Geometry parseFile(Path path, ParserConfiguration config) {
+		Geometry geo = null;
+		if (path.toFile().exists()) {
+			try {
+				CityGmlParser.gagLogger(true);
+				CityDoctorModel model = CityGmlParser.parseCityGmlFile(path.toString(), config);
+				List<CityObject> objects = model.createFeatureStream().toList();
+				if (objects.isEmpty()) {
+					throw new InvalidGmlFileException(
+							"Referenced library-object's gml file does not contain a CityGML object!");
+				} else if (objects.size() > 1) {
+					throw new InvalidGmlFileException(
+							"Referenced library-object's gml file contains more than one CityGML object!");
+				}
+				geo = objects.get(0).getHighestLodGeometry();
+			} catch (CityGmlParseException e) {
+				logger.error("Encountered an error while parsing library object {}", path);
+				logger.error(e.getStackTrace());
+			} catch (InvalidGmlFileException e) {
+				logger.error(e.getStackTrace());
+			} finally {
+				// Failsafe to remove gag should parsing fail
+				CityGmlParser.gagLogger(false);
+			}
+		} else {
+			logger.error("Implicit geometry references non-existing library object file {}.", path);
+		}
+		return geo;
+	}
 
 }

CityDoctorParent/CityDoctorModel/src/main/java/de/hft/stuttgart/citydoctor2/datastructure/RelativeGeometry.java

 package de.hft.stuttgart.citydoctor2.datastructure;
 
-
-import org.apache.logging.log4j.LogManager;
-import org.apache.logging.log4j.Logger;
-
 import java.io.Serial;
 import java.util.Map;
 import java.util.concurrent.ConcurrentHashMap;
@@ -15,27 +11,23 @@ import java.util.concurrent.ConcurrentHashMap;
  */
 public class RelativeGeometry extends Geometry {
 
-    private static final Logger logger = LogManager.getLogger(RelativeGeometry.class);
-    @Serial
-    private static final long serialVersionUID = -686112245455298977L;
-
-    private static Map<Geometry, RelativeGeometry> relativeGeometries = new ConcurrentHashMap<>();
-
-    public static RelativeGeometry of(Geometry geom) {
-        if (relativeGeometries.containsKey(geom)) {
-            return relativeGeometries.get(geom);
-        }
-        RelativeGeometry relGeo = new RelativeGeometry(geom.getType(), geom.getLod());
-        geom.getPolygons().forEach(relGeo::addPolygon);
-        relGeo.updateEdgesAndVertices();
-        relativeGeometries.put(geom, relGeo);
-        return relGeo;
-    }
-
-
-    private RelativeGeometry(GeometryType type, Lod lod) {
-        super(type, lod);
-    }
+	@Serial
+	private static final long serialVersionUID = -686112245455298977L;
+
+	private static Map<Geometry, RelativeGeometry> relativeGeometries = new ConcurrentHashMap<>();
+
+	public static RelativeGeometry of(Geometry geom) {
+		if (relativeGeometries.containsKey(geom)) {
+			return relativeGeometries.get(geom);
+		}
+		RelativeGeometry relGeo = new RelativeGeometry(geom.getType(), geom.getLod());
+		geom.getPolygons().forEach(relGeo::addPolygon);
+		relGeo.updateEdgesAndVertices();
+		relativeGeometries.put(geom, relGeo);
+		return relGeo;
+	}
+
+	private RelativeGeometry(GeometryType type, Lod lod) {
+		super(type, lod);
+	}
 }
-
-

CityDoctorParent/CityDoctorModel/src/main/java/de/hft/stuttgart/citydoctor2/datastructure/TunnelConstructiveElement.java

@@ -60,6 +60,8 @@ public class TunnelConstructiveElement extends CityObject {
                     MultiSurface ms = CityGmlUtils.createMultiSurface(geom, factory, config);
                     setMultiSurfaceAccordingToLod(geom, ms);
                     break;
+                case COMPOSITE_SURFACE:
+                	throw new IllegalStateException("Tunnel constructive element cannot have a composite surface geometry");
             }
         }
         for (BoundarySurface bs : boundarySurfaceList) {

CityDoctorParent/CityDoctorModel/src/main/java/de/hft/stuttgart/citydoctor2/mapper/citygml3/Citygml3GeometryMapper.java

@@ -59,7 +59,7 @@ public class Citygml3GeometryMapper extends GeometryWalker {
     public void visit(Polygon polygon) {
         parsePolygon(polygon.getId(), polygon.getExterior(), polygon.getInterior());
         if (polygon.getExterior() == null) {
-            logger.warn(String.format("No exterior: %s", polygon.getId()));
+            logger.warn("No exterior: {}", polygon.getId());
         }
     }
 

CityDoctorParent/CityDoctorModel/src/main/java/de/hft/stuttgart/citydoctor2/math/ProjectionAxis.java

@@ -34,7 +34,7 @@ import de.hft.stuttgart.citydoctor2.datastructure.Vertex;
  *
  */
 public class ProjectionAxis {
-	
+
 	private static final String DIVISOR_IS_0 = "Divisor is 0";
 
 	private final int[] axis;
@@ -87,20 +87,36 @@ public class ProjectionAxis {
 		this.axis = axis;
 	}
 
+	/**
+	 * This will write the two coordinates determined in this projection axis into a
+	 * given array at the startIndex location. The array has to have at least a
+	 * length of startIndex + 1.
+	 * 
+	 * @param v          the vector from which the coordinates are taken.
+	 * @param array      the array that is written to.
+	 * @param startIndex the start location in the array.
+	 */
+	public void writeCoordinatesOfVectorInArray(Vector3d v, double[] array, int startIndex) {
+		array[startIndex] = v.getCoordinate(axis[0]);
+		array[startIndex + 1] = v.getCoordinate(axis[1]);
+	}
+
 	public Vector2d project(Vector3d v) {
 		return new Vector2d(v.getCoordinate(axis[0]), v.getCoordinate(axis[1]));
 	}
 
 	/**
 	 * calculates the missing coordinate for 3d vector from the plane and this axis.
+	 * 
 	 * @return the projected 3d point.
 	 */
 	public Vector3d projectToPlane(Plane plane, Vector2d v) {
 		return projectToPlane(plane, v.getX(), v.getY());
 	}
-	
+
 	/**
 	 * calculates the missing coordinate for 3d vector from the plane and this axis.
+	 * 
 	 * @return the projected 3d point.
 	 */
 	public Vector3d projectToPlane(Plane plane, double vectorX, double vectorY) {

CityDoctorParent/CityDoctorModel/src/main/java/de/hft/stuttgart/citydoctor2/tesselation/EarcutTesselator.java

@@ -6,10 +6,8 @@ import java.util.List;
 import de.hft.stuttgart.citydoctor2.datastructure.LinearRing;
 import de.hft.stuttgart.citydoctor2.datastructure.Polygon;
 import de.hft.stuttgart.citydoctor2.datastructure.Vertex;
-import de.hft.stuttgart.citydoctor2.math.Polygon2d;
-import de.hft.stuttgart.citydoctor2.math.Ring2d;
+import de.hft.stuttgart.citydoctor2.math.ProjectionAxis;
 import de.hft.stuttgart.citydoctor2.math.Triangle3d;
-import de.hft.stuttgart.citydoctor2.math.Vector2d;
 import earcut4j.Earcut;
 
 /**
@@ -35,8 +33,8 @@ public class EarcutTesselator {
 			}
 		}
 		// collect vertices
-		// project polygon to 2D space as library is buggy for more than 2 dimensions
-		Polygon2d projectedPolygon = Polygon2d.withProjection(p);
+		// find most dominant projection axis for 2d projection
+		ProjectionAxis axis = ProjectionAxis.of(p);
 		
 		double[] vertices = new double[nrOfVertices * 2];
 		List<Vertex> vertexObjects = new ArrayList<>();
@@ -45,9 +43,10 @@ public class EarcutTesselator {
 			addVerticesToList(innerRing, vertexObjects);
 		}
 		
-		int start = addRingToArray(projectedPolygon.getExterior(), vertices, 0);
-		for (Ring2d innerRing : projectedPolygon.getInteriorRings()) {
-			start = addRingToArray(innerRing, vertices, start);
+		// write the vector data according to the projection axis into the array
+		int start = addRingToArray(p.getExteriorRing(), vertices, 0, axis);
+		for (LinearRing innerRing : p.getInnerRings()) {
+			start = addRingToArray(innerRing, vertices, start, axis);
 		}
 		
 		// triangulation
@@ -73,12 +72,12 @@ public class EarcutTesselator {
 		}
 	}
 
-	private static int addRingToArray(Ring2d ring, double[] vertices, int start) {
-		List<Vector2d> ringVertices = ring.getVertices();
+	private static int addRingToArray(LinearRing ring, double[] vertices, int start, ProjectionAxis axis) {
+		List<Vertex> ringVertices = ring.getVertices();
 		for (int i = 0; i < ringVertices.size() - 1; i++) {
-			Vector2d v = ringVertices.get(i);
-			vertices[start++] = v.getX();
-			vertices[start++] = v.getY();
+			Vertex v = ringVertices.get(i);
+			axis.writeCoordinatesOfVectorInArray(v, vertices, start);
+			start = start + 2;
 		}
 		return start;
 	}

CityDoctorParent/CityDoctorModel/src/main/java/de/hft/stuttgart/citydoctor2/writer/CityGMLWriterUtils.java

@@ -31,7 +31,6 @@ import java.util.concurrent.atomic.AtomicInteger;
 
 import org.apache.logging.log4j.LogManager;
 import org.apache.logging.log4j.Logger;
-import org.citygml4j.core.model.CityGMLVersion;
 import org.citygml4j.core.model.core.AbstractCityObjectProperty;
 import org.citygml4j.core.model.core.AbstractFeatureProperty;
 import org.citygml4j.core.model.core.CityModel;

CityDoctorParent/CityDoctorValidation/pom.xml

 <?xml version="1.0" encoding="utf-8"?>
-<project xmlns="http://maven.apache.org/POM/4.0.0">
+<project xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd" xmlns="http://maven.apache.org/POM/4.0.0">
 	<modelVersion>4.0.0</modelVersion>
 	<parent>
 		<groupId>de.hft.stuttgart</groupId>
@@ -65,11 +65,11 @@
 			<groupId>net.sf.saxon</groupId>
 			<artifactId>Saxon-HE</artifactId>
 		</dependency>
-        <dependency>
-            <groupId>org.yaml</groupId>
-            <artifactId>snakeyaml</artifactId>
-        </dependency>
-    </dependencies>
+		<dependency>
+			<groupId>org.yaml</groupId>
+			<artifactId>snakeyaml</artifactId>
+		</dependency>
+	</dependencies>
 	<build>
 		<resources>
 			<resource>

CityDoctorParent/CityDoctorValidation/src/main/java/de/hft/stuttgart/citydoctor2/check/Checker.java

@@ -423,6 +423,7 @@ public class Checker {
 		}
 	}
 
+	@SuppressWarnings("resource")
 	public static SvrlContentHandler executeSchematronValidationIfAvailable(ValidationConfiguration config,
 			InputStream in) {
 		if (config.getSchematronFilePath() != null && !config.getSchematronFilePath().isEmpty()) {

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

@@ -65,23 +65,19 @@ public class SvrlContentHandler implements ContentHandler {
 	public void setDocumentLocator(Locator locator) {
 		// not needed
 	}
-	@SuppressWarnings("RedundantThrows")
 	@Override
 	public void startDocument() throws SAXException {
 		// not needed
 	}
 
-	@SuppressWarnings("RedundantThrows")
     @Override
 	public void endDocument() throws SAXException {
 		// not needed
 	}
-	@SuppressWarnings("RedundantThrows")
 	@Override
 	public void startPrefixMapping(String prefix, String uri) throws SAXException {
 		// not needed
 	}
-	@SuppressWarnings("RedundantThrows")
 	@Override
 	public void endPrefixMapping(String prefix) throws SAXException {
 		// not needed
@@ -133,17 +129,14 @@ public class SvrlContentHandler implements ContentHandler {
 			buffer.append(ch, start, length);
 		}
 	}
-	@SuppressWarnings("RedundantThrows")
 	@Override
 	public void ignorableWhitespace(char[] ch, int start, int length) throws SAXException {
 		// not needed
 	}
-	@SuppressWarnings("RedundantThrows")
 	@Override
 	public void processingInstruction(String target, String data) throws SAXException {
 		// not needed
 	}
-	@SuppressWarnings("RedundantThrows")
 	@Override
 	public void skippedEntity(String name) throws SAXException {
 		// not needed

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

@@ -76,7 +76,6 @@ public class SolidSelfIntCheck extends Check {
 		}
 		CheckResult cr;
 		List<PolygonIntersection> intersections = SelfIntersectionUtil.calculateSolidSelfIntersection(g);
-//		List<PolygonIntersection> intersections = SelfIntersectionUtil.doesSolidSelfIntersect2(g);
 		if (intersections.isEmpty()) {
 			cr = new CheckResult(this, ResultStatus.OK, null);
 		} else {

CityDoctorParent/CityDoctorValidation/src/test/java/de/hft/stuttgart/citydoctor2/checks/geometry/SolidSelfIntCheckFalsePositiveBigMeshTest.java

@@ -36,7 +36,6 @@ public class SolidSelfIntCheckFalsePositiveBigMeshTest {
 		Checker c = new Checker(config, m);
 		c.runChecks();
 		Building building = m.getBuildings().get(0);
-		System.out.println(building.containsAnyError());
 		/*
 		 *  The examples have no actual self-intersections, but can contain other actual model defects.
 		 *  If an error is detected, it is thus required to check if the