Merge branch 'dev' into 'master'

Version 3.18.3

See merge request !42

CHANGELOG.md

@@ -5,6 +5,14 @@ All notable changes to this project will be documented in this file.
 The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.1.0/),
 and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
 
+## [3.18.3] (2026-04-16)
+
+### Fixes
+
+- Fixed FragmentedSurface errors reporting roof BoundarySurfaces as ground BoundarySurfaces
+- Fixed degenerated triangles causing false-positive detection of AllPolygonsWrongOrientation errors
+- Fixed -db_location and -db_settings arguments not being parsed when starting the GUI from the CLI
+
 ## [3.18.2] (2026-02-24)
 
 ### Added

CityDoctorParent/CityDoctorCheckResult/pom.xml

@@ -6,7 +6,7 @@
 	<parent>
 		<groupId>de.hft.stuttgart</groupId>
 		<artifactId>CityDoctorParent</artifactId>
-		<version>3.18.2</version>
+		<version>3.18.3</version>
 	</parent>
 	<artifactId>CityDoctorCheckResult</artifactId>
 	<dependencies>

CityDoctorParent/CityDoctorEdge/pom.xml

@@ -6,7 +6,7 @@
 	<parent>
 		<groupId>de.hft.stuttgart</groupId>
 		<artifactId>CityDoctorParent</artifactId>
-		<version>3.18.2</version>
+		<version>3.18.3</version>
 	</parent>
 	<artifactId>CityDoctorEdge</artifactId>
 	<dependencies>

CityDoctorParent/CityDoctorModel/pom.xml

@@ -6,7 +6,7 @@
 	<parent>
 		<groupId>de.hft.stuttgart</groupId>
 		<artifactId>CityDoctorParent</artifactId>
-		<version>3.18.2</version>
+		<version>3.18.3</version>
 	</parent>
 	<properties>
 		<versionString>${project.version}-${git.commit.id.abbrev}</versionString>

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

@@ -37,7 +37,7 @@ import de.hft.stuttgart.citydoctor2.check.error.SchematronError;
 import de.hft.stuttgart.citydoctor2.check.error.SolidError;
 import de.hft.stuttgart.citydoctor2.check.error.SolidNotClosedError;
 import de.hft.stuttgart.citydoctor2.check.error.SolidSelfIntError;
-import de.hft.stuttgart.citydoctor2.check.error.SurfaceUnfragmentedError;
+import de.hft.stuttgart.citydoctor2.check.error.SurfaceFragmentedError;
 import de.hft.stuttgart.citydoctor2.check.error.TooFewPolygonsError;
 import de.hft.stuttgart.citydoctor2.check.error.UnknownCheckError;
 import de.hft.stuttgart.citydoctor2.check.error.XMLValidationError;
@@ -181,7 +181,7 @@ public abstract class AbstractErrorVisitor implements ErrorVisitor {
 	}
 
 	@Override
