add INWARD/OUTWARD property to geometries for inward facing geometries

extend all polygon wrong orientation test to handle inward facing geometries
fix validation plan not written when validating in stream mode

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

@@ -32,21 +32,22 @@ import java.util.ArrayList;
 import java.util.List;
 import java.util.concurrent.atomic.AtomicInteger;
 
-import de.hft.stuttgart.citydoctor2.utils.visitors.UnsetGeometriesVisitor;
 import org.citygml4j.core.model.bridge.AbstractBridge;
 import org.citygml4j.core.model.deprecated.bridge.DeprecatedPropertiesOfAbstractBridge;
 import org.citygml4j.core.util.geometry.GeometryFactory;
 import org.citygml4j.core.visitor.ObjectVisitor;
 import org.junit.Test;
+import org.mockito.Mockito;
 
-import de.hft.stuttgart.citydoctor2.check.CheckableUtilsVisitor;
 import de.hft.stuttgart.citydoctor2.check.CheckError;
 import de.hft.stuttgart.citydoctor2.check.CheckId;
 import de.hft.stuttgart.citydoctor2.check.CheckResult;
+import de.hft.stuttgart.citydoctor2.check.CheckableUtilsVisitor;
 import de.hft.stuttgart.citydoctor2.check.ResultStatus;
 import de.hft.stuttgart.citydoctor2.datastructure.BridgeObject.BridgeType;
+import de.hft.stuttgart.citydoctor2.datastructure.Geometry.Orientation;
 import de.hft.stuttgart.citydoctor2.parser.ParserConfiguration;
