Merge branch 'dev' into 'master'

CityDoctor Version 3.18.0

See merge request !37

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

@@ -24,7 +24,6 @@ import de.hft.stuttgart.citydoctor2.checkresult.GlobalErrorStatistics;
 import de.hft.stuttgart.citydoctor2.checkresult.GlobalStatistics;
 import de.hft.stuttgart.citydoctor2.checkresult.ModelStatistics;
 import de.hft.stuttgart.citydoctor2.checkresult.utility.CheckReportParseException;
-import de.hft.stuttgart.citydoctor2.checks.util.FeatureCheckedListener;
 import de.hft.stuttgart.citydoctor2.datastructure.Building;
 import de.hft.stuttgart.citydoctor2.datastructure.CityDoctorModel;
 import de.hft.stuttgart.citydoctor2.exceptions.CityDoctorWriteException;
@@ -32,8 +31,6 @@ 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 de.hft.stuttgart.citydoctor2.zip.CityGmlZipArchive;
-import de.hft.stuttgart.citydoctor2.zip.CityGmlZipEntry;
 import org.apache.commons.io.FileUtils;
 import org.junit.Rule;
 import org.junit.Test;
@@ -68,7 +65,7 @@ public class CheckerTest {
                 "src/test/resources/SimpleSolid_SrefBS_SchematronTest.gml", config.getParserConfiguration());
         Checker checker = new Checker(config, model);
         checker.runChecks();