-	public void visit(SurfaceUnfragmentedError err) {
+	public void visit(SurfaceFragmentedError err) {
 	}
 
 	@Override

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

@@ -55,7 +55,7 @@ import de.hft.stuttgart.citydoctor2.check.error.SchematronError;
 import de.hft.stuttgart.citydoctor2.check.error.SolidError;
 import de.hft.stuttgart.citydoctor2.check.error.SolidNotClosedError;
 import de.hft.stuttgart.citydoctor2.check.error.SolidSelfIntError;
-import de.hft.stuttgart.citydoctor2.check.error.SurfaceUnfragmentedError;
+import de.hft.stuttgart.citydoctor2.check.error.SurfaceFragmentedError;
 import de.hft.stuttgart.citydoctor2.check.error.TooFewPolygonsError;
 import de.hft.stuttgart.citydoctor2.check.error.UnknownCheckError;
 import de.hft.stuttgart.citydoctor2.check.error.XMLValidationError;
@@ -135,7 +135,7 @@ public interface ErrorVisitor {
 
 	public void visit(SchematronError err);
 	
-	public void visit(SurfaceUnfragmentedError err);
+	public void visit(SurfaceFragmentedError err);
 	
 	public void visit(DegeneratedRingError err);
 	

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

@@ -48,7 +48,7 @@ import de.hft.stuttgart.citydoctor2.check.error.RingTooFewPointsError;
 import de.hft.stuttgart.citydoctor2.check.error.SchematronError;
 import de.hft.stuttgart.citydoctor2.check.error.SolidNotClosedError;
 import de.hft.stuttgart.citydoctor2.check.error.SolidSelfIntError;
-import de.hft.stuttgart.citydoctor2.check.error.SurfaceUnfragmentedError;
+import de.hft.stuttgart.citydoctor2.check.error.SurfaceFragmentedError;
 import de.hft.stuttgart.citydoctor2.check.error.TooFewPolygonsError;
 import de.hft.stuttgart.citydoctor2.check.error.UnknownCheckError;
 import de.hft.stuttgart.citydoctor2.check.error.XMLValidationError;
@@ -189,7 +189,7 @@ public interface HealingMethod {
 		return false;
 	}
 
-	default boolean visit(SurfaceUnfragmentedError err, ModificationListener l) {
+	default boolean visit(SurfaceFragmentedError err, ModificationListener l) {
 		return false;
 	}
 	

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

@@ -55,7 +55,7 @@ import de.hft.stuttgart.citydoctor2.check.error.RingTooFewPointsError;
 import de.hft.stuttgart.citydoctor2.check.error.SchematronError;
 import de.hft.stuttgart.citydoctor2.check.error.SolidNotClosedError;
 import de.hft.stuttgart.citydoctor2.check.error.SolidSelfIntError;
-import de.hft.stuttgart.citydoctor2.check.error.SurfaceUnfragmentedError;
+import de.hft.stuttgart.citydoctor2.check.error.SurfaceFragmentedError;
 import de.hft.stuttgart.citydoctor2.check.error.TooFewPolygonsError;
 import de.hft.stuttgart.citydoctor2.check.error.UnknownCheckError;
 import de.hft.stuttgart.citydoctor2.check.error.XMLValidationError;
@@ -367,7 +367,7 @@ public class QualityAdeErrorVisitor extends AbstractErrorVisitor {
 	}
 
 	@Override
-	public void visit(SurfaceUnfragmentedError err) {
+	public void visit(SurfaceFragmentedError err) {
 		// not translated
 	}
 

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

@@ -63,7 +63,7 @@ public class Requirement implements Serializable {
 	public static final Requirement R_GE_R_NULL_AREA = new Requirement("R_GE_R_NULL_AREA", RequirementType.GEOMETRY);
 
 	public static final Requirement R_SE_BS_GROUND_UNFRAGMENTED = new Requirement("R_SE_BS_GROUND_UNFRAGMENTED", RequirementType.SEMANTIC);
-	public static final Requirement R_SE_BS_ROOF_UNFRAGMENTED = new Requirement("R_SE_BS_GROUND_UNFRAGMENTED", RequirementType.SEMANTIC);
+	public static final Requirement R_SE_BS_ROOF_UNFRAGMENTED = new Requirement("R_SE_BS_ROOF_UNFRAGMENTED", RequirementType.SEMANTIC);
 	public static final Requirement R_SE_BS_IS_CEILING = new Requirement("R_SE_BS_IS_CEILING", RequirementType.SEMANTIC);
 	public static final Requirement R_SE_BS_IS_FLOOR = new Requirement("R_SE_BS_IS_FLOOR", RequirementType.SEMANTIC);
 	public static final Requirement R_SE_BS_IS_WALL = new Requirement("R_SE_BS_IS_WALL", RequirementType.SEMANTIC);
@@ -83,6 +83,7 @@ public class Requirement implements Serializable {
 		defaultParameters.add(new DefaultParameter(UPPER_ANGLE_NAME, "135", Unit.DEGREE));
 		R_SE_BS_IS_WALL.parameters = Collections.unmodifiableList(defaultParameters);
 		
+		defaultParameters = new ArrayList<>();
 		defaultParameters.add(new DefaultParameter(MAX_ANGLE_DEVIATION, "1", Unit.DEGREE));
 		R_SE_BS_ROOF_UNFRAGMENTED.parameters = Collections.unmodifiableList(defaultParameters);
 		

CityDoctorParent/CityDoctorModel/src/main/java/de/hft/stuttgart/citydoctor2/check/error/SurfaceUnfragmentedError.java → CityDoctorParent/CityDoctorModel/src/main/java/de/hft/stuttgart/citydoctor2/check/error/SurfaceFragmentedError.java

@@ -36,7 +36,7 @@ import java.io.Serial;
  * @author Matthias Betz
  *
  */
-public class SurfaceUnfragmentedError implements CheckError {
+public class SurfaceFragmentedError implements CheckError {
 
 	@Serial
 	private static final long serialVersionUID = 3146243879393474196L;
@@ -44,7 +44,7 @@ public class SurfaceUnfragmentedError implements CheckError {
 	private final BoundarySurface bs;
 	private final double angleDeviation;
 
-	public SurfaceUnfragmentedError(BoundarySurface bs, double angleDerivation) {
+	public SurfaceFragmentedError(BoundarySurface bs, double angleDerivation) {
 		this.bs = bs;
 		this.angleDeviation = angleDerivation;
 	}

CityDoctorParent/CityDoctorValidation/pom.xml

@@ -4,7 +4,7 @@
 	<parent>
 		<groupId>de.hft.stuttgart</groupId>
 		<artifactId>CityDoctorParent</artifactId>
-		<version>3.18.2</version>
+		<version>3.18.3</version>
 	</parent>
 	<artifactId>CityDoctorValidation</artifactId>
 	<name>CityDoctorValidation</name>

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

@@ -96,7 +96,7 @@ public class CityDoctorValidation {
 		return outputFile;
 	}
 
-	private static void lookForDbConfigFileParameter(ArgumentParser argParser) {
+	public static void lookForDbConfigFileParameter(ArgumentParser argParser) {
 		if (!argParser.containsOption("db_config")) {
 			return;
 		}
@@ -108,7 +108,7 @@ public class CityDoctorValidation {
 		}
 	}
 
-	private static void lookForDbLocationParameter(ArgumentParser argParser) {
+	public static void lookForDbLocationParameter(ArgumentParser argParser) {
 		if (!argParser.containsOption("db_location")) {
 			return;
 		}

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

@@ -118,13 +118,15 @@ public class AllPolygonsWrongOrientationCheck extends Check {
 		// find the centroid of a triangle
 		Vector3d centroid = t.getCentroid();
 		// create a point outside of the geometry
-		Vector3d outsidePoint = bbox[0].minus(Vector3d.X, 5).minus(Vector3d.Y, 5).minus(Vector3d.Z, 5);
+		Vector3d outsideDif1 = new Vector3d(5, 5, 5);
+		Vector3d outsidePoint = bbox[0].minus(outsideDif1);
 		// create a second point outside of the geometry
 		// the check can fail if the building is exactly oriented so that the ray is
 		// parallel to a side of the building
 		// in order to avoid this we check two rays, if one of those says it is oriented
 		// correctly it is oriented correctly
-		Vector3d secondOutsidePoint = bbox[0].minus(Vector3d.X, 5).minus(Vector3d.Y, 10).minus(Vector3d.Z, 5);
+		Vector3d outsideDif2 = new Vector3d(7, 10, 5);
+		Vector3d secondOutsidePoint = bbox[0].minus(outsideDif2);
 		return checkIfGeometryIsWrongOriented(tessPolygons, centroid, outsidePoint)
 				|| checkIfGeometryIsWrongOriented(tessPolygons, centroid, secondOutsidePoint);
 	}
@@ -164,8 +166,8 @@ public class AllPolygonsWrongOrientationCheck extends Check {
 	}
 
 	private Triangle3d findSuitableTriangle(TesselatedPolygon p1) {
-		Triangle3d t = p1.getTriangles().get(0);
-		double maxArea = t.getArea();
+		Triangle3d t = null;
+		double maxArea = Double.NEGATIVE_INFINITY;
 		for (Triangle3d tri : p1.getTriangles()) {
 			double area = tri.getArea();
 			if (area > maxArea) {
@@ -173,6 +175,9 @@ public class AllPolygonsWrongOrientationCheck extends Check {
 				t = tri;
 			}
 		}
+		if (t == null) {
+			throw new IllegalStateException("No suitable triangle found");
+		}
 		return t;
 	}
 

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

@@ -29,6 +29,7 @@ import de.hft.stuttgart.citydoctor2.check.CheckId;
 import de.hft.stuttgart.citydoctor2.check.CheckResult;
 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.checks.util.CollectionUtils;
 import de.hft.stuttgart.citydoctor2.checks.util.UnfragmentedCheck;
 import de.hft.stuttgart.citydoctor2.datastructure.BoundarySurface;
@@ -80,6 +81,10 @@ public class RoofSurfaceUnfragmentedCheck extends Check {
 		}
 		// only use lod1 and lod2 polygons
 		CheckResult cr = UnfragmentedCheck.checkForFragmentedBoundarySurfaces(this, bs, maxAngleDeviation);
+		if (cr.getResultStatus() == ResultStatus.OK) {
+			// check if neighboring roof surfaces have the same average normal
+			// they should be merged
+		}
 		bs.addCheckResult(cr);
 	}
 

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

@@ -24,7 +24,7 @@ import java.util.List;
 import de.hft.stuttgart.citydoctor2.check.Check;
 import de.hft.stuttgart.citydoctor2.check.CheckResult;
 import de.hft.stuttgart.citydoctor2.check.ResultStatus;
-import de.hft.stuttgart.citydoctor2.check.error.SurfaceUnfragmentedError;
+import de.hft.stuttgart.citydoctor2.check.error.SurfaceFragmentedError;
 import de.hft.stuttgart.citydoctor2.datastructure.BoundarySurface;
 import de.hft.stuttgart.citydoctor2.datastructure.Geometry;
 import de.hft.stuttgart.citydoctor2.datastructure.Polygon;
@@ -75,7 +75,7 @@ public class UnfragmentedCheck {
 				double dot = averageNormal.dot(n);
 				double acos = Math.acos(dot);
 				if (acos > delta) {
-					SurfaceUnfragmentedError err = new SurfaceUnfragmentedError(bs, acos);
+					SurfaceFragmentedError err = new SurfaceFragmentedError(bs, acos);
 					return new CheckResult(c, ResultStatus.ERROR, err);
 				}
 			}

CityDoctorParent/Extensions/CityDoctorGUI/pom.xml

@@ -6,7 +6,7 @@
 	<parent>
 		<groupId>de.hft.stuttgart</groupId>
 		<artifactId>CityDoctorParent</artifactId>
-		<version>3.18.2</version>
+		<version>3.18.3</version>
 		<relativePath>../../pom.xml</relativePath>
 	</parent>
 	<artifactId>CityDoctorGUI</artifactId>

CityDoctorParent/Extensions/CityDoctorGUI/src/main/java/de/hft/stuttgart/citydoctor2/gui/GlobalErrorVisitor.java

@@ -39,7 +39,7 @@ import de.hft.stuttgart.citydoctor2.check.error.SchematronError;
 import de.hft.stuttgart.citydoctor2.check.error.SolidError;
 import de.hft.stuttgart.citydoctor2.check.error.SolidNotClosedError;
 import de.hft.stuttgart.citydoctor2.check.error.SolidSelfIntError;
-import de.hft.stuttgart.citydoctor2.check.error.SurfaceUnfragmentedError;
+import de.hft.stuttgart.citydoctor2.check.error.SurfaceFragmentedError;
 import de.hft.stuttgart.citydoctor2.check.error.TooFewPolygonsError;
 import de.hft.stuttgart.citydoctor2.check.error.UnknownCheckError;
 import de.hft.stuttgart.citydoctor2.check.error.XMLValidationError;
@@ -186,7 +186,7 @@ public class GlobalErrorVisitor implements ErrorVisitor {
 	}
 
 	@Override
-	public void visit(SurfaceUnfragmentedError err) {
+	public void visit(SurfaceFragmentedError err) {
 	}
 
 	@Override

CityDoctorParent/Extensions/CityDoctorGUI/src/main/java/de/hft/stuttgart/citydoctor2/gui/ListErrorVisitor.java

@@ -41,7 +41,7 @@ import de.hft.stuttgart.citydoctor2.check.error.SchematronError;
 import de.hft.stuttgart.citydoctor2.check.error.SolidError;
 import de.hft.stuttgart.citydoctor2.check.error.SolidNotClosedError;
 import de.hft.stuttgart.citydoctor2.check.error.SolidSelfIntError;
-import de.hft.stuttgart.citydoctor2.check.error.SurfaceUnfragmentedError;
+import de.hft.stuttgart.citydoctor2.check.error.SurfaceFragmentedError;
 import de.hft.stuttgart.citydoctor2.check.error.DegeneratedRingError;
 import de.hft.stuttgart.citydoctor2.check.error.TooFewPolygonsError;
 import de.hft.stuttgart.citydoctor2.check.error.UnknownCheckError;
@@ -243,7 +243,7 @@ public class ListErrorVisitor implements ErrorVisitor {
 	}
 
 	@Override
-	public void visit(SurfaceUnfragmentedError err) {
+	public void visit(SurfaceFragmentedError err) {
 		// nothing to display
 	}
 

CityDoctorParent/Extensions/CityDoctorGUI/src/main/java/de/hft/stuttgart/citydoctor2/gui/MainWindow.java

@@ -278,6 +278,8 @@ public class MainWindow extends Application {
                 System.exit(4);
             }
         }
+        CityDoctorValidation.lookForDbConfigFileParameter(argParser);
+        CityDoctorValidation.lookForDbLocationParameter(argParser);
         Application.launch(args);
     }
 

CityDoctorParent/Extensions/CityDoctorGUI/src/main/java/de/hft/stuttgart/citydoctor2/gui/tree/ErrorItemVisitor.java

@@ -36,7 +36,7 @@ import de.hft.stuttgart.citydoctor2.check.error.RingTooFewPointsError;
 import de.hft.stuttgart.citydoctor2.check.error.SchematronError;
 import de.hft.stuttgart.citydoctor2.check.error.SolidNotClosedError;
 import de.hft.stuttgart.citydoctor2.check.error.SolidSelfIntError;
-import de.hft.stuttgart.citydoctor2.check.error.SurfaceUnfragmentedError;
+import de.hft.stuttgart.citydoctor2.check.error.SurfaceFragmentedError;
 import de.hft.stuttgart.citydoctor2.check.error.TooFewPolygonsError;
 import de.hft.stuttgart.citydoctor2.check.error.UnknownCheckError;
 import de.hft.stuttgart.citydoctor2.datastructure.ConcretePolygon;
@@ -396,7 +396,7 @@ public class ErrorItemVisitor extends AbstractErrorVisitor {
 	}
 
 	@Override
-	public void visit(SurfaceUnfragmentedError err) {
+	public void visit(SurfaceFragmentedError err) {
 		TextNode textNode = new TextNode(
 				Localization.getText("ErrorItemVisitor.deviation") + ": " + err.getAngleDeviation());
 		TreeItem<Renderable> textItem = new TreeItem<>(textNode);