Merge branch 'refs/heads/dev' into dev_advanced_db_management

# Conflicts:
#	CityDoctorParent/CityDoctorModel/src/main/java/de/hft/stuttgart/citydoctor2/database/EmbeddedDatabaseHandler.java

CHANGELOG.md

@@ -5,6 +5,16 @@ 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.1] (2025-12-10)
+
+### Hotfix
+
+This hotfix removes the AUTO_SERVER flag from the embedded database, which causes a Firewall popup when the database is 
+started, due to opening local ports for accessing the database while CityDoctor is running.  
+The Firewall request can be safely denied, as CityDoctor uses the database-file for connections to the database.  
+Accepting the request does not open up remote connections to the database, as H2 by default only allows connections from 
+the local machine.
+
 ## [3.18.0] (2025-12-05)
 
 **Semi-breaking change:** This MR introduces breaking changes to the CityDoctorModel and CityObject classes. Usage of the CityDoctorValidation API and CLI remain backwards compatible.

CityDoctorParent/CityDoctorCheckResult/pom.xml

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

CityDoctorParent/CityDoctorCheckResult/src/main/java/de/hft/stuttgart/citydoctor2/checkresult/CheckReport.java

@@ -22,6 +22,7 @@ import java.io.BufferedReader;
 import java.io.FileReader;
 import java.io.IOException;
 import java.io.OutputStream;