-        for (Building b : model.getBuildings()) {
+        for (Building b : model.getBuildings().toList()) {
             if (b.getGmlId().getGmlString().equals("_Simple_BD.1")) {
                 assertTrue(b.containsAnyError());
             } else {
@@ -128,76 +125,6 @@ public class CheckerTest {
         }
     }
 
-    @Test
-    public void testCliZipChecking() throws IOException, CityDoctorWriteException, CityGmlParseException, InvalidGmlFileException {
-        String output = folder.getRoot().toPath() + File.separator + "test";
-        String pdfOutput = folder.getRoot().toPath() + File.separator + "pdf" + File.separator;
-        String xmlOutput = folder.getRoot().toPath() + File.separator + "xml" + File.separator;
-        try {
-            String[] args = new String[10];
-            args[0] = "-in";
-            args[1] = "src/test/resources/zipArchive.zip";
-            args[2] = "-config";
-            args[3] = "src/test/resources/testConfigWithStreaming.yml";
-            args[4] = "-pdfReport";
-            args[5] = pdfOutput;
-            args[6] = "-xmlReport";
-            args[7] = xmlOutput;
-            args[8] = "-out";
-            args[9] = output + File.separator;
-            CityDoctorValidation.main(args);
-            File zipFile = new File(output + ".zip");
-            File pdfDir = new File(pdfOutput);
-            File xmlDir = new File(xmlOutput);
-            assertTrue(zipFile.exists());
-            assertTrue(pdfDir.exists());
-            assertTrue(xmlDir.exists());
-
-            assertTrue(pdfDir.isDirectory());
-            assertTrue(xmlDir.isDirectory());
-            assertEquals(5, pdfDir.listFiles().length);
-            assertEquals(5, xmlDir.listFiles().length);
-
-            CityGmlZipArchive cgmlArch = CityGmlZipArchive.register(output + ".zip");
-            assertNotNull(cgmlArch);
-            cgmlArch.mountArchive(new ParserConfiguration(8, true));
-            assertEquals(5, cgmlArch.getEntries().size());
-            for (CityGmlZipEntry entry : cgmlArch.getEntries()) {
-                assertNotNull(entry);
-                assertNull(entry.getErrorType());
-            }
-
-        } catch (CityGmlParseException | IOException | InvalidGmlFileException | CityDoctorWriteException e) {
-            throw e;
-        }
-    }
-
-    @Test
-    public void testZipEntryChecking() throws CityGmlParseException, IOException {
-        CityGmlZipArchive cgmlArch = CityGmlZipArchive.register("src/test/resources/zipArchive.zip");
-        assertNotNull(cgmlArch);
-        cgmlArch.mountArchive(new ParserConfiguration(8, false));
-        ValidationConfiguration config = ValidationConfiguration.loadStandardValidationConfig();
-        FeatureCheckedListener l = co -> {
-            assertTrue("CityObject should be validated", co.isValidated());
-        };
-        for (CityGmlZipEntry entry : cgmlArch.getEntries()) {
-            Checker.streamCheck(entry, null, null, config, l, null);
-        }
-    }
-
-    @Test
-    public void testZipArchiveChecking() throws CityGmlParseException, IOException {
-        CityGmlZipArchive cgmlArch = CityGmlZipArchive.register("src/test/resources/zipArchive.zip");
-        assertNotNull(cgmlArch);
-        cgmlArch.mountArchive(new ParserConfiguration(8, false));
-        ValidationConfiguration config = ValidationConfiguration.loadStandardValidationConfig();
-        FeatureCheckedListener l = co -> {
-            assertTrue(co.isValidated());
-        };
-        Checker.streamCheck(cgmlArch, null, null, config, l, null);
-    }
-
     @Test
     public void testReportCreation() throws IOException, CityGmlParseException, InvalidGmlFileException {
         Path tmpDir = null;
@@ -207,7 +134,7 @@ public class CheckerTest {
             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.parseCityGmlFileSilently(
+            CityDoctorModel model = CityGmlParser.nestedCityGmlFileParse(
                     features.toString(), new ParserConfiguration(8, false));
             assertNotNull(model);
             Checker checker = new Checker(model);

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

@@ -45,12 +45,12 @@ public class FilterTest {
 		Checker c = new Checker(config, model);
 		c.runChecks();
 
-		Building b = model.getBuildings().get(0);
+		Building b = model.getBuildings().toList().get(0);
 		Geometry geom = b.getGeometries().get(0);
 
 		assertFalse(geom.hasCheckResults());
 
-		TransportationObject to = model.getTransportation().get(0);
+		TransportationObject to = model.getTransportation().toList().get(0);
 		Geometry geom2 = to.getGeometries().get(0);
 
 		assertTrue(geom2.getPolygons().get(0).hasCheckResults());
@@ -65,12 +65,12 @@ public class FilterTest {
 		Checker c = new Checker(config, model);
 		c.runChecks();
 
-		Building b = model.getBuildings().get(0);
+		Building b = model.getBuildings().toList().get(0);
 		Geometry geom = b.getGeometries().get(0);
 
 		assertFalse(geom.hasCheckResults());
 
-		TransportationObject to = model.getTransportation().get(0);
+		TransportationObject to = model.getTransportation().toList().get(0);
 		Geometry geom2 = to.getGeometries().get(0);
 
 		assertTrue(geom2.getPolygons().get(0).hasCheckResults());

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

@@ -26,6 +26,7 @@ import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
 
+import de.hft.stuttgart.citydoctor2.database.UnconnectedCache;
 import org.junit.Test;
 
 import de.hft.stuttgart.citydoctor2.check.CheckError;
@@ -44,6 +45,7 @@ import de.hft.stuttgart.citydoctor2.datastructure.Vertex;
 import de.hft.stuttgart.citydoctor2.datastructure.Geometry.Orientation;
 import de.hft.stuttgart.citydoctor2.parser.ParserConfiguration;
 import de.hft.stuttgart.quality.model.enums.RequirementId;
+import org.mockito.Mockito;
 
 public class DegeneratedPolygonCheckTest {
 
@@ -68,9 +70,10 @@ public class DegeneratedPolygonCheckTest {
 
 		Building b = new Building();
 		b.addGeometry(geom);
-
+        File file = Mockito.mock(File.class);
+        Mockito.when(file.getName()).thenReturn("building");
 		ParserConfiguration config = new ParserConfiguration(8, false);
-		CityDoctorModel model = new CityDoctorModel(config, new File(""));
+		CityDoctorModel model = new CityDoctorModel(config, file, new UnconnectedCache());
 		model.addBuilding(b);
 
 		ValidationConfiguration valConfig = ValidationConfiguration.loadStandardValidationConfig();

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

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

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

@@ -25,14 +25,18 @@ import static org.junit.Assert.assertNotNull;
 import org.junit.Assert;
 import org.junit.Test;
 
+import de.hft.stuttgart.citydoctor2.check.CheckId;
 import de.hft.stuttgart.citydoctor2.check.CheckResult;
 import de.hft.stuttgart.citydoctor2.check.Checker;
 import de.hft.stuttgart.citydoctor2.check.ResultStatus;
 import de.hft.stuttgart.citydoctor2.check.ValidationConfiguration;
+import de.hft.stuttgart.citydoctor2.check.error.NonPlanarPolygonDistancePlaneError;
 import de.hft.stuttgart.citydoctor2.checks.util.GeometryTestUtils;
 import de.hft.stuttgart.citydoctor2.datastructure.Building;
 import de.hft.stuttgart.citydoctor2.datastructure.CityDoctorModel;
+import de.hft.stuttgart.citydoctor2.datastructure.ConcretePolygon;
 import de.hft.stuttgart.citydoctor2.datastructure.Geometry;
+import de.hft.stuttgart.citydoctor2.datastructure.Geometry.Orientation;
 import de.hft.stuttgart.citydoctor2.datastructure.GeometryType;
 import de.hft.stuttgart.citydoctor2.datastructure.Lod;
 import de.hft.stuttgart.citydoctor2.parser.CityGmlParseException;
@@ -45,6 +49,22 @@ import de.hft.stuttgart.citydoctor2.parser.InvalidGmlFileException;
  *
  */
 public class SolidSelfIntCheckTest {
+	
+	@Test
+	public void testDependencyChecking() {
+		Geometry geom = new Geometry(GeometryType.SOLID, Lod.LOD2, Orientation.OUTWARD);
+		
+		ConcretePolygon p = new ConcretePolygon();
+		geom.addPolygon(p);
+		NonPlanarPolygonDistancePlaneError err = new NonPlanarPolygonDistancePlaneError(p, 2, null, null);
+		CheckResult cr = new CheckResult(CheckId.C_GE_P_NON_PLANAR, ResultStatus.ERROR, err);
+		p.addCheckResult(cr);
+		
+		SolidSelfIntCheck selfIntCheck = new SolidSelfIntCheck();
+		
+		boolean canExecute = selfIntCheck.canExecute(geom);
+		assertFalse(canExecute);
+	}
 
 	@Test
 	public void testGoodGeometry() {
@@ -75,7 +95,7 @@ public class SolidSelfIntCheckTest {
 		CityDoctorModel m = CityGmlParser.parseCityGmlFile("src/test/resources/SolidSelfIntTest1.gml", config.getParserConfiguration());
 		Checker c = new Checker(config, m);
 		c.runChecks();
-		assertFalse(m.getBuildings().get(0).containsAnyError());
+		assertFalse(m.getBuildings().toList().get(0).containsAnyError());
 	}
 	
 	
@@ -85,7 +105,7 @@ public class SolidSelfIntCheckTest {
 		CityDoctorModel m = CityGmlParser.parseCityGmlFile(gml_filepath, config.getParserConfiguration());
 		Checker c = new Checker(config, m);
 		c.runChecks();
-		Building building = m.getBuildings().get(0);
+		Building building = m.getBuildings().toList().get(0);
 		/*
 		 *  The examples have no actual self-intersections, but can contain other actual model defects.
 		 *  If an error is detected, it is thus required to check if the

CityDoctorParent/CityDoctorValidation/src/test/java/de/hft/stuttgart/citydoctor2/systemtest/AllPolygonWrongOrientedTest.java

@@ -48,7 +48,7 @@ public class AllPolygonWrongOrientedTest {
 		Checker c = new Checker(config, model);
 		c.runChecks();
 		
-		Building b = model.getBuildings().get(0);
+		Building b = model.getBuildings().toList().get(0);
 		
 		assertFalse(b.containsError(CheckId.C_GE_S_ALL_POLYGONS_WRONG_ORIENTATION));
 	}

CityDoctorParent/CityDoctorValidation/src/test/java/de/hft/stuttgart/citydoctor2/systemtest/ConCompCheckTest.java

@@ -51,7 +51,7 @@ public class ConCompCheckTest extends TestCleanUp {
 		Checker c = new Checker(m);
 		c.runChecks();
 		
-		Geometry geom = m.getBuildings().get(0).getGeometries().get(0);
+		Geometry geom = m.getBuildings().toList().get(0).getGeometries().get(0);
 		CheckResult cr = geom.getCheckResult(CheckId.C_GE_S_MULTIPLE_CONNECTED_COMPONENTS);
 		assertNotNull(cr);
 		assertEquals(ResultStatus.ERROR, cr.getResultStatus());
@@ -65,7 +65,7 @@ public class ConCompCheckTest extends TestCleanUp {
 		Checker c = new Checker(m);
 		c.runChecks();
 
-		Geometry geom = m.getBuildings().get(0).getGeometries().get(0);
+		Geometry geom = m.getBuildings().toList().get(0).getGeometries().get(0);
 		CheckResult cr = geom.getCheckResult(CheckId.C_GE_S_MULTIPLE_CONNECTED_COMPONENTS);
 		assertNotNull(cr);
 		assertEquals(ResultStatus.ERROR, cr.getResultStatus());

CityDoctorParent/CityDoctorValidation/src/test/java/de/hft/stuttgart/citydoctor2/systemtest/DupPointsCheckTest.java

@@ -79,7 +79,7 @@ public class DupPointsCheckTest {
 	@Test
 	public void testDupPoints3() throws CityGmlParseException, IOException, InvalidGmlFileException {
 		CityDoctorModel m = TestUtil.loadAndCheckCityModel("src/test/resources/SimpleSolid_SrefBS.gml");
-		for (Polygon p : m.getBuildings().get(0).getGeometries().get(0).getPolygons()) {
+		for (Polygon p : m.getBuildings().toList().get(0).getGeometries().get(0).getPolygons()) {
 			LinearRing r = p.getExteriorRing();
 			CheckResult cr = r.getCheckResult(CheckId.C_GE_R_DUPLICATE_POINT);
 			assertEquals(ResultStatus.OK, cr.getResultStatus());

CityDoctorParent/CityDoctorValidation/src/test/java/de/hft/stuttgart/citydoctor2/systemtest/HoleOutsideSystemTest.java

@@ -43,7 +43,7 @@ public class HoleOutsideSystemTest {
 	@Test
 	public void testHoleOutside1() throws CityGmlParseException, IOException, InvalidGmlFileException {
 		CityDoctorModel c = TestUtil.loadAndCheckCityModel("src/test/resources/SimpleSolid_SrefBS-GE-gml-PO-0001-T0002.gml");
-		for (Polygon p : c.getBuildings().get(0).getGeometries().get(0).getPolygons()) {
+		for (Polygon p : c.getBuildings().toList().get(0).getGeometries().get(0).getPolygons()) {
 			CheckResult cr = p.getCheckResult(CheckId.C_GE_P_HOLE_OUTSIDE);
 			assertEquals(ResultStatus.OK, cr.getResultStatus());
 		}

CityDoctorParent/CityDoctorValidation/src/test/java/de/hft/stuttgart/citydoctor2/systemtest/InnerRingsNestedSystemTest.java

@@ -43,7 +43,7 @@ public class InnerRingsNestedSystemTest {
 	@Test
 	public void innerRingsNested1() throws CityGmlParseException, IOException, InvalidGmlFileException {
 		CityDoctorModel c = TestUtil.loadAndCheckCityModel("src/test/resources/SimpleSolid_SrefBS-GE-gml-PO-0001-T0002.gml");
-		for (Polygon p : c.getBuildings().get(0).getGeometries().get(0).getPolygons()) {
+		for (Polygon p : c.getBuildings().toList().get(0).getGeometries().get(0).getPolygons()) {
 			CheckResult cr = p.getCheckResult(CheckId.C_GE_P_INNER_RINGS_NESTED);
 			assertEquals(ResultStatus.OK, cr.getResultStatus());
 		}

CityDoctorParent/CityDoctorValidation/src/test/java/de/hft/stuttgart/citydoctor2/systemtest/InteriorDisconnectedSystemTest.java

@@ -43,7 +43,7 @@ public class InteriorDisconnectedSystemTest {
 	@Test
 	public void testInteriorDisconnected1() throws CityGmlParseException, IOException, InvalidGmlFileException {
 		CityDoctorModel c = TestUtil.loadAndCheckCityModel("src/test/resources/SimpleSolid_SrefBS-GE-gml-PO-0001-T0002.gml");
-		for (Polygon p : c.getBuildings().get(0).getGeometries().get(0).getPolygons()) {
+		for (Polygon p : c.getBuildings().toList().get(0).getGeometries().get(0).getPolygons()) {
 			CheckResult cr = p.getCheckResult(CheckId.C_GE_P_INTERIOR_DISCONNECTED);
 			assertEquals(ResultStatus.OK, cr.getResultStatus());
 		}

CityDoctorParent/CityDoctorValidation/src/test/java/de/hft/stuttgart/citydoctor2/systemtest/MultipleComponentTest.java

@@ -43,7 +43,7 @@ public class MultipleComponentTest {
 	@Test
 	public void testNoMultipleComponents() throws CityGmlParseException, IOException, InvalidGmlFileException {
 		CityDoctorModel c = TestUtil.loadAndCheckCityModel("src/test/resources/SimpleSolid_SrefBS.gml");
-		Geometry g = c.getBuildings().get(0).getGeometries().get(0);
+		Geometry g = c.getBuildings().toList().get(0).getGeometries().get(0);
 		CheckResult cr = g.getCheckResult(CheckId.C_GE_S_MULTIPLE_CONNECTED_COMPONENTS);
 		assertEquals(ResultStatus.OK, cr.getResultStatus());
 	}
@@ -51,7 +51,7 @@ public class MultipleComponentTest {
 	@Test
 	public void testMultipleComponents() throws CityGmlParseException, IOException, InvalidGmlFileException {
 		CityDoctorModel c = TestUtil.loadAndCheckCityModel("src/test/resources/SimpleSolid_SrefBS-GE-gml-SO-0005-T0001.gml");
-		Geometry g = c.getBuildings().get(0).getGeometries().get(0);
+		Geometry g = c.getBuildings().toList().get(0).getGeometries().get(0);
 		CheckResult cr = g.getCheckResult(CheckId.C_GE_S_MULTIPLE_CONNECTED_COMPONENTS);
 		assertEquals(ResultStatus.ERROR, cr.getResultStatus());
 		assertEquals(ErrorId.GE_S_MULTIPLE_CONNECTED_COMPONENTS, cr.getError().getErrorId());

CityDoctorParent/CityDoctorValidation/src/test/java/de/hft/stuttgart/citydoctor2/systemtest/NonManifoldEdgeSystemTest.java

@@ -46,7 +46,7 @@ public class NonManifoldEdgeSystemTest {
 	@Test
 	public void testNonManifoldEdge1() throws CityGmlParseException, IOException, InvalidGmlFileException {
 		CityDoctorModel c = TestUtil.loadAndCheckCityModel("src/test/resources/SimpleSolid_SrefBS.gml");
-		Geometry g = c.getBuildings().get(0).getGeometries().get(0);
+		Geometry g = c.getBuildings().toList().get(0).getGeometries().get(0);
 		CheckResult cr = g.getCheckResult(CheckId.C_GE_S_NON_MANIFOLD_EDGE);
 		assertEquals(ResultStatus.OK, cr.getResultStatus());
 	}
@@ -59,7 +59,7 @@ public class NonManifoldEdgeSystemTest {
 		paramMap.put(RequirementId.R_GE_P_NON_PLANAR.toString(), parameter);
 		CityDoctorModel c = TestUtil.loadAndCheckCityModel("src/test/resources/SimpleSolid_SrefBS-GE-gml-SO-0004-T0001.gml",
 				paramMap);
-		Geometry g = c.getBuildings().get(0).getGeometries().get(0);
+		Geometry g = c.getBuildings().toList().get(0).getGeometries().get(0);
 		CheckResult cr = g.getCheckResult(CheckId.C_GE_S_NON_MANIFOLD_EDGE);
 		assertEquals(ResultStatus.ERROR, cr.getResultStatus());
 		assertEquals(ErrorId.GE_S_NON_MANIFOLD_EDGE, cr.getError().getErrorId());

CityDoctorParent/CityDoctorValidation/src/test/java/de/hft/stuttgart/citydoctor2/systemtest/NonManifoldVertexSystemTest.java

@@ -43,7 +43,7 @@ public class NonManifoldVertexSystemTest {
 	@Test
 	public void testNonManifoldVertex1() throws CityGmlParseException, IOException, InvalidGmlFileException {
 		CityDoctorModel c = TestUtil.loadAndCheckCityModel("src/test/resources/SimpleSolid_SrefBS.gml");
-		Geometry g = c.getBuildings().get(0).getGeometries().get(0);
+		Geometry g = c.getBuildings().toList().get(0).getGeometries().get(0);
 		CheckResult cr = g.getCheckResult(CheckId.C_GE_S_NON_MANIFOLD_VERTEX);
 		assertEquals(ResultStatus.OK, cr.getResultStatus());
 	}
@@ -51,7 +51,7 @@ public class NonManifoldVertexSystemTest {
 	@Test
 	public void testNonManifoldVertex2() throws CityGmlParseException, IOException, InvalidGmlFileException {
 		CityDoctorModel c = TestUtil.loadAndCheckCityModel("src/test/resources/SimpleSolid_SrefBS-GE-gml-SO-0003-T0001.gml");
-		Geometry g = c.getBuildings().get(0).getGeometries().get(0);
+		Geometry g = c.getBuildings().toList().get(0).getGeometries().get(0);
 		CheckResult cr = g.getCheckResult(CheckId.C_GE_S_NON_MANIFOLD_VERTEX);
 		assertEquals(ResultStatus.ERROR, cr.getResultStatus());
 		assertEquals(ErrorId.GE_S_NON_MANIFOLD_VERTEX, cr.getError().getErrorId());

CityDoctorParent/CityDoctorValidation/src/test/java/de/hft/stuttgart/citydoctor2/systemtest/NumPointsCheckTest.java

@@ -80,7 +80,7 @@ public class NumPointsCheckTest {
 	public void testNumPoints3() throws CityGmlParseException, IOException, InvalidGmlFileException {
 		CityDoctorModel c = TestUtil.loadAndCheckCityModel("src/test/resources/SimpleSolid_SrefBS.gml");
 
-		for (Polygon p : c.getBuildings().get(0).getGeometries().get(0).getPolygons()) {
+		for (Polygon p : c.getBuildings().toList().get(0).getGeometries().get(0).getPolygons()) {
 			LinearRing r = p.getExteriorRing();
 			assertEquals(ResultStatus.OK, r.getCheckResult(CheckId.C_GE_R_TOO_FEW_POINTS).getResultStatus());
 		}

CityDoctorParent/CityDoctorValidation/src/test/java/de/hft/stuttgart/citydoctor2/systemtest/OrientationSameSystemTest.java

@@ -43,7 +43,7 @@ public class OrientationSameSystemTest {
 	@Test
 	public void testOrientationSame1() throws CityGmlParseException, IOException, InvalidGmlFileException {
 		CityDoctorModel c = TestUtil.loadAndCheckCityModel("src/test/resources/SimpleSolid_SrefBS-GE-gml-PO-0001-T0002.gml");
-		for (Polygon p : c.getBuildings().get(0).getGeometries().get(0).getPolygons()) {
+		for (Polygon p : c.getBuildings().toList().get(0).getGeometries().get(0).getPolygons()) {
 			CheckResult cr = p.getCheckResult(CheckId.C_GE_P_ORIENTATION_RINGS_SAME);
 			assertEquals(ResultStatus.OK, cr.getResultStatus());
 		}

CityDoctorParent/CityDoctorValidation/src/test/java/de/hft/stuttgart/citydoctor2/systemtest/OuterEdgeCheckTest.java

@@ -71,7 +71,7 @@ public class OuterEdgeCheckTest {
 		expectedErrorEdges.add(new Vertex(1.0, 0.0, 3.5));
 		expectedErrorEdges.add(new Vertex(2.0, 0.0, 3.0));
 		
-		Geometry geom = m.getBuildings().get(0).getGeometries().get(0);
+		Geometry geom = m.getBuildings().toList().get(0).getGeometries().get(0);
 		CheckResult cr = geom.getCheckResult(CheckId.C_GE_S_NOT_CLOSED);
 		Assert.assertEquals(ResultStatus.ERROR, cr.getResultStatus());
 	}

CityDoctorParent/CityDoctorValidation/src/test/java/de/hft/stuttgart/citydoctor2/systemtest/PlanarTest.java

@@ -31,6 +31,7 @@ import de.hft.stuttgart.citydoctor2.check.CheckResult;
 import de.hft.stuttgart.citydoctor2.check.Checker;
 import de.hft.stuttgart.citydoctor2.check.ErrorId;
 import de.hft.stuttgart.citydoctor2.check.ResultStatus;
+import de.hft.stuttgart.citydoctor2.checks.geometry.PlanarCheck;
 import de.hft.stuttgart.citydoctor2.datastructure.CityDoctorModel;
 import de.hft.stuttgart.citydoctor2.datastructure.Polygon;
 import de.hft.stuttgart.citydoctor2.parser.CityGmlParseException;
@@ -106,7 +107,7 @@ public class PlanarTest {
 	@Test
 	public void testPlanarPolygon3() throws CityGmlParseException, IOException, InvalidGmlFileException {
 		CityDoctorModel c = TestUtil.loadAndCheckCityModel("src/test/resources/SimpleSolid_SrefBS-GE-gml-PO-0001-T0002.gml");
-		for (Polygon p : c.getBuildings().get(0).getGeometries().get(0).getPolygons()) {
+		for (Polygon p : c.getBuildings().toList().get(0).getGeometries().get(0).getPolygons()) {
 			CheckResult cr = p.getCheckResult(CheckId.C_GE_P_NON_PLANAR);
 			assertEquals(ResultStatus.OK, cr.getResultStatus());
 		}
@@ -142,7 +143,7 @@ public class PlanarTest {
 	public void testPlanarPolygon6() throws CityGmlParseException, IOException, InvalidGmlFileException {
 		Map<String, Map<String, String>> paramMap = new HashMap<>();
 		Map<String, String> parameter = new HashMap<>();
-		parameter.put("type", "both");
+		parameter.put(PlanarCheck.TYPE, PlanarCheck.BOTH);
 		parameter.put("distanceTolerance", "0.5");
 		paramMap.put(RequirementId.R_GE_P_NON_PLANAR.toString(), parameter);
 		CityDoctorModel c = TestUtil.loadAndCheckCityModel("src/test/resources/SimpleSolid_SrefBS-GE-gml-PO-0002-T0002.gml", paramMap);

CityDoctorParent/CityDoctorValidation/src/test/java/de/hft/stuttgart/citydoctor2/systemtest/PolygonIntersectingRingsTest.java

@@ -43,7 +43,7 @@ public class PolygonIntersectingRingsTest {
 	@Test
 	public void testSelfIntPolygon1() throws CityGmlParseException, IOException, InvalidGmlFileException {
 		CityDoctorModel c = TestUtil.loadAndCheckCityModel("src/test/resources/SimpleSolid_SrefBS.gml");
-		for (Polygon p : c.getBuildings().get(0).getGeometries().get(0).getPolygons()) {
+		for (Polygon p : c.getBuildings().toList().get(0).getGeometries().get(0).getPolygons()) {
 			CheckResult cr = p.getCheckResult(CheckId.C_GE_P_INTERSECTING_RINGS);
 			assertEquals(ResultStatus.OK, cr.getResultStatus());
 		}
@@ -52,7 +52,7 @@ public class PolygonIntersectingRingsTest {
 	@Test
 	public void testSelfIntPolygon2() throws CityGmlParseException, IOException, InvalidGmlFileException {
 		CityDoctorModel c = TestUtil.loadAndCheckCityModel("src/test/resources/SimpleSolid_SrefBS-GE-gml-PO-0001-T0002.gml");
-		for (Polygon p : c.getBuildings().get(0).getGeometries().get(0).getPolygons()) {
+		for (Polygon p : c.getBuildings().toList().get(0).getGeometries().get(0).getPolygons()) {
 			CheckResult cr = p.getCheckResult(CheckId.C_GE_P_INTERSECTING_RINGS);
 			assertEquals(ResultStatus.OK, cr.getResultStatus());
 		}

CityDoctorParent/CityDoctorValidation/src/test/java/de/hft/stuttgart/citydoctor2/systemtest/RingClosedCheckTest.java

@@ -91,7 +91,7 @@ public class RingClosedCheckTest extends TestCleanUp {
 	@Test
 	public void testClosedRing3() throws CityGmlParseException, IOException, InvalidGmlFileException {
 		CityDoctorModel c = TestUtil.loadAndCheckCityModel("src/test/resources/SimpleSolid_SrefBS.gml");
-		for (Polygon p : c.getBuildings().get(0).getGeometries().get(0).getPolygons()) {
+		for (Polygon p : c.getBuildings().toList().get(0).getGeometries().get(0).getPolygons()) {
 			LinearRing r = p.getExteriorRing();
 			CheckResult cr = r.getCheckResult(CheckId.C_GE_R_NOT_CLOSED);
 			assertEquals(ResultStatus.OK, cr.getResultStatus());
@@ -111,7 +111,7 @@ public class RingClosedCheckTest extends TestCleanUp {
 	@Test
 	public void testClosedRing5() throws CityGmlParseException, IOException, InvalidGmlFileException {
 		CityDoctorModel c = TestUtil.loadAndCheckCityModel("src/test/resources/SimpleSolid_SrefBS-GE-gml-LR-0003-T0002.gml", 1);
-		for (Polygon p : c.getBuildings().get(0).getGeometries().get(0).getPolygons()) {
+		for (Polygon p : c.getBuildings().toList().get(0).getGeometries().get(0).getPolygons()) {
 			LinearRing r = p.getExteriorRing();
 			CheckResult cr = r.getCheckResult(CheckId.C_GE_R_NOT_CLOSED);
 			assertEquals(ResultStatus.OK, cr.getResultStatus());