Merge branch 'refs/heads/dev' into dev_topo_checks

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

@@ -23,6 +23,7 @@ import java.io.FileNotFoundException;
 import java.io.IOException;
 import java.util.List;
 
+import de.hft.stuttgart.citydoctor2.database.DatabaseSettings;
 import de.hft.stuttgart.citydoctor2.utils.Localization;
 import org.apache.logging.log4j.LogManager;
 import org.apache.logging.log4j.Logger;
@@ -70,6 +71,8 @@ public class CityDoctorValidation {
 		String xmlOutput = getXmlOutput(argParser);
 		String pdfOutput = getPdfOutput(argParser);
 		String outputFile = getOutputFile(argParser, true);
+		lookForDbConfigFileParameter(argParser);
+		lookForDbLocationParameter(argParser);
 		ValidationConfiguration config = getValidationConfig(argParser);
 
 		startValidationProcess(inputFile, xmlOutput, pdfOutput, config, outputFile);
@@ -81,18 +84,42 @@ public class CityDoctorValidation {
 			if (optional) {
 				return null;
 			}
-			logger.error(Localization.getText("CityDoctorValidation.noOutputFile"));
+			logger.fatal(Localization.getText("CityDoctorValidation.noOutputFile"));
 			System.exit(11);
 		}
 		List<String> outFiles = argParser.getValues("out");
 		if (outFiles.size() != 1) {
-			logger.error(Localization.getText("CityDoctorValidation.notExactlyOneOutputFile"));
+			logger.fatal(Localization.getText("CityDoctorValidation.notExactlyOneOutputFile"));
 			System.exit(12);
 		}
 		outputFile = outFiles.get(0);
 		return outputFile;
 	}
 
