Merge branch 'refs/heads/dev' into dev_advanced_db_management

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

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

@@ -65,7 +65,7 @@ public class CityGMLWriterUtils {
 	}
 	
 	public static void writeCityModel(String file, CityDoctorModel model) throws CityDoctorWriteException {
-		CityGMLContext gmlContext = CityGmlParser.getContext();
+		CityGMLContext gmlContext = CityGmlParser.setupContext();
 		CityModel cModel = model.getCityModel();
 		CityGMLOutputFactory factory = gmlContext.createCityGMLOutputFactory(model.getCityGMLVersion());
 		try (CityGMLWriter writer = factory.createCityGMLWriter(new File(file))) {

CityDoctorParent/CityDoctorModel/src/main/java/org/xmlobjects/xml/Attributes.java

+package org.xmlobjects.xml;
+
+import java.io.Serializable;
+import java.util.Collections;
+import java.util.HashMap;
+import java.util.Map;
+
+import javax.xml.XMLConstants;
+import javax.xml.namespace.QName;
+
+public class Attributes implements Serializable {
+	
+	private static final long serialVersionUID = 8942583366234714632L;
+	
+	private final Map<String, Map<String, TextContent>> attributes = new HashMap<>();
+
+    public boolean isEmpty() {
+        return attributes.isEmpty();
+    }
+
+    public void add(String namespaceURI, String localName, TextContent value) {
+        attributes.computeIfAbsent(namespaceURI, v -> new HashMap<>()).put(localName, value);
+    }
+
+    public void add(String namespaceURI, String localName, String value) {
+        add(namespaceURI, localName, TextContent.of(value));
+    }
+
+    public void add(String localName, TextContent value) {
+        add(XMLConstants.NULL_NS_URI, localName, value);
+    }
+
+    public void add(String localName, String value) {
+        add(localName, TextContent.of(value));
+    }
+
+    public void add(QName name, TextContent value) {
+        add(name.getNamespaceURI(), name.getLocalPart(), value);
+    }
+
+    public void add(QName name, String value) {
+        add(name, TextContent.of(value));
+    }
+
+    public void addAll(String namespaceURI, Map<String, TextContent> attributes) {
+        this.attributes.computeIfAbsent(namespaceURI, v -> new HashMap<>()).putAll(attributes);
+    }
+
+    public Map<String, Map<String, TextContent>> get() {
+        return attributes;
+    }
+
+    public Map<String, TextContent> get(String namespaceURI) {
+        return attributes.getOrDefault(namespaceURI, Collections.emptyMap());
+    }
+
+    public TextContent getValue(String localName) {
+        return getValue(XMLConstants.NULL_NS_URI, localName);
+    }
+
+    public TextContent getValue(String namespaceURI, String localName) {
+        return get(namespaceURI).getOrDefault(localName, TextContent.empty());
+    }
+
+    public TextContent getValue(QName name) {
+        return getValue(name.getNamespaceURI(), name.getLocalPart());
+    }
+
+    public Attributes copy() {
+        Attributes copy = new Attributes();
+        copy.attributes.putAll(attributes);
+        return copy;
+    }
+}

CityDoctorParent/CityDoctorModel/src/test/java/de/hft/stuttgart/citydoctor2/datastructure/BoundarySurfaceTest.java

@@ -30,7 +30,7 @@ import java.util.ArrayList;
 import java.util.List;
 import java.util.concurrent.atomic.AtomicInteger;
 
-import de.hft.stuttgart.citydoctor2.utils.visitors.ClearVisitorResultsVisitor;
+import de.hft.stuttgart.citydoctor2.utils.visitors.ClearResultsVisitor;
 import de.hft.stuttgart.citydoctor2.utils.visitors.GmlGeometryRebuilder;
 import de.hft.stuttgart.citydoctor2.utils.visitors.UnsetGeometriesVisitor;
 import org.citygml4j.core.model.construction.AbstractConstructionSurface;
@@ -141,7 +141,7 @@ public class BoundarySurfaceTest {
 		assertFalse(bs.getAllCheckResults().isEmpty());
 		bs.addOpening(oMock);
 		bs.clearAllContainedCheckResults();
-		verify(oMock).accept(any(ClearVisitorResultsVisitor.class));
+		verify(oMock).accept(any(ClearResultsVisitor.class));
 		assertTrue(bs.getAllCheckResults().isEmpty());
 	}
 

CityDoctorParent/CityDoctorModel/src/test/java/de/hft/stuttgart/citydoctor2/datastructure/BridgeConstructiveElementTest.java

+package de.hft.stuttgart.citydoctor2.datastructure;
+
+import static org.junit.jupiter.api.Assertions.*;
+
+import org.citygml4j.core.model.construction.WallSurface;
+import org.citygml4j.core.util.geometry.GeometryFactory;
+import org.junit.jupiter.api.Test;
+
+import de.hft.stuttgart.citydoctor2.parser.ParserConfiguration;
+
+class BridgeConstructiveElementTest {
+
+	@Test
+	void testBoundarySurfaceGeometryRecreation() {
+		WallSurface wallSurface = new WallSurface();
+		BoundarySurface surface = new BoundarySurface(wallSurface);
+		surface.addGeometry(GeometryTestUtils.createDummyGeometry(GeometryType.MULTI_SURFACE, Lod.LOD2));
+		
+		var gmlBce = new org.citygml4j.core.model.bridge.BridgeConstructiveElement();
+		BridgeConstructiveElement bce = new BridgeConstructiveElement(gmlBce);
+		bce.addBoundarySurface(surface);
+		
+		assertNull(wallSurface.getLod2MultiSurface());
+		GeometryFactory factory = GeometryFactory.newInstance();
+		ParserConfiguration config = new ParserConfiguration(8, false);
+		bce.reCreateGeometries(factory, config);
+		assertNotNull(wallSurface.getLod2MultiSurface());
+	}
+
+}

CityDoctorParent/CityDoctorModel/src/test/java/de/hft/stuttgart/citydoctor2/datastructure/GeometryTest.java

@@ -33,7 +33,7 @@ import java.util.ArrayList;
 import java.util.List;
 
 import de.hft.stuttgart.citydoctor2.check.CheckableUtilsVisitor;
-import de.hft.stuttgart.citydoctor2.utils.visitors.ClearVisitorResultsVisitor;
+import de.hft.stuttgart.citydoctor2.utils.visitors.ClearResultsVisitor;
 import org.citygml4j.core.model.construction.AbstractConstructionSurface;
 import org.citygml4j.core.model.construction.WallSurface;
 import org.citygml4j.core.util.geometry.GeometryFactory;
@@ -301,7 +301,7 @@ public class GeometryTest {
 		Polygon p = mock(Polygon.class);
 		geom.addPolygon(p);
 		geom.clearAllContainedCheckResults();
-		verify(p).accept(any(ClearVisitorResultsVisitor.class));
+		verify(p).accept(any(ClearResultsVisitor.class));
 		assertFalse(geom.containsError(CheckId.C_GE_P_HOLE_OUTSIDE));
 	}
 

CityDoctorParent/CityDoctorModel/src/test/java/de/hft/stuttgart/citydoctor2/datastructure/TrafficSpaceTest.java

@@ -6,7 +6,7 @@ import de.hft.stuttgart.citydoctor2.check.CheckId;
 import de.hft.stuttgart.citydoctor2.check.CheckResult;
 import de.hft.stuttgart.citydoctor2.check.ResultStatus;
 import de.hft.stuttgart.citydoctor2.parser.ParserConfiguration;
-import de.hft.stuttgart.citydoctor2.utils.visitors.ClearVisitorResultsVisitor;
+import de.hft.stuttgart.citydoctor2.utils.visitors.ClearResultsVisitor;
 import org.citygml4j.core.model.core.AbstractSpaceBoundary;
 import org.citygml4j.core.model.core.AbstractUnoccupiedSpace;
 import org.citygml4j.core.model.deprecated.core.DeprecatedPropertiesOfAbstractCityObject;
@@ -91,7 +91,7 @@ public class TrafficSpaceTest {
         tso.clearAllContainedCheckResults();
         assertFalse(tso.containsError(CheckId.C_GE_P_HOLE_OUTSIDE));
 
-        verify(taMock).accept(any(ClearVisitorResultsVisitor.class));
+        verify(taMock).accept(any(ClearResultsVisitor.class));
     }
 
     @Test

CityDoctorParent/CityDoctorModel/src/test/java/de/hft/stuttgart/citydoctor2/parser/CityGml3ParserTest.java

@@ -37,7 +37,7 @@ public class CityGml3ParserTest {
 
 	@Test
 	public void testGetContext() {
-		CityGMLContext context = CityGmlParser.getContext();
+		CityGMLContext context = CityGmlParser.setupContext();
 		List<ADE> ades = ADERegistry.getInstance().getADEs();
 		ADE ade = ades.get(0);
 		assertEquals(QualityADEContext.class, ade.getClass());

CityDoctorParent/CityDoctorValidation/pom.xml

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

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

@@ -133,7 +133,7 @@ public class CityDoctorValidation {
 			config = ValidationConfiguration.loadStandardValidationConfig();
 			config.setUseStreaming(true);
 		} else {
-			config = ValidationConfiguration.loadValidationConfig(validationConfigFile.getAbsolutePath());
+			config = ValidationConfiguration.loadValidationConfigFile(validationConfigFile.getAbsolutePath());
 		}
 		String xmlOutputPath = null;
 		if (xmlOutput != null) {
@@ -234,7 +234,7 @@ public class CityDoctorValidation {
 				logger.error(Localization.getText("CityDoctorValidation.notExactlyOneConfigFile"));
 				System.exit(4);
 			}
-			return ValidationConfiguration.loadValidationConfig(configFiles.get(0));
+			return ValidationConfiguration.loadValidationConfigFile(configFiles.get(0));
 		} else {
 			if (optional) {
 				logger.warn(Localization.getText("CityDoctorValidation.loadingDefaultConfig"));

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

@@ -47,7 +47,7 @@ public class CityDoctorValidationCLI implements Runnable {
             if(config == null){
                 valConfig=ValidationConfiguration.loadStandardValidationConfig();
             } else{
-                valConfig=ValidationConfiguration.loadValidationConfig(config.getAbsolutePath());
+                valConfig=ValidationConfiguration.loadValidationConfigFile(config.getAbsolutePath());
             }
             CityDoctorValidation.startValidationProcess(input, xmlReport, pdfReport, valConfig,output);
         } catch (CityDoctorWriteException | CityGmlParseException | IOException | InvalidGmlFileException e) {

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

@@ -18,10 +18,54 @@
  */
 package de.hft.stuttgart.citydoctor2.check;
 
+import java.io.BufferedOutputStream;
+import java.io.File;
+import java.io.FileInputStream;
+import java.io.FileNotFoundException;
+import java.io.FileOutputStream;
+import java.io.IOException;
+import java.io.InputStream;
+import java.io.UncheckedIOException;
+import java.nio.file.Files;
+import java.nio.file.Path;
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.HashMap;
+import java.util.HashSet;
+import java.util.Iterator;
+import java.util.List;
+import java.util.Map;
+import java.util.Map.Entry;
+import java.util.Set;
+import java.util.concurrent.Callable;
+import java.util.concurrent.ExecutionException;
+import java.util.concurrent.ExecutorService;
+import java.util.concurrent.Executors;
+import java.util.concurrent.Future;
+import java.util.concurrent.LinkedBlockingQueue;
+import java.util.concurrent.ThreadPoolExecutor;
+import java.util.concurrent.TimeUnit;
+import java.util.concurrent.atomic.AtomicInteger;
+
+import javax.xml.XMLConstants;
+import javax.xml.transform.Result;
+import javax.xml.transform.Source;
+import javax.xml.transform.Transformer;
+import javax.xml.transform.TransformerException;
+import javax.xml.transform.TransformerFactory;
+import javax.xml.transform.dom.DOMResult;
+import javax.xml.transform.dom.DOMSource;
+import javax.xml.transform.sax.SAXResult;
+import javax.xml.transform.stream.StreamSource;
+
+import org.apache.logging.log4j.LogManager;
+import org.apache.logging.log4j.Logger;
+
 import de.hft.stuttgart.citydoctor2.check.error.AttributeInvalidError;
 import de.hft.stuttgart.citydoctor2.check.error.AttributeMissingError;
 import de.hft.stuttgart.citydoctor2.check.error.AttributeValueWrongError;
 import de.hft.stuttgart.citydoctor2.check.error.SchematronError;
+import de.hft.stuttgart.citydoctor2.check.error.XMLValidationError;
 import de.hft.stuttgart.citydoctor2.checkresult.utility.CheckReportWriteException;
 import de.hft.stuttgart.citydoctor2.checks.CheckContainer;
 import de.hft.stuttgart.citydoctor2.checks.CheckPrototype;
@@ -29,13 +73,11 @@ import de.hft.stuttgart.citydoctor2.checks.Checks;
 import de.hft.stuttgart.citydoctor2.checks.SvrlContentHandler;
 import de.hft.stuttgart.citydoctor2.checks.util.FeatureCheckedListener;
 import de.hft.stuttgart.citydoctor2.database.CityObjectCache;
-import de.hft.stuttgart.citydoctor2.database.CityObjectCache;
 import de.hft.stuttgart.citydoctor2.datastructure.CityDoctorModel;
 import de.hft.stuttgart.citydoctor2.datastructure.CityObject;
 import de.hft.stuttgart.citydoctor2.datastructure.FeatureType;
 import de.hft.stuttgart.citydoctor2.datastructure.GmlId;
 import de.hft.stuttgart.citydoctor2.datastructure.ImplicitGeometryHolder;
-import de.hft.stuttgart.citydoctor2.datastructure.GmlId;
 import de.hft.stuttgart.citydoctor2.parser.CityGmlConsumer;
 import de.hft.stuttgart.citydoctor2.parser.CityGmlParseException;
 import de.hft.stuttgart.citydoctor2.parser.CityGmlParser;
@@ -59,40 +101,6 @@ import de.hft.stuttgart.quality.model.properties.RequirementProperty;
 import de.hft.stuttgart.quality.model.types.Checking;
 import de.hft.stuttgart.quality.model.types.Parameter;
 import de.hft.stuttgart.quality.model.types.ValidationPlan;
-import org.apache.logging.log4j.LogManager;
-import org.apache.logging.log4j.Logger;
-
-import javax.xml.XMLConstants;
-import javax.xml.transform.Result;
-import javax.xml.transform.Source;
-import javax.xml.transform.Transformer;
-import javax.xml.transform.TransformerException;
-import javax.xml.transform.TransformerFactory;
-import javax.xml.transform.dom.DOMResult;
-import javax.xml.transform.dom.DOMSource;
-import javax.xml.transform.sax.SAXResult;
-import javax.xml.transform.stream.StreamSource;
-import java.io.BufferedOutputStream;
-import java.io.File;
-import java.io.FileInputStream;
-import java.io.FileNotFoundException;
-import java.io.FileOutputStream;
-import java.io.IOException;
-import java.io.InputStream;
-import java.io.UncheckedIOException;
-import java.nio.file.Files;
-import java.nio.file.Path;
-import java.util.ArrayList;
-import java.util.Collections;
-import java.util.HashMap;
-import java.util.HashSet;
-import java.util.Iterator;
-import java.util.List;
-import java.util.Map;
-import java.util.Map.Entry;
-import java.util.Set;
-import java.util.concurrent.*;
-import java.util.concurrent.atomic.AtomicInteger;
 
 /**
  * The main container class for checking. It contains the logic for validation,
@@ -253,7 +261,7 @@ public class Checker {
         }
         handler.getFeatureErrors().forEach((k, v) -> {
         	String trimmedId = k.trim();
-            CityObject co = cache.get(new GmlId(k));
+            CityObject co = cache.get(new GmlId(trimmedId));
             if (co == null) {
                 // gml id reported by schematron was not found, add to general errors
                 handleSchematronErrorsGlobal(v);
@@ -692,7 +700,8 @@ public class Checker {
 
         AtomicInteger checkedCount = new AtomicInteger(0);
         // clear global errors
-        model.getGlobalErrors().clear();
+        model.getGlobalErrors().removeIf(e -> !e.isParsingError());
+        
         CityObjectCache cache = model.getCache();
         logger.trace("Setting up ThreadPool");
         int threadCount = Runtime.getRuntime().availableProcessors() * 5;
@@ -911,6 +920,20 @@ public class Checker {
             // create reporter if available
             XmlStreamReporter xmlReporter = getXmlReporter(config, xmlBos, fileName);
             PdfStreamReporter pdfReporter = getPdfReporter(config, pdfBos, fileName);
+            
+            // XML validation
+			if (config.isXmlValidation() && (xmlReporter != null || pdfReporter != null)) {
+				List<String> validationIssues = CityGmlParser.validateFile(null, inputFile.toPath());
+				for (String xmlError : validationIssues) {
+					XMLValidationError validationError = new XMLValidationError(xmlError);
+					if (xmlReporter != null) {
+						xmlReporter.reportGlobalError(validationError);
+					}
+					if (pdfReporter != null) {
+						pdfReporter.reportGlobalError(validationError);
+					}
+				}
+			}
 
             // execute schematron first
             SvrlContentHandler handler = executeSchematronValidationIfAvailable(config, inputFile);

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

@@ -53,7 +53,6 @@ public class ValidationConfiguration implements Serializable {
 	private static final long serialVersionUID = -8020055032177740646L;
 	private static final Logger logger = LogManager.getLogger(ValidationConfiguration.class);
 
-	
 	private Map<String, String> globalParameters = new HashMap<>();
 	private boolean xmlValidation = false;
 	private boolean useStreaming = false;
@@ -62,9 +61,16 @@ public class ValidationConfiguration implements Serializable {
 
 	private ParserConfiguration parserConfig;
 
-	public static ValidationConfiguration loadValidationConfig(String validationFile) throws FileNotFoundException {
+	public static ValidationConfiguration loadValidationConfigFile(String validationFile) throws FileNotFoundException {
 		return loadValidationConfig(new FileInputStream(validationFile));
 	}
+	
+	public static ValidationConfiguration loadValidationConfigFromString(String validationString) throws FileNotFoundException {
+		Yaml yaml = new Yaml(new Constructor(ValidationConfiguration.class, new LoaderOptions()));
+		ValidationConfiguration config = yaml.load(validationString);
+		config.validateConfiguration();
+		return config;
+	}
 
 	public static ValidationConfiguration loadValidationConfig(InputStream stream) {
 		Yaml yaml = new Yaml(new Constructor(ValidationConfiguration.class, new LoaderOptions()));
@@ -91,20 +97,30 @@ public class ValidationConfiguration implements Serializable {
 		config.setSchematronFilePathInGlobalParameters(CHECK_FOR_SOLID_XML);
 		return config;
 	}
-	
+
 	private ValidationConfiguration() {
 	}
 
 	public void saveAs(File f) throws IOException {
+		Yaml yaml = prepareDumpingOfConfig();
+		try (BufferedWriter bw = new BufferedWriter(new FileWriter(f))) {
+			yaml.dump(this, bw);
+		}
+	}
+
+	public String saveAsString() throws IOException {
+		Yaml yaml = prepareDumpingOfConfig();
+		return yaml.dump(this);
+	}
+
+	private Yaml prepareDumpingOfConfig() {
 		DumperOptions options = new DumperOptions();
 		options.setDefaultFlowStyle(DumperOptions.FlowStyle.BLOCK);
 		options.setPrettyFlow(true);
 		Representer rep = new ValidationConfigurationRepresenter(options);
 		rep.addClassTag(ValidationConfiguration.class, Tag.MAP);
 		Yaml yaml = new Yaml(rep);
-		try (BufferedWriter bw = new BufferedWriter(new FileWriter(f))) {
-			yaml.dump(this, bw);
-		}
+		return yaml;
 	}
 
 	public boolean isXmlValidation() {
@@ -141,7 +157,7 @@ public class ValidationConfiguration implements Serializable {
 	public Map<String, String> getGlobalParameters() {
 		return globalParameters;
 	}
-	
+
 	public void setGlobalParameters(Map<String, String> globalParameters) {
 		this.globalParameters = globalParameters;
 	}
@@ -174,8 +190,7 @@ public class ValidationConfiguration implements Serializable {
 			});
 		}
 		globalParameters.putIfAbsent(GlobalParameters.MIN_VERTEX_DISTANCE, MIN_VERTEX_DISTANCE_DEFAULT);
-		globalParameters.putIfAbsent(GlobalParameters.NUMBER_OF_ROUNDING_PLACES,
-                NUMBER_OF_ROUNDING_PLACES_DEFAULT);
+		globalParameters.putIfAbsent(GlobalParameters.NUMBER_OF_ROUNDING_PLACES, NUMBER_OF_ROUNDING_PLACES_DEFAULT);
 	}
 
 	public int getNumberOfRoundingPlaces() {
@@ -220,7 +235,7 @@ public class ValidationConfiguration implements Serializable {
 	public void setSchematronFilePathInGlobalParameters(String string) {
 		globalParameters.put(GlobalParameters.SCHEMATRON_PATH, string);
 	}
-	
+
 	public void setRequirements(Map<String, RequirementConfiguration> requirements) {
 		this.requirements = requirements;
 	}

CityDoctorParent/CityDoctorValidation/src/test/java/de/hft/stuttgart/citydoctor2/check/CheckerTest.java

@@ -18,6 +18,22 @@
  */
 package de.hft.stuttgart.citydoctor2.check;
 
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertFalse;
+import static org.junit.Assert.assertNotNull;
+import static org.junit.Assert.assertTrue;
+import static org.junit.Assert.fail;
+
+import java.io.File;
+import java.io.IOException;
+import java.nio.file.Files;
+import java.nio.file.Path;
+
+import org.apache.commons.io.FileUtils;
+import org.junit.Rule;
+import org.junit.Test;
+import org.junit.rules.TemporaryFolder;
+
 import de.hft.stuttgart.citydoctor2.CityDoctorValidation;
 import de.hft.stuttgart.citydoctor2.checkresult.CheckReport;
 import de.hft.stuttgart.citydoctor2.checkresult.GlobalErrorStatistics;
@@ -31,160 +47,165 @@ import de.hft.stuttgart.citydoctor2.parser.CityGmlParseException;
 import de.hft.stuttgart.citydoctor2.parser.CityGmlParser;
 import de.hft.stuttgart.citydoctor2.parser.InvalidGmlFileException;
 import de.hft.stuttgart.citydoctor2.parser.ParserConfiguration;
-import org.apache.commons.io.FileUtils;
-import org.junit.Rule;
-import org.junit.Test;
-import org.junit.rules.TemporaryFolder;
-
-import java.io.File;
-import java.io.IOException;
-import java.nio.file.Files;
-import java.nio.file.Path;
-
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertFalse;
-import static org.junit.Assert.assertNotNull;
-import static org.junit.Assert.assertNull;
-import static org.junit.Assert.assertTrue;
-import static org.junit.Assert.fail;
 
 /**
  * @author Matthias Betz
  */
 public class CheckerTest {
 
-    @Rule
-    public TemporaryFolder folder = new TemporaryFolder();
-
-    @Test
-    public void testSchematron() throws CityGmlParseException, InvalidGmlFileException {
-        ValidationConfiguration config = ValidationConfiguration.loadStandardValidationConfig();
-        config.getRequirements().get(Requirement.R_SE_BS_ROOF_UNFRAGMENTED.toString()).setEnabled(false);
-        config.setSchematronFilePathInGlobalParameters("src/test/resources/schematronTest.xml");
-        CityDoctorModel model = CityGmlParser.parseCityGmlFile(
-                "src/test/resources/SimpleSolid_SrefBS_SchematronTest.gml", config.getParserConfiguration());
-        Checker checker = new Checker(config, model);
-        checker.runChecks();
-        for (Building b : model.getBuildings().toList()) {
-            if (b.getGmlId().getGmlString().equals("_Simple_BD.1")) {
-                assertTrue(b.containsAnyError());
-            } else {
-                assertFalse(b.containsAnyError());
-            }
-        }
-        assertFalse(model.getGlobalErrors().isEmpty());
-    }
-
-    @Test
-    public void testChecker() throws CityGmlParseException, IOException, InvalidGmlFileException, CityDoctorWriteException {
-
-        File f = folder.newFile();
-        File f2 = folder.newFile();
-        try {
-            String[] args = new String[6];
-            args[0] = "-in";
-            args[1] = "src/test/resources/QA-CS-CONCOMP.gml";
-            args[2] = "-xmlReport";
-            args[3] = f.getAbsolutePath();
-            args[4] = "-pdfReport";
-            args[5] = f2.getAbsolutePath();
-            CityDoctorValidation.main(args);
-            assertTrue(f.exists());
-            assertTrue(f2.exists());
-        } finally {
-            f.delete();
-            f2.delete();
-        }
-    }
-
-    @Test
-    public void testStreaming() throws CityGmlParseException, IOException, InvalidGmlFileException, CityDoctorWriteException {
-        File f = folder.newFile();
-        File f2 = folder.newFile();
-        File f3 = folder.newFile();
-        try {
-            String[] args = new String[10];
-            args[0] = "-in";
-            args[1] = "src/test/resources/testarea.gml";
-            args[2] = "-config";
-            args[3] = "src/test/resources/testConfigWithStreaming.yml";
-            args[4] = "-pdfReport";
-            args[5] = f.getAbsolutePath();
-            args[6] = "-xmlReport";
-            args[7] = f2.getAbsolutePath();
-            args[8] = "-out";
-            args[9] = f3.getAbsolutePath();
-            CityDoctorValidation.main(args);
-            assertTrue(f.exists());
-            assertTrue(f2.exists());
-            assertTrue(f3.exists());
-        } finally {
-            f.delete();
-            f2.delete();
-            f3.delete();
-        }
-    }
-
-    @Test
-    public void testReportCreation() throws IOException, CityGmlParseException, InvalidGmlFileException {
-        Path tmpDir = null;
-        try {
-            tmpDir = Files.createTempDirectory("testTmp");
-            tmpDir.toFile().deleteOnExit();
-            Path xmlPath = tmpDir.resolve("report.xml");
-            Path pdfPath = tmpDir.resolve("report.pdf");
-            File features = new File("src/test/resources/feature_types.gml");
-            CityDoctorModel model = CityGmlParser.nestedCityGmlFileParse(
-                    features.toString(), new ParserConfiguration(8, false));
-            assertNotNull(model);
-            Checker checker = new Checker(model);
-            checker.runChecks();
-            checker.writeXmlReport(xmlPath.toString());
-            checker.writePdfReport(pdfPath.toString());
-            assertTrue(Files.exists(xmlPath));
-            assertTrue(Files.exists(pdfPath));
-            try {
-                CheckReport report = CheckReport.load(xmlPath.toString());
-                assertNotNull(report);
-
-                GlobalStatistics globalStatistics = report.getGlobalStatistics();
-                assertNotNull(globalStatistics);
-
-                ModelStatistics modelStats = globalStatistics.getModelStats();
-                assertNotNull(modelStats);
-                assertEquals(1, modelStats.getNumBuildings());
-                assertEquals(1, modelStats.getNumVegetation());
-                assertEquals(1, modelStats.getNumTransportation());
-                assertEquals(1, modelStats.getNumTunnelObjects());
-                assertEquals(1, modelStats.getNumBridgeObjects());
-                assertEquals(1, modelStats.getNumWaterObjects());
-                assertEquals(1, modelStats.getNumLandObjects());
-                assertEquals(1, modelStats.getNumCityFurniture());
-                assertEquals(1, modelStats.getNumGenericCityObjects());
-
-                GlobalErrorStatistics globError = globalStatistics.getGlobalErrorStats();
-                assertNotNull(globError);
-                assertEquals(0, globError.getNumErrorBuildings());
-                assertEquals(0, globError.getNumErrorVegetation());
-                assertEquals(0, globError.getNumErrorTransportation());
-                assertEquals(0, globError.getNumErrorTunnelObjects());
-                assertEquals(0, globError.getNumErrorBridgeObjects());
-                assertEquals(0, globError.getNumErrorWaterObjects());
-                assertEquals(0, globError.getNumErrorLandObjects());
-                assertEquals(1, globError.getNumErrorCityFurniture());
-                assertEquals(1, globError.getNumErrorGenericCityObjects());
-
-
-            } catch (CheckReportParseException e) {
-                fail("Report should be valid file");
-            }
-
-
-        } finally {
-            if (tmpDir != null) {
-                FileUtils.deleteDirectory(tmpDir.toFile());
-            }
-        }
-    }
+	@Rule
+	public TemporaryFolder folder = new TemporaryFolder();
+
+	@Test
+	public void testSchematron() throws CityGmlParseException, InvalidGmlFileException {
+		ValidationConfiguration config = ValidationConfiguration.loadStandardValidationConfig();
+		config.getRequirements().get(Requirement.R_SE_BS_ROOF_UNFRAGMENTED.toString()).setEnabled(false);
+		config.setSchematronFilePathInGlobalParameters("src/test/resources/schematronTest.xml");
+		CityDoctorModel model = CityGmlParser.parseCityGmlFile(
+				"src/test/resources/SimpleSolid_SrefBS_SchematronTest.gml", config.getParserConfiguration());
+		Checker checker = new Checker(config, model);
+		checker.runChecks();
+		for (Building b : model.getBuildings().toList()) {
+			if (b.getGmlId().getGmlString().equals("_Simple_BD.1")) {
+				assertTrue(b.containsAnyError());
+			} else {
+				assertFalse(b.containsAnyError());
+			}
+		}
+		assertFalse(model.getGlobalErrors().isEmpty());
+	}
+
+	@Test
+	public void testChecker()
+			throws CityGmlParseException, IOException, InvalidGmlFileException, CityDoctorWriteException {
+
+		File f = folder.newFile();
+		File f2 = folder.newFile();
+		try {
+			String[] args = new String[6];
+			args[0] = "-in";
+			args[1] = "src/test/resources/QA-CS-CONCOMP.gml";
+			args[2] = "-xmlReport";
+			args[3] = f.getAbsolutePath();
+			args[4] = "-pdfReport";
+			args[5] = f2.getAbsolutePath();
+			CityDoctorValidation.main(args);
+			assertTrue(f.exists());
+			assertTrue(f2.exists());
+		} finally {
+			f.delete();
+			f2.delete();
+		}
+	}
+
+	@Test
+	public void testStreaming()
+			throws CityGmlParseException, IOException, InvalidGmlFileException, CityDoctorWriteException {
+		File f = folder.newFile();
+		File f2 = folder.newFile();
+		File f3 = folder.newFile();
+		try {
+			String[] args = new String[10];
+			args[0] = "-in";
+			args[1] = "src/test/resources/testarea.gml";
+			args[2] = "-config";
+			args[3] = "src/test/resources/testConfigWithStreaming.yml";
+			args[4] = "-pdfReport";
+			args[5] = f.getAbsolutePath();
+			args[6] = "-xmlReport";
+			args[7] = f2.getAbsolutePath();
+			args[8] = "-out";
+			args[9] = f3.getAbsolutePath();
+			CityDoctorValidation.main(args);
+			assertTrue(f.exists());
+			assertTrue(f2.exists());
+			assertTrue(f3.exists());
+		} finally {
+			f.delete();
+			f2.delete();
+			f3.delete();
+		}
+	}
+
+	@Test
+	public void testStreamingWithXMLValidation() throws CityGmlParseException, IOException, InvalidGmlFileException,
+			CityDoctorWriteException, CheckReportParseException {
+		File f2 = folder.newFile();
+		try {
+			String[] args = new String[6];
+			args[0] = "-in";
+			args[1] = "src/test/resources/SimpleSolid_SrefBS_XMLInvalid.gml";
+			args[2] = "-config";
+			args[3] = "src/test/resources/testConfigWithStreamingWithValidation.yml";
+			args[4] = "-xmlReport";
+			args[5] = f2.getAbsolutePath();
+			CityDoctorValidation.main(args);
+			assertTrue(f2.exists());
+			CheckReport checkReport = CheckReport.load(f2.toPath());
+			assertEquals(1, checkReport.getValidationResults().getGlobalErrors().size());
+		} finally {
+			f2.delete();
+		}
+	}
+
+	@Test
+	public void testReportCreation() throws IOException, CityGmlParseException, InvalidGmlFileException {
+		Path tmpDir = null;
+		try {
+			tmpDir = Files.createTempDirectory("testTmp");
+			tmpDir.toFile().deleteOnExit();
+			Path xmlPath = tmpDir.resolve("report.xml");
+			Path pdfPath = tmpDir.resolve("report.pdf");
+			File features = new File("src/test/resources/feature_types.gml");
+			CityDoctorModel model = CityGmlParser.nestedCityGmlFileParse(features.toString(),
+					new ParserConfiguration(8, false));
+			assertNotNull(model);
+			Checker checker = new Checker(model);
+			checker.runChecks();
+			checker.writeXmlReport(xmlPath.toString());
+			checker.writePdfReport(pdfPath.toString());
+			assertTrue(Files.exists(xmlPath));
+			assertTrue(Files.exists(pdfPath));
+			try {
+				CheckReport report = CheckReport.load(xmlPath.toString());
+				assertNotNull(report);
+
+				GlobalStatistics globalStatistics = report.getGlobalStatistics();
+				assertNotNull(globalStatistics);
+
+				ModelStatistics modelStats = globalStatistics.getModelStats();
+				assertNotNull(modelStats);
+				assertEquals(1, modelStats.getNumBuildings());
+				assertEquals(1, modelStats.getNumVegetation());
+				assertEquals(1, modelStats.getNumTransportation());
+				assertEquals(1, modelStats.getNumTunnelObjects());
+				assertEquals(1, modelStats.getNumBridgeObjects());
+				assertEquals(1, modelStats.getNumWaterObjects());
+				assertEquals(1, modelStats.getNumLandObjects());
+				assertEquals(1, modelStats.getNumCityFurniture());
+				assertEquals(1, modelStats.getNumGenericCityObjects());
+
+				GlobalErrorStatistics globError = globalStatistics.getGlobalErrorStats();
+				assertNotNull(globError);
+				assertEquals(0, globError.getNumErrorBuildings());
+				assertEquals(0, globError.getNumErrorVegetation());
+				assertEquals(0, globError.getNumErrorTransportation());
+				assertEquals(0, globError.getNumErrorTunnelObjects());
+				assertEquals(0, globError.getNumErrorBridgeObjects());
+				assertEquals(0, globError.getNumErrorWaterObjects());
+				assertEquals(0, globError.getNumErrorLandObjects());
+				assertEquals(1, globError.getNumErrorCityFurniture());
+				assertEquals(1, globError.getNumErrorGenericCityObjects());
+
+			} catch (CheckReportParseException e) {
+				fail("Report should be valid file");
+			}
+
+		} finally {
+			if (tmpDir != null) {
+				FileUtils.deleteDirectory(tmpDir.toFile());
+			}
+		}
+	}
 
 }

CityDoctorParent/CityDoctorValidation/src/test/java/de/hft/stuttgart/citydoctor2/check/FilterTest.java

@@ -39,7 +39,7 @@ public class FilterTest {
 	@Test
 	public void testFilterExclude() throws CityGmlParseException, IOException, InvalidGmlFileException {
 		ValidationConfiguration config = ValidationConfiguration
-				.loadValidationConfig("src/test/resources/testConfigWithExclude.yml");
+				.loadValidationConfigFile("src/test/resources/testConfigWithExclude.yml");
 		CityDoctorModel model = CityGmlParser.parseCityGmlFile("src/test/resources/testarea.gml",
 				new ParserConfiguration(8, false));
 		Checker c = new Checker(config, model);
@@ -59,7 +59,7 @@ public class FilterTest {
 	@Test
 	public void testFilterInclude() throws CityGmlParseException, IOException, InvalidGmlFileException {
 		ValidationConfiguration config = ValidationConfiguration
-				.loadValidationConfig("src/test/resources/testConfigWithInclude.yml");
+				.loadValidationConfigFile("src/test/resources/testConfigWithInclude.yml");
 		CityDoctorModel model = CityGmlParser.parseCityGmlFile("src/test/resources/testarea.gml",
 				new ParserConfiguration(8, false));
 		Checker c = new Checker(config, model);

CityDoctorParent/CityDoctorValidation/src/test/java/de/hft/stuttgart/citydoctor2/check/ValidationConfigurationTest.java

@@ -37,7 +37,7 @@ public class ValidationConfigurationTest {
 	@Test
 	public void testLoadingConfig() throws FileNotFoundException {
 		String file = "src/test/resources/testConfig.yml";
-		ValidationConfiguration config = ValidationConfiguration.loadValidationConfig(file);
+		ValidationConfiguration config = ValidationConfiguration.loadValidationConfigFile(file);
 		assertEquals(8, config.getNumberOfRoundingPlaces());
 		assertTrue(config.getRequirements().containsKey(RequirementId.R_GE_R_TOO_FEW_POINTS.toString()));
 		assertFalse(config.getRequirements().get(RequirementId.R_GE_P_NON_PLANAR.toString()).isEnabled());
@@ -47,7 +47,7 @@ public class ValidationConfigurationTest {
 	@Test
 	public void testLoadingConfigWithFilter() throws FileNotFoundException {
 		String file = "src/test/resources/testConfigWithFilter.yml";
-		ValidationConfiguration config = ValidationConfiguration.loadValidationConfig(file);
+		ValidationConfiguration config = ValidationConfiguration.loadValidationConfigFile(file);
 		assertEquals(8, config.getNumberOfRoundingPlaces());
 		assertTrue(config.getRequirements().containsKey(RequirementId.R_GE_R_TOO_FEW_POINTS.toString()));
 		assertFalse(config.getRequirements().get(RequirementId.R_GE_P_NON_PLANAR.toString()).isEnabled());
@@ -76,7 +76,7 @@ public class ValidationConfigurationTest {
 		String file = "src/test/resources/testConfigVulnerability.yml";
 		ValidationConfiguration config = null;
 		try {
-			config = ValidationConfiguration.loadValidationConfig(file);
+			config = ValidationConfiguration.loadValidationConfigFile(file);
 			assertNotNull(config);
 			fail("Config with Vulnerability should not be successfully loaded");
 		} catch (FileNotFoundException e){

CityDoctorParent/CityDoctorValidation/src/test/resources/SimpleSolid_SrefBS_XMLInvalid.gml

+<?xml version="1.0" encoding="utf-8"?>
+<core:CityModel xmlns:core="http://www.opengis.net/citygml/2.0" xmlns:gen="http://www.opengis.net/citygml/generics/2.0" xmlns:bldg="http://www.opengis.net/citygml/building/2.0" xmlns:app="http://www.opengis.net/citygml/appearance/2.0" xmlns:dem="http://www.opengis.net/citygml/relief/2.0" xmlns:gml="http://www.opengis.net/gml" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.opengis.net/citygml/building/2.0 http://schemas.opengis.net/citygml/building/2.0/building.xsd http://www.opengis.net/citygml/appearance/2.0 http://schemas.opengis.net/citygml/appearance/2.0/appearance.xsd http://www.opengis.net/citygml/relief/2.0 http://schemas.opengis.net/citygml/relief/2.0/relief.xsd http://www.opengis.net/citygml/2.0 http://schemas.opengis.net/citygml/2.0/cityGMLBase.xsd http://www.opengis.net/citygml/generics/2.0 http://schemas.opengis.net/citygml/generics/2.0/generics.xsd">
+
+<!--
+Einfaches Gebäude mit Grundriss 3m x 5m und Satteldach, Traufhöhe 3m, Firsthöhe 4,5m
+Modelliert mit Begrenzungsflächen (eine Dachfläche, 4 Wandflächen, 1 Grundfläche), 
+die Gebäudegeometrie als Solid, der auf die Polygone der Begrenzungsflächen referenziert.
+
+Fehler in der Reihenfolge der Attribute.
+
+CityGML 2.0
+
+Gebäudevolumen: 56,25 m3
+
+12.12.2025
+
+Author: V. Coors, HFT Stuttgart
+Lizenz: 
+-->
+
+	<core:cityObjectMember>
+		<bldg:Building gml:id="_Simple_BD.1">
+			<gen:stringAttribute name="averageStoreyHeight">
+                 <gen:value>2.5</gen:value>
+            </gen:stringAttribute>	
+			<gml:name>falsche Reihenfolge</gml:name>
+			<bldg:lod2Solid>
+				<gml:Solid>
+					<gml:exterior>
+						<gml:CompositeSurface>
+							<gml:surfaceMember xlink:href="#_Simple_BD.1_PG.1"/>
+							<gml:surfaceMember xlink:href="#_Simple_BD.1_PG.2"/>
+							<gml:surfaceMember xlink:href="#_Simple_BD.1_PG.3"/>
+							<gml:surfaceMember xlink:href="#_Simple_BD.1_PG.4"/>
+							<gml:surfaceMember xlink:href="#_Simple_BD.1_PG.5"/>
+							<gml:surfaceMember xlink:href="#_Simple_BD.1_PG.6"/>
+							<gml:surfaceMember xlink:href="#_Simple_BD.1_PG.7"/>
+						</gml:CompositeSurface>
+					</gml:exterior>
+				</gml:Solid>
+			</bldg:lod2Solid>
+			<bldg:boundedBy>
+				<bldg:WallSurface gml:id="_Simple_BD.1_WallSurface_1">
+					<bldg:lod2MultiSurface>
+						<gml:MultiSurface>
+							<gml:surfaceMember>
+								<gml:Polygon gml:id="_Simple_BD.1_PG.2">
+									<gml:exterior>
+										<gml:LinearRing gml:id="_Simple_BD.1_PG.2_LR.1">
+											<gml:posList srsDimension="3">
+												13.0 15.0 0.0
+												13.0 15.0 3.0
+												13.0 10.0 3.0
+												13.0 10.0 0.0
+												13.0 15.0 0.0
+											</gml:posList>
+										</gml:LinearRing>
+									</gml:exterior>
+								</gml:Polygon>
+							</gml:surfaceMember>
+						</gml:MultiSurface>
+					</bldg:lod2MultiSurface>
+				</bldg:WallSurface>
+			</bldg:boundedBy>
+			<bldg:boundedBy>
+				<bldg:WallSurface gml:id="_Simple_BD.1_WallSurface_2">
+					<bldg:lod2MultiSurface>
+						<gml:MultiSurface>
+							<gml:surfaceMember>
+								<gml:Polygon gml:id="_Simple_BD.1_PG.3">
+									<gml:exterior>
+										<gml:LinearRing gml:id="_Simple_BD.1_PG.3_LR.1">
+											<gml:posList srsDimension="3">
+												10.0 15.0 0.0
+												10.0 15.0 3.0
+												11.5 15.0 4.5
+												13.0 15.0 3.0
+												13.0 15.0 0.0
+												10.0 15.0 0.0
+											</gml:posList>
+										</gml:LinearRing>
+									</gml:exterior>
+								</gml:Polygon>
+							</gml:surfaceMember>
+						</gml:MultiSurface>
+					</bldg:lod2MultiSurface>
+				</bldg:WallSurface>
+			</bldg:boundedBy>
+			<bldg:boundedBy>
+				<bldg:WallSurface gml:id="_Simple_BD.1_WallSurface_3">
+					<bldg:lod2MultiSurface>
+						<gml:MultiSurface>
+							<gml:surfaceMember>
+								<gml:Polygon gml:id="_Simple_BD.1_PG.4">
+									<gml:exterior>
+										<gml:LinearRing gml:id="_Simple_BD.1_PG.4_LR.1">
+											<gml:posList srsDimension="3">
+												10.0 10.0 3.0
+												10.0 15.0 3.0
+												10.0 15.0 0.0
+												10.0 10.0 0.0
+												10.0 10.0 3.0
+											</gml:posList>
+										</gml:LinearRing>
+									</gml:exterior>
+								</gml:Polygon>
+							</gml:surfaceMember>
+						</gml:MultiSurface>
+					</bldg:lod2MultiSurface>
+				</bldg:WallSurface>
+			</bldg:boundedBy>
+			<bldg:boundedBy>
+				<bldg:WallSurface gml:id="_Simple_BD.1_WallSurface_4">
+					<bldg:lod2MultiSurface>
+						<gml:MultiSurface>
+							<gml:surfaceMember>
+								<gml:Polygon gml:id="_Simple_BD.1_PG.5">
+									<gml:exterior>
+										<gml:LinearRing gml:id="_Simple_BD.1_PG.5_LR.1">
+											<gml:posList srsDimension="3">
+												13.0 10.0 0.0
+												13.0 10.0 3.0
+												11.5 10.0 4.5
+												10.0 10.0 3.0
+												10.0 10.0 0.0
+												13.0 10.0 0.0
+											</gml:posList>
+										</gml:LinearRing>
+									</gml:exterior>
+								</gml:Polygon>
+							</gml:surfaceMember>
+						</gml:MultiSurface>
+					</bldg:lod2MultiSurface>
+				</bldg:WallSurface>
+			</bldg:boundedBy>
+			<bldg:boundedBy>
+				<bldg:RoofSurface gml:id="_Simple_BD.1_RoofSurface_1">
+					<bldg:lod2MultiSurface>
+						<gml:MultiSurface>
+							<gml:surfaceMember>
+								<gml:Polygon gml:id="_Simple_BD.1_PG.6">
+									<gml:exterior>
+										<gml:LinearRing gml:id="_Simple_BD.1_PG.6_LR.1">
+											<gml:posList srsDimension="3">
+												10.0 10.0 3.0
+												11.5 10.0 4.5
+												11.5 15.0 4.5
+												10.0 15.0 3.0
+												10.0 10.0 3.0
+											</gml:posList>
+										</gml:LinearRing>
+									</gml:exterior>
+								</gml:Polygon>
+							</gml:surfaceMember>
+							<gml:surfaceMember>
+								<gml:Polygon gml:id="_Simple_BD.1_PG.7">
+									<gml:exterior>
+										<gml:LinearRing gml:id="_Simple_BD.1_PG.7_LR.1">
+											<gml:posList srsDimension="3">
+												11.5 10.0 4.5
+												13.0 10.0 3.0
+												13.0 15.0 3.0
+												11.5 15.0 4.5
+												11.5 10.0 4.5
+											</gml:posList>
+										</gml:LinearRing>
+									</gml:exterior>
+								</gml:Polygon>
+							</gml:surfaceMember>
+						</gml:MultiSurface>
+					</bldg:lod2MultiSurface>
+				</bldg:RoofSurface>
+			</bldg:boundedBy>
+			<bldg:boundedBy>
+				<bldg:GroundSurface gml:id="_Simple_BD.1_GroundSurface_1">
+					<bldg:lod2MultiSurface>
+						<gml:MultiSurface>
+							<gml:surfaceMember>
+								<gml:Polygon gml:id="_Simple_BD.1_PG.1">
+									<gml:exterior>
+										<gml:LinearRing gml:id="_Simple_BD.1_PG.1_LR.1">
+											<gml:posList srsDimension="3">
+												10.0 10.0 0.0
+												10.0 15.0 0.0
+												13.0 15.0 0.0
+												13.0 10.0 0.0
+												10.0 10.0 0.0
+											</gml:posList>
+										</gml:LinearRing>
+									</gml:exterior>
+								</gml:Polygon>
+							</gml:surfaceMember>
+						</gml:MultiSurface>
+					</bldg:lod2MultiSurface>
+				</bldg:GroundSurface>
+			</bldg:boundedBy>
+		</bldg:Building>
+	</core:cityObjectMember>
+</core:CityModel>
\ No newline at end of file

CityDoctorParent/CityDoctorValidation/src/test/resources/testConfigWithStreamingWithValidation.yml

+globalParameters:
+   numberOfRoundingPlaces: 8
+   schematronFilePath: src/test/resources/schematronTest.xml
+useStreaming: true
+xmlValidation: true
+requirements:
+   R_GE_R_TOO_FEW_POINTS:
+      enabled: true
+   R_GE_R_NOT_CLOSED:
+      enabled: true
+   R_GE_R_CONSECUTIVE_POINTS_SAME:
+      enabled: true
+   R_GE_R_SELF_INTERSECTION:
+      enabled: true
+   R_GE_S_MULTIPLE_CONNECTED_COMPONENTS:
+      enabled: true
+   R_GE_P_INTERIOR_DISCONNECTED:
+      enabled: true
+   R_GE_P_INTERSECTING_RINGS:
+      enabled: true
+   R_GE_P_NON_PLANAR:
+      enabled: false
+      parameters:
+         # one of ("distance", "angle", "both")
+         type: distance
+         distanceTolerance: 0.01
+         angleTolerance: 0.1
+   R_GE_P_HOLE_OUTSIDE:
+      enabled: true
+   R_GE_P_ORIENTATION_RINGS_SAME:
+      enabled: true
+   R_GE_P_INNER_RINGS_NESTED:
+      enabled: true
+   R_GE_S_TOO_FEW_POLYGONS:
+      enabled: true
+   R_GE_S_NOT_CLOSED:
+      enabled: true
+   R_GE_S_NON_MANIFOLD_EDGE:
+      enabled: true
+   R_GE_S_POLYGON_WRONG_ORIENTATION:
+      enabled: true
+   R_GE_S_ALL_POLYGONS_WRONG_ORIENTATION:
+      enabled: true
+   R_GE_S_NON_MANIFOLD_VERTEX:
+      enabled: true
+   R_GE_S_SELF_INTERSECTION:
+      enabled: true
\ No newline at end of file

CityDoctorParent/Extensions/CityDoctorAutoPro/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>
 		<relativePath>../../pom.xml</relativePath>
 	</parent>
 	<artifactId>CityDoctorAutoPro</artifactId>

CityDoctorParent/Extensions/CityDoctorAutoPro/src/main/java/de/hft/stuttgart/citydoctor2/gui/AutoProWindow.java

@@ -362,7 +362,7 @@ public class AutoProWindow extends JDialog implements ItemListener {
 	 */
 	private void startCppAutoProMethods() throws FileNotFoundException {
 		
-		List<Building> buildings = this.model.getBuildings();
+		List<Building> buildings = this.model.getBuildings().toList();
 		
 		List<Geometry> geometryList = getAllGeometriesOfSelectedBuildings(buildings);
 		setBuildingsToOrigin(geometryList);
@@ -525,12 +525,12 @@ public class AutoProWindow extends JDialog implements ItemListener {
 						Building building = part.getParent();
 						building.getBuildingParts().remove(part);
 						if (building.getBuildingParts().isEmpty() && building.getGeometries().isEmpty()) {
-							model.getBuildings().remove(building);
+							model.getBuildings().toList().remove(building);
 						}
 					} else if (parent instanceof Building && parent.getGeometries().isEmpty()) {
 						Building building = (Building) parent;
 						if (building.getBuildingParts().isEmpty()) {
-							model.getBuildings().remove(building);
+							model.getBuildings().toList().remove(building);
 						}
 					}
 				}