-import org.mockito.Mockito;
+import de.hft.stuttgart.citydoctor2.utils.visitors.UnsetGeometriesVisitor;
 
 public class BridgeObjectTest {
 
@@ -117,7 +118,7 @@ public class BridgeObjectTest {
 	@Test
 	public void testPrepareForChecking() {
 		BridgeObject bo = new BridgeObject(mock(AbstractBridge.class));
-		Geometry geom = new Geometry(GeometryType.MULTI_SURFACE, Lod.LOD2);
+		Geometry geom = new Geometry(GeometryType.MULTI_SURFACE, Lod.LOD2, Orientation.OUTWARD);
 		Geometry spyGeom = Mockito.spy(geom);
 
 		bo.addGeometry(spyGeom);

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

@@ -32,6 +32,7 @@ import org.junit.Test;
 import org.mockito.Mockito;
 import org.xmlobjects.gml.model.basictypes.Code;
 
+import de.hft.stuttgart.citydoctor2.datastructure.Geometry.Orientation;
 import de.hft.stuttgart.citydoctor2.datastructure.LinearRing.LinearRingType;
 import de.hft.stuttgart.citydoctor2.utils.Copy;
 
@@ -55,7 +56,7 @@ public class BuildingTest {
 		lr.addVertex(v1);
 		lr.addVertex(v2);
 		lr.addVertex(v1);
-		Geometry geom = new Geometry(GeometryType.SOLID, Lod.LOD0);
+		Geometry geom = new Geometry(GeometryType.SOLID, Lod.LOD0, Orientation.OUTWARD);
 		geom.addPolygon(p);
 		geom.updateEdgesAndVertices();
 		b.addGeometry(geom);
@@ -64,7 +65,7 @@ public class BuildingTest {
 		RoofSurface rs = new RoofSurface();
 		rs.setId("testRoof");
 		BoundarySurface surface = new BoundarySurface(SurfaceFeatureType.BUILDING, BoundarySurfaceType.ROOF, rs);
-		Geometry geomSurface = new Geometry(GeometryType.MULTI_SURFACE, Lod.LOD2);
+		Geometry geomSurface = new Geometry(GeometryType.MULTI_SURFACE, Lod.LOD2, Orientation.OUTWARD);
 		geomSurface.addPolygon(new LinkedPolygon(p, geomSurface));
 		geomSurface.updateEdgesAndVertices();
 		surface.addGeometry(geomSurface);

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

 package de.hft.stuttgart.citydoctor2.datastructure;
 
-import de.hft.stuttgart.citydoctor2.check.CheckableUtilsVisitor;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertFalse;
+import static org.junit.Assert.assertNull;
+import static org.junit.Assert.assertTrue;
+import static org.mockito.ArgumentMatchers.any;
+import static org.mockito.Mockito.mock;
+import static org.mockito.Mockito.verify;
+
+import java.util.ArrayList;
+import java.util.List;
+
+import org.citygml4j.core.model.core.AbstractCityObject;
+import org.citygml4j.core.util.geometry.GeometryFactory;
+import org.junit.Before;
+import org.junit.Test;
+import org.mockito.Mockito;
+
 import de.hft.stuttgart.citydoctor2.check.CheckError;
 import de.hft.stuttgart.citydoctor2.check.CheckId;
 import de.hft.stuttgart.citydoctor2.check.CheckResult;
+import de.hft.stuttgart.citydoctor2.check.CheckableUtilsVisitor;
 import de.hft.stuttgart.citydoctor2.check.ResultStatus;
+import de.hft.stuttgart.citydoctor2.datastructure.Geometry.Orientation;
 import de.hft.stuttgart.citydoctor2.parser.ParserConfiguration;
 import de.hft.stuttgart.citydoctor2.utils.visitors.GmlGeometryRebuilder;
 import de.hft.stuttgart.citydoctor2.utils.visitors.UnsetGeometriesVisitor;
-import org.citygml4j.core.model.core.AbstractCityObject;
-import org.citygml4j.core.util.geometry.GeometryFactory;
-import org.junit.Before;
-import org.junit.Test;
-import org.mockito.Mockito;
-
-import java.util.ArrayList;
-import java.util.List;
-
-import static org.junit.Assert.*;
-import static org.mockito.ArgumentMatchers.any;
-import static org.mockito.Mockito.mock;
-import static org.mockito.Mockito.verify;
 
 public class CityObjectTest {
 
@@ -101,10 +106,10 @@ public class CityObjectTest {
 
     @Test
     public void testGetHighestLodGeometry() {
-        Geometry geometryLod1 = new Geometry(GeometryType.SOLID, Lod.LOD1);
-        Geometry geometryLod2 = new Geometry(GeometryType.SOLID, Lod.LOD2);
-        Geometry geometryLod3 = new Geometry(GeometryType.SOLID, Lod.LOD3);
-        Geometry geometryLod4 = new Geometry(GeometryType.SOLID, Lod.LOD4);
+        Geometry geometryLod1 = new Geometry(GeometryType.SOLID, Lod.LOD1, Orientation.OUTWARD);
+        Geometry geometryLod2 = new Geometry(GeometryType.SOLID, Lod.LOD2, Orientation.OUTWARD);
+        Geometry geometryLod3 = new Geometry(GeometryType.SOLID, Lod.LOD3, Orientation.OUTWARD);
+        Geometry geometryLod4 = new Geometry(GeometryType.SOLID, Lod.LOD4, Orientation.OUTWARD);
 
         assertNull(co.getHighestLodGeometry());
         co.addGeometry(geometryLod1);

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

@@ -44,6 +44,7 @@ import de.hft.stuttgart.citydoctor2.check.CheckError;
 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.datastructure.Geometry.Orientation;
 import de.hft.stuttgart.citydoctor2.datastructure.LinearRing.LinearRingType;
 import de.hft.stuttgart.citydoctor2.math.Vector3d;
 import de.hft.stuttgart.citydoctor2.parser.ParserConfiguration;
@@ -58,7 +59,7 @@ public class GeometryTest {
 
 	@Test
 	public void testVisitorPropagation() {
-		Geometry geom = new Geometry(GeometryType.SOLID, Lod.LOD0);
+		Geometry geom = new Geometry(GeometryType.SOLID, Lod.LOD0, Orientation.OUTWARD);
 		ConcretePolygon mockPolygon = mock(ConcretePolygon.class);
 
 		geom.addPolygon(mockPolygon);
@@ -72,7 +73,7 @@ public class GeometryTest {
 
 	@Test
 	public void testCreate() {
-		Geometry geom = new Geometry(GeometryType.SOLID, Lod.LOD0);
+		Geometry geom = new Geometry(GeometryType.SOLID, Lod.LOD0, Orientation.OUTWARD);
 
 		assertNotNull(geom);
 		assertSame(GeometryType.SOLID, geom.getType());
@@ -81,7 +82,7 @@ public class GeometryTest {
 
 	@Test
 	public void testAddPolygon() {
-		Geometry geom = new Geometry(GeometryType.SOLID, Lod.LOD0);
+		Geometry geom = new Geometry(GeometryType.SOLID, Lod.LOD0, Orientation.OUTWARD);
 
 		Polygon p = new ConcretePolygon();
 		geom.addPolygon(p);
@@ -99,7 +100,7 @@ public class GeometryTest {
 		var gmlBi = new org.citygml4j.core.model.building.BuildingInstallation();
 		Installation bi = new Installation();
 		bi.setGmlObject(gmlBi);
-		Geometry geom = new Geometry(GeometryType.MULTI_SURFACE, Lod.LOD2);
+		Geometry geom = new Geometry(GeometryType.MULTI_SURFACE, Lod.LOD2, Orientation.OUTWARD);
 
 		ConcretePolygon p = new ConcretePolygon();
 		LinearRing lr = new LinearRing(LinearRingType.EXTERIOR);
@@ -112,7 +113,7 @@ public class GeometryTest {
 
 		bs.addGeometry(geom);
 
-		Geometry biGeom = new Geometry(GeometryType.COMPOSITE_SURFACE, Lod.LOD2);
+		Geometry biGeom = new Geometry(GeometryType.COMPOSITE_SURFACE, Lod.LOD2, Orientation.OUTWARD);
 		biGeom.addPolygon(new LinkedPolygon(p, biGeom));
 		bi.addGeometry(biGeom);
 
@@ -133,7 +134,7 @@ public class GeometryTest {
 		ParserConfiguration config = new ParserConfiguration(4, false);
 		AbstractConstructionSurface abs = new WallSurface();
 		BoundarySurface bs = new BoundarySurface(SurfaceFeatureType.BUILDING, BoundarySurfaceType.WALL, abs);
-		Geometry geom = new Geometry(GeometryType.MULTI_SURFACE, Lod.LOD2);
+		Geometry geom = new Geometry(GeometryType.MULTI_SURFACE, Lod.LOD2, Orientation.OUTWARD);
 
 		ConcretePolygon p = new ConcretePolygon();
 		LinearRing lr = new LinearRing(LinearRingType.EXTERIOR);
@@ -159,7 +160,7 @@ public class GeometryTest {
 		var gmlBi = new org.citygml4j.core.model.building.BuildingInstallation();
 		Installation bi = new Installation();
 		bi.setGmlObject(gmlBi);
-		Geometry geom = new Geometry(GeometryType.MULTI_SURFACE, Lod.LOD2);
+		Geometry geom = new Geometry(GeometryType.MULTI_SURFACE, Lod.LOD2, Orientation.OUTWARD);
 
 		ConcretePolygon p = new ConcretePolygon();
 		LinearRing lr = new LinearRing(LinearRingType.EXTERIOR);
@@ -171,7 +172,7 @@ public class GeometryTest {
 		p.setPartOfSurface(bs);
 		p.setPartOfInstallation(bi);
 
-		Geometry biGeom = new Geometry(GeometryType.COMPOSITE_SURFACE, Lod.LOD2);
+		Geometry biGeom = new Geometry(GeometryType.COMPOSITE_SURFACE, Lod.LOD2, Orientation.OUTWARD);
 		LinkedPolygon linkedPolygon = new LinkedPolygon(p, biGeom);
 		biGeom.addPolygon(linkedPolygon);
 		bi.addGeometry(biGeom);
@@ -197,7 +198,7 @@ public class GeometryTest {
 		Installation bi = new Installation();
 		bi.setGmlObject(gmlBi);
 		bi.addBoundarySurface(bs);
-		Geometry geom2 = new Geometry(GeometryType.MULTI_SURFACE, Lod.LOD2);
+		Geometry geom2 = new Geometry(GeometryType.MULTI_SURFACE, Lod.LOD2, Orientation.OUTWARD);
 		ConcretePolygon p = new ConcretePolygon();
 		geom2.addPolygon(p);
 		LinearRing lr = new LinearRing(LinearRingType.EXTERIOR);
@@ -210,7 +211,7 @@ public class GeometryTest {
 		p.setPartOfInstallation(bi);
 		bs.addGeometry(geom2);
 
-		Geometry geom = new Geometry(GeometryType.SOLID, Lod.LOD2);
+		Geometry geom = new Geometry(GeometryType.SOLID, Lod.LOD2, Orientation.OUTWARD);
 		Polygon linkedPoly = new LinkedPolygon(p, geom);
 		geom.addPolygon(linkedPoly);
 
@@ -241,7 +242,7 @@ public class GeometryTest {
 
 	@Test
 	public void testSetParent() {
-		Geometry geom = new Geometry(GeometryType.MULTI_SURFACE, Lod.LOD2);
+		Geometry geom = new Geometry(GeometryType.MULTI_SURFACE, Lod.LOD2, Orientation.OUTWARD);
 		CityObject co = mock(CityObject.class);
 		geom.setParent(co);
 		assertEquals(co, geom.getParent());
@@ -262,7 +263,7 @@ public class GeometryTest {
 
 	@Test
 	public void testSetType() {
-		Geometry geom = new Geometry(GeometryType.MULTI_SURFACE, Lod.LOD2);
+		Geometry geom = new Geometry(GeometryType.MULTI_SURFACE, Lod.LOD2, Orientation.OUTWARD);
 		geom.setType(GeometryType.SOLID);
 		assertEquals(GeometryType.SOLID, geom.getType());
 	}
@@ -278,7 +279,7 @@ public class GeometryTest {
 
 	@Test
 	public void testContainsError() {
-		Geometry geom = new Geometry(GeometryType.SOLID, Lod.LOD1);
+		Geometry geom = new Geometry(GeometryType.SOLID, Lod.LOD1, Orientation.OUTWARD);
 		assertFalse(geom.containsError(CheckId.C_GE_P_HOLE_OUTSIDE));
 		geom.addCheckResult(new CheckResult(CheckId.C_GE_P_HOLE_OUTSIDE, ResultStatus.ERROR, mock(CheckError.class)));
 		assertTrue(geom.containsError(CheckId.C_GE_P_HOLE_OUTSIDE));
@@ -293,7 +294,7 @@ public class GeometryTest {
 
 	@Test
 	public void testClearAllContainedCheckResults() {
-		Geometry geom = new Geometry(GeometryType.SOLID, Lod.LOD1);
+		Geometry geom = new Geometry(GeometryType.SOLID, Lod.LOD1, Orientation.OUTWARD);
 		assertFalse(geom.containsError(CheckId.C_GE_P_HOLE_OUTSIDE));
 		geom.addCheckResult(new CheckResult(CheckId.C_GE_P_HOLE_OUTSIDE, ResultStatus.ERROR, mock(CheckError.class)));
 		assertTrue(geom.containsError(CheckId.C_GE_P_HOLE_OUTSIDE));
@@ -306,7 +307,7 @@ public class GeometryTest {
 
 	@Test
 	public void testCollectContainedErrors() {
-		Geometry geom = new Geometry(GeometryType.SOLID, Lod.LOD1);
+		Geometry geom = new Geometry(GeometryType.SOLID, Lod.LOD1, Orientation.OUTWARD);
 		assertFalse(geom.containsError(CheckId.C_GE_P_HOLE_OUTSIDE));
 		geom.addCheckResult(new CheckResult(CheckId.C_GE_P_HOLE_OUTSIDE, ResultStatus.ERROR, mock(CheckError.class)));
 		assertTrue(geom.containsError(CheckId.C_GE_P_HOLE_OUTSIDE));
@@ -324,7 +325,7 @@ public class GeometryTest {
 
 	@Test
 	public void testContainsAnyError() {
-		Geometry geom = new Geometry(GeometryType.SOLID, Lod.LOD1);
+		Geometry geom = new Geometry(GeometryType.SOLID, Lod.LOD1, Orientation.OUTWARD);
 		assertFalse(geom.containsAnyError());
 		geom.addCheckResult(new CheckResult(CheckId.C_GE_P_HOLE_OUTSIDE, ResultStatus.ERROR, mock(CheckError.class)));
 		assertTrue(geom.containsAnyError());
@@ -343,7 +344,7 @@ public class GeometryTest {
 
 	@Test
 	public void testAccept() {
-		Geometry geom = new Geometry(GeometryType.SOLID, Lod.LOD1);
+		Geometry geom = new Geometry(GeometryType.SOLID, Lod.LOD1, Orientation.OUTWARD);
 		Check c = mock(Check.class);
 		geom.accept(c);
 		when(c.canExecute(geom)).thenReturn(true);
@@ -434,7 +435,7 @@ public class GeometryTest {
 
 	@Test
 	public void testContainsPolygon() {
-		Geometry geom = new Geometry(GeometryType.SOLID, Lod.LOD0);
+		Geometry geom = new Geometry(GeometryType.SOLID, Lod.LOD0, Orientation.OUTWARD);
 		ConcretePolygon cdPoly = new ConcretePolygon();
 		geom.addPolygon(cdPoly);
 		cdPoly.setGmlId(new GmlId("test1"));

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

@@ -18,6 +18,7 @@
  */
 package de.hft.stuttgart.citydoctor2.datastructure;
 
+import de.hft.stuttgart.citydoctor2.datastructure.Geometry.Orientation;
 import de.hft.stuttgart.citydoctor2.datastructure.LinearRing.LinearRingType;
 import org.xmlobjects.gml.model.geometry.primitives.AbstractRing;
 import org.xmlobjects.gml.model.geometry.primitives.AbstractSolid;
@@ -48,7 +49,7 @@ public class GeometryTestUtils {
 	}
 	
 	public static Geometry createDummyGeometry(GeometryType type, Lod lod) {
-		Geometry geom = new Geometry(type, lod);
+		Geometry geom = new Geometry(type, lod, Orientation.OUTWARD);
 		ConcretePolygon polygon = new ConcretePolygon();
 		geom.getPolygons().add(polygon);
 		polygon.setParent(geom);
@@ -68,7 +69,7 @@ public class GeometryTestUtils {
 	}
 
 	public static Geometry createDummyGeometryWithInnerRingWithNeighboringPolygon(GeometryType type, Lod lod) {
-		Geometry geom = new Geometry(type, lod);
+		Geometry geom = new Geometry(type, lod, Orientation.OUTWARD);
 		ConcretePolygon polygon = new ConcretePolygon();
 		geom.getPolygons().add(polygon);
 		polygon.setParent(geom);

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

@@ -25,6 +25,7 @@ import java.util.Set;
 
 import org.junit.Test;
 
+import de.hft.stuttgart.citydoctor2.datastructure.Geometry.Orientation;
 import de.hft.stuttgart.citydoctor2.datastructure.LinearRing.LinearRingType;
 import de.hft.stuttgart.citydoctor2.math.Vector3d;
 
@@ -46,7 +47,7 @@ public class VertexTest {
 	
 	@Test
 	public void testGetAdjacentRings() {
-		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);
@@ -64,7 +65,7 @@ public class VertexTest {
 	
 	@Test(expected = IllegalStateException.class)
 	public void testGetAdjacentRingsGeometryNotContainingVertex() {
-		Geometry geom = new Geometry(GeometryType.SOLID, Lod.LOD1);
+		Geometry geom = new Geometry(GeometryType.SOLID, Lod.LOD1, Orientation.OUTWARD);
 		
 		Polygon p = new ConcretePolygon();
 		

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

@@ -890,9 +890,6 @@ public class Checker {
      * @param co          the city object to be checked
      */
     public void checkFeature(XmlStreamReporter xmlReporter, PdfStreamReporter pdfReporter, CityObject co) {
-        if (logger.isDebugEnabled()) {
-            logger.debug(Localization.getText("Checker.checkFeature"), co);
-        }
         executeChecksForCityObject(co);
         if (xmlReporter != null) {
             xmlReporter.report(co);

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

@@ -29,11 +29,6 @@ import java.util.Set;
 import java.util.UUID;
 import java.util.concurrent.atomic.AtomicInteger;
 
-import de.hft.stuttgart.citydoctor2.datastructure.AbstractTunnel;
-import de.hft.stuttgart.citydoctor2.datastructure.CityFurniture;
-import de.hft.stuttgart.citydoctor2.datastructure.GenericCityObject;
-import org.apache.logging.log4j.LogManager;
-import org.apache.logging.log4j.Logger;
 import org.citygml4j.core.model.core.AbstractFeatureProperty;
 import org.citygml4j.core.model.core.CityModel;
 import org.citygml4j.core.util.geometry.GeometryFactory;
@@ -42,9 +37,12 @@ import org.xmlobjects.gml.model.base.Reference;
 import de.hft.stuttgart.citydoctor2.check.error.SchematronError;
 import de.hft.stuttgart.citydoctor2.checks.SvrlContentHandler;
 import de.hft.stuttgart.citydoctor2.checks.util.FeatureCheckedListener;
+import de.hft.stuttgart.citydoctor2.datastructure.AbstractTunnel;
 import de.hft.stuttgart.citydoctor2.datastructure.BridgeObject;
 import de.hft.stuttgart.citydoctor2.datastructure.Building;
+import de.hft.stuttgart.citydoctor2.datastructure.CityFurniture;
 import de.hft.stuttgart.citydoctor2.datastructure.CityObject;
+import de.hft.stuttgart.citydoctor2.datastructure.GenericCityObject;
 import de.hft.stuttgart.citydoctor2.datastructure.LandObject;
 import de.hft.stuttgart.citydoctor2.datastructure.TransportationObject;
 import de.hft.stuttgart.citydoctor2.datastructure.Vegetation;
@@ -64,8 +62,6 @@ import de.hft.stuttgart.quality.model.types.ValidationPlan;
 
 public class StreamCityGmlConsumer implements CityGmlConsumer {
 
-	private static final Logger logger = LogManager.getLogger(StreamCityGmlConsumer.class);
-
 	private final Checker c;
 	private final XmlStreamReporter xmlReporter;
 	private final PdfStreamReporter pdfReporter;
@@ -82,7 +78,7 @@ public class StreamCityGmlConsumer implements CityGmlConsumer {
 	private final FeatureStatistics waterStatistics;
 	private final Validation val;
 	private final FeatureCheckedListener l;
-
+	
 	public StreamCityGmlConsumer(Checker c, XmlStreamReporter xmlReporter, PdfStreamReporter pdfReporter,
 			SvrlContentHandler handler, ValidationConfiguration config, FeatureCheckedListener l) {
 		this.c = c;
@@ -116,10 +112,6 @@ public class StreamCityGmlConsumer implements CityGmlConsumer {
 
 	@Override
 	public void accept(CityObject co) {
-		if (logger.isDebugEnabled()) {
-			logger.debug(Localization.getText("Checker.checkFeature"), co);
-		}
-
 		// check without reporters, nothing will be put into the reports like that
 		// this will also clear old check results if any (though in stream mode there
 		// won't be any)

CityDoctorParent/CityDoctorValidation/src/main/java/de/hft/stuttgart/citydoctor2/checks/geometry/AllPolygonsWrongOrientationCheck.java

@@ -35,6 +35,7 @@ import de.hft.stuttgart.citydoctor2.checks.util.CollectionUtils;
 import de.hft.stuttgart.citydoctor2.datastructure.Geometry;
 import de.hft.stuttgart.citydoctor2.datastructure.GeometryType;
 import de.hft.stuttgart.citydoctor2.datastructure.Polygon;
+import de.hft.stuttgart.citydoctor2.datastructure.Geometry.Orientation;
 import de.hft.stuttgart.citydoctor2.math.Ray;
 import de.hft.stuttgart.citydoctor2.math.Triangle3d;
 import de.hft.stuttgart.citydoctor2.math.Vector3d;
@@ -76,6 +77,10 @@ public class AllPolygonsWrongOrientationCheck extends Check {
 			return;
 		}
 		boolean isOutwardOriented = geometryIsOutwardOrientedJava(g);
+		// invert outward direction for inward facing geometries
+		if (g.getOrientation() == Orientation.INWARD) {
+			isOutwardOriented = !isOutwardOriented;
+		}
 		CheckResult cr;
 		if (isOutwardOriented) {
 			cr = new CheckResult(this, ResultStatus.OK, null);

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

@@ -41,6 +41,7 @@ import de.hft.stuttgart.citydoctor2.datastructure.LinearRing;
 import de.hft.stuttgart.citydoctor2.datastructure.LinearRing.LinearRingType;
 import de.hft.stuttgart.citydoctor2.datastructure.Lod;
 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;
 
@@ -48,7 +49,7 @@ public class DegeneratedPolygonCheckTest {
 
 	@Test
 	public void testDegeneratedPolygon() {
-		Geometry geom = new Geometry(GeometryType.MULTI_SURFACE, Lod.LOD1);
+		Geometry geom = new Geometry(GeometryType.MULTI_SURFACE, Lod.LOD1, Orientation.OUTWARD);
 		ConcretePolygon polygon = new ConcretePolygon();
 		geom.getPolygons().add(polygon);
 		polygon.setParent(geom);

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

@@ -34,6 +34,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;
 
 /**
  * 
@@ -90,7 +91,7 @@ public class DuplicatePointsCheckTest {
 	
 	@Test
 	public void testCheckSelfInt() {
-		Geometry geom = new Geometry(GeometryType.MULTI_SURFACE, Lod.LOD1);
+		Geometry geom = new Geometry(GeometryType.MULTI_SURFACE, Lod.LOD1, Orientation.OUTWARD);
 		Vertex v0 = new Vertex(1, 1, 1);
 		Vertex v1 = new Vertex(2, 2, 2);
 		Vertex v2 = new Vertex(3, 3, 3);

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

@@ -31,6 +31,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;
 
 /**
  * 
@@ -40,7 +41,7 @@ import de.hft.stuttgart.citydoctor2.datastructure.Vertex;
 public class FaceOutCheckTest {
 
 	private 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);
@@ -62,7 +63,7 @@ public class FaceOutCheckTest {
 	}
 	
 	private 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);

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

@@ -33,6 +33,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;
 
 /**
  * 
@@ -43,7 +44,7 @@ public class HoleOutsideCheckTest {
 
 	@Test
 	public void testHoleOutside() {
-		Geometry geom = new Geometry(GeometryType.MULTI_SURFACE, Lod.LOD1);
+		Geometry geom = new Geometry(GeometryType.MULTI_SURFACE, Lod.LOD1, Orientation.OUTWARD);
 		
 		Polygon p = new ConcretePolygon();
 		geom.addPolygon(p);
@@ -79,7 +80,7 @@ public class HoleOutsideCheckTest {
 	
 	@Test
 	public void testPolygonGood() {
-		Geometry geom = new Geometry(GeometryType.MULTI_SURFACE, Lod.LOD1);
+		Geometry geom = new Geometry(GeometryType.MULTI_SURFACE, Lod.LOD1, Orientation.OUTWARD);
 		
 		Polygon poly = new ConcretePolygon();
 		geom.addPolygon(poly);

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

@@ -31,6 +31,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;
 
 /**
  * 
@@ -44,7 +45,7 @@ public class InteriorDisconnectedCheckTest {
 	 */
 	@Test
 	public void testBadPolygon1() {
-		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);
@@ -89,7 +90,7 @@ public class InteriorDisconnectedCheckTest {
 	 */
 	@Test
 	public void testBadPolygon2() {
-		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);
@@ -145,7 +146,7 @@ public class InteriorDisconnectedCheckTest {
 	 */
 	@Test
 	public void testBadPolygon3() {
-		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);
@@ -213,7 +214,7 @@ public class InteriorDisconnectedCheckTest {
 	 */
 	@Test
 	public void testGoodPolygon3() {
-		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);
@@ -274,7 +275,7 @@ public class InteriorDisconnectedCheckTest {
 	
 	@Test
 	public void testGoodPolygon2() {
-		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/CityDoctorValidation/src/test/java/de/hft/stuttgart/citydoctor2/checks/geometry/ManifoldVertexCheckTest.java

@@ -31,6 +31,7 @@ import de.hft.stuttgart.citydoctor2.datastructure.Geometry;
 import de.hft.stuttgart.citydoctor2.datastructure.GeometryType;
 import de.hft.stuttgart.citydoctor2.datastructure.Lod;
 import de.hft.stuttgart.citydoctor2.datastructure.Vertex;
+import de.hft.stuttgart.citydoctor2.datastructure.Geometry.Orientation;
 
 /**
  * 
@@ -41,7 +42,7 @@ public class ManifoldVertexCheckTest {
 
 	@Test
 	public void testNonManifoldVertex() {
-		Geometry geom = new Geometry(GeometryType.SOLID, Lod.LOD1);
+		Geometry geom = new Geometry(GeometryType.SOLID, Lod.LOD1, Orientation.OUTWARD);
 		
 		Vertex v12 = createVertex(10, 10, 3, geom);
 		Vertex v13 = createVertex(10, 10, 0, geom);

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

@@ -33,6 +33,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;
 
 /**
  * 
@@ -43,7 +44,7 @@ public class NestedRingsCheckTest {
 
 	@Test
 	public void testNestedRings() {
-		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);
@@ -90,7 +91,7 @@ public class NestedRingsCheckTest {
 	
 	@Test
 	public void testPolygonGood() {
-		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/CityDoctorValidation/src/test/java/de/hft/stuttgart/citydoctor2/checks/geometry/NullAreaCheckTest.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;
 
 /**
  * 
@@ -38,7 +39,7 @@ import de.hft.stuttgart.citydoctor2.datastructure.Vertex;
 public class NullAreaCheckTest {
 	
 	private LinearRing setupValidGeometry() {
-		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);
@@ -62,7 +63,7 @@ public class NullAreaCheckTest {
 	}
 	
 	private LinearRing setupErrorGeometry() {
-		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/CityDoctorValidation/src/test/java/de/hft/stuttgart/citydoctor2/checks/geometry/PlanarCheckTest.java

@@ -31,6 +31,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;
 
 /**
  * 
@@ -41,7 +42,7 @@ public class PlanarCheckTest {
 
 	@Test
 	public void testCheckPolygonOK() {
-		Geometry geom = new Geometry(GeometryType.SOLID, Lod.LOD1);
+		Geometry geom = new Geometry(GeometryType.SOLID, Lod.LOD1, Orientation.OUTWARD);
 		Vertex v0 = new Vertex(0, 0, 0);
 		Vertex v1 = new Vertex(0, 0, 1);
 		Vertex v2 = new Vertex(1, 0, 1);
@@ -62,7 +63,7 @@ public class PlanarCheckTest {
 	
 	@Test
 	public void testCheckPolygonDistanceERROR() {
-		Geometry geom = new Geometry(GeometryType.SOLID, Lod.LOD1);
+		Geometry geom = new Geometry(GeometryType.SOLID, Lod.LOD1, Orientation.OUTWARD);
 		Vertex v0 = new Vertex(0, 0, 0);
 		Vertex v1 = new Vertex(0, 0.06, 1);
 		Vertex v2 = new Vertex(1, 1, 1);

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

@@ -34,6 +34,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;
 
 /**
  * 
@@ -44,7 +45,7 @@ public class PolygonSameOrientationCheckTest {
 
 	@Test
 	public void testSameOrientation() {
-		Geometry geom = new Geometry(GeometryType.SOLID, Lod.LOD1);
+		Geometry geom = new Geometry(GeometryType.SOLID, Lod.LOD1, Orientation.OUTWARD);
 
 		Vertex v0 = GeometryTestUtils.createVertex(0, 0, 0, geom);
 		Vertex v1 = GeometryTestUtils.createVertex(6, 0, 0, geom);
@@ -76,7 +77,7 @@ public class PolygonSameOrientationCheckTest {
 	
 	@Test
 	public void testGoodPoly() {
-		Geometry geom = new Geometry(GeometryType.SOLID, Lod.LOD1);
+		Geometry geom = new Geometry(GeometryType.SOLID, Lod.LOD1, Orientation.OUTWARD);
 
 		Vertex v0 = GeometryTestUtils.createVertex(0, 0, 0, geom);
 		Vertex v1 = GeometryTestUtils.createVertex(6, 0, 0, geom);

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

@@ -33,6 +33,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;
 
 /**
  * 
@@ -45,7 +46,7 @@ public class PolygonSelfIntCheckTest {
 	
 	@Test
 	public void testPolygonInteriorIntersectExterior() {
-		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);
@@ -95,7 +96,7 @@ public class PolygonSelfIntCheckTest {
 	
 	@Test
 	public void testPolygonGood() {
-		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);
@@ -143,7 +144,7 @@ public class PolygonSelfIntCheckTest {
 	
 	@Test
 	public void test2InteriorRingsIntersecting() {
-		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);
@@ -211,7 +212,7 @@ public class PolygonSelfIntCheckTest {
 	
 	@Test
 	public void test2InteriorRingsNotIntersecting() {
-		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);