+	public static void lookForDbConfigFileParameter(ArgumentParser argParser) {
+		if (!argParser.containsOption("db_config")) {
+			return;
+		}
+		List<String> dbConfigFiles = argParser.getValues("db_config");
+		if (dbConfigFiles.size() == 1) {
+			DatabaseSettings.loadPropertiesFromFile(new File(dbConfigFiles.get(0)));
+		} else if (dbConfigFiles.size() > 1) {
+			logger.warn("More than one DB config file provided! Using standard config instead.");
+		}
+	}
+
+	public static void lookForDbLocationParameter(ArgumentParser argParser) {
+		if (!argParser.containsOption("db_location")) {
+			return;
+		}
+		List<String> dbLocations = argParser.getValues("db_location");
+		if (dbLocations.size() == 1) {
+			DatabaseSettings.setDBLocation(dbLocations.get(0));
+		} else if (dbLocations.size() > 1) {
+			logger.warn("More than one DB location provided! Using standard location instead.");
+		}
+	}
+
 	/**
 	 * Validates the cityGML input file with a standard validation configuration.
 	 * 
@@ -202,7 +229,7 @@ public class CityDoctorValidation {
 		if (argParser.containsOption("pdfreport")) {
 			List<String> reportFiles = argParser.getValues("pdfreport");
 			if (reportFiles.size() != 1) {
-				logger.error(Localization.getText("CityDoctorValidation.notExactlyOnePDFOutput"));
+				logger.fatal(Localization.getText("CityDoctorValidation.notExactlyOnePDFOutput"));
 				System.exit(6);
 			}
 			return reportFiles.get(0);
@@ -214,7 +241,7 @@ public class CityDoctorValidation {
 		if (argParser.containsOption("xmlreport")) {
 			List<String> reportFiles = argParser.getValues("xmlreport");
 			if (reportFiles.size() != 1) {
-				logger.error(Localization.getText("CityDoctorValidation.notExactlyOneXMLOutput"));
+				logger.fatal(Localization.getText("CityDoctorValidation.notExactlyOneXMLOutput"));
 				System.exit(5);
 			}
 			return reportFiles.get(0);
@@ -231,7 +258,7 @@ public class CityDoctorValidation {
 		if (argParser.containsOption("config")) {
 			List<String> configFiles = argParser.getValues("config");
 			if (configFiles.size() != 1) {
-				logger.error(Localization.getText("CityDoctorValidation.notExactlyOneConfigFile"));
+				logger.fatal(Localization.getText("CityDoctorValidation.notExactlyOneConfigFile"));
 				System.exit(4);
 			}
 			return ValidationConfiguration.loadValidationConfigFile(configFiles.get(0));
@@ -240,7 +267,7 @@ public class CityDoctorValidation {
 				logger.warn(Localization.getText("CityDoctorValidation.loadingDefaultConfig"));
 				return ValidationConfiguration.loadStandardValidationConfig();
 			} else {
-				logger.error(Localization.getText("CityDoctorValidation.noConfig"));
+				logger.fatal(Localization.getText("CityDoctorValidation.noConfig"));
 				System.exit(7);
 				return null;
 			}
@@ -252,7 +279,7 @@ public class CityDoctorValidation {
 		if (argParser.containsOption("out")) {
 			List<String> outFiles = argParser.getValues("out");
 			if (outFiles.size() != 1) {
-				logger.error(Localization.getText("CityDoctorValidation.multipleOutputFiles"));
+				logger.fatal(Localization.getText("CityDoctorValidation.multipleOutputFiles"));
 				System.exit(3);
 			}
 			return outFiles.get(0);
@@ -271,12 +298,12 @@ public class CityDoctorValidation {
 			if (optional) {
 				return null;
 			}
-			logger.error(Localization.getText("CityDoctorValidation.noInputFile"));
+			logger.fatal(Localization.getText("CityDoctorValidation.noInputFile"));
 			System.exit(1);
 		}
 		List<String> inFiles = argParser.getValues("in");
 		if (inFiles.size() != 1) {
-			logger.error(Localization.getText("CityDoctorValidation.notExactlyOneInputFile"));
+			logger.fatal(Localization.getText("CityDoctorValidation.notExactlyOneInputFile"));
 			System.exit(2);
 		}
 		inputFile = inFiles.get(0);

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

@@ -2,6 +2,7 @@ package de.hft.stuttgart.citydoctor2;
 
 
 import de.hft.stuttgart.citydoctor2.check.ValidationConfiguration;
+import de.hft.stuttgart.citydoctor2.database.DatabaseSettings;
 import de.hft.stuttgart.citydoctor2.exceptions.CityDoctorWriteException;
 import de.hft.stuttgart.citydoctor2.parser.CityGmlParseException;
 import de.hft.stuttgart.citydoctor2.parser.InvalidGmlFileException;
@@ -26,20 +27,30 @@ public class CityDoctorValidationCLI implements Runnable {
     private File config;
 
     @Option(names = {"-x" , "--xml" , "--xmlReport"},
-            description = "Create a XML validation report at target location",
+            description = "Creates a XML validation report at target location",
             defaultValue = Option.NULL_VALUE)
     private String xmlReport;
 
     @Option(names = {"-p" , "--pdf" , "--pdfReport"},
-            description = "Create a PDF validation report at target location",
+            description = "Creates a PDF validation report at target location",
             defaultValue = Option.NULL_VALUE)
     private String pdfReport;
 
     @Option(names = {"-o" , "--out" , "--output"},
-            description = "Create a validated copy of the CityGML input with QualityADE at target location.",
+            description = "Creates a validated copy of the CityGML input with QualityADE at target location.",
             defaultValue = Option.NULL_VALUE)
     private String output;
 
+    @Option(names = {"--db_location", "--db_loc"},
+            description = "Creates the embedded database file at target location instead of CityDoctor's working directory.",
+            defaultValue = Option.NULL_VALUE)
+    private String dbLocation;
+
+    @Option(names = {"-db", "--db_config", "--db_settings"},
+            description = "Filepath to a .properties file for overriding the default configuration of the embedded database",
+            defaultValue = Option.NULL_VALUE)
+    private String dbConfig;
+
     @Override
     public void run(){
         try {
@@ -49,6 +60,12 @@ public class CityDoctorValidationCLI implements Runnable {
             } else{
                 valConfig=ValidationConfiguration.loadValidationConfigFile(config.getAbsolutePath());
             }
+            if(dbConfig != null){
+                DatabaseSettings.loadPropertiesFromFile(new File(dbConfig));
+            }
+            if (dbLocation != null) {
+                DatabaseSettings.setDBLocation(dbLocation);
+            }
             CityDoctorValidation.startValidationProcess(input, xmlReport, pdfReport, valConfig,output);
         } catch (CityDoctorWriteException | CityGmlParseException | IOException | InvalidGmlFileException e) {
             throw new RuntimeException(e);

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.database.CityObjectCache;
@@ -81,6 +82,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/CityDoctorAutoPro/pom.xml

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

CityDoctorParent/Extensions/CityDoctorGUI/DBSettings.properties

-#Embedded database configuration
-#Mon Jan 19 13:16:58 CET 2026
-#database.attemptFallback=true
-#database.connectionPoolSize=22
-#database.debugMode=false
-#database.directory=\\database\\
-#database.inMemoryMode=false
-#database.name=cd_db
-#database.tempMode=false

CityDoctorParent/Extensions/CityDoctorGUI/pom.xml

@@ -6,7 +6,7 @@
 	<parent>
 		<groupId>de.hft.stuttgart</groupId>
 		<artifactId>CityDoctorParent</artifactId>
-		<version>3.18.1</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

@@ -40,7 +40,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;
@@ -188,7 +188,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

@@ -42,7 +42,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;
@@ -244,7 +244,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

@@ -280,6 +280,8 @@ public class MainWindow extends Application {
                 System.exit(4);
             }
         }
+        CityDoctorValidation.lookForDbConfigFileParameter(argParser);
+        CityDoctorValidation.lookForDbLocationParameter(argParser);
         Application.launch(args);
     }
 
@@ -820,8 +822,11 @@ public class MainWindow extends Application {
         MenuItem deleteOption = new MenuItem(Localization.getText("MainWindow.delete"));
         deleteOption.setOnAction(ae -> controller.delete(featureView.getSelectionModel().getSelectedItem()));
         menu.getItems().add(deleteOption);
-        featureView.setContextMenu(menu);
+
      */
