Merge branch 'dev' into 'master'

CityDoctor Version 3.17.3

See merge request !34

CityDoctorParent/CityDoctorValidation/src/test/java/de/hft/stuttgart/citydoctor2/checks/util/GeometryTestUtils.java

@@ -30,6 +30,7 @@ import de.hft.stuttgart.citydoctor2.datastructure.LinearRing.LinearRingType;
 import de.hft.stuttgart.citydoctor2.datastructure.Lod;
 import de.hft.stuttgart.citydoctor2.datastructure.Polygon;
 import de.hft.stuttgart.citydoctor2.datastructure.Vertex;
+import de.hft.stuttgart.citydoctor2.datastructure.Geometry.Orientation;
 
 /**
  * 
@@ -39,7 +40,7 @@ import de.hft.stuttgart.citydoctor2.datastructure.Vertex;
 public class GeometryTestUtils {
 	
 	public static Geometry createGoodGeometry() {
-		Geometry geom = new Geometry(GeometryType.SOLID, Lod.LOD1);
+		Geometry geom = new Geometry(GeometryType.SOLID, Lod.LOD1, Orientation.OUTWARD);
 		
 		Vertex v0 = createVertex(0, 0, 0, geom);
 		Vertex v1 = createVertex(10, 0, 0, geom);
@@ -65,7 +66,7 @@ public class GeometryTestUtils {
 	}
 	
 	public static Geometry createBadGeometry() {
-		Geometry geom = new Geometry(GeometryType.SOLID, Lod.LOD1);
+		Geometry geom = new Geometry(GeometryType.SOLID, Lod.LOD1, Orientation.OUTWARD);
 		
 		Vertex v0 = createVertex(0, 0, 0, geom);
 		Vertex v1 = createVertex(10, 0, 0, geom);

CityDoctorParent/CityDoctorValidation/src/test/java/de/hft/stuttgart/citydoctor2/checks/util/SelfIntersectionUtilTest.java

@@ -37,6 +37,7 @@ import de.hft.stuttgart.citydoctor2.datastructure.LinearRing.LinearRingType;
 import de.hft.stuttgart.citydoctor2.datastructure.Lod;
 import de.hft.stuttgart.citydoctor2.datastructure.Polygon;
 import de.hft.stuttgart.citydoctor2.datastructure.Vertex;
+import de.hft.stuttgart.citydoctor2.datastructure.Geometry.Orientation;
 import de.hft.stuttgart.citydoctor2.math.Segment3d;
 import de.hft.stuttgart.citydoctor2.math.Vector3d;
 import de.hft.stuttgart.citydoctor2.parser.ParserConfiguration;
@@ -806,7 +807,7 @@ public class SelfIntersectionUtilTest {
 
 	@Test
 	public void testIsSimpleGood() {
-		Geometry geom = new Geometry(GeometryType.SOLID, Lod.LOD1);
+		Geometry geom = new Geometry(GeometryType.SOLID, Lod.LOD1, Orientation.OUTWARD);
 		Polygon poly = new ConcretePolygon();
 		geom.addPolygon(poly);
 
@@ -837,7 +838,7 @@ public class SelfIntersectionUtilTest {
 
 	@Test
 	public void testIsSimpleFail() {
-		Geometry geom = new Geometry(GeometryType.SOLID, Lod.LOD1);
+		Geometry geom = new Geometry(GeometryType.SOLID, Lod.LOD1, Orientation.OUTWARD);
 		Polygon poly = new ConcretePolygon();
 		geom.addPolygon(poly);
 
@@ -867,7 +868,7 @@ public class SelfIntersectionUtilTest {
 
 	@Test
 	public void testIsSimpleGood2() {
-		Geometry geom = new Geometry(GeometryType.SOLID, Lod.LOD1);
+		Geometry geom = new Geometry(GeometryType.SOLID, Lod.LOD1, Orientation.OUTWARD);
 		Polygon poly = new ConcretePolygon();
 		geom.addPolygon(poly);
 

CityDoctorParent/Extensions/CityDoctorAutoPro/pom.xml

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

CityDoctorParent/Extensions/CityDoctorGUI/pom.xml

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

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

@@ -590,6 +590,7 @@ public class CityDoctorController {
             TreeItem<Renderable> item = buildTopLevelCityObjectNode(b, root, b.getBoundarySurfaces());
 
             createBuildingInstallationNodes(b, item);
+            createBuildingConstructiveElementsNodes(b, item);
             createBuildingRoomNodes(b, item);
             createBuildingFurnitureNodes(b, item);
             createBuildingStoreyNodes(b, item);
@@ -860,6 +861,21 @@ public class CityDoctorController {
         createRoomNodes(ab.getBuildingRooms(), root);
     }
 
+    private void createBuildingConstructiveElementsNodes(AbstractBuilding ab, TreeItem<Renderable> root) {
+        if (ab.getConstructiveElements().isEmpty()) {
+            return;
+        }
+
+        CityObjectGroupNode constructiveElementsGroupNode = new CityObjectGroupNode(
+                ab.getConstructiveElements(), "Constructive Elements", Color.CORAL);
+        TreeItem<Renderable> constructiveElementsGroupItem = new TreeItem<>(constructiveElementsGroupNode);
+        root.getChildren().add(constructiveElementsGroupItem);
+
+        for (BuildingConstructiveElement bce : ab.getConstructiveElements()) {
+            buildCityObjectNode(bce, constructiveElementsGroupItem, bce.getBoundarySurfaces());
+        }
+    }
+
     private void createRoomNodes(List<? extends AbstractRoom> rooms, TreeItem<Renderable> root) {
         if (rooms.isEmpty()) {
             return;
@@ -1030,7 +1046,7 @@ public class CityDoctorController {
                 updateTree(mainWindow.getPolygonsView().getRoot());
                 for (CheckError e : model.getGlobalErrors()) {
                     if (e instanceof SchematronError se) {
-                        mainWindow.getGlobalErrorsView().getItems().add(se.getErrorIdString());
+                        mainWindow.getGlobalErrorsView().getItems().add(se.getErrorIdString() + " - " + se.getNameOfAttribute());
                     }
                 }
                 renderer.refresh();
@@ -1083,7 +1099,7 @@ public class CityDoctorController {
                 updateTree(mainWindow.getPolygonsView().getRoot());
                 for (CheckError e : model.getGlobalErrors()) {
                     if (e instanceof SchematronError se) {
-                        mainWindow.getGlobalErrorsView().getItems().add(se.getErrorIdString());
+                        mainWindow.getGlobalErrorsView().getItems().add(se.getErrorIdString() + " - " + se.getNameOfAttribute());
                     }
                 }
                 renderer.refresh();

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

@@ -22,7 +22,9 @@ import de.hft.stuttgart.citydoctor2.check.error.NotFloorError;
 import de.hft.stuttgart.citydoctor2.check.error.NotGroundError;
 import de.hft.stuttgart.citydoctor2.check.error.NotWallError;
 import de.hft.stuttgart.citydoctor2.check.error.NullAreaError;
+import de.hft.stuttgart.citydoctor2.check.error.PlanarityError;
 import de.hft.stuttgart.citydoctor2.check.error.PointTouchesEdgeError;
+import de.hft.stuttgart.citydoctor2.check.error.PolygonError;
 import de.hft.stuttgart.citydoctor2.check.error.PolygonHoleOutsideError;
 import de.hft.stuttgart.citydoctor2.check.error.PolygonInteriorDisconnectedError;
 import de.hft.stuttgart.citydoctor2.check.error.PolygonIntersectingRingsError;
@@ -31,9 +33,12 @@ import de.hft.stuttgart.citydoctor2.check.error.PolygonWithoutSurfaceError;
 import de.hft.stuttgart.citydoctor2.check.error.PolygonWrongOrientationError;
 import de.hft.stuttgart.citydoctor2.check.error.RingDuplicatePointError;
 import de.hft.stuttgart.citydoctor2.check.error.RingEdgeIntersectionError;
+import de.hft.stuttgart.citydoctor2.check.error.RingError;
 import de.hft.stuttgart.citydoctor2.check.error.RingNotClosedError;
+import de.hft.stuttgart.citydoctor2.check.error.RingSelfIntersectionError;
 import de.hft.stuttgart.citydoctor2.check.error.RingTooFewPointsError;
 import de.hft.stuttgart.citydoctor2.check.error.SchematronError;
+import de.hft.stuttgart.citydoctor2.check.error.SolidError;
 import de.hft.stuttgart.citydoctor2.check.error.SolidNotClosedError;
 import de.hft.stuttgart.citydoctor2.check.error.SolidSelfIntError;
 import de.hft.stuttgart.citydoctor2.check.error.SurfaceUnfragmentedError;
@@ -265,4 +270,29 @@ public class ListErrorVisitor implements ErrorVisitor {
 	public void visit(PolygonWithoutSurfaceError err) {
 		controller.highlight(err.getPolygon(), geom);
 	}
+
+	@Override
+	public void visit(RingError err) {
+		// nothing to display
+	}
+
+	@Override
+	public void visit(PolygonError err) {
+		// nothing to display
+	}
+
+	@Override
+	public void visit(RingSelfIntersectionError err) {
+		// nothing to display
+	}
+
+	@Override
+	public void visit(PlanarityError err) {
+		// nothing to display
+	}
+
+	@Override
+	public void visit(SolidError err) {
+		// nothing to display
+	}
 }

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

@@ -2,13 +2,14 @@ package de.hft.stuttgart.citydoctor2.gui.tree;
 
 import java.util.List;
 
+import de.hft.stuttgart.citydoctor2.check.AbstractErrorVisitor;
 import de.hft.stuttgart.citydoctor2.check.CheckError;
-import de.hft.stuttgart.citydoctor2.check.ErrorVisitor;
 import de.hft.stuttgart.citydoctor2.check.error.AllPolygonsWrongOrientationError;
 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.ConsecutivePointSameError;
+import de.hft.stuttgart.citydoctor2.check.error.DegeneratedRingError;
 import de.hft.stuttgart.citydoctor2.check.error.DependenciesNotMetError;
 import de.hft.stuttgart.citydoctor2.check.error.MultipleConnectedComponentsError;
 import de.hft.stuttgart.citydoctor2.check.error.NestedRingError;
@@ -36,7 +37,6 @@ import de.hft.stuttgart.citydoctor2.check.error.SchematronError;
 import de.hft.stuttgart.citydoctor2.check.error.SolidNotClosedError;
 import de.hft.stuttgart.citydoctor2.check.error.SolidSelfIntError;
 import de.hft.stuttgart.citydoctor2.check.error.SurfaceUnfragmentedError;
-import de.hft.stuttgart.citydoctor2.check.error.DegeneratedRingError;
 import de.hft.stuttgart.citydoctor2.check.error.TooFewPolygonsError;
 import de.hft.stuttgart.citydoctor2.check.error.UnknownCheckError;
 import de.hft.stuttgart.citydoctor2.datastructure.ConcretePolygon;
@@ -57,7 +57,7 @@ import de.hft.stuttgart.citydoctor2.utils.PolygonIntersection;
 import de.hft.stuttgart.citydoctor2.utils.PolygonIntersection.IntersectionType;
 import javafx.scene.control.TreeItem;
 
-public class ErrorItemVisitor implements ErrorVisitor {
+public class ErrorItemVisitor extends AbstractErrorVisitor {
 
 	private static String nameOfAttribute = Localization.getText("ErrorItemVisitor.nameOfAttribute") + ": ";
 	private static String childId = Localization.getText("ErrorItemVisitor.childId") + ": ";

CityDoctorParent/Extensions/CityDoctorHealer/pom.xml

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

CityDoctorParent/Extensions/CityDoctorHealer/src/main/java/de/hft/stuttgart/citydoctor2/healer/Healer.java

@@ -26,7 +26,7 @@ import org.citygml4j.xml.writer.CityGMLWriteException;
 import org.citygml4j.xml.writer.CityGMLWriter;
 
 import de.hft.stuttgart.citydoctor2.CityDoctorValidation;
-import de.hft.stuttgart.citydoctor2.check.AbstractCheck;
+import de.hft.stuttgart.citydoctor2.check.CheckableUtilsVisitor;
 import de.hft.stuttgart.citydoctor2.check.CheckError;
 import de.hft.stuttgart.citydoctor2.check.Checker;
 import de.hft.stuttgart.citydoctor2.check.HealingMethod;
@@ -353,7 +353,7 @@ public class Healer {
 
 	private void filterOutDuplicateVertices(CityObject co) {
 		Map<Vertex, Vertex> map = new HashMap<>();
-		co.accept(new AbstractCheck() {
+		co.accept(new CheckableUtilsVisitor() {
 			@Override
 			public void check(LinearRing ring) {
 				for (int i = 0; i < ring.getVertices().size(); i++) {

CityDoctorParent/Extensions/CityDoctorHealer/src/main/java/de/hft/stuttgart/citydoctor2/healing/HealMissingSolid.java

@@ -24,7 +24,7 @@ import java.util.List;
 import org.apache.logging.log4j.LogManager;
 import org.apache.logging.log4j.Logger;
 
-import de.hft.stuttgart.citydoctor2.check.AbstractCheck;
+import de.hft.stuttgart.citydoctor2.check.CheckableUtilsVisitor;
 import de.hft.stuttgart.citydoctor2.check.HealingID;
 import de.hft.stuttgart.citydoctor2.check.HealingMethod;
 import de.hft.stuttgart.citydoctor2.check.ModificationListener;
@@ -42,6 +42,7 @@ import de.hft.stuttgart.citydoctor2.datastructure.GmlElement;
 import de.hft.stuttgart.citydoctor2.datastructure.LinkedPolygon;
 import de.hft.stuttgart.citydoctor2.datastructure.Lod;
 import de.hft.stuttgart.citydoctor2.datastructure.Polygon;
+import de.hft.stuttgart.citydoctor2.datastructure.Geometry.Orientation;
 
 public class HealMissingSolid implements HealingMethod {
 	
@@ -103,7 +104,7 @@ public class HealMissingSolid implements HealingMethod {
 	
 	private List<Polygon> collectPolygons(CityObject co) {
 		List<Polygon> polygons = new ArrayList<>();
-		AbstractCheck polygonCheck = new AbstractCheck() {
+		CheckableUtilsVisitor polygonCheck = new CheckableUtilsVisitor() {
 			@Override
 			public void check(Polygon p) {
 				if (!p.isLink()) {
@@ -116,7 +117,7 @@ public class HealMissingSolid implements HealingMethod {
 	}
 
 	private boolean createSolidInFeature(Lod lod, AbstractBuilding building) {
-		Geometry geom = new Geometry(GeometryType.SOLID, lod);
+		Geometry geom = new Geometry(GeometryType.SOLID, lod, Orientation.OUTWARD);
 		List<Polygon> polygons = collectPolygons(building, lod, geom);
 		for (Polygon p : polygons) {
 			geom.addPolygon(p);

CityDoctorParent/Extensions/CityDoctorHealer/src/main/java/de/hft/stuttgart/citydoctor2/healing/HealPolygonWithoutSurface.java

@@ -19,6 +19,7 @@ import de.hft.stuttgart.citydoctor2.datastructure.Geometry;
 import de.hft.stuttgart.citydoctor2.datastructure.GeometryType;
 import de.hft.stuttgart.citydoctor2.datastructure.LinkedPolygon;
 import de.hft.stuttgart.citydoctor2.datastructure.Polygon;
+import de.hft.stuttgart.citydoctor2.datastructure.Geometry.Orientation;
 import de.hft.stuttgart.citydoctor2.math.Vector3d;
 
 public class HealPolygonWithoutSurface implements HealingMethod {
@@ -60,7 +61,7 @@ public class HealPolygonWithoutSurface implements HealingMethod {
 		Geometry parentGeometry = cp.getParent();
 		parentGeometry.getPolygons().remove(cp);
 		ab.addBoundarySurface(bs);
-		Geometry geom = new Geometry(GeometryType.MULTI_SURFACE, parentGeometry.getLod());
+		Geometry geom = new Geometry(GeometryType.MULTI_SURFACE, parentGeometry.getLod(), Orientation.OUTWARD);
 		bs.addGeometry(geom);
 		geom.addPolygon(cp);
 		parentGeometry.addPolygon(new LinkedPolygon(cp, parentGeometry));

CityDoctorParent/Extensions/CityDoctorHealer/src/test/java/de/hft/stuttgart/citydoctor2/healing/HealHoleOutsideErrorTest.java

@@ -2,16 +2,14 @@ package de.hft.stuttgart.citydoctor2.healing;
 
 import java.io.IOException;
 
-import de.hft.stuttgart.citydoctor2.datastructure.BoundarySurface;
-import de.hft.stuttgart.citydoctor2.datastructure.Building;
 import org.junit.Assert;
 import org.junit.Test;
 
 import de.hft.stuttgart.citydoctor2.check.CheckId;
 import de.hft.stuttgart.citydoctor2.check.Checker;
 import de.hft.stuttgart.citydoctor2.check.ValidationConfiguration;
+import de.hft.stuttgart.citydoctor2.datastructure.Building;
 import de.hft.stuttgart.citydoctor2.datastructure.CityDoctorModel;
-import de.hft.stuttgart.citydoctor2.datastructure.Geometry;
 import de.hft.stuttgart.citydoctor2.healer.Healer;
 import de.hft.stuttgart.citydoctor2.parser.CityGmlParseException;
 import de.hft.stuttgart.citydoctor2.parser.InvalidGmlFileException;

CityDoctorParent/Extensions/CityDoctorHealer/src/test/java/de/hft/stuttgart/citydoctor2/healing/HealMissingSolidTest.java

@@ -55,6 +55,7 @@ import de.hft.stuttgart.citydoctor2.datastructure.LinkedPolygon;
 import de.hft.stuttgart.citydoctor2.datastructure.Lod;
 import de.hft.stuttgart.citydoctor2.datastructure.Polygon;
 import de.hft.stuttgart.citydoctor2.datastructure.Vertex;
+import de.hft.stuttgart.citydoctor2.datastructure.Geometry.Orientation;
 import de.hft.stuttgart.citydoctor2.exceptions.CityDoctorWriteException;
 import de.hft.stuttgart.citydoctor2.healer.Healer;
 import de.hft.stuttgart.citydoctor2.parser.CityGmlParseException;
@@ -75,7 +76,7 @@ public class HealMissingSolidTest {
 		model.addBuilding(b);
 		b.setGmlObject(new org.citygml4j.core.model.building.Building());
 
-		Geometry geom = new Geometry(GeometryType.MULTI_SURFACE, Lod.LOD2);
+		Geometry geom = new Geometry(GeometryType.MULTI_SURFACE, Lod.LOD2, Orientation.OUTWARD);
 		b.addGeometry(geom);
 		ConcretePolygon p1 = new ConcretePolygon();
 		LinearRing ext1 = createTestRing();
@@ -84,7 +85,7 @@ public class HealMissingSolidTest {
 
 		BoundarySurface bs1 = new BoundarySurface(mock(AbstractThematicSurface.class));
 		b.addBoundarySurface(bs1);
-		Geometry geom2 = new Geometry(GeometryType.MULTI_SURFACE, Lod.LOD2);
+		Geometry geom2 = new Geometry(GeometryType.MULTI_SURFACE, Lod.LOD2, Orientation.OUTWARD);
 		bs1.addGeometry(geom2);
 		ConcretePolygon p2 = new ConcretePolygon();
 		LinearRing ext2 = createTestRing();
@@ -95,7 +96,7 @@ public class HealMissingSolidTest {
 
 		Installation bi = new Installation();
 		b.addBuildingInstallation(bi);
-		Geometry geom3 = new Geometry(GeometryType.MULTI_SURFACE, Lod.LOD2);
+		Geometry geom3 = new Geometry(GeometryType.MULTI_SURFACE, Lod.LOD2, Orientation.OUTWARD);
 		bi.addGeometry(geom3);
 		ConcretePolygon p3 = new ConcretePolygon();
 		LinearRing ext3 = createTestRing();
@@ -104,7 +105,7 @@ public class HealMissingSolidTest {
 
 		BoundarySurface bs2 = new BoundarySurface(mock(AbstractThematicSurface.class));
 		bi.addBoundarySurface(bs2);
-		Geometry geom4 = new Geometry(GeometryType.MULTI_SURFACE, Lod.LOD2);
+		Geometry geom4 = new Geometry(GeometryType.MULTI_SURFACE, Lod.LOD2, Orientation.OUTWARD);
 		bs2.addGeometry(geom4);
 		ConcretePolygon p4 = new ConcretePolygon();
 		LinearRing ext4 = createTestRing();

CityDoctorParent/Extensions/CityDoctorHealer/src/test/java/de/hft/stuttgart/citydoctor2/healing/HealPlanarPolygonErrorTest.java

@@ -27,6 +27,7 @@ import de.hft.stuttgart.citydoctor2.datastructure.LinearRing.LinearRingType;
 import de.hft.stuttgart.citydoctor2.datastructure.Lod;
 import de.hft.stuttgart.citydoctor2.datastructure.Polygon;
 import de.hft.stuttgart.citydoctor2.datastructure.Vertex;
+import de.hft.stuttgart.citydoctor2.datastructure.Geometry.Orientation;
 import de.hft.stuttgart.citydoctor2.healer.Healer;
 import de.hft.stuttgart.citydoctor2.parser.CityGmlParseException;
 import de.hft.stuttgart.citydoctor2.parser.InvalidGmlFileException;
@@ -57,7 +58,7 @@ public class HealPlanarPolygonErrorTest {
 	public void testNonplanarPolygon() {
 		CppInitializer.initCpp();
 		Building b = new Building();
-		Geometry geom = new Geometry(GeometryType.SOLID, Lod.LOD2);
+		Geometry geom = new Geometry(GeometryType.SOLID, Lod.LOD2, Orientation.OUTWARD);
 		b.addGeometry(geom);
 		
 		Vertex v0 = new Vertex(0, 0, 0);
@@ -162,7 +163,7 @@ public class HealPlanarPolygonErrorTest {
 	public void testNonplanarPolygon_Split() {
 		CppInitializer.initCpp();
 		Building b = new Building();
-		Geometry geom = new Geometry(GeometryType.SOLID, Lod.LOD2);
+		Geometry geom = new Geometry(GeometryType.SOLID, Lod.LOD2, Orientation.OUTWARD);
 		b.addGeometry(geom);
 		
 		Vertex v0 = new Vertex(0, 0, 0);
@@ -276,7 +277,7 @@ public class HealPlanarPolygonErrorTest {
 	public void testNonplanarPolygon_Split2() {
 		CppInitializer.initCpp();
 		Building b = new Building();
-		Geometry geom = new Geometry(GeometryType.SOLID, Lod.LOD2);
+		Geometry geom = new Geometry(GeometryType.SOLID, Lod.LOD2, Orientation.OUTWARD);
 		b.addGeometry(geom);
 		
 		Vertex v0 = new Vertex(0, 0, 0);

CityDoctorParent/Extensions/CityDoctorHealer/src/test/java/de/hft/stuttgart/citydoctor2/healing/HealRingSelfIntErrorTest.java

@@ -27,6 +27,7 @@ import de.hft.stuttgart.citydoctor2.datastructure.LinearRing.LinearRingType;
 import de.hft.stuttgart.citydoctor2.datastructure.Lod;
 import de.hft.stuttgart.citydoctor2.datastructure.Polygon;
 import de.hft.stuttgart.citydoctor2.datastructure.Vertex;
+import de.hft.stuttgart.citydoctor2.datastructure.Geometry.Orientation;
 import de.hft.stuttgart.citydoctor2.healer.Healer;
 import de.hft.stuttgart.citydoctor2.parser.CityGmlParseException;
 import de.hft.stuttgart.citydoctor2.parser.InvalidGmlFileException;
@@ -35,7 +36,7 @@ public class HealRingSelfIntErrorTest {
 	
 	@Test
 	public void testIntersectingEdges1() {
-		Geometry geom = new Geometry(GeometryType.SOLID, Lod.LOD1);
+		Geometry geom = new Geometry(GeometryType.SOLID, Lod.LOD1, Orientation.OUTWARD);
 		Polygon p = new ConcretePolygon();
 		geom.addPolygon(p);
 		
@@ -92,7 +93,7 @@ public class HealRingSelfIntErrorTest {
 
 	@Test
 	public void testDuplicatePoint1() {
-		Geometry geom = new Geometry(GeometryType.SOLID, Lod.LOD1);
+		Geometry geom = new Geometry(GeometryType.SOLID, Lod.LOD1, Orientation.OUTWARD);
 		Polygon p = new ConcretePolygon();
 		geom.addPolygon(p);
 		
@@ -137,7 +138,7 @@ public class HealRingSelfIntErrorTest {
 	
 	@Test
 	public void testDuplicatePoint2() {
-		Geometry geom = new Geometry(GeometryType.SOLID, Lod.LOD1);
+		Geometry geom = new Geometry(GeometryType.SOLID, Lod.LOD1, Orientation.OUTWARD);
 		Polygon p = new ConcretePolygon();
 		geom.addPolygon(p);
 		

CityDoctorParent/Extensions/CityDoctorHealer/src/test/java/de/hft/stuttgart/citydoctor2/healing/HealSolidNotClosedErrorTest.java

@@ -29,6 +29,7 @@ import de.hft.stuttgart.citydoctor2.datastructure.LinearRing.LinearRingType;
 import de.hft.stuttgart.citydoctor2.datastructure.Lod;
 import de.hft.stuttgart.citydoctor2.datastructure.Polygon;
 import de.hft.stuttgart.citydoctor2.datastructure.Vertex;
+import de.hft.stuttgart.citydoctor2.datastructure.Geometry.Orientation;
 import de.hft.stuttgart.citydoctor2.healer.Healer;
 import de.hft.stuttgart.citydoctor2.parser.CityGmlParseException;
 import de.hft.stuttgart.citydoctor2.parser.InvalidGmlFileException;
@@ -42,7 +43,7 @@ public class HealSolidNotClosedErrorTest {
 	public void testVertexCloseToEdge() {
 		CppInitializer.initCpp();
 		Building b = new Building(); //Angelika: als Test eingefügt
-		Geometry geom = new Geometry(GeometryType.SOLID, Lod.LOD0); //Original
+		Geometry geom = new Geometry(GeometryType.SOLID, Lod.LOD0, Orientation.OUTWARD); //Original
 //		Geometry geom = new Geometry(GeometryType.SOLID, Lod.LOD2); //Angelika: Test
 		b.addGeometry(geom); //Angelika: als Test eingefügt
 		
@@ -166,7 +167,7 @@ public class HealSolidNotClosedErrorTest {
 	public void testMissingPolygon() {
 		CppInitializer.initCpp();
 		Building b = new Building();
-		Geometry geom = new Geometry(GeometryType.SOLID, Lod.LOD2);
+		Geometry geom = new Geometry(GeometryType.SOLID, Lod.LOD2, Orientation.OUTWARD);
 		b.addGeometry(geom);
 		
 		Vertex v0 = new Vertex(0, 0, 0);
@@ -255,7 +256,7 @@ public class HealSolidNotClosedErrorTest {
 	@Test
 	public void test2MissingPolygons() {
 		Building b = new Building(); 
-		Geometry geom = new Geometry(GeometryType.SOLID, Lod.LOD0);
+		Geometry geom = new Geometry(GeometryType.SOLID, Lod.LOD0, Orientation.OUTWARD);
 		b.addGeometry(geom); 
 		
 		Vertex v0 = new Vertex(0, 0, 0);
@@ -345,7 +346,7 @@ public class HealSolidNotClosedErrorTest {
 	public void test2MissingPolygonsCpp() {
 		CppInitializer.initCpp();
 		Building b = new Building(); 
-		Geometry geom = new Geometry(GeometryType.SOLID, Lod.LOD2); 
+		Geometry geom = new Geometry(GeometryType.SOLID, Lod.LOD2, Orientation.OUTWARD); 
 		b.addGeometry(geom);
 		
 		Vertex v0 = new Vertex(0, 0, 0);

CityDoctorParent/Extensions/CityDoctorHealerGUI/pom.xml

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

CityDoctorParent/Extensions/CityDoctorHealerGUI/src/main/java/de/hft/stuttgart/citydoctor2/healer/gui/HealerController.java

@@ -30,6 +30,7 @@ import de.hft.stuttgart.citydoctor2.datastructure.LinkedPolygon;
 import de.hft.stuttgart.citydoctor2.datastructure.Lod;
 import de.hft.stuttgart.citydoctor2.datastructure.Opening;
 import de.hft.stuttgart.citydoctor2.datastructure.Polygon;
+import de.hft.stuttgart.citydoctor2.datastructure.Geometry.Orientation;
 import de.hft.stuttgart.citydoctor2.gui.AutoProWindow;
 import de.hft.stuttgart.citydoctor2.gui.HighlightController;
 import de.hft.stuttgart.citydoctor2.gui.ListErrorVisitor;
@@ -614,7 +615,7 @@ public class HealerController {
 		List<Polygon> newPolygons = availablePolygons.get(lod);
 		if (newPolygons != null) {
 			// found polygons to be added
-			Geometry newGeometry = new Geometry(GeometryType.SOLID, lod);
+			Geometry newGeometry = new Geometry(GeometryType.SOLID, lod, Orientation.OUTWARD);
 			Set<Polygon> polygons = existingPolygons.get(lod);
 			if (polygons != null) {
 				// add existing polygons

CityDoctorParent/Extensions/CityDoctorHealerGenetic/pom.xml

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

CityDoctorParent/Extensions/CityDoctorHealerGenetic/src/test/java/de/hft/stuttgart/citydoctor2/healer/genetic/NonPlanarGenetic.java

@@ -36,10 +36,8 @@ import java.util.Map.Entry;
 import java.util.Random;
 import java.util.Set;
 
-import org.junit.Test;
-
 import Jama.EigenvalueDecomposition;
-import de.hft.stuttgart.citydoctor2.check.AbstractCheck;
+import de.hft.stuttgart.citydoctor2.check.CheckableUtilsVisitor;
 import de.hft.stuttgart.citydoctor2.check.CheckError;
 import de.hft.stuttgart.citydoctor2.check.Checker;
 import de.hft.stuttgart.citydoctor2.check.ValidationConfiguration;
@@ -448,7 +446,7 @@ public class NonPlanarGenetic {
 
 	private Polygon findPolygonInFeature(CityObject copy, Polygon polygon) {
 		Polygon[] result = new Polygon[1];
-		copy.accept(new AbstractCheck() {
+		copy.accept(new CheckableUtilsVisitor() {
 
 			@Override
 			public void check(Polygon p) {