+import java.nio.file.Path;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
@@ -65,7 +66,11 @@ public class CheckReport {
 	private Map<String, FeatureReport> featureReports;
 
 	public static CheckReport load(String file) throws CheckReportParseException {
-		try (BufferedReader reader = new BufferedReader(new FileReader(file))) {
+		return load(Path.of(file));
+	}
+	
+	public static CheckReport load(Path path) throws CheckReportParseException {
+		try (BufferedReader reader = new BufferedReader(new FileReader(path.toFile()))) {
 			CheckReport report = (CheckReport) getContext().createUnmarshaller().unmarshal(new InputSource(reader));
 			enrichReportStructure(report);
 			return report;

CityDoctorParent/CityDoctorEdge/pom.xml

@@ -6,7 +6,7 @@
 	<parent>
 		<groupId>de.hft.stuttgart</groupId>
 		<artifactId>CityDoctorParent</artifactId>
-		<version>3.18.0</version>
+		<version>3.18.1</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.0</version>
+		<version>3.18.1</version>
 	</parent>
 	<properties>
 		<versionString>${project.version}-${git.commit.id.abbrev}</versionString>

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

@@ -40,6 +40,7 @@ import de.hft.stuttgart.citydoctor2.check.error.SolidSelfIntError;
 import de.hft.stuttgart.citydoctor2.check.error.SurfaceUnfragmentedError;
 import de.hft.stuttgart.citydoctor2.check.error.TooFewPolygonsError;
 import de.hft.stuttgart.citydoctor2.check.error.UnknownCheckError;
+import de.hft.stuttgart.citydoctor2.check.error.XMLValidationError;
 
 public abstract class AbstractErrorVisitor implements ErrorVisitor {
 
@@ -206,5 +207,9 @@ public abstract class AbstractErrorVisitor implements ErrorVisitor {
 	@Override
 	public void visit(SolidError err) {
 	}
+	
+	@Override
+	public void visit(XMLValidationError err) {
+	}
 
 }

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

@@ -83,4 +83,8 @@ public interface CheckError extends Serializable {
 	 */
 	public void report(ErrorReport report);
 
+	public default boolean isParsingError() {
+		return false;
+	}
+
 }

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

@@ -26,7 +26,7 @@ import java.util.Map;
 
 import de.hft.stuttgart.citydoctor2.utils.CheckErrorFound;
 import de.hft.stuttgart.citydoctor2.utils.visitors.CheckableErrorCollector;
-import de.hft.stuttgart.citydoctor2.utils.visitors.ClearVisitorResultsVisitor;
+import de.hft.stuttgart.citydoctor2.utils.visitors.ClearResultsVisitor;
 import de.hft.stuttgart.citydoctor2.utils.visitors.ClearMetaInformationVisitor;
 import de.hft.stuttgart.citydoctor2.utils.visitors.ContainsAnyErrorVisitor;
 import de.hft.stuttgart.citydoctor2.utils.visitors.ContainsErrorVisitor;
@@ -221,18 +221,23 @@ public abstract class Checkable implements Serializable {
 	}
 
 	/**
-	 * Clears the checkResults list of this checkable.
+	 * Clears the checkResults of this checkable unless the error occured during parsing.
 	 */
 	public void clearCheckResults() {
-		setValidated(false);
-		checkResults.clear();
+		checkResults.entrySet().removeIf(e -> {
+			if (e.getValue().getError() == null) {
+				return true;
+			}
+			return !e.getValue().getError().isParsingError();
+		});
+		setValidated(!checkResults.isEmpty());
 	}
 
 	/**
 	 * Clears the checkResults list of this checkable and all child objects in its datastructure.
 	 */
 	public final void clearAllContainedCheckResults() {
-		this.accept(new ClearVisitorResultsVisitor());
+		this.accept(new ClearResultsVisitor());
 	}
 
 	/**

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

@@ -66,6 +66,7 @@ public record ErrorId(String name) implements Serializable {
 	public static final ErrorId SE_BS_UNFRAGMENTED = new ErrorId("SE_BS_UNFRAGMENTED");
 	public static final ErrorId GE_P_DEGENERATED_RING = new ErrorId("GE_P_DEGENERATED_POLYGON");
 	public static final ErrorId SE_POLYGON_WITHOUT_SURFACE = new ErrorId("SE_POLYGON_WITHOUT_SURFACE");
+	public static final ErrorId SC_SCHEMA_VALIDATION = new ErrorId("SC_SCHEMA_VALIDATION");
 
 
 

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

@@ -58,6 +58,7 @@ import de.hft.stuttgart.citydoctor2.check.error.SolidSelfIntError;
 import de.hft.stuttgart.citydoctor2.check.error.SurfaceUnfragmentedError;
 import de.hft.stuttgart.citydoctor2.check.error.TooFewPolygonsError;
 import de.hft.stuttgart.citydoctor2.check.error.UnknownCheckError;
+import de.hft.stuttgart.citydoctor2.check.error.XMLValidationError;
 
 /**
  * Visitor pattern interface to access errors. This is to determine the type of
@@ -149,5 +150,7 @@ public interface ErrorVisitor {
 	public void visit(CheckError err);
 	
 	public void visit(SolidError err);
+	
+	public void visit(XMLValidationError err);
 
 }

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

@@ -51,6 +51,7 @@ import de.hft.stuttgart.citydoctor2.check.error.SolidSelfIntError;
 import de.hft.stuttgart.citydoctor2.check.error.SurfaceUnfragmentedError;
 import de.hft.stuttgart.citydoctor2.check.error.TooFewPolygonsError;
 import de.hft.stuttgart.citydoctor2.check.error.UnknownCheckError;
+import de.hft.stuttgart.citydoctor2.check.error.XMLValidationError;
 
 /**
  * Visitor pattern interface used in the healing procedures. The modification
@@ -199,6 +200,10 @@ public interface HealingMethod {
 	default boolean visit(PolygonWithoutSurfaceError err, ModificationListener l) {
 		return false;
 	}
+	
+	default boolean visit(XMLValidationError err, ModificationListener l) {
+		return false;
+	}
 
 	public HealingMethod createNew();
 

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

@@ -58,6 +58,7 @@ import de.hft.stuttgart.citydoctor2.check.error.SolidSelfIntError;
 import de.hft.stuttgart.citydoctor2.check.error.SurfaceUnfragmentedError;
 import de.hft.stuttgart.citydoctor2.check.error.TooFewPolygonsError;
 import de.hft.stuttgart.citydoctor2.check.error.UnknownCheckError;
+import de.hft.stuttgart.citydoctor2.check.error.XMLValidationError;
 import de.hft.stuttgart.citydoctor2.datastructure.Edge;
 import de.hft.stuttgart.citydoctor2.datastructure.LinearRing;
 import de.hft.stuttgart.citydoctor2.datastructure.Polygon;
@@ -403,5 +404,10 @@ public class QualityAdeErrorVisitor extends AbstractErrorVisitor {
 	public void visit(PolygonWithoutSurfaceError err) {
 		// not translated
 	}
+	
+	@Override
+	public void visit(XMLValidationError err) {
+		// not translated
+	}
 
 }

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

+package de.hft.stuttgart.citydoctor2.check.error;
+
+import java.io.Serial;
+
+import de.hft.stuttgart.citydoctor2.check.CheckError;
+import de.hft.stuttgart.citydoctor2.check.ErrorId;
+import de.hft.stuttgart.citydoctor2.check.ErrorReport;
+import de.hft.stuttgart.citydoctor2.check.ErrorType;
+import de.hft.stuttgart.citydoctor2.check.ErrorVisitor;
+import de.hft.stuttgart.citydoctor2.check.HealingMethod;
+import de.hft.stuttgart.citydoctor2.check.ModificationListener;
+import de.hft.stuttgart.citydoctor2.datastructure.GmlElement;
+
+public class XMLValidationError implements CheckError {
+
+	@Serial
+	private static final long serialVersionUID = 4002356100680460598L;
+
+	private String message;
+	
+	public XMLValidationError(String message) {
+		this.message = message;
+	}
+
+	@Override
+	public ErrorType getType() {
+		return ErrorType.ERROR;
+	}
+
+	@Override
+	public ErrorId getErrorId() {
+		return ErrorId.SC_SCHEMA_VALIDATION;
+	}
+
+	@Override
+	public GmlElement getFeature() {
+		return null;
+	}
+
+	@Override
+	public void accept(ErrorVisitor errorVisitor) {
+		errorVisitor.visit(this);
+	}
+
+	@Override
+	public boolean accept(HealingMethod method, ModificationListener l) {
+		return method.visit(this, l);
+	}
+	
+	public String getMessage() {
+		return message;
+	}
+
+	@Override
+	public void report(ErrorReport report) {
+		report.add("message", message);
+	}
+	
+	@Override
+	public boolean isParsingError() {
+		return true;
+	}
+
+}

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

@@ -18,13 +18,10 @@
  */
 package de.hft.stuttgart.citydoctor2.datastructure;
 
-import de.hft.stuttgart.citydoctor2.check.CheckableVisitor;
-import de.hft.stuttgart.citydoctor2.parser.ParserConfiguration;
-import de.hft.stuttgart.citydoctor2.utils.CityGmlUtils;
-import javafx.scene.paint.Color;
-import org.apache.logging.log4j.LogManager;
-import org.apache.logging.log4j.Logger;
-import org.citygml4j.core.model.core.AbstractSpaceBoundaryProperty;
+import java.io.Serial;
+import java.util.ArrayList;
+import java.util.List;
+
 import org.citygml4j.core.model.deprecated.bridge.DeprecatedPropertiesOfBridgeConstructiveElement;
 import org.citygml4j.core.util.geometry.GeometryFactory;
 import org.xmlobjects.gml.model.geometry.GeometryProperty;
@@ -34,14 +31,13 @@ import org.xmlobjects.gml.model.geometry.complexes.CompositeSurface;
 import org.xmlobjects.gml.model.geometry.primitives.Solid;
 import org.xmlobjects.gml.model.geometry.primitives.SolidProperty;
 
-import java.io.Serial;
-import java.util.ArrayList;
-import java.util.List;
+import de.hft.stuttgart.citydoctor2.check.CheckableVisitor;
+import de.hft.stuttgart.citydoctor2.parser.ParserConfiguration;
+import de.hft.stuttgart.citydoctor2.utils.CityGmlUtils;
+import javafx.scene.paint.Color;
 
 public class BridgeConstructiveElement extends CityObject {
 
-    private static final Logger logger = LogManager.getLogger(BridgeConstructiveElement.class);
-
     private static final String CANNOT_ADD = "Cannot add ";
 
     @Serial
@@ -105,20 +101,6 @@ public class BridgeConstructiveElement extends CityObject {
         }
     }
 
-    private void reCreateBoundarySurface(GeometryFactory factory, ParserConfiguration config, BoundarySurface bs) {
-        if (bs.getGeometries().isEmpty()) {
-            for (AbstractSpaceBoundaryProperty bsp : gmlBridgeElement.getBoundaries()) {
-                if (bsp.getObject() != null && bsp.getObject() == bs.getGmlObject()) {
-                    logger.warn("Found empty boundary surface: {}, removing from BridgeConstructiveElement", bs.getGmlId());
-                    gmlBridgeElement.getBoundaries().remove(bsp);
-                    break;
-                }
-            }
-            return;
-        }
-        bs.reCreateGeometries(factory, config);
-    }
-
     private void setCompositeSurfaceAccordingToLod(Geometry geom, CompositeSurface cs) {
         switch (geom.getLod()) {
             case LOD1:

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

@@ -23,6 +23,8 @@ import java.util.ArrayList;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
+import java.util.StringJoiner;
+import java.util.function.Function;
 
 import de.hft.stuttgart.citydoctor2.database.FeatureCache;
 import de.hft.stuttgart.citydoctor2.database.UnconnectedCache;
@@ -172,10 +174,13 @@ public class Citygml3FeatureMapper extends ObjectWalker {
 	private final Path directory;
     private final double neighborDistance;
 	private Map<String, ConcretePolygon> polygonMap = new HashMap<>();
-	private Map<String, CompositeCollection> compositeMap = new HashMap<>();
+	private Map<String, CompositeCollection> compositeMap = new HashMap<>();;
 	private List<ResolvableReference> references = new ArrayList<>();
 	private Map<Vertex, Vertex> vertexMap = new HashMap<>();
 
+	private Map<String, List<GmlId>> unresolvedPolyRefIDMap = new HashMap<>();
+	private Map<String, GmlId> parsedPolygonsIdMap = new HashMap<>();
+
     public Citygml3FeatureMapper(ParserConfiguration config, Path path, boolean unconnected) {
         this.config = config;
         this.directory = path.getParent();
@@ -197,6 +202,37 @@ public class Citygml3FeatureMapper extends ObjectWalker {
 		}
 	}
 
+	public void checkUnresolvedReferences() {
+		if (unresolvedPolyRefIDMap.isEmpty()) {
+			return;
+		}
+		boolean xLinkGlobalError = false;
+		List<String> crossRefs = new ArrayList<>();
+		for (Map.Entry<String, List<GmlId>> entry : unresolvedPolyRefIDMap.entrySet()) {
+			String id = entry.getKey();
+			boolean emptyCrossFeatureReference = parsedPolygonsIdMap.containsKey(id);
+			xLinkGlobalError = xLinkGlobalError || emptyCrossFeatureReference;
+			if (emptyCrossFeatureReference) {
+				List<GmlId> gmlIds = entry.getValue();
+				StringJoiner joiner = new StringJoiner(", ");
+				gmlIds.forEach(gmlId -> joiner.add(gmlId.toString()));
+				GmlId crossFeatureId = parsedPolygonsIdMap.get(id);
+				//TODO: Localize String
+				logger.warn("Polygon {} of Feature {} is being referenced in other Features: {}", id, crossFeatureId, joiner);
+				crossRefs.add(id);
+			}
+		}
+		if (xLinkGlobalError) {
+			//TODO: Localize String
+			logger.warn("Model has Features containing cross-feature references without their own copies of the referenced polygons");
+		}
+		crossRefs.forEach(unresolvedPolyRefIDMap::remove);
+		if(!unresolvedPolyRefIDMap.isEmpty()) {
+			logger.warn("Model contains polygon references that could not be found");
+		}
+	}
+
+
 	@Override
 	public void visit(AbstractSpace space) {
 		// if we are here, an AbstractSpace thing was read that is not handled in the
@@ -903,7 +939,7 @@ public class Citygml3FeatureMapper extends ObjectWalker {
 	private void finishCityObjectConstruction(CityObject co) {
 		parseId(co.getGmlObject(), co);
 		co.clearGmlGeometries();
-		resolveAndClearReferences();
+		resolveAndClearReferences(co);
 		updateEdgesAndVertices(co);
 	}
 
@@ -1092,7 +1128,7 @@ public class Citygml3FeatureMapper extends ObjectWalker {
 		return igh;
 	}
 
-	private void resolveAndClearReferences() {
+	private void resolveAndClearReferences(CityObject co) {
 		for (ResolvableReference ref : references) {
 			String href = ref.href();
 			if (href.startsWith("#")) {
@@ -1107,6 +1143,9 @@ public class Citygml3FeatureMapper extends ObjectWalker {
 				handlePolygonReference(href, geom);
 			}
 		}
+		for(String polygonId: polygonMap.keySet()){
+			parsedPolygonsIdMap.put(polygonId, co.getGmlId());
+		}
 
 		// clear storage for polygons and vertices
 		references = new ArrayList<>();
@@ -1117,9 +1156,12 @@ public class Citygml3FeatureMapper extends ObjectWalker {
 	private void handlePolygonReference(String href, Geometry geom) {
 		ConcretePolygon concPoly = polygonMap.get(href);
 		if (concPoly == null) {
-			if (logger.isWarnEnabled()) {
-				logger.warn(Localization.getText("FeatureMapper.polygonUnreferenced"), href);
-			}
+            List<GmlId> featureList = unresolvedPolyRefIDMap.computeIfAbsent(href, k -> new ArrayList<>());
+			GmlId featureId = geom.getParent().getTopLevelCityObject().getGmlId();
+			featureList.add(featureId);
+//            if (logger.isWarnEnabled()) {
+//				logger.warn(Localization.getText("FeatureMapper.polygonUnreferenced"), href);
+//			}
 		} else {
 			LinkedPolygon lPoly = new LinkedPolygon(concPoly, geom);
 			if (geom.getParent() instanceof BoundarySurface bs) {

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

@@ -28,29 +28,38 @@ import org.xml.sax.SAXParseException;
 
 public class GMLValidationHandler implements ErrorHandler {
 	
+	private static final int MAX_LINE_SIZE = 200;
+	
 	private static final Logger logger = LogManager.getLogger(GMLValidationHandler.class);
 	private final List<String> messages = new ArrayList<>();
 	
 	@Override
 	public void error(SAXParseException exception) {
-		String message = "[" + exception.getLineNumber() + ", " + exception.getColumnNumber() + "] "
-				+ exception.getMessage();
+        String message = constructMessage(exception);
 		logger.error(message);
 		messages.add(message);
 	}
 
+	private String constructMessage(SAXParseException exception) {
+		String exceptionMessage = exception.getMessage();
+		String message = "[line: " + exception.getLineNumber() + "] "
+				+ exceptionMessage.substring(0, Math.min(exceptionMessage.length(), MAX_LINE_SIZE));
+        if (exceptionMessage.length() > MAX_LINE_SIZE) {
+        	message += "...";
+        }
+		return message;
+	}
+
 	@Override
 	public void warning(SAXParseException exception) {
-		String message = "[" + exception.getLineNumber() + ", " + exception.getColumnNumber() + "] "
-				+ exception.getMessage();
+        String message = constructMessage(exception);
 		logger.warn(message);
 		messages.add(message);
 	}
 
 	@Override
 	public void fatalError(SAXParseException exception) {
-		String message = "[" + exception.getLineNumber() + ", " + exception.getColumnNumber() + "] "
-				+ exception.getMessage();
+        String message = constructMessage(exception);
 		logger.fatal(message);
 		messages.add(message);
 	}

CityDoctorParent/CityDoctorModel/src/main/java/de/hft/stuttgart/citydoctor2/parser/CityGmlConsumer.java

@@ -32,6 +32,5 @@ public interface CityGmlConsumer {
 		
 	}
 
-//	public void endOfFile();
 
 }

CityDoctorParent/CityDoctorModel/src/main/java/de/hft/stuttgart/citydoctor2/parser/CityGmlParser.java

@@ -28,6 +28,7 @@ import java.nio.file.Path;
 import java.nio.file.Paths;
 import java.util.ArrayList;
 import java.util.Arrays;
+import java.util.Collections;
 import java.util.List;
 import java.util.regex.Matcher;
 import java.util.regex.Pattern;
@@ -43,8 +44,6 @@ import javax.xml.validation.Schema;
 import javax.xml.validation.SchemaFactory;
 import javax.xml.validation.Validator;
 
-import de.hft.stuttgart.citydoctor2.datastructure.GmlId;
-import de.hft.stuttgart.citydoctor2.datastructure.ImplicitGeometryHolder;
 import org.apache.logging.log4j.Level;
 import org.apache.logging.log4j.LogManager;
 import org.apache.logging.log4j.Logger;
@@ -84,8 +83,11 @@ import org.xmlobjects.schema.SchemaHandlerException;
 import org.xmlobjects.stream.XMLReader;
 import org.xmlobjects.stream.XMLReaderFactory;
 
+import de.hft.stuttgart.citydoctor2.check.error.XMLValidationError;
 import de.hft.stuttgart.citydoctor2.datastructure.CityDoctorModel;
 import de.hft.stuttgart.citydoctor2.datastructure.CityObject;
+import de.hft.stuttgart.citydoctor2.datastructure.GmlId;
+import de.hft.stuttgart.citydoctor2.datastructure.ImplicitGeometryHolder;
 import de.hft.stuttgart.citydoctor2.mapper.citygml3.Citygml3FeatureMapper;
 import de.hft.stuttgart.citydoctor2.mapper.citygml3.GMLValidationHandler;
 import de.hft.stuttgart.citydoctor2.math.Vector3d;
@@ -100,615 +102,629 @@ import de.hft.stuttgart.quality.QualityADEModule;
  */
 public class CityGmlParser {
 
-    private static final String CITY_OBJECT_MEMBER = "cityObjectMember";
-
-    private static final String WGS_84 = "EPSG:4326";
-
-    private static final Logger logger = LogManager.getLogger(CityGmlParser.class);
-
-    private static final CRSFactory CRS_FACTORY = new CRSFactory();
-    // EPSG:31467
-    private static final Pattern P_EPSG = Pattern.compile("^(EPSG:\\d+)$");
-    // urn:ogc:def:crs,crs:EPSG:6.12:31467,crs:EPSG:6.12:5783
-    // or
-    // urn:ogc:def:crs,crs:EPSG::28992
-    private static final Pattern P_OGC = Pattern.compile("urn:ogc:def:crs,crs:EPSG:[\\d\\.]*:([\\d]+)\\D*");
-
-    private static final Pattern P_OGC2 = Pattern.compile("urn:ogc:def:crs:EPSG:[\\d\\.]*:([\\d]+)\\D*");
-
-    // urn:adv:crs:DE_DHDN_3GK3*DE_DHHN92_NH
-    // urn:adv:crs:ETRS89_UTM32*DE_DHHN92_NH
-    private static final Pattern P_URN = Pattern.compile("urn:adv:crs:([^\\*]+)");
-
-    private static final SAXParserFactory FACTORY;
-
-    private static Proj4FileReader csReader = new Proj4FileReader();
-    private static final Pattern P_VUNITS = Pattern.compile("^\\+vunits=.+");
-    private static final Pattern P_GEOIDGRID = Pattern.compile("^\\+geoidgrid=.+");
-
-    private static CityGMLContext context;
-    private static List<QName> chunkProperties = new ArrayList<>();
-
-
-    static {
-        System.setProperty("javax.xml.transform.TransformerFactory", "com.sun.org.apache.xalan.internal.xsltc.trax.TransformerFactoryImpl");
-        FACTORY = SAXParserFactory.newInstance();
-        try {
-            FACTORY.setFeature(XMLConstants.FEATURE_SECURE_PROCESSING, false);
-        } catch (SAXNotRecognizedException | SAXNotSupportedException | ParserConfigurationException e) {
-            logger.catching(e);
-        }
-
-        chunkProperties.add(new QName(CityGMLConstants.CITYGML_1_0_CORE_NAMESPACE, CITY_OBJECT_MEMBER));
-        chunkProperties.add(new QName(CityGMLConstants.CITYGML_2_0_CORE_NAMESPACE, CITY_OBJECT_MEMBER));
-        chunkProperties.add(new QName(CityGMLConstants.CITYGML_3_0_CORE_NAMESPACE, CITY_OBJECT_MEMBER));
-    }
-
-    private CityGmlParser() {
-    }
-
-    public static synchronized CityGMLContext getContext() {
-        if (context == null) {
-            try {
-                context = CityGMLContext.newInstance(CityGmlParser.class.getClassLoader());
-                // also setup ades
-                ADERegistry adeRegistry = ADERegistry.getInstance();
-                adeRegistry.loadADE(new QualityADEContext());
-            } catch (CityGMLContextException e) {
-                logger.fatal(Localization.getText("CityGmlParser.creating4jContextFailed"), e);
-                throw new IllegalStateException("Unable to create citygml4j context");
-            } catch (ADEException e) {
-                logger.fatal(Localization.getText("CityGmlParser.creatingAdePluginsFailed"), e);
-                throw new IllegalStateException("Unable to add ADE plugins to citygml4j");
-            }
-        }
-        return context;
-    }
-
-    /**
-     * Parses a given CityGML file and collects the contained CityObject Features in a {@link CityDoctorModel}.
-     * <p/>
-     * The nested parse uses an {@link de.hft.stuttgart.citydoctor2.database.UnconnectedCache UnconnectedCache}, which
-     * is not connected to the database.
-     * <p/>
-     * Nested parsing should only be used for accessing Features in auxiliary, small CityGML files, e.g. parsing of
-     * {@link de.hft.stuttgart.citydoctor2.datastructure.LibraryObject LibraryObject} files.
-     *
-     * @param filePath String path to the file
-     * @param config Configuration of the parser
-     * @return A {@link CityDoctorModel} object with the parsed Features
-     * @throws CityGmlParseException if parsing of the CityGML-file failed
-     * @throws InvalidGmlFileException if the GMLValidationHandler found an error
-     */
-    public static CityDoctorModel nestedCityGmlFileParse(String filePath, ParserConfiguration config)
-            throws CityGmlParseException, InvalidGmlFileException {
-        return parseCityGmlFile(filePath, config, null, null, false, true);
-    }
-
-    /**
-     * Parses a given CityGML file and collects the contained CityObject Features in a {@link CityDoctorModel}.
-     * <p/>
-     * Features are held in a non-persistent, embedded Database with an in-memory upstream cache. Thus, strong references
-     * to {@link CityObject} are to be avoided, to allow for the memory management of the cache.
-     *
-     * @param filePath String path to the file
-     * @param config Configuration of the parser
-     * @return A {@link CityDoctorModel} object with the parsed Features
-     * @throws CityGmlParseException if parsing of the CityGML-file failed
-     * @throws InvalidGmlFileException if the GMLValidationHandler found an error
-     */
-    public static CityDoctorModel parseCityGmlFile(String filePath, ParserConfiguration config)
-            throws CityGmlParseException, InvalidGmlFileException {
-        return parseCityGmlFile(filePath, config, null, null);
-    }
-
-
-    /**
-     * Parses a given CityGML file and collects the contained CityObject Features in a {@link CityDoctorModel}.
-     * <p/>
-     * Features are held in a non-persistent, embedded Database with an in-memory upstream cache. Thus, strong references
-     * to {@link CityObject} are to be avoided, to allow for the memory management of the cache.
-     *
-     * @param filePath String path to the file
-     * @param config Configuration of the parser
-     * @param l Listener hook for tracking of parsing progress
-     * @return A {@link CityDoctorModel} object with the parsed Features
-     * @throws CityGmlParseException if parsing of the CityGML-file failed
-     * @throws InvalidGmlFileException if the GMLValidationHandler found an error
-     */
-    public static CityDoctorModel parseCityGmlFile(String filePath, ParserConfiguration config, ProgressListener l)
-            throws CityGmlParseException, InvalidGmlFileException {
-        return parseCityGmlFile(filePath, config, l, null);
-    }
-
-    /**
-     * Parses a given CityGML file and collects the contained CityObject Features in a {@link CityDoctorModel}.
-     * <p/>
-     * Features are held in a non-persistent, embedded Database with an in-memory upstream cache. Thus, strong references
-     * to {@link CityObject} are to be avoided, to allow for the memory management of the cache.
-     *
-     * @param filePath String path to the file
-     * @param config Configuration of the parser
-     * @param l Listener hook for tracking of parsing progress
-     * @param handler Validation handler for GML-file validation
-     * @return A {@link CityDoctorModel} object with the parsed Features
-     * @throws CityGmlParseException if parsing of the CityGML-file failed
-     * @throws InvalidGmlFileException if the GMLValidationHandler found an error
-     */
-    public static CityDoctorModel parseCityGmlFile(String filePath, ParserConfiguration config, ProgressListener l,
-                                                   GMLValidationHandler handler) throws CityGmlParseException, InvalidGmlFileException {
-        return parseCityGmlFile(filePath, config, l, handler, true, false);
-    }
-
-    /**
-     * Parses a given CityGML file and collects the contained CityObject Features in a {@link CityDoctorModel}.
-     * <p/>
-     * Features are held in a non-persistent, embedded Database with an in-memory upstream cache. Thus, strong references
-     * to {@link CityObject} are to be avoided, to allow for the memory management of the cache.
-     *
-     * @param filePath String path to the file
-     * @param config Configuration of the parser
-     * @param l Listener hook for tracking of parsing progress
-     * @param handler Validation handler for GML-file validation
-     * @param verbose If verbosity is enabled the parser will write info logs to the logger
-     * @param unconnected If true the parser will use an {@link de.hft.stuttgart.citydoctor2.database.UnconnectedCache UnconnectedCache}
-     *                    to collect the parsed CityObjects
-     * @return A {@link CityDoctorModel} object with the parsed Features
-     * @throws CityGmlParseException if parsing of the CityGML-file failed
-     * @throws InvalidGmlFileException if the GMLValidationHandler found an error
-     */
-    private static CityDoctorModel parseCityGmlFile(String filePath, ParserConfiguration config, ProgressListener l,
-                                                   GMLValidationHandler handler, boolean verbose, boolean unconnected)
-            throws CityGmlParseException, InvalidGmlFileException {
-        CityGMLContext context = getContext();
-        Path file = Paths.get(filePath);
-        if (config.getValidate()) {
-            List<String> messages = validateFile(context, handler, file);
-            if (!messages.isEmpty()) {
-                throw new InvalidGmlFileException("Invalid GML File. First error: \n" + messages.get(0));
-            }
-        }
-
-        try {
-            parseEpsgCodeFromFile(file, config, verbose);
-            CityGMLInputFactory in = context.createCityGMLInputFactory()
-                    .withChunking(ChunkOptions.chunkByProperties(chunkProperties).skipCityModel(false));
-            try (ObservedInputStream ois = new ObservedInputStream(file.toFile())) {
-                if (l != null) {
-                    ois.addListener(l::updateProgress);
-                }
-                return readAndKeepFeatures(config, file, in, ois, verbose, unconnected);
-            }
-        } catch (CityGMLReadException | IOException e) {
-            throw new CityGmlParseException("Failed to read CityGML file", e);
-        }
-    }
-
-
-
-    public static void streamCityGml(String file, ParserConfiguration config, CityGmlConsumer cityObjectConsumer,
-                                     String outputFile) throws CityGmlParseException {
-        Path f = Paths.get(file);
-        streamCityGml(f, config, null, cityObjectConsumer, outputFile);
-    }
-
-    public static void streamCityGml(File file, ParserConfiguration parserConfig, CityGmlConsumer cityObjectConsumer,
-                                     String outputFile) throws CityGmlParseException {
-        streamCityGml(file.toPath(), parserConfig, null, cityObjectConsumer, outputFile);
-    }
-
-    public static void streamCityGml(Path file, ParserConfiguration config, ProgressListener l,
-                                     CityGmlConsumer cityObjectConsumer, String outputFile) throws CityGmlParseException {
-        parseEpsgCodeFromFile(file, config, true);
-        startReadingCityGmlFile(file, config, l, cityObjectConsumer, outputFile);
-    }
-
-    public static CityModel parseOnlyCityModel(File inputFile) throws CityGmlParseException {
-        try {
-            CityGMLInputFactory inputFactory = context.createCityGMLInputFactory()
-                    .withChunking(ChunkOptions.chunkByProperties(chunkProperties).skipCityModel(false));
-            try (CityGMLReader reader = inputFactory.createCityGMLReader(inputFile)) {
-                while (reader.hasNext()) {
-                    AbstractFeature chunk = reader.next();
-                    if (chunk instanceof CityModel cModel) {
-                        cModel.setCityObjectMembers(null);
-                        return cModel;
-                    }
-                }
-            }
-        } catch (CityGMLReadException e) {
-            throw new CityGmlParseException(e);
-        }
-        throw new CityGmlParseException("Did not find any CityModel in CityGML file");
-    }
-
-    private static void startReadingCityGmlFile(Path file, ParserConfiguration config, ProgressListener l,
-                                                CityGmlConsumer cityObjectConsumer, String outputFile) {
-        try (ObservedInputStream ois = new ObservedInputStream(file.toFile())) {
-            if (l != null) {
-                ois.addListener(l::updateProgress);
-            }
-            readAndDiscardFeatures(file, config, ois, cityObjectConsumer, outputFile);
-        } catch (IOException | CityGMLReadException e) {
-            logger.error(Localization.getText("CityGmlParser.errorReadingGmlFile"), e.getMessage());
-            logger.catching(Level.ERROR, e);
-        }
-    }
-
-    private static void readAndDiscardFeatures(Path file, ParserConfiguration config, ObservedInputStream ois,
-                                               CityGmlConsumer cityObjectConsumer, String outputFile) throws CityGMLReadException {
-        Citygml3FeatureMapper mapper = new Citygml3FeatureMapper(config, file, false);
-        readAndDiscardModel(mapper, ois, cityObjectConsumer, outputFile);
-
-    }
-
-    private static void readAndDiscardModel(Citygml3FeatureMapper mapper, ObservedInputStream ois,
-                                            CityGmlConsumer cityObjectConsumer, String outputFile) throws CityGMLReadException {
-        getContext();
-        CityGMLInputFactory inputFactory = context.createCityGMLInputFactory()
-                .withChunking(ChunkOptions.chunkByProperties(chunkProperties).skipCityModel(false));
-        CityGMLChunkWriter writer = null;
-        try (CityGMLReader reader = inputFactory.createCityGMLReader(ois)) {
-
-            CityDoctorModel model = mapper.getModel();
-            boolean isInitialized = false;
-            while (reader.hasNext()) {
-                AbstractFeature chunk = reader.next();
-                if (writer == null) {
-                    writer = createCityModelWriter(outputFile, reader);
-                }
-                if (!isInitialized && writer != null && reader.getParentInfo() != null
-                        && reader.getParentInfo().getTypeName().getLocalPart().equals("CityModel")) {
-                    FeatureInfo parentInfo = reader.getParentInfo();
-                    writer.withCityModelInfo(parentInfo);
-                    isInitialized = true;
-                }
-                if (chunk instanceof AbstractCityObject ag) {
-                    ag.accept(mapper);
-                    drainCityModel(model, cityObjectConsumer);
-                    writeAbstractCityObject(writer, ag);
-                } else if (chunk instanceof CityModel cModel) {
-                    cModel.setCityObjectMembers(null);
-                    mapper.setCityModel(cModel);
-                    cityObjectConsumer.accept(cModel);
-                    writeCityModel(writer, cModel);
-                } else if (writer != null) {
-                    writer.writeMember(chunk);
-                }
-            }
-            
-            // end of stream
-            logger.debug("End of gml file stream");
-        } catch (CityGMLReadException e) {
-            logger.error(Localization.getText("CityGmlParser.errorReadingGmlFile"), e.getMessage(), e);
-        } catch (CityGMLWriteException e) {
-            logger.error(Localization.getText("CityGmlParser.errorWritingGmlFile"), e.getMessage(), e);
-        } finally {
-            if (writer != null) {
-                try {
-                    writer.close();
-                } catch (CityGMLWriteException e) {
-                    // ignore
-                }
-            }
-        }
-    }
-
-    private static void writeCityModel(CityGMLChunkWriter writer, CityModel cModel) throws CityGMLWriteException {
-        if (writer != null) {
-        	for (AbstractFeatureProperty featureProp : cModel.getFeatureMembers()) {
-        		writer.writeMember(featureProp.getObject());
-        	}
-        }
-    }
-
-    private static void writeAbstractCityObject(CityGMLChunkWriter writer, AbstractCityObject ag)
-            throws CityGMLWriteException {
-        if (writer != null) {
-            writer.writeMember(ag);
-        }
-    }
-
-    private static CityGMLChunkWriter createCityModelWriter(String outputFile, CityGMLReader reader)
-            throws CityGMLWriteException {
-        if (outputFile == null) {
-            return null;
-        }
-        CityGMLContext gmlContext = CityGmlParser.getContext();
-        CityGMLVersion version = CityGMLModules.getCityGMLVersion(reader.getName().getNamespaceURI());
-        CityGMLOutputFactory factory = gmlContext.createCityGMLOutputFactory(version);
-        CityGMLChunkWriter writer = factory.createCityGMLChunkWriter(new File(outputFile),
-                StandardCharsets.UTF_8.name());
-        writer.withPrefix("qual", QualityADEModule.NAMESPACE_URI);
-        writer.withSchemaLocation(QualityADEModule.NAMESPACE_URI, QualityADEModule.NAMESPACE_URI + "/qualityAde.xsd");
-        writer.withIndent("  ");
-        writer.withDefaultPrefixes();
-        writer.withDefaultSchemaLocations();
-        return writer;
-    }
-
-    private static CityDoctorModel readAndKeepFeatures(ParserConfiguration config, Path file,
-                                                       CityGMLInputFactory inputFactory, ObservedInputStream ois,
-                                                       boolean verbose, boolean unconnected) throws CityGMLReadException {
-        return readAndKeepModel(new Citygml3FeatureMapper(config, file, unconnected), inputFactory, ois, verbose);
-    }
-
-    private static CityDoctorModel readAndKeepModel(Citygml3FeatureMapper mapper, CityGMLInputFactory inputFactory,
-                                                    ObservedInputStream ois, boolean verbose) throws CityGMLReadException {
-        try (CityGMLReader reader = inputFactory.createCityGMLReader(ois)) {
-            CityGMLVersion version = null;
-            // model is read in chunked mode
-            // object members are replaced by href in model
-            // need to remove the refs and re-add unparsed objects
-            List<AbstractCityObject> acos = new ArrayList<>();
-            CityModel cgmlModel = null;
-            CityDoctorModel cdModel = mapper.getModel();
-            AutoCloseable parsingContext = cdModel.getCache().startParsingMode();
-            try (parsingContext){
-                List<AbstractCityObject> queuedObjects = new ArrayList<>();
-                while (reader.hasNext()) {
-                    AbstractFeature chunk = reader.next();
-                    version = CityGMLModules.getCityGMLVersion(reader.getName().getNamespaceURI());
-                    if (chunk instanceof CityModel cModel) {
-                        cModel.setCityObjectMembers(null);
-                        mapper.setCityModel(cModel);
-                        mapper.setCityGMLVersion(version);
-                        cgmlModel = cModel;
-
-                        if (!queuedObjects.isEmpty()) {
-                            for (AbstractCityObject aco : queuedObjects) {
-                                if (!cdModel.containsGmlId(aco.getId())) {
-                                    cgmlModel.getCityObjectMembers().add(new AbstractCityObjectProperty(aco));
-                                }
-                            }
-                        }
-                    } else if (chunk instanceof AbstractCityObject aco) {
-                        acos.add(aco); // getid
-                        String id = aco.getId();
-                        aco.accept(mapper);
-                        if (cgmlModel == null) {
-                            // Add object to queue till the CityModel has been parsed
-                            queuedObjects.add(aco);
-                        }else if (!cdModel.containsGmlId(id)){
-                            cgmlModel.getCityObjectMembers().add(new AbstractCityObjectProperty(aco));
-                        }
-                    }
-                }
-
-                if (mapper.getModel().getCityModel() == null) {
-                    // file does not contain a city model?
-                    // create it for now
-                    logger.warn(Localization.getText("CityGmlParser.missingCityModel"));
-                    mapper.setCityModel(new CityModel());
-                    for (AbstractCityObject aco : queuedObjects) {
-                        if (!cdModel.containsGmlId(aco.getId())) {
-                            mapper.getModel().getCityModel().getCityObjectMembers().add(new AbstractCityObjectProperty(aco));
-                        }
-                    }
-                }
-
-                ImplicitGeometryHolder.resolveDeferredObjects(mapper.getModel().getCache());
-                if (logger.isInfoEnabled() && verbose) {
-                    logger.info(Localization.getText("CityGmlParser.parsedObjects"),
-                            mapper.getModel().getNumberOfFeatures());
-                }
-                mapper.setCityGMLVersion(version);
-                return mapper.getModel();
-            } catch (Exception e) {
-                throw new CityGMLReadException(e);
-            }
-
-        }
-    }
-
-    private static void parseEpsgCodeFromFile(Path file, ParserConfiguration config, boolean verbose) throws CityGmlParseException {
-        try (BufferedInputStream bis = new BufferedInputStream(new FileInputStream(file.toFile()))) {
-            parseEpsgCodeFromStream(bis, config, verbose);
-        } catch (ParserConfigurationException | SAXException | IOException e) {
-            throw new CityGmlParseException("Failed to read CityGML file", e);
-        }
-    }
-
-    private static void parseEpsgCodeFromStream(InputStream is, ParserConfiguration config, boolean verbose)
-            throws ParserConfigurationException, SAXException {
-        SAXParser parser = FACTORY.newSAXParser();
-        CityGmlHandler handler = new CityGmlHandler();
-        try {
-            parser.parse(new InputSource(is), handler);
-        } catch (EnvelopeFoundException e) {
-            try {
-                parseCoordinateSystem(config, handler, verbose);
-            } catch (Exception e2) {
-                logEpsgParseError(e2);
-            }
-        } catch (Exception e) {
-            logEpsgParseError(e);
-        }
-        if (handler.getEpsg() == null && logger.isInfoEnabled() && verbose) {
-            logger.info(Localization.getText("CityGmlParser.missingEPSGCode"));
-        }
-
-    }
-
-    private static void logEpsgParseError(Exception e) {
-        logger.debug("Exception while parsing for EPSG code", e);
-        if (logger.isWarnEnabled()) {
-            logger.warn(Localization.getText("CityGmlParser.failedEPSGParse"));
-        }
-    }
-
-    private static void parseCoordinateSystem(ParserConfiguration config, CityGmlHandler handler, boolean verbose) {
-        if (handler.getEpsg() == null) {
-            return;
-        }
-        CoordinateReferenceSystem crs = crsFromSrsName(handler.getEpsg());
-        if (crs == null) {
-            // could not find a coordinate system for srsName
-            // assuming metric system
-            if (logger.isInfoEnabled() && verbose) {
-                logger.info(Localization.getText("CityGmlParser.missingEPSGCode"));
-            }
-            return;
-        }
-        if (crs.getProjection().getUnits() == Units.METRES) {
-            // coordinate system is in meters, do not convert
-            if (logger.isInfoEnabled() && verbose) {
-                logger.info(Localization.getText("CityGmlParser.noConversionNeeded"));
-            }
-            return;
-        }
-        parseMeterConversion(config, crs);
-        Vector3d low = handler.getLowerCorner();
-        Vector3d up = handler.getUpperCorner();
-        double centerLong = low.getX() + ((up.getX() - low.getX()) / 2);
-        double centerLat = low.getY() + ((up.getY() - low.getY()) / 2);
-        if (!crs.getName().equals(WGS_84)) {
-            // need to convert coordinates first to WGS84, then find UTM Zone
-            CoordinateReferenceSystem wgs84 = crsFromSrsName(WGS_84);
-            ProjCoordinate p1 = new ProjCoordinate();
-            p1.setValue(centerLong, centerLat);
-            ProjCoordinate p2 = new ProjCoordinate();
-            BasicCoordinateTransform bct = new BasicCoordinateTransform(crs, wgs84);
-            bct.transform(p1, p2);
-            centerLong = p2.x;
-            centerLat = p2.y;
-        }
-        int zone = (int) (31 + Math.round(centerLong / 6));
-        CoordinateReferenceSystem utm;
-        if (centerLat < 0) {
-            // south
-            if (logger.isInfoEnabled() && verbose) {
-                logger.info(Localization.getText("CityGmlParser.convertCrsToUtmZoneS"), zone);
-            }
-            utm = CRS_FACTORY.createFromParameters("UTM", "+proj=utm +ellps=WGS84 +units=m +zone=" + zone + " +south");
-        } else {
-            // north
-            if (logger.isInfoEnabled() && verbose) {
-                logger.info(Localization.getText("CityGmlParser.convertCrsToUtmZoneN"), zone);
-                }
-            utm = CRS_FACTORY.createFromParameters("UTM", "+proj=utm +ellps=WGS84 +units=m +zone=" + zone);
-        }
-        config.setCoordinateSystem(crs, utm);
-    }
-
-    private static void parseMeterConversion(ParserConfiguration config, CoordinateReferenceSystem crs) {
-        Projection projection = crs.getProjection();
-        double fromMetres = projection.getFromMetres();
-        if (fromMetres > 0) {
-            // also transform height information
-            config.setFromMeters(fromMetres);
-        } else {
-            config.setFromMeters(1.0);
-        }
-    }
-
-    /**
-     * The srsName (The name by which this reference system is identified) inside
-     * the CityGML file can have multiple formats. This method tries to parse the
-     * string and detect the corresponding reference system. If it is found, it
-     * returns a proj4j.CoordinateReferenceSystem. It throws an
-     * IllegalArgumentException otherwise.
-     * <p>
-     * This method should be able to parse any EPSG id : e.g. "EPSG:1234". German
-     * Citygmls might also have "DE_DHDN_3GK3" or "ETRS89_UTM32" as srsName, so
-     * those are also included. It isn't guaranteed that those formats are correctly
-     * parsed, though.
-     * <p>
-     * The EPSG ids and parameters are defined in resources ('nad/epsg') inside
-     * proj4j-0.1.0.jar. Some EPSG ids are missing though, e.g. 7415
-     *
-     * @param srsName
-     * @return CoordinateReferenceSystem
-     */
-    private static CoordinateReferenceSystem crsFromSrsName(String srsName) {
-        srsName = srsName.trim();
-        Matcher mEPSG = P_EPSG.matcher(srsName);
-        if (mEPSG.find()) {
-            if ("EPSG:4979".contentEquals(srsName)) {
-                srsName = "EPSG:4236";
-            } else if ("EPSG:7415".contentEquals(srsName)) {
-                return CRS_FACTORY.createFromParameters("EPSG:7415",
-                        "+proj=sterea +lat_0=52.15616055555555 +lon_0=5.38763888888889 +k=0.9999079 +x_0=155000 +y_0=463000 +ellps=bessel +towgs84=565.417,50.3319,465.552,-0.398957,0.343988,-1.8774,4.0725 +units=m +no_defs");
-            }
-            return CRS_FACTORY.createFromName(srsName);
-        }
-
-        Matcher mOGC = P_OGC.matcher(srsName);
-        if (mOGC.find()) {
-            return getCrsFromOGCSrsCode(mOGC.group(1));
-        }
-        Matcher mOGC2 = P_OGC2.matcher(srsName);
-        if (mOGC2.find()) {
-            return getCrsFromOGCSrsCode(mOGC2.group(1));
-
-        }
-        Matcher mURN = P_URN.matcher(srsName);
-        // NOTE: Could use a HashMap if the switch/case becomes too long.
-        if (mURN.find()) {
-            return switch (mURN.group(1)) {
-                case "DE_DHDN_3GK2" -> CRS_FACTORY.createFromName("EPSG:31466");
-                case "DE_DHDN_3GK3" -> CRS_FACTORY.createFromName("EPSG:31467");
-                case "DE_DHDN_3GK4" -> CRS_FACTORY.createFromName("EPSG:31468");
-                case "DE_DHDN_3GK5" -> CRS_FACTORY.createFromName("EPSG:31469");
-                case "ETRS89_UTM32" -> CRS_FACTORY.createFromName("EPSG:25832");
-                default -> null;
-            };
-        }
-        if (srsName.equals("http://www.opengis.net/def/crs/EPSG/0/6697")) {
-            return CRS_FACTORY.createFromParameters("EPSG:6697", "+proj=longlat +ellps=GRS80 +no_defs +axis=neu");
-        }
-        return null;
-    }
-
-    private static CoordinateReferenceSystem getCrsFromOGCSrsCode(String srsCode) {
-        String crsName = "EPSG:" + srsCode;
-        List<String> params = new ArrayList<>(Arrays.stream(csReader.getParameters(crsName)).toList());
-        params.removeIf(P_VUNITS.asPredicate());
-        params.removeIf(P_GEOIDGRID.asPredicate());
-        return CRS_FACTORY.createFromParameters(crsName, params.toArray(new String[0]));
-    }
-
-    private static List<String> validateFile(CityGMLContext context, GMLValidationHandler handler, Path file)
-            throws CityGmlParseException {
-        if (handler == null) {
-            handler = new GMLValidationHandler();
-        }
-        try {
-            SchemaHandler schemaHandler = new ValidationSchemaHandler(context.getDefaultSchemaHandler());
-            readAdditionalSchemaDefinitions(context, file, schemaHandler);
-            Source[] schemas = schemaHandler.getSchemas();
-            SchemaFactory schemaFactory = SchemaFactory.newInstance(XMLConstants.W3C_XML_SCHEMA_NS_URI);
-            schemaFactory.setFeature("http://apache.org/xml/features/disallow-doctype-decl", true);
-            Schema schema = schemaFactory.newSchema(schemas);
-            Validator validator = schema.newValidator();
-            validator.setErrorHandler(handler);
-            validator.validate(new StreamSource(file.toFile()));
-            return handler.getMessages();
-        } catch (SchemaHandlerException | SAXException | IOException e) {
-            throw new CityGmlParseException("Failed to validate CityGML file", e);
-        }
-    }
-
-    private static void readAdditionalSchemaDefinitions(CityGMLContext context, Path file, SchemaHandler schemaHandler)
-            throws CityGmlParseException {
-        try (XMLReader reader = XMLReaderFactory.newInstance(context.getXMLObjects())
-                .withSchemaHandler(schemaHandler)
-                .createReader(file)) {
-            reader.nextTag();
-        } catch (Exception e) {
-            throw new CityGmlParseException("Failed to read file " + file.toAbsolutePath() + ".", e);
-        }
-    }
-
-    private static void drainCityModel(CityDoctorModel model, CityGmlConsumer cityObjectConsumer) {
-        List<GmlId> id = new ArrayList<>();
-        model.createFeatureStream().forEach(co -> {
-            cityObjectConsumer.accept(co);
-            id.add(co.getGmlId());
-        });
-        id.forEach(model::removeFeature);
-
-    }
-
+	private static final String CITY_OBJECT_MEMBER = "cityObjectMember";
+
+	private static final String WGS_84 = "EPSG:4326";
+
+	private static final Logger logger = LogManager.getLogger(CityGmlParser.class);
+
+	private static final CRSFactory CRS_FACTORY = new CRSFactory();
+	// EPSG:31467
+	private static final Pattern P_EPSG = Pattern.compile("^(EPSG:\\d+)$");
+	// urn:ogc:def:crs,crs:EPSG:6.12:31467,crs:EPSG:6.12:5783
+	// or
+	// urn:ogc:def:crs,crs:EPSG::28992
+	private static final Pattern P_OGC = Pattern.compile("urn:ogc:def:crs,crs:EPSG:[\\d\\.]*:([\\d]+)\\D*");
+
+	private static final Pattern P_OGC2 = Pattern.compile("urn:ogc:def:crs:EPSG:[\\d\\.]*:([\\d]+)\\D*");
+
+	// urn:adv:crs:DE_DHDN_3GK3*DE_DHHN92_NH
+	// urn:adv:crs:ETRS89_UTM32*DE_DHHN92_NH
+	private static final Pattern P_URN = Pattern.compile("urn:adv:crs:([^\\*]+)");
+
+	private static final SAXParserFactory FACTORY;
+
+	private static Proj4FileReader csReader = new Proj4FileReader();
+	private static final Pattern P_VUNITS = Pattern.compile("^\\+vunits=.+");
+	private static final Pattern P_GEOIDGRID = Pattern.compile("^\\+geoidgrid=.+");
+
+	private static CityGMLContext context;
+	private static List<QName> chunkProperties = new ArrayList<>();
+
+	static {
+		System.setProperty("javax.xml.transform.TransformerFactory",
+				"com.sun.org.apache.xalan.internal.xsltc.trax.TransformerFactoryImpl");
+		FACTORY = SAXParserFactory.newInstance();
+		try {
+			FACTORY.setFeature(XMLConstants.FEATURE_SECURE_PROCESSING, false);
+		} catch (SAXNotRecognizedException | SAXNotSupportedException | ParserConfigurationException e) {
+			logger.catching(e);
+		}
+
+		chunkProperties.add(new QName(CityGMLConstants.CITYGML_1_0_CORE_NAMESPACE, CITY_OBJECT_MEMBER));
+		chunkProperties.add(new QName(CityGMLConstants.CITYGML_2_0_CORE_NAMESPACE, CITY_OBJECT_MEMBER));
+		chunkProperties.add(new QName(CityGMLConstants.CITYGML_3_0_CORE_NAMESPACE, CITY_OBJECT_MEMBER));
+	}
+
+	private CityGmlParser() {
+	}
+
+	public static synchronized CityGMLContext setupContext() {
+		if (context == null) {
+			try {
+				context = CityGMLContext.newInstance(CityGmlParser.class.getClassLoader());
+				// also setup ades
+				ADERegistry adeRegistry = ADERegistry.getInstance();
+				adeRegistry.loadADE(new QualityADEContext());
+			} catch (CityGMLContextException e) {
+				logger.fatal(Localization.getText("CityGmlParser.creating4jContextFailed"), e);
+				throw new IllegalStateException("Unable to create citygml4j context");
+			} catch (ADEException e) {
+				logger.fatal(Localization.getText("CityGmlParser.creatingAdePluginsFailed"), e);
+				throw new IllegalStateException("Unable to add ADE plugins to citygml4j");
+			}
+		}
+		return context;
+	}
+
+	/**
+	 * Parses a given CityGML file and collects the contained CityObject Features in
+	 * a {@link CityDoctorModel}.
+	 * <p/>
+	 * The nested parse uses an
+	 * {@link de.hft.stuttgart.citydoctor2.database.UnconnectedCache
+	 * UnconnectedCache}, which is not connected to the database.
+	 * <p/>
+	 * Nested parsing should only be used for accessing Features in auxiliary, small
+	 * CityGML files, e.g. parsing of
+	 * {@link de.hft.stuttgart.citydoctor2.datastructure.LibraryObject
+	 * LibraryObject} files.
+	 *
+	 * @param filePath String path to the file
+	 * @param config   Configuration of the parser
+	 * @return A {@link CityDoctorModel} object with the parsed Features
+	 * @throws CityGmlParseException   if parsing of the CityGML-file failed
+	 * @throws InvalidGmlFileException if the GMLValidationHandler found an error
+	 */
+	public static CityDoctorModel nestedCityGmlFileParse(String filePath, ParserConfiguration config)
+			throws CityGmlParseException, InvalidGmlFileException {
+		return parseCityGmlFile(filePath, config, null, null, false, true);
+	}
+
+	/**
+	 * Parses a given CityGML file and collects the contained CityObject Features in
+	 * a {@link CityDoctorModel}.
+	 * <p/>
+	 * Features are held in a non-persistent, embedded Database with an in-memory
+	 * upstream cache. Thus, strong references to {@link CityObject} are to be
+	 * avoided, to allow for the memory management of the cache.
+	 *
+	 * @param filePath String path to the file
+	 * @param config   Configuration of the parser
+	 * @return A {@link CityDoctorModel} object with the parsed Features
+	 * @throws CityGmlParseException   if parsing of the CityGML-file failed
+	 * @throws InvalidGmlFileException if the GMLValidationHandler found an error
+	 */
+	public static CityDoctorModel parseCityGmlFile(String filePath, ParserConfiguration config)
+			throws CityGmlParseException, InvalidGmlFileException {
+		return parseCityGmlFile(filePath, config, null, null);
+	}
+
+	/**
+	 * Parses a given CityGML file and collects the contained CityObject Features in
+	 * a {@link CityDoctorModel}.
+	 * <p/>
+	 * Features are held in a non-persistent, embedded Database with an in-memory
+	 * upstream cache. Thus, strong references to {@link CityObject} are to be
+	 * avoided, to allow for the memory management of the cache.
+	 *
+	 * @param filePath String path to the file
+	 * @param config   Configuration of the parser
+	 * @param l        Listener hook for tracking of parsing progress
+	 * @return A {@link CityDoctorModel} object with the parsed Features
+	 * @throws CityGmlParseException   if parsing of the CityGML-file failed
+	 * @throws InvalidGmlFileException if the GMLValidationHandler found an error
+	 */
+	public static CityDoctorModel parseCityGmlFile(String filePath, ParserConfiguration config, ProgressListener l)
+			throws CityGmlParseException, InvalidGmlFileException {
+		return parseCityGmlFile(filePath, config, l, null);
+	}
+
+	/**
+	 * Parses a given CityGML file and collects the contained CityObject Features in
+	 * a {@link CityDoctorModel}.
+	 * <p/>
+	 * Features are held in a non-persistent, embedded Database with an in-memory
+	 * upstream cache. Thus, strong references to {@link CityObject} are to be
+	 * avoided, to allow for the memory management of the cache.
+	 *
+	 * @param filePath String path to the file
+	 * @param config   Configuration of the parser
+	 * @param l        Listener hook for tracking of parsing progress
+	 * @param handler  Validation handler for GML-file validation
+	 * @return A {@link CityDoctorModel} object with the parsed Features
+	 * @throws CityGmlParseException   if parsing of the CityGML-file failed
+	 * @throws InvalidGmlFileException if the GMLValidationHandler found an error
+	 */
+	public static CityDoctorModel parseCityGmlFile(String filePath, ParserConfiguration config, ProgressListener l,
+			GMLValidationHandler handler) throws CityGmlParseException, InvalidGmlFileException {
+		return parseCityGmlFile(filePath, config, l, handler, true, false);
+	}
+
+	/**
+	 * Parses a given CityGML file and collects the contained CityObject Features in
+	 * a {@link CityDoctorModel}.
+	 * <p/>
+	 * Features are held in a non-persistent, embedded Database with an in-memory
+	 * upstream cache. Thus, strong references to {@link CityObject} are to be
+	 * avoided, to allow for the memory management of the cache.
+	 *
+	 * @param filePath    String path to the file
+	 * @param config      Configuration of the parser
+	 * @param l           Listener hook for tracking of parsing progress
+	 * @param handler     Validation handler for GML-file validation
+	 * @param verbose     If verbosity is enabled the parser will write info logs to
+	 *                    the logger
+	 * @param unconnected If true the parser will use an
+	 *                    {@link de.hft.stuttgart.citydoctor2.database.UnconnectedCache
+	 *                    UnconnectedCache} to collect the parsed CityObjects
+	 * @return A {@link CityDoctorModel} object with the parsed Features
+	 * @throws CityGmlParseException   if parsing of the CityGML-file failed
+	 * @throws InvalidGmlFileException if the GMLValidationHandler found an error
+	 */
+	private static CityDoctorModel parseCityGmlFile(String filePath, ParserConfiguration config, ProgressListener l,
+			GMLValidationHandler handler, boolean verbose, boolean unconnected)
+			throws CityGmlParseException, InvalidGmlFileException {
+		CityGMLContext context = setupContext();
+		Path file = Paths.get(filePath);
+		List<String> validationIssues = Collections.emptyList();
+		if (config.getValidate()) {
+			validationIssues = validateFile(handler, file);
+		}
+		try {
+			parseEpsgCodeFromFile(file, config, verbose);
+			CityGMLInputFactory in = context.createCityGMLInputFactory()
+					.withChunking(ChunkOptions.chunkByProperties(chunkProperties).skipCityModel(false));
+			try (ObservedInputStream ois = new ObservedInputStream(file.toFile())) {
+				if (l != null) {
+					ois.addListener(l::updateProgress);
+				}
+				CityDoctorModel model = readAndKeepFeatures(config, file, in, ois, verbose, unconnected);
+				for (String xmlError : validationIssues) {
+					model.addGlobalError(new XMLValidationError(xmlError));
+				}
+				return model;
+			}
+		} catch (CityGMLReadException | IOException e) {
+			throw new CityGmlParseException("Failed to read CityGML file", e);
+		}
+	}
+
+	public static void streamCityGml(String file, ParserConfiguration config, CityGmlConsumer cityObjectConsumer,
+			String outputFile) throws CityGmlParseException {
+		Path f = Paths.get(file);
+		streamCityGml(f, config, null, cityObjectConsumer, outputFile);
+	}
+
+	public static void streamCityGml(File file, ParserConfiguration parserConfig, CityGmlConsumer cityObjectConsumer,
+			String outputFile) throws CityGmlParseException {
+		streamCityGml(file.toPath(), parserConfig, null, cityObjectConsumer, outputFile);
+	}
+
+	public static void streamCityGml(Path file, ParserConfiguration config, ProgressListener l,
+			CityGmlConsumer cityObjectConsumer, String outputFile) throws CityGmlParseException {
+		parseEpsgCodeFromFile(file, config, true);
+		startReadingCityGmlFile(file, config, l, cityObjectConsumer, outputFile);
+	}
+
+	public static CityModel parseOnlyCityModel(File inputFile) throws CityGmlParseException {
+		try {
+			CityGMLInputFactory inputFactory = context.createCityGMLInputFactory()
+					.withChunking(ChunkOptions.chunkByProperties(chunkProperties).skipCityModel(false));
+			try (CityGMLReader reader = inputFactory.createCityGMLReader(inputFile)) {
+				while (reader.hasNext()) {
+					AbstractFeature chunk = reader.next();
+					if (chunk instanceof CityModel cModel) {
+						cModel.setCityObjectMembers(null);
+						return cModel;
+					}
+				}
+			}
+		} catch (CityGMLReadException e) {
+			throw new CityGmlParseException(e);
+		}
+		throw new CityGmlParseException("Did not find any CityModel in CityGML file");
+	}
+
+	private static void startReadingCityGmlFile(Path file, ParserConfiguration config, ProgressListener l,
+			CityGmlConsumer cityObjectConsumer, String outputFile) {
+		try (ObservedInputStream ois = new ObservedInputStream(file.toFile())) {
+			if (l != null) {
+				ois.addListener(l::updateProgress);
+			}
+			readAndDiscardFeatures(file, config, ois, cityObjectConsumer, outputFile);
+		} catch (IOException | CityGMLReadException e) {
+			logger.error(Localization.getText("CityGmlParser.errorReadingGmlFile"), e.getMessage());
+			logger.catching(Level.ERROR, e);
+		}
+	}
+
+	private static void readAndDiscardFeatures(Path file, ParserConfiguration config, ObservedInputStream ois,
+			CityGmlConsumer cityObjectConsumer, String outputFile) throws CityGMLReadException {
+		Citygml3FeatureMapper mapper = new Citygml3FeatureMapper(config, file, false);
+		readAndDiscardModel(mapper, ois, cityObjectConsumer, outputFile, config, file);
+
+	}
+
+	private static void readAndDiscardModel(Citygml3FeatureMapper mapper, ObservedInputStream ois,
+			CityGmlConsumer cityObjectConsumer, String outputFile, ParserConfiguration config, Path file)
+			throws CityGMLReadException {
+		setupContext();
+		CityGMLInputFactory inputFactory = context.createCityGMLInputFactory()
+				.withChunking(ChunkOptions.chunkByProperties(chunkProperties).skipCityModel(false));
+		CityGMLChunkWriter writer = null;
+		try (CityGMLReader reader = inputFactory.createCityGMLReader(ois)) {
+			CityDoctorModel model = mapper.getModel();
+			boolean isInitialized = false;
+			while (reader.hasNext()) {
+				AbstractFeature chunk = reader.next();
+				if (writer == null) {
+					writer = createCityModelWriter(outputFile, reader);
+				}
+				if (!isInitialized && writer != null && reader.getParentInfo() != null
+						&& reader.getParentInfo().getTypeName().getLocalPart().equals("CityModel")) {
+					FeatureInfo parentInfo = reader.getParentInfo();
+					writer.withCityModelInfo(parentInfo);
+					isInitialized = true;
+				}
+				if (chunk instanceof AbstractCityObject ag) {
+					ag.accept(mapper);
+					drainCityModel(model, cityObjectConsumer);
+					writeAbstractCityObject(writer, ag);
+				} else if (chunk instanceof CityModel cModel) {
+					cModel.setCityObjectMembers(null);
+					mapper.setCityModel(cModel);
+					cityObjectConsumer.accept(cModel);
+					writeCityModel(writer, cModel);
+				} else if (writer != null) {
+					writer.writeMember(chunk);
+				}
+			}
+
+			// end of stream
+			logger.debug("End of gml file stream");
+		} catch (CityGMLReadException e) {
+			logger.error(Localization.getText("CityGmlParser.errorReadingGmlFile"), e.getMessage(), e);
+		} catch (CityGMLWriteException e) {
+			logger.error(Localization.getText("CityGmlParser.errorWritingGmlFile"), e.getMessage(), e);
+		} finally {
+			if (writer != null) {
+				try {
+					writer.close();
+				} catch (CityGMLWriteException e) {
+					// ignore
+				}
+			}
+		}
+	}
+
+	private static void writeCityModel(CityGMLChunkWriter writer, CityModel cModel) throws CityGMLWriteException {
+		if (writer != null) {
+			for (AbstractFeatureProperty featureProp : cModel.getFeatureMembers()) {
+				writer.writeMember(featureProp.getObject());
+			}
+		}
+	}
+
+	private static void writeAbstractCityObject(CityGMLChunkWriter writer, AbstractCityObject ag)
+			throws CityGMLWriteException {
+		if (writer != null) {
+			writer.writeMember(ag);
+		}
+	}
+
+	private static CityGMLChunkWriter createCityModelWriter(String outputFile, CityGMLReader reader)
+			throws CityGMLWriteException {
+		if (outputFile == null) {
+			return null;
+		}
+		CityGMLContext gmlContext = CityGmlParser.setupContext();
+		CityGMLVersion version = CityGMLModules.getCityGMLVersion(reader.getName().getNamespaceURI());
+		CityGMLOutputFactory factory = gmlContext.createCityGMLOutputFactory(version);
+		CityGMLChunkWriter writer = factory.createCityGMLChunkWriter(new File(outputFile),
+				StandardCharsets.UTF_8.name());
+		writer.withPrefix("qual", QualityADEModule.NAMESPACE_URI);
+		writer.withSchemaLocation(QualityADEModule.NAMESPACE_URI, QualityADEModule.NAMESPACE_URI + "/qualityAde.xsd");
+		writer.withIndent("  ");
+		writer.withDefaultPrefixes();
+		writer.withDefaultSchemaLocations();
+		return writer;
+	}
+
+	private static CityDoctorModel readAndKeepFeatures(ParserConfiguration config, Path file,
+			CityGMLInputFactory inputFactory, ObservedInputStream ois, boolean verbose, boolean unconnected)
+			throws CityGMLReadException {
+		return readAndKeepModel(new Citygml3FeatureMapper(config, file, unconnected), inputFactory, ois, verbose);
+	}
+
+	private static CityDoctorModel readAndKeepModel(Citygml3FeatureMapper mapper, CityGMLInputFactory inputFactory,
+			ObservedInputStream ois, boolean verbose) throws CityGMLReadException {
+		try (CityGMLReader reader = inputFactory.createCityGMLReader(ois)) {
+			CityGMLVersion version = null;
+			// model is read in chunked mode
+			// object members are replaced by href in model
+			// need to remove the refs and re-add unparsed objects
+			List<AbstractCityObject> acos = new ArrayList<>();
+			CityModel cgmlModel = null;
+			CityDoctorModel cdModel = mapper.getModel();
+			AutoCloseable parsingContext = cdModel.getCache().startParsingMode();
+			try (parsingContext) {
+				List<AbstractCityObject> queuedObjects = new ArrayList<>();
+				while (reader.hasNext()) {
+					AbstractFeature chunk = reader.next();
+					version = CityGMLModules.getCityGMLVersion(reader.getName().getNamespaceURI());
+					if (chunk instanceof CityModel cModel) {
+						cModel.setCityObjectMembers(null);
+						mapper.setCityModel(cModel);
+						mapper.setCityGMLVersion(version);
+						cgmlModel = cModel;
+
+						if (!queuedObjects.isEmpty()) {
+							for (AbstractCityObject aco : queuedObjects) {
+								if (!cdModel.containsGmlId(aco.getId())) {
+									cgmlModel.getCityObjectMembers().add(new AbstractCityObjectProperty(aco));
+								}
+							}
+						}
+					} else if (chunk instanceof AbstractCityObject aco) {
+						acos.add(aco); // getid
+						String id = aco.getId();
+						aco.accept(mapper);
+						if (cgmlModel == null) {
+							// Add object to queue till the CityModel has been parsed
+							queuedObjects.add(aco);
+						} else if (!cdModel.containsGmlId(id)) {
+							cgmlModel.getCityObjectMembers().add(new AbstractCityObjectProperty(aco));
+						}
+					}
+				}
+
+				if (mapper.getModel().getCityModel() == null) {
+					// file does not contain a city model?
+					// create it for now
+					logger.warn(Localization.getText("CityGmlParser.missingCityModel"));
+					mapper.setCityModel(new CityModel());
+					for (AbstractCityObject aco : queuedObjects) {
+						if (!cdModel.containsGmlId(aco.getId())) {
+							mapper.getModel().getCityModel().getCityObjectMembers()
+									.add(new AbstractCityObjectProperty(aco));
+						}
+					}
+				}
+
+				ImplicitGeometryHolder.resolveDeferredObjects(mapper.getModel().getCache());
+				if (logger.isInfoEnabled() && verbose) {
+					logger.info(Localization.getText("CityGmlParser.parsedObjects"),
+							mapper.getModel().getNumberOfFeatures());
+				}
+				mapper.checkUnresolvedReferences();
+				mapper.setCityGMLVersion(version);
+				return mapper.getModel();
+			} catch (Exception e) {
+				throw new CityGMLReadException(e);
+			}
+
+		}
+	}
+
+	private static void parseEpsgCodeFromFile(Path file, ParserConfiguration config, boolean verbose)
+			throws CityGmlParseException {
+		try (BufferedInputStream bis = new BufferedInputStream(new FileInputStream(file.toFile()))) {
+			parseEpsgCodeFromStream(bis, config, verbose);
+		} catch (ParserConfigurationException | SAXException | IOException e) {
+			throw new CityGmlParseException("Failed to read CityGML file", e);
+		}
+	}
+
+	private static void parseEpsgCodeFromStream(InputStream is, ParserConfiguration config, boolean verbose)
+			throws ParserConfigurationException, SAXException {
+		SAXParser parser = FACTORY.newSAXParser();
+		CityGmlHandler handler = new CityGmlHandler();
+		try {
+			parser.parse(new InputSource(is), handler);
+		} catch (EnvelopeFoundException e) {
+			try {
+				parseCoordinateSystem(config, handler, verbose);
+			} catch (Exception e2) {
+				logEpsgParseError(e2);
+			}
+		} catch (Exception e) {
+			logEpsgParseError(e);
+		}
+		if (handler.getEpsg() == null && logger.isInfoEnabled() && verbose) {
+			logger.info(Localization.getText("CityGmlParser.missingEPSGCode"));
+		}
+
+	}
+
+	private static void logEpsgParseError(Exception e) {
+		logger.debug("Exception while parsing for EPSG code", e);
+		if (logger.isWarnEnabled()) {
+			logger.warn(Localization.getText("CityGmlParser.failedEPSGParse"));
+		}
+	}
+
+	private static void parseCoordinateSystem(ParserConfiguration config, CityGmlHandler handler, boolean verbose) {
+		if (handler.getEpsg() == null) {
+			return;
+		}
+		CoordinateReferenceSystem crs = crsFromSrsName(handler.getEpsg());
+		if (crs == null) {
+			// could not find a coordinate system for srsName
+			// assuming metric system
+			if (logger.isInfoEnabled() && verbose) {
+				logger.info(Localization.getText("CityGmlParser.missingEPSGCode"));
+			}
+			return;
+		}
+		if (crs.getProjection().getUnits() == Units.METRES) {
+			// coordinate system is in meters, do not convert
+			if (logger.isInfoEnabled() && verbose) {
+				logger.info(Localization.getText("CityGmlParser.noConversionNeeded"));
+			}
+			return;
+		}
+		parseMeterConversion(config, crs);
+		Vector3d low = handler.getLowerCorner();
+		Vector3d up = handler.getUpperCorner();
+		double centerLong = low.getX() + ((up.getX() - low.getX()) / 2);
+		double centerLat = low.getY() + ((up.getY() - low.getY()) / 2);
+		if (!crs.getName().equals(WGS_84)) {
+			// need to convert coordinates first to WGS84, then find UTM Zone
+			CoordinateReferenceSystem wgs84 = crsFromSrsName(WGS_84);
+			ProjCoordinate p1 = new ProjCoordinate();
+			p1.setValue(centerLong, centerLat);
+			ProjCoordinate p2 = new ProjCoordinate();
+			BasicCoordinateTransform bct = new BasicCoordinateTransform(crs, wgs84);
+			bct.transform(p1, p2);
+			centerLong = p2.x;
+			centerLat = p2.y;
+		}
+		int zone = (int) (31 + Math.round(centerLong / 6));
+		CoordinateReferenceSystem utm;
+		if (centerLat < 0) {
+			// south
+			if (logger.isInfoEnabled() && verbose) {
+				logger.info(Localization.getText("CityGmlParser.convertCrsToUtmZoneS"), zone);
+			}
+			utm = CRS_FACTORY.createFromParameters("UTM", "+proj=utm +ellps=WGS84 +units=m +zone=" + zone + " +south");
+		} else {
+			// north
+			if (logger.isInfoEnabled() && verbose) {
+				logger.info(Localization.getText("CityGmlParser.convertCrsToUtmZoneN"), zone);
+			}
+			utm = CRS_FACTORY.createFromParameters("UTM", "+proj=utm +ellps=WGS84 +units=m +zone=" + zone);
+		}
+		config.setCoordinateSystem(crs, utm);
+	}
+
+	private static void parseMeterConversion(ParserConfiguration config, CoordinateReferenceSystem crs) {
+		Projection projection = crs.getProjection();
+		double fromMetres = projection.getFromMetres();
+		if (fromMetres > 0) {
+			// also transform height information
+			config.setFromMeters(fromMetres);
+		} else {
+			config.setFromMeters(1.0);
+		}
+	}
+
+	/**
+	 * The srsName (The name by which this reference system is identified) inside
+	 * the CityGML file can have multiple formats. This method tries to parse the
+	 * string and detect the corresponding reference system. If it is found, it
+	 * returns a proj4j.CoordinateReferenceSystem. It throws an
+	 * IllegalArgumentException otherwise.
+	 * <p>
+	 * This method should be able to parse any EPSG id : e.g. "EPSG:1234". German
+	 * Citygmls might also have "DE_DHDN_3GK3" or "ETRS89_UTM32" as srsName, so
+	 * those are also included. It isn't guaranteed that those formats are correctly
+	 * parsed, though.
+	 * <p>
+	 * The EPSG ids and parameters are defined in resources ('nad/epsg') inside
+	 * proj4j-0.1.0.jar. Some EPSG ids are missing though, e.g. 7415
+	 *
+	 * @param srsName
+	 * @return CoordinateReferenceSystem
+	 */
+	private static CoordinateReferenceSystem crsFromSrsName(String srsName) {
+		srsName = srsName.trim();
+		Matcher mEPSG = P_EPSG.matcher(srsName);
+		if (mEPSG.find()) {
+			if ("EPSG:4979".contentEquals(srsName)) {
+				srsName = "EPSG:4236";
+			} else if ("EPSG:7415".contentEquals(srsName)) {
+				return CRS_FACTORY.createFromParameters("EPSG:7415",
+						"+proj=sterea +lat_0=52.15616055555555 +lon_0=5.38763888888889 +k=0.9999079 +x_0=155000 +y_0=463000 +ellps=bessel +towgs84=565.417,50.3319,465.552,-0.398957,0.343988,-1.8774,4.0725 +units=m +no_defs");
+			}
+			return CRS_FACTORY.createFromName(srsName);
+		}
+
+		Matcher mOGC = P_OGC.matcher(srsName);
+		if (mOGC.find()) {
+			return getCrsFromOGCSrsCode(mOGC.group(1));
+		}
+		Matcher mOGC2 = P_OGC2.matcher(srsName);
+		if (mOGC2.find()) {
+			return getCrsFromOGCSrsCode(mOGC2.group(1));
+
+		}
+		Matcher mURN = P_URN.matcher(srsName);
+		// NOTE: Could use a HashMap if the switch/case becomes too long.
+		if (mURN.find()) {
+			return switch (mURN.group(1)) {
+			case "DE_DHDN_3GK2" -> CRS_FACTORY.createFromName("EPSG:31466");
+			case "DE_DHDN_3GK3" -> CRS_FACTORY.createFromName("EPSG:31467");
+			case "DE_DHDN_3GK4" -> CRS_FACTORY.createFromName("EPSG:31468");
+			case "DE_DHDN_3GK5" -> CRS_FACTORY.createFromName("EPSG:31469");
+			case "ETRS89_UTM32" -> CRS_FACTORY.createFromName("EPSG:25832");
+			default -> null;
+			};
+		}
+		if (srsName.equals("http://www.opengis.net/def/crs/EPSG/0/6697")) {
+			return CRS_FACTORY.createFromParameters("EPSG:6697", "+proj=longlat +ellps=GRS80 +no_defs +axis=neu");
+		}
+		return null;
+	}
+
+	private static CoordinateReferenceSystem getCrsFromOGCSrsCode(String srsCode) {
+		String crsName = "EPSG:" + srsCode;
+		List<String> params = new ArrayList<>(Arrays.stream(csReader.getParameters(crsName)).toList());
+		params.removeIf(P_VUNITS.asPredicate());
+		params.removeIf(P_GEOIDGRID.asPredicate());
+		return CRS_FACTORY.createFromParameters(crsName, params.toArray(new String[0]));
+	}
+
+	public static List<String> validateFile(GMLValidationHandler handler, Path file)
+			throws CityGmlParseException {
+		if (handler == null) {
+			handler = new GMLValidationHandler();
+		}
+		setupContext();
+		try {
+			SchemaHandler schemaHandler = new ValidationSchemaHandler(context.getDefaultSchemaHandler());
+			readAdditionalSchemaDefinitions(context, file, schemaHandler);
+			Source[] schemas = schemaHandler.getSchemas();
+			SchemaFactory schemaFactory = SchemaFactory.newInstance(XMLConstants.W3C_XML_SCHEMA_NS_URI);
+			schemaFactory.setFeature("http://apache.org/xml/features/disallow-doctype-decl", true);
+			Schema schema = schemaFactory.newSchema(schemas);
+			Validator validator = schema.newValidator();
+			validator.setErrorHandler(handler);
+			validator.validate(new StreamSource(file.toFile()));
+			return handler.getMessages();
+		} catch (SchemaHandlerException | SAXException | IOException e) {
+			throw new CityGmlParseException("Failed to validate CityGML file", e);
+		}
+	}
+
+	private static void readAdditionalSchemaDefinitions(CityGMLContext context, Path file, SchemaHandler schemaHandler)
+			throws CityGmlParseException {
+		try (XMLReader reader = XMLReaderFactory.newInstance(context.getXMLObjects()).withSchemaHandler(schemaHandler)
+				.createReader(file)) {
+			reader.nextTag();
+		} catch (Exception e) {
+			throw new CityGmlParseException("Failed to read file " + file.toAbsolutePath() + ".", e);
+		}
+	}
+
+	private static void drainCityModel(CityDoctorModel model, CityGmlConsumer cityObjectConsumer) {
+		List<GmlId> id = new ArrayList<>();
+		model.createFeatureStream().forEach(co -> {
+			cityObjectConsumer.accept(co);
+			id.add(co.getGmlId());
+		});
+		id.forEach(model::removeFeature);
+
+	}
 
 }

CityDoctorParent/CityDoctorModel/src/main/java/de/hft/stuttgart/citydoctor2/utils/CityGmlUtils.java

@@ -41,175 +41,174 @@ import java.util.Set;
  */
 public final class CityGmlUtils {
 
-
-    private CityGmlUtils() {
-        // util class
-    }
-
-    public static org.xmlobjects.gml.model.geometry.primitives.Polygon createGmlPolygon(GeometryFactory factory,
-                                                                                        Polygon cdPoly, ParserConfiguration config) {
-        if (cdPoly.getExteriorRing() == null) {
-            return null;
-        }
-        org.xmlobjects.gml.model.geometry.primitives.Polygon gmlPoly = new org.xmlobjects.gml.model.geometry.primitives.Polygon();
-        // exterior ring
-        LinearRing extLr = cdPoly.getExteriorRing();
-        if (extLr.getVertices().size() < 3) {
-            // this ring does not have enough points in it
-            // this leads to errors when exporting therefore ignore it
-            return null;
-        }
-        org.xmlobjects.gml.model.geometry.primitives.LinearRing gmlLr = createGmlRing(factory, config, extLr);
-        gmlPoly.setExterior(new AbstractRingProperty(gmlLr));
-
-        // interior rings
-        for (LinearRing lr : cdPoly.getInnerRings()) {
-            gmlLr = createGmlRing(factory, config, lr);
-            if (lr.getVertices().size() < 3) {
-                // this ring does not have enough points in it
-                // this leads to errors when exporting therefore ignore it
-                return null;
-            }
-            gmlPoly.getInterior().add(new AbstractRingProperty(gmlLr));
-        }
-        gmlPoly.setId(cdPoly.getGmlId().getGmlString());
-        return gmlPoly;
-    }
-
-    public static CompositeSurface createGmlComposite(GeometryFactory factory, CompositeCollection comp,
-                                                      ParserConfiguration config) {
-        List<SurfaceProperty> surfaces = new ArrayList<>();
-        for (ConcretePolygon cd : comp.getNonRecursiveCompositeMembers()) {
-            surfaces.add(new SurfaceProperty(createGmlPolygon(factory, cd, config)));
-        }
-        for (CompositeCollection cc : comp.getChildComposites()) {
-            surfaces.add(new SurfaceProperty(createGmlComposite(factory, cc, config)));
-        }
-        if (surfaces.isEmpty()) {
-            return null;
-        }
-        return new CompositeSurface(surfaces);
-    }
-
-
-    public static org.xmlobjects.gml.model.geometry.primitives.LinearRing createGmlRing(GeometryFactory factory,
-                                                                                        ParserConfiguration config, LinearRing lr) {
-
-        ProjCoordinate p1 = new ProjCoordinate();
-        ProjCoordinate p2 = new ProjCoordinate();
-        List<Double> ringValues = new ArrayList<>();
-        BasicCoordinateTransform trans = config.getOriginalTransform();
-        for (Vertex v : lr.getVertices()) {
-            double x = v.getX();
-            double y = v.getY();
-            double z = v.getZ();
-            if (trans != null) {
-                p1.x = x;
-                p1.y = y;
-                trans.transform(p1, p2);
-                x = p2.x;
-                y = p2.y;
-                z = z * config.getFromMeters();
-            }
-            ringValues.add(x);
-            ringValues.add(y);
-            ringValues.add(z);
-        }
-
-        org.xmlobjects.gml.model.geometry.primitives.LinearRing gmlLr = factory.createLinearRing(ringValues, 3);
-        gmlLr.setId(lr.getGmlId().getGmlString());
-        return gmlLr;
-    }
-
-    public static Solid createSolid(Geometry geom, GeometryFactory factory, ParserConfiguration config) {
-        if (geom.getType() != GeometryType.SOLID) {
-            throw new IllegalArgumentException("Only solids are allowed");
-        }
-
-        CompositeSurface comp = new CompositeSurface();
-        List<SurfaceProperty> surfaceMember = comp.getSurfaceMembers();
-        for (Polygon cdPoly : geom.getPolygons()) {
-            if (!cdPoly.isLink()) {
-                org.xmlobjects.gml.model.geometry.primitives.Polygon gmlPoly = createGmlPolygon(factory, cdPoly, config);
-                if (gmlPoly != null) {
-                    surfaceMember.add(new SurfaceProperty(gmlPoly));
-                }
-            } else {
-                // add reference to polygon
-                surfaceMember.add(new SurfaceProperty("#" + cdPoly.getGmlId().getGmlString()));
-            }
-        }
-
-        if (surfaceMember.isEmpty()) {
-            return null;
-        }
-        Solid solid = new Solid();
-        Shell shell = new Shell(surfaceMember);
-        solid.setExterior(new ShellProperty(shell));
-        solid.setId(geom.getGmlId().getGmlString());
-        return solid;
-    }
-
-    public static MultiSurface createMultiSurface(Geometry geom, GeometryFactory factory,
-                                                  ParserConfiguration config) {
-        if (geom.getType() != GeometryType.MULTI_SURFACE && geom.getType() != GeometryType.COMPOSITE_SURFACE) {
-            throw new IllegalArgumentException("This can only handle MultiSurfaces");
-        }
-        List<SurfaceProperty> surfaces = new ArrayList<>();
-        Set<CompositeCollection> compositeCollections = new HashSet<>();
-        for (Polygon cdPoly : geom.getPolygons()) {
-            if (cdPoly instanceof ConcretePolygon conc && conc.isCompositeMember()) {
-                compositeCollections.add(conc.getPartOfComposite());
-            } else if (!cdPoly.isLink()) {
-                // is not part of a boundary surface
-                org.xmlobjects.gml.model.geometry.primitives.Polygon gmlPoly = createGmlPolygon(factory, cdPoly, config);
-                if (gmlPoly != null) {
-                    surfaces.add(new SurfaceProperty(gmlPoly));
-                }
-            } else {
-                // add reference to polygon
-                surfaces.add(new SurfaceProperty("#" + cdPoly.getGmlId().getGmlString()));
-            }
-        }
-        for (CompositeCollection cdPoly : compositeCollections) {
-            surfaces.add(new SurfaceProperty(createGmlComposite(factory, cdPoly, config)));
-        }
-        if (surfaces.isEmpty()) {
-            return null;
-        }
-        MultiSurface ms = new MultiSurface(surfaces);
-        ms.setId(geom.getGmlId().getGmlString());
-        return ms;
-    }
-
-    public static MultiSurface createMultiSurface(List<Polygon> polygons, GeometryFactory factory,
-                                                  ParserConfiguration config) {
-        List<SurfaceProperty> surfaces = new ArrayList<>();
-        for (Polygon cdPoly : polygons) {
-            org.xmlobjects.gml.model.geometry.primitives.Polygon gmlPoly = createGmlPolygon(factory, cdPoly, config);
-            if (gmlPoly != null) {
-                surfaces.add(new SurfaceProperty(gmlPoly));
-            }
-        }
-        if (surfaces.isEmpty()) {
-            return null;
-        }
-        return new MultiSurface(surfaces);
-    }
-
-    public static CompositeSurface createCompositeSurface(Geometry geom, GeometryFactory factory,
-                                                          ParserConfiguration config) {
-        List<SurfaceProperty> surfaces = new ArrayList<>();
-        for (Polygon cdPoly : geom.getPolygons()) {
-            org.xmlobjects.gml.model.geometry.primitives.Polygon gmlPoly = createGmlPolygon(factory, cdPoly, config);
-            if (gmlPoly != null) {
-                surfaces.add(new SurfaceProperty(gmlPoly));
-            }
-        }
-        if (surfaces.isEmpty()) {
-            return null;
-        }
-        return new CompositeSurface(surfaces);
-    }
+	private CityGmlUtils() {
+		// util class
+	}
+
+	public static org.xmlobjects.gml.model.geometry.primitives.Polygon createGmlPolygon(GeometryFactory factory,
+			Polygon cdPoly, ParserConfiguration config) {
+		if (cdPoly.getExteriorRing() == null) {
+			return null;
+		}
+		org.xmlobjects.gml.model.geometry.primitives.Polygon gmlPoly = new org.xmlobjects.gml.model.geometry.primitives.Polygon();
+		// exterior ring
+		LinearRing extLr = cdPoly.getExteriorRing();
+		if (extLr.getVertices().size() < 3) {
+			// this ring does not have enough points in it
+			// this leads to errors when exporting therefore ignore it
+			return null;
+		}
+		org.xmlobjects.gml.model.geometry.primitives.LinearRing gmlLr = createGmlRing(factory, config, extLr);
+		gmlPoly.setExterior(new AbstractRingProperty(gmlLr));
+
+		// interior rings
+		for (LinearRing lr : cdPoly.getInnerRings()) {
+			gmlLr = createGmlRing(factory, config, lr);
+			if (lr.getVertices().size() < 3) {
+				// this ring does not have enough points in it
+				// this leads to errors when exporting therefore ignore it
+				return null;
+			}
+			gmlPoly.getInterior().add(new AbstractRingProperty(gmlLr));
+		}
+		gmlPoly.setId(cdPoly.getGmlId().getGmlString());
+		return gmlPoly;
+	}
+
+	public static CompositeSurface createGmlComposite(GeometryFactory factory, CompositeCollection comp,
+			ParserConfiguration config) {
+		List<SurfaceProperty> surfaces = new ArrayList<>();
+		for (ConcretePolygon cd : comp.getNonRecursiveCompositeMembers()) {
+			surfaces.add(new SurfaceProperty(createGmlPolygon(factory, cd, config)));
+		}
+		for (CompositeCollection cc : comp.getChildComposites()) {
+			surfaces.add(new SurfaceProperty(createGmlComposite(factory, cc, config)));
+		}
+		if (surfaces.isEmpty()) {
+			return null;
+		}
+		return new CompositeSurface(surfaces);
+	}
+
+	public static org.xmlobjects.gml.model.geometry.primitives.LinearRing createGmlRing(GeometryFactory factory,
+			ParserConfiguration config, LinearRing lr) {
+
+		ProjCoordinate p1 = new ProjCoordinate();
+		ProjCoordinate p2 = new ProjCoordinate();
+		List<Double> ringValues = new ArrayList<>();
+		BasicCoordinateTransform trans = config.getOriginalTransform();
+		for (Vertex v : lr.getVertices()) {
+			double x = v.getX();
+			double y = v.getY();
+			double z = v.getZ();
+			if (trans != null) {
+				p1.x = x;
+				p1.y = y;
+				trans.transform(p1, p2);
+				x = p2.x;
+				y = p2.y;
+				z = z * config.getFromMeters();
+			}
+			ringValues.add(x);
+			ringValues.add(y);
+			ringValues.add(z);
+		}
+
+		org.xmlobjects.gml.model.geometry.primitives.LinearRing gmlLr = factory.createLinearRing(ringValues, 3);
+		gmlLr.setId(lr.getGmlId().getGmlString());
+		return gmlLr;
+	}
+
+	public static Solid createSolid(Geometry geom, GeometryFactory factory, ParserConfiguration config) {
+		if (geom.getType() != GeometryType.SOLID) {
+			throw new IllegalArgumentException("Only solids are allowed");
+		}
+
+		CompositeSurface comp = new CompositeSurface();
+		List<SurfaceProperty> surfaceMember = comp.getSurfaceMembers();
+		for (Polygon cdPoly : geom.getPolygons()) {
+			if (!cdPoly.isLink()) {
+				org.xmlobjects.gml.model.geometry.primitives.Polygon gmlPoly = createGmlPolygon(factory, cdPoly,
+						config);
+				if (gmlPoly != null) {
+					surfaceMember.add(new SurfaceProperty(gmlPoly));
+				}
+			} else {
+				// add reference to polygon
+				surfaceMember.add(new SurfaceProperty("#" + cdPoly.getGmlId().getGmlString()));
+			}
+		}
+
+		if (surfaceMember.isEmpty()) {
+			return null;
+		}
+		Solid solid = new Solid();
+		Shell shell = new Shell(surfaceMember);
+		solid.setExterior(new ShellProperty(shell));
+		solid.setId(geom.getGmlId().getGmlString());
+		return solid;
+	}
+
+	public static MultiSurface createMultiSurface(Geometry geom, GeometryFactory factory, ParserConfiguration config) {
+		if (geom.getType() != GeometryType.MULTI_SURFACE && geom.getType() != GeometryType.COMPOSITE_SURFACE) {
+			throw new IllegalArgumentException("This can only handle MultiSurfaces");
+		}
+		List<SurfaceProperty> surfaces = new ArrayList<>();
+		Set<CompositeCollection> compositeCollections = new HashSet<>();
+		for (Polygon cdPoly : geom.getPolygons()) {
+			if (cdPoly instanceof ConcretePolygon conc && conc.isCompositeMember()) {
+				compositeCollections.add(conc.getPartOfComposite());
+			} else if (!cdPoly.isLink()) {
+				// is not part of a boundary surface
+				org.xmlobjects.gml.model.geometry.primitives.Polygon gmlPoly = createGmlPolygon(factory, cdPoly,
+						config);
+				if (gmlPoly != null) {
+					surfaces.add(new SurfaceProperty(gmlPoly));
+				}
+			} else {
+				// add reference to polygon
+				surfaces.add(new SurfaceProperty("#" + cdPoly.getGmlId().getGmlString()));
+			}
+		}
+		for (CompositeCollection cdPoly : compositeCollections) {
+			surfaces.add(new SurfaceProperty(createGmlComposite(factory, cdPoly, config)));
+		}
+		if (surfaces.isEmpty()) {
+			return null;
+		}
+		MultiSurface ms = new MultiSurface(surfaces);
+		ms.setId(geom.getGmlId().getGmlString());
+		return ms;
+	}
+
+	public static MultiSurface createMultiSurface(List<Polygon> polygons, GeometryFactory factory,
+			ParserConfiguration config) {
+		List<SurfaceProperty> surfaces = new ArrayList<>();
+		for (Polygon cdPoly : polygons) {
+			org.xmlobjects.gml.model.geometry.primitives.Polygon gmlPoly = createGmlPolygon(factory, cdPoly, config);
+			if (gmlPoly != null) {
+				surfaces.add(new SurfaceProperty(gmlPoly));
+			}
+		}
+		if (surfaces.isEmpty()) {
+			return null;
+		}
+		return new MultiSurface(surfaces);
+	}
+
+	public static CompositeSurface createCompositeSurface(Geometry geom, GeometryFactory factory,
+			ParserConfiguration config) {
+		List<SurfaceProperty> surfaces = new ArrayList<>();
+		for (Polygon cdPoly : geom.getPolygons()) {
+			org.xmlobjects.gml.model.geometry.primitives.Polygon gmlPoly = createGmlPolygon(factory, cdPoly, config);
+			if (gmlPoly != null) {
+				surfaces.add(new SurfaceProperty(gmlPoly));
+			}
+		}
+		if (surfaces.isEmpty()) {
+			return null;
+		}
+		return new CompositeSurface(surfaces);
+	}
 
 }

CityDoctorParent/CityDoctorModel/src/main/java/de/hft/stuttgart/citydoctor2/utils/visitors/ClearVisitorResultsVisitor.java → CityDoctorParent/CityDoctorModel/src/main/java/de/hft/stuttgart/citydoctor2/utils/visitors/ClearResultsVisitor.java

@@ -6,7 +6,7 @@ import de.hft.stuttgart.citydoctor2.check.Checkable;
 /**
  * This Visitor removes the check results from a CityObject and the objects in its datastructure.
  */
-public class ClearVisitorResultsVisitor extends CheckableUtilsVisitor {
+public class ClearResultsVisitor extends CheckableUtilsVisitor {
 
     @Override
     public void check(Checkable checkable) {