+
+        featureView.setContextMenu(menu);
+
     }
 
     public void fetchCopyAction(Renderable node) {

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

@@ -38,7 +38,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;
@@ -400,7 +400,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);

CityDoctorParent/Extensions/CityDoctorHealer/pom.xml

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

CityDoctorParent/Extensions/CityDoctorHealerGUI/pom.xml

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

CityDoctorParent/Extensions/CityDoctorHealerGenetic/pom.xml

@@ -4,7 +4,7 @@
 	<parent>
 		<groupId>de.hft.stuttgart</groupId>
 		<artifactId>CityDoctorParent</artifactId>
-		<version>3.18.1</version>
+		<version>3.18.2</version>
 		<relativePath>../../pom.xml</relativePath>
 	</parent>
 	<artifactId>CityDoctorHealerGenetic</artifactId>

CityDoctorParent/pom.xml

@@ -5,7 +5,7 @@
     <modelVersion>4.0.0</modelVersion>
     <groupId>de.hft.stuttgart</groupId>
     <artifactId>CityDoctorParent</artifactId>
-    <version>3.18.1</version>
+    <version>3.18.3</version>
     <packaging>pom</packaging>
     <name>CityDoctorParent</name>
     <properties>

DBSettings.properties

+! Embedded database configuration
+! Remove # at the beginning of a parameter line to override the value.
+
+! Directory for the database file. DEFAULT: \\database\\
+# database.directory=\\database\\
+! Name of the database file. DEFAULT: cd_db
+# database.name=cd_db
+
+! Sets a limit for the number of pooled connections to the embedded database. DEFAULT: 10
+! If not overridden CityDoctor will use the number of available CPU cores as limit.
+# database.connectionPoolSize=10
+
+! If temp mode is enabled the database-file will be created in the System's TEMP directory. DEFAULT: false
+# database.tempMode=false
+
+! If in-memory mode is enabled the database will be created in the Systems RAM. DEFAULT: false
+! WARNING: Enabling in-memory mode can lead to out-of-memory errors when loading bigger CityGML files.
+# database.inMemoryMode=false
+
+! If fallback is enabled CityDoctor will attempt to use the in-memory mode if database-file creation fails DEFAULT: true
+# database.attemptFallback=true
+
+! If debug mode is enabled the embedded database will start in automatic mixed mode DEFAULT: false
+! NOTE: Activating this mode will start a local server with random ports. This may trigger a Firewall request, which can be safely denied.
+! NOTE: This server is only accessible locally and automatically rejects any remote connections.
+# database.debugMode=false
+
+
+
+

README.md

@@ -43,7 +43,7 @@ Use [Maven](https://maven.apache.org/) to build CityDoctor2.
 
 ```bash
 cd CityDoctorParent
-mvn install
+mvn clean install -P create-binaries 
 ```
 
 CityDoctor2 uses the [quality ade plugin](https://transfer.hft-stuttgart.de/gitlab/betzms/qualityade). A jar is provided in a local repository for ease of use.
@@ -55,14 +55,16 @@ Once built there is a CityDoctorValidation-\<version\>.zip file in the target fo
 There is a start script included in the binary releases of citydoctor. An example start command looks like this:
 
 ```bash
-java -classpath libs/*;plugins/*;CityDoctorValidation-<version>.jar de.hft.stuttgart.citydoctor2.CityDoctorValidation -in <path-to-gml-file>.gml -config <path-to-validation-config>.yml -xmlReport <path-to-xml-output>.xml -pdfReport <path-to-pdf-output>.pdf -out <path-to-output-gml>.gml
+java -classpath libs/*;plugins/*;CityDoctorValidation-<version>.jar de.hft.stuttgart.citydoctor2.CityDoctorValidation -in <path-to-gml-file>.gml -config <path-to-validation-config>.yml -xmlReport <path-to-xml-output>.xml -pdfReport <path-to-pdf-output>.pdf -out <path-to-output-gml>.gml -db_location <path-for-database-file> -db_settings <path-to-database-settings-file>.properties
 ```
 
 Notes:
 
-- -xmlReport, -pdfReport and -out are optional
-- If a ZIP file is given as input, CityDoctor2 will check all contained CityGML files. The -out parameter is required in
-  this case
+- -xmlReport, -pdfReport, -out, -db_location and -db_settings are optional
+- Paths will be resolved from CityDoctor's working directory
+- See [DBSettings.properties](DBSettings.properties) for the formatting of the database-settings file
+- The -db_location parameter takes precedence over the location set in the database-settings file
+- The start scripts included in the binary releases have -db_location set to the system's temp directory
 
 ## Extension modules