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/CityDoctorEdge/src/test/java/de/hft/stuttgart/citydoctor2/edge/IntersectionErrorsTest.java

@@ -32,12 +32,13 @@ 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;
 
 public class IntersectionErrorsTest {
 
 	@Test
 	public void testWrongIntersection() {
-		Geometry geom = new Geometry(GeometryType.SOLID, Lod.LOD1);
+		Geometry geom = new Geometry(GeometryType.SOLID, Lod.LOD1, Orientation.OUTWARD);
 
 		ConcretePolygon p1 = new ConcretePolygon();
 

CityDoctorParent/CityDoctorEdge/src/test/java/de/hft/stuttgart/citydoctor2/edge/MeshSurfaceUtilsTest.java

@@ -43,12 +43,13 @@ import de.hft.stuttgart.citydoctor2.parser.ParserConfiguration;
 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;
 
 public class MeshSurfaceUtilsTest {
 
 	@Test
 	public void testIntersectionTwoTrianglesOneSharedEdgeInPlane() {
-		Geometry geom = new Geometry(GeometryType.SOLID, Lod.LOD1);
+		Geometry geom = new Geometry(GeometryType.SOLID, Lod.LOD1, Orientation.OUTWARD);
 
 		Polygon p1 = new ConcretePolygon();
 		geom.addPolygon(p1);
@@ -161,7 +162,7 @@ public class MeshSurfaceUtilsTest {
 
 	@Test
 	public void testIntersectionTwoPolygonsTwoSharedEdges() {
-		Geometry geom = new Geometry(GeometryType.SOLID, Lod.LOD1);
+		Geometry geom = new Geometry(GeometryType.SOLID, Lod.LOD1, Orientation.OUTWARD);
 
 		Polygon p1 = new ConcretePolygon();
 		geom.addPolygon(p1);
@@ -212,7 +213,7 @@ public class MeshSurfaceUtilsTest {
 
 	@Test
 	public void testIntersectionTwoPolygonsOneSharedEdgeIntersectionPolygonPlanar() {
-		Geometry geom = new Geometry(GeometryType.SOLID, Lod.LOD1);
+		Geometry geom = new Geometry(GeometryType.SOLID, Lod.LOD1, Orientation.OUTWARD);
 
 		Polygon p1 = new ConcretePolygon();
 		geom.addPolygon(p1);
@@ -276,7 +277,7 @@ public class MeshSurfaceUtilsTest {
 	
 	@Test
 	public void testIntersectionTwoPolygonsOneSharedEdgeIntersectionPolygonPlanar2() {
-		Geometry geom = new Geometry(GeometryType.SOLID, Lod.LOD1);
+		Geometry geom = new Geometry(GeometryType.SOLID, Lod.LOD1, Orientation.OUTWARD);
 
 		Polygon p1 = new ConcretePolygon();
 		geom.addPolygon(p1);
@@ -339,7 +340,7 @@ public class MeshSurfaceUtilsTest {
 
 	@Test
 	public void testIntersectionTwoPolygonsOneSharedEdgeCloseEdgePlanar() {
-		Geometry geom = new Geometry(GeometryType.SOLID, Lod.LOD1);
+		Geometry geom = new Geometry(GeometryType.SOLID, Lod.LOD1, Orientation.OUTWARD);
 
 		Polygon p1 = new ConcretePolygon();
 		geom.addPolygon(p1);
@@ -393,7 +394,7 @@ public class MeshSurfaceUtilsTest {
 
 	@Test
 	public void testIntersectionTwoPolygonsOneSharedEdgeNotPlanar() {
-		Geometry geom = new Geometry(GeometryType.SOLID, Lod.LOD1);
+		Geometry geom = new Geometry(GeometryType.SOLID, Lod.LOD1, Orientation.OUTWARD);
 
 		Polygon p1 = new ConcretePolygon();
 		geom.addPolygon(p1);
@@ -447,7 +448,7 @@ public class MeshSurfaceUtilsTest {
 
 	@Test
 	public void testIntersectionTwoPolygonsOneSharedPointNotPlanar() {
-		Geometry geom = new Geometry(GeometryType.SOLID, Lod.LOD1);
+		Geometry geom = new Geometry(GeometryType.SOLID, Lod.LOD1, Orientation.OUTWARD);
 
 		Polygon p1 = new ConcretePolygon();
 		geom.addPolygon(p1);
@@ -508,7 +509,7 @@ public class MeshSurfaceUtilsTest {
 
 	@Test
 	public void testIntersectionTwoPolygonsTouchingInOnePointNoIntersectionNotPlanar() {
-		Geometry geom = new Geometry(GeometryType.SOLID, Lod.LOD1);
+		Geometry geom = new Geometry(GeometryType.SOLID, Lod.LOD1, Orientation.OUTWARD);
 
 		Polygon p1 = new ConcretePolygon();
 		geom.addPolygon(p1);
@@ -561,7 +562,7 @@ public class MeshSurfaceUtilsTest {
 
 	@Test
 	public void testIntersectionTwoPolygonsTouchingInOnePointNoIntersectionNotPlanar2() {
-		Geometry geom = new Geometry(GeometryType.SOLID, Lod.LOD1);
+		Geometry geom = new Geometry(GeometryType.SOLID, Lod.LOD1, Orientation.OUTWARD);
 
 		Polygon p1 = new ConcretePolygon();
 		geom.addPolygon(p1);
@@ -616,7 +617,7 @@ public class MeshSurfaceUtilsTest {
 
 	@Test
 	public void testIntersectionTwoPolygonsNotInSamePlaneBelow() {
-		Geometry geom = new Geometry(GeometryType.SOLID, Lod.LOD1);
+		Geometry geom = new Geometry(GeometryType.SOLID, Lod.LOD1, Orientation.OUTWARD);
 
 		Polygon p1 = new ConcretePolygon();
 		geom.addPolygon(p1);
@@ -670,7 +671,7 @@ public class MeshSurfaceUtilsTest {
 
 	@Test
 	public void testIntersectionTwoPolygonsNotInSamePlaneAbove() {
-		Geometry geom = new Geometry(GeometryType.SOLID, Lod.LOD1);
+		Geometry geom = new Geometry(GeometryType.SOLID, Lod.LOD1, Orientation.OUTWARD);
 
 		Polygon p1 = new ConcretePolygon();
 		geom.addPolygon(p1);
@@ -724,7 +725,7 @@ public class MeshSurfaceUtilsTest {
 
 	@Test
 	public void testIntersectionTwoPolygonsNotInSamePlaneAboveInverted() {
-		Geometry geom = new Geometry(GeometryType.SOLID, Lod.LOD1);
+		Geometry geom = new Geometry(GeometryType.SOLID, Lod.LOD1, Orientation.OUTWARD);
 
 		Polygon p1 = new ConcretePolygon();
 		geom.addPolygon(p1);
@@ -778,7 +779,7 @@ public class MeshSurfaceUtilsTest {
 
 	@Test
 	public void testIntersectionTwoPolygonsTouchingNoPointsSameNotPlanar() {
-		Geometry geom = new Geometry(GeometryType.SOLID, Lod.LOD1);
+		Geometry geom = new Geometry(GeometryType.SOLID, Lod.LOD1, Orientation.OUTWARD);
 
 		Polygon p1 = new ConcretePolygon();
 		geom.addPolygon(p1);
@@ -834,7 +835,7 @@ public class MeshSurfaceUtilsTest {
 
 	@Test
 	public void testIntersectionTwoPolygonsTouchingEdgeNoPointsSameNotPlanar() {
-		Geometry geom = new Geometry(GeometryType.SOLID, Lod.LOD1);
+		Geometry geom = new Geometry(GeometryType.SOLID, Lod.LOD1, Orientation.OUTWARD);
 
 		Polygon p1 = new ConcretePolygon();
 		geom.addPolygon(p1);
@@ -890,7 +891,7 @@ public class MeshSurfaceUtilsTest {
 
 	@Test
 	public void testIntersectionTwoPolygonsTouchingEdgeInPointNoPointsSameNotPlanar() {
-		Geometry geom = new Geometry(GeometryType.SOLID, Lod.LOD1);
+		Geometry geom = new Geometry(GeometryType.SOLID, Lod.LOD1, Orientation.OUTWARD);
 
 		Polygon p1 = new ConcretePolygon();
 		geom.addPolygon(p1);
@@ -946,7 +947,7 @@ public class MeshSurfaceUtilsTest {
 
 	@Test
 	public void testIntersectionTwoPolygonsTwoTouchingEdgesNotPlanar() {
-		Geometry geom = new Geometry(GeometryType.SOLID, Lod.LOD1);
+		Geometry geom = new Geometry(GeometryType.SOLID, Lod.LOD1, Orientation.OUTWARD);
 
 		Polygon p1 = new ConcretePolygon();
 		geom.addPolygon(p1);
@@ -1002,7 +1003,7 @@ public class MeshSurfaceUtilsTest {
 
 	@Test
 	public void testIntersectionTwoPolygonsPlanarInnerRingsContained() {
-		Geometry geom = new Geometry(GeometryType.SOLID, Lod.LOD1);
+		Geometry geom = new Geometry(GeometryType.SOLID, Lod.LOD1, Orientation.OUTWARD);
 
 		Polygon p1 = new ConcretePolygon();
 		geom.addPolygon(p1);
@@ -1067,7 +1068,7 @@ public class MeshSurfaceUtilsTest {
 
 	@Test
 	public void testIntersectionTwoPolygonsPlanarInnerRingsContainedConnected() {
-		Geometry geom = new Geometry(GeometryType.SOLID, Lod.LOD1);
+		Geometry geom = new Geometry(GeometryType.SOLID, Lod.LOD1, Orientation.OUTWARD);
 
 		Polygon p1 = new ConcretePolygon();
 		geom.addPolygon(p1);
@@ -1128,7 +1129,7 @@ public class MeshSurfaceUtilsTest {
 
 	@Test
 	public void testIntersectionTwoPolygonsInnerRingsConnected() {
-		Geometry geom = new Geometry(GeometryType.SOLID, Lod.LOD1);
+		Geometry geom = new Geometry(GeometryType.SOLID, Lod.LOD1, Orientation.OUTWARD);
 
 		Polygon p1 = new ConcretePolygon();
 		geom.addPolygon(p1);
@@ -1191,7 +1192,7 @@ public class MeshSurfaceUtilsTest {
 
 	@Test
 	public void testIntersectionTwoPolygonsInnerRingsThroughHole() {
-		Geometry geom = new Geometry(GeometryType.SOLID, Lod.LOD1);
+		Geometry geom = new Geometry(GeometryType.SOLID, Lod.LOD1, Orientation.OUTWARD);
 
 		Polygon p1 = new ConcretePolygon();
 		geom.addPolygon(p1);

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

@@ -41,6 +41,10 @@ public class Geometry extends GmlElement {
     @Serial
     private static final long serialVersionUID = 2539031030917731575L;
     
+    public enum Orientation {
+    	INWARD, OUTWARD
+    }
+
     private static final Random r = new Random();
 
     private GeometryType type;
@@ -52,10 +56,19 @@ public class Geometry extends GmlElement {
     private List<Edge> edges;
     private Map<SerializablePair<Vertex, Vertex>, Edge> edgeMap;
     private List<Vertex> vertices;
+    private Orientation orientation;
 
-    public Geometry(GeometryType type, Lod lod) {
+    public Geometry(GeometryType type, Lod lod, Orientation orientation) {
         this.lod = lod;
         this.type = type;
+        if (type == GeometryType.SOLID) {
+        	Objects.requireNonNull(orientation);
+        }
+        this.orientation = orientation;
+    }
+    
+    public Orientation getOrientation() {
+		return orientation;
 	}
 
     void setParent(CityObject parent) {

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

@@ -23,7 +23,7 @@ public class ImplicitGeometryHolder extends Geometry {
     private final Geometry prototypeGeometry;
 
     public ImplicitGeometryHolder(ImplicitGeometry cgmlImplicitGeometry, LibraryObject libObject) {
-        super(libObject.getType(), libObject.getLod());
+        super(libObject.getType(), libObject.getLod(), libObject.getOrientation());
         prototypeGeometry = libObject;
         type = PrototypeGeometryType.LIBRARY_OBJECT;
         this.cgmlImplicitGeometry = cgmlImplicitGeometry;
@@ -31,7 +31,7 @@ public class ImplicitGeometryHolder extends Geometry {
     }
 
     public ImplicitGeometryHolder(ImplicitGeometry cgmlImplicitGeometry, RelativeGeometry relativeGeometry) {
-        super(relativeGeometry.getType(), relativeGeometry.getLod());
+        super(relativeGeometry.getType(), relativeGeometry.getLod(), relativeGeometry.getOrientation());
         prototypeGeometry = relativeGeometry;
         type = PrototypeGeometryType.RELATIVE_GEOMETRY;
         this.cgmlImplicitGeometry = cgmlImplicitGeometry;

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

@@ -37,7 +37,7 @@ public class LibraryObject extends Geometry {
         if (protoGeom == null) {
             return null;
         }
-        LibraryObject libOb = new LibraryObject(protoGeom.getType(), protoGeom.getLod());
+        LibraryObject libOb = new LibraryObject(protoGeom.getType(), protoGeom.getLod(), protoGeom.getOrientation());
         protoGeom.getPolygons().forEach(libOb::addPolygon);
         libOb.updateEdgesAndVertices();
         libraryObjects.put(path.toString(), libOb);
@@ -53,15 +53,15 @@ public class LibraryObject extends Geometry {
         if (protoGeom == null) {
             return null;
         }
-        LibraryObject libOb = new LibraryObject(protoGeom.getType(), protoGeom.getLod());
+        LibraryObject libOb = new LibraryObject(protoGeom.getType(), protoGeom.getLod(), protoGeom.getOrientation());
         protoGeom.getPolygons().forEach(libOb::addPolygon);
         libOb.updateEdgesAndVertices();
         libraryObjects.put(fileName, libOb);
         return libOb;
     }
 
-    private LibraryObject(GeometryType type, Lod lod) {
-        super(type, lod);
+    private LibraryObject(GeometryType type, Lod lod, Orientation orientation) {
+        super(type, lod, orientation);
     }
 
 

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

@@ -20,14 +20,14 @@ public class RelativeGeometry extends Geometry {
 		if (relativeGeometries.containsKey(geom)) {
 			return relativeGeometries.get(geom);
 		}
-		RelativeGeometry relGeo = new RelativeGeometry(geom.getType(), geom.getLod());
+		RelativeGeometry relGeo = new RelativeGeometry(geom.getType(), geom.getLod(), geom.getOrientation());
 		geom.getPolygons().forEach(relGeo::addPolygon);
 		relGeo.updateEdgesAndVertices();
 		relativeGeometries.put(geom, relGeo);
 		return relGeo;
 	}
 
-	private RelativeGeometry(GeometryType type, Lod lod) {
-		super(type, lod);
+	private RelativeGeometry(GeometryType type, Lod lod, Orientation orientation) {
+		super(type, lod, orientation);
 	}
 }

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

@@ -107,7 +107,7 @@ public class SurfaceMapper extends ObjectWalker {
     }
 
     private Geometry parseMultiSurface(MultiSurface ms, Lod lod) {
-        Geometry geom = new Geometry(GeometryType.MULTI_SURFACE, lod);
+        Geometry geom = new Geometry(GeometryType.MULTI_SURFACE, lod, null);
         Citygml3GeometryMapper geometryMapper = new Citygml3GeometryMapper(config, vertexMap);
         readSurfaceMember(geom, geometryMapper, ms.getSurfaceMember());
         return geom;

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

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

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

@@ -18,26 +18,42 @@
  */
 package de.hft.stuttgart.citydoctor2.parser;
 
-import de.hft.stuttgart.citydoctor2.datastructure.CityDoctorModel;
-import de.hft.stuttgart.citydoctor2.datastructure.CityObject;
-import de.hft.stuttgart.citydoctor2.mapper.citygml3.Citygml3FeatureMapper;
-import de.hft.stuttgart.citydoctor2.mapper.citygml3.GMLValidationHandler;
-import de.hft.stuttgart.citydoctor2.math.Vector3d;
-import de.hft.stuttgart.citydoctor2.utils.Localization;
-import de.hft.stuttgart.citydoctor2.zip.CityGmlZipEntry;
-import de.hft.stuttgart.citydoctor2.zip.CityGmlZipEntryFile;
-import de.hft.stuttgart.quality.QualityADEContext;
-import de.hft.stuttgart.quality.QualityADEModule;
+import java.io.BufferedInputStream;
+import java.io.ByteArrayInputStream;
+import java.io.File;
+import java.io.FileInputStream;
+import java.io.IOException;
+import java.io.InputStream;
+import java.nio.charset.StandardCharsets;
+import java.nio.file.Path;
+import java.nio.file.Paths;
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.List;
+import java.util.regex.Matcher;
+import java.util.regex.Pattern;
+
+import javax.xml.XMLConstants;
+import javax.xml.namespace.QName;
+import javax.xml.parsers.ParserConfigurationException;
+import javax.xml.parsers.SAXParser;
+import javax.xml.parsers.SAXParserFactory;
+import javax.xml.transform.Source;
+import javax.xml.transform.stream.StreamSource;
+import javax.xml.validation.Schema;
+import javax.xml.validation.SchemaFactory;
+import javax.xml.validation.Validator;
+
 import org.apache.logging.log4j.Level;
 import org.apache.logging.log4j.LogManager;
 import org.apache.logging.log4j.Logger;
 import org.citygml4j.core.ade.ADEException;
 import org.citygml4j.core.ade.ADERegistry;
 import org.citygml4j.core.model.CityGMLVersion;
-import org.citygml4j.core.model.ade.ADEProperty;
 import org.citygml4j.core.model.core.AbstractCityObject;
 import org.citygml4j.core.model.core.AbstractCityObjectProperty;
 import org.citygml4j.core.model.core.AbstractFeature;
+import org.citygml4j.core.model.core.AbstractFeatureProperty;
 import org.citygml4j.core.model.core.CityModel;
 import org.citygml4j.core.util.CityGMLConstants;
 import org.citygml4j.xml.CityGMLContext;
@@ -68,30 +84,16 @@ import org.xmlobjects.schema.SchemaHandlerException;
 import org.xmlobjects.stream.XMLReader;
 import org.xmlobjects.stream.XMLReaderFactory;
 
-import javax.xml.XMLConstants;
-import javax.xml.namespace.QName;
-import javax.xml.parsers.ParserConfigurationException;
-import javax.xml.parsers.SAXParser;
-import javax.xml.parsers.SAXParserFactory;
-import javax.xml.transform.Source;
-import javax.xml.transform.stream.StreamSource;
-import javax.xml.validation.Schema;
-import javax.xml.validation.SchemaFactory;
-import javax.xml.validation.Validator;
-import java.io.BufferedInputStream;
-import java.io.ByteArrayInputStream;
-import java.io.File;
-import java.io.FileInputStream;
-import java.io.IOException;
-import java.io.InputStream;
-import java.nio.charset.StandardCharsets;
-import java.nio.file.Path;
-import java.nio.file.Paths;
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.List;
-import java.util.regex.Matcher;
-import java.util.regex.Pattern;
+import de.hft.stuttgart.citydoctor2.datastructure.CityDoctorModel;
+import de.hft.stuttgart.citydoctor2.datastructure.CityObject;
+import de.hft.stuttgart.citydoctor2.mapper.citygml3.Citygml3FeatureMapper;
+import de.hft.stuttgart.citydoctor2.mapper.citygml3.GMLValidationHandler;
+import de.hft.stuttgart.citydoctor2.math.Vector3d;
+import de.hft.stuttgart.citydoctor2.utils.Localization;
+import de.hft.stuttgart.citydoctor2.zip.CityGmlZipEntry;
+import de.hft.stuttgart.citydoctor2.zip.CityGmlZipEntryFile;
+import de.hft.stuttgart.quality.QualityADEContext;
+import de.hft.stuttgart.quality.QualityADEModule;
 
 /**
  * Utility class to parse CityGML files.
@@ -430,6 +432,7 @@ public class CityGmlParser {
                     writer.writeMember(chunk);
                 }
             }
+            
             // end of stream
             logger.debug("End of gml file stream");
         } catch (CityGMLReadException e) {
@@ -447,10 +450,10 @@ public class CityGmlParser {
         }
     }
 
-    private static void writeCityModel(CityGMLChunkWriter writer, CityModel cModel) {
+    private static void writeCityModel(CityGMLChunkWriter writer, CityModel cModel) throws CityGMLWriteException {
         if (writer != null) {
-            for (ADEProperty genEle : cModel.getADEProperties()) {
-                writer.getCityModelInfo().addADEProperty(genEle);
+        	for (AbstractFeatureProperty featureProp : cModel.getFeatureMembers()) {
+        		writer.writeMember(featureProp.getObject());
         	}
         }
     }

CityDoctorParent/CityDoctorModel/src/test/java/de/hft/stuttgart/citydoctor2/check/CheckableTest.java

@@ -31,6 +31,7 @@ import org.junit.Test;
 import de.hft.stuttgart.citydoctor2.check.error.SchematronError;
 import de.hft.stuttgart.citydoctor2.datastructure.Building;
 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.GmlId;
 import de.hft.stuttgart.citydoctor2.datastructure.Lod;
@@ -90,7 +91,7 @@ public class CheckableTest {
 	@Test
 	public void testContainsError() {
 		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);
 		assertFalse(b.containsError(CheckId.C_GE_P_HOLE_OUTSIDE));
 		assertFalse(b.containsAnyError());
@@ -148,7 +149,7 @@ public class CheckableTest {
 	@Test
 	public void testCollectAllContainedErrors() {
 		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);
 		b.addCheckResult(new CheckResult(CheckId.C_GE_P_HOLE_OUTSIDE, ResultStatus.ERROR,
 				new SchematronError(null, null, null, null)));

CityDoctorParent/CityDoctorModel/src/test/java/de/hft/stuttgart/citydoctor2/check/error/AllPolygonsWrongOrientationErrorTest.java

@@ -30,6 +30,7 @@ import de.hft.stuttgart.citydoctor2.datastructure.Geometry;
 import de.hft.stuttgart.citydoctor2.datastructure.GeometryType;
 import de.hft.stuttgart.citydoctor2.datastructure.GmlId;
 import de.hft.stuttgart.citydoctor2.datastructure.Lod;
+import de.hft.stuttgart.citydoctor2.datastructure.Geometry.Orientation;
 import de.hft.stuttgart.quality.model.properties.AbstractErrorProperty;
 import de.hft.stuttgart.quality.model.types.AbstractError;
 import de.hft.stuttgart.quality.model.types.AllPolygonsOrientedWrongError;
@@ -39,7 +40,7 @@ public class AllPolygonsWrongOrientationErrorTest {
 
 	@Test
 	public void testAddToValidationResult() {
-		Geometry geom = new Geometry(GeometryType.SOLID, Lod.LOD2);
+		Geometry geom = new Geometry(GeometryType.SOLID, Lod.LOD2, Orientation.OUTWARD);
 		GmlId gmlId = new GmlId("testId");
 		geom.setGmlId(gmlId);
 		AllPolygonsWrongOrientationError err = new AllPolygonsWrongOrientationError(geom);

CityDoctorParent/CityDoctorModel/src/test/java/de/hft/stuttgart/citydoctor2/check/error/MultipleConnectedComponentsErrorTest.java

@@ -33,6 +33,7 @@ import de.hft.stuttgart.citydoctor2.datastructure.GeometryType;
 import de.hft.stuttgart.citydoctor2.datastructure.GmlId;
 import de.hft.stuttgart.citydoctor2.datastructure.Lod;
 import de.hft.stuttgart.citydoctor2.datastructure.Polygon;
+import de.hft.stuttgart.citydoctor2.datastructure.Geometry.Orientation;
 import de.hft.stuttgart.quality.model.properties.AbstractErrorProperty;
 import de.hft.stuttgart.quality.model.properties.PolygonIdListProperty;
 import de.hft.stuttgart.quality.model.types.AbstractError;
@@ -44,7 +45,7 @@ public class MultipleConnectedComponentsErrorTest {
 
 	@Test
 	public void testConvertToQualityAdeDatastructure() {
-		Geometry geom = new Geometry(GeometryType.SOLID, Lod.LOD2);
+		Geometry geom = new Geometry(GeometryType.SOLID, Lod.LOD2, Orientation.OUTWARD);
 		GmlId geomId = new GmlId("geomId");
 		geom.setGmlId(geomId);
 		Polygon p1 = new ConcretePolygon();

CityDoctorParent/CityDoctorModel/src/test/java/de/hft/stuttgart/citydoctor2/check/error/NonManifoldEdgeErrorTest.java

@@ -33,6 +33,7 @@ import de.hft.stuttgart.citydoctor2.datastructure.GeometryType;
 import de.hft.stuttgart.citydoctor2.datastructure.GmlId;
 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.quality.model.properties.AbstractErrorProperty;
 import de.hft.stuttgart.quality.model.properties.EdgeProperty;
 import de.hft.stuttgart.quality.model.types.AbstractError;
@@ -42,7 +43,7 @@ public class NonManifoldEdgeErrorTest {
 
 	@Test
 	public void testConvertToQualityAdeDatastructure() {
-		Geometry geom = new Geometry(GeometryType.SOLID, Lod.LOD2);
+		Geometry geom = new Geometry(GeometryType.SOLID, Lod.LOD2, Orientation.OUTWARD);
 		GmlId geomId = new GmlId("geomId");
 		geom.setGmlId(geomId);
 		

CityDoctorParent/CityDoctorModel/src/test/java/de/hft/stuttgart/citydoctor2/check/error/NonManifoldVertexErrorTest.java

@@ -34,6 +34,7 @@ import de.hft.stuttgart.citydoctor2.datastructure.GmlId;
 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.quality.model.properties.AbstractErrorProperty;
 import de.hft.stuttgart.quality.model.types.AbstractError;
 import de.hft.stuttgart.quality.model.types.ValidationResult;
@@ -42,7 +43,7 @@ public class NonManifoldVertexErrorTest {
 
 	@Test
 	public void testConvertToQualityAdeDatastructure() {
-		Geometry geom = new Geometry(GeometryType.SOLID, Lod.LOD2);
+		Geometry geom = new Geometry(GeometryType.SOLID, Lod.LOD2, Orientation.OUTWARD);
 		GmlId geomId = new GmlId("geomId");
 		geom.setGmlId(geomId);
 		Polygon p1 = new ConcretePolygon();

CityDoctorParent/CityDoctorModel/src/test/java/de/hft/stuttgart/citydoctor2/check/error/PolygonWrongOrientationErrorTest.java

@@ -33,6 +33,7 @@ import de.hft.stuttgart.citydoctor2.datastructure.GeometryType;
 import de.hft.stuttgart.citydoctor2.datastructure.GmlId;
 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.quality.model.properties.AbstractErrorProperty;
 import de.hft.stuttgart.quality.model.properties.EdgeProperty;
 import de.hft.stuttgart.quality.model.types.AbstractError;
@@ -42,7 +43,7 @@ public class PolygonWrongOrientationErrorTest {
 
 	@Test
 	public void testConvertToQualityAdeDatastructure() {
-		Geometry geom = new Geometry(GeometryType.SOLID, Lod.LOD2);
+		Geometry geom = new Geometry(GeometryType.SOLID, Lod.LOD2, Orientation.OUTWARD);
 		GmlId geomId = new GmlId("geomId");
 		geom.setGmlId(geomId);
 		

CityDoctorParent/CityDoctorModel/src/test/java/de/hft/stuttgart/citydoctor2/check/error/SolidNotClosedErrorTest.java

@@ -33,6 +33,7 @@ import de.hft.stuttgart.citydoctor2.datastructure.GeometryType;
 import de.hft.stuttgart.citydoctor2.datastructure.GmlId;
 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.quality.model.properties.AbstractErrorProperty;
 import de.hft.stuttgart.quality.model.properties.EdgeProperty;
 import de.hft.stuttgart.quality.model.types.AbstractError;
@@ -42,7 +43,7 @@ public class SolidNotClosedErrorTest {
 
 	@Test
 	public void testConvertToQualityAdeDatastructure() {
-		Geometry geom = new Geometry(GeometryType.SOLID, Lod.LOD2);
+		Geometry geom = new Geometry(GeometryType.SOLID, Lod.LOD2, Orientation.OUTWARD);
 		GmlId geomId = new GmlId("geomId");
 		geom.setGmlId(geomId);
 		

CityDoctorParent/CityDoctorModel/src/test/java/de/hft/stuttgart/citydoctor2/check/error/SolidSelfIntErrorTest.java

@@ -33,6 +33,7 @@ import de.hft.stuttgart.citydoctor2.datastructure.GeometryType;
 import de.hft.stuttgart.citydoctor2.datastructure.GmlId;
 import de.hft.stuttgart.citydoctor2.datastructure.Lod;
 import de.hft.stuttgart.citydoctor2.datastructure.Polygon;
+import de.hft.stuttgart.citydoctor2.datastructure.Geometry.Orientation;
 import de.hft.stuttgart.citydoctor2.utils.PolygonIntersection;
 import de.hft.stuttgart.quality.model.properties.AbstractErrorProperty;
 import de.hft.stuttgart.quality.model.types.AbstractError;
@@ -43,7 +44,7 @@ public class SolidSelfIntErrorTest {
 
 	@Test
 	public void testConvertToQualityAdeDatastructure() {
-		Geometry geom = new Geometry(GeometryType.SOLID, Lod.LOD2);
+		Geometry geom = new Geometry(GeometryType.SOLID, Lod.LOD2, Orientation.OUTWARD);
 		GmlId geomId = new GmlId("geomId");
 		geom.setGmlId(geomId);
 		Polygon p1 = new ConcretePolygon();

CityDoctorParent/CityDoctorModel/src/test/java/de/hft/stuttgart/citydoctor2/check/error/TooFewPolygonsErrorTest.java

@@ -30,6 +30,7 @@ import de.hft.stuttgart.citydoctor2.datastructure.Geometry;
 import de.hft.stuttgart.citydoctor2.datastructure.GeometryType;
 import de.hft.stuttgart.citydoctor2.datastructure.GmlId;
 import de.hft.stuttgart.citydoctor2.datastructure.Lod;
+import de.hft.stuttgart.citydoctor2.datastructure.Geometry.Orientation;
 import de.hft.stuttgart.quality.model.properties.AbstractErrorProperty;
 import de.hft.stuttgart.quality.model.types.AbstractError;
 import de.hft.stuttgart.quality.model.types.SolidTooFewPolygonsError;
@@ -39,7 +40,7 @@ public class TooFewPolygonsErrorTest {
 
 	@Test
 	public void testConvertToQualityAdeDatastructure() {
-		Geometry geom = new Geometry(GeometryType.SOLID, Lod.LOD2);
+		Geometry geom = new Geometry(GeometryType.SOLID, Lod.LOD2, Orientation.OUTWARD);
 		GmlId geomId = new GmlId("geomId");
 		geom.setGmlId(geomId);
 

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

@@ -46,6 +46,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.parser.ParserConfiguration;
 
 public class BoundarySurfaceTest {
@@ -104,7 +105,7 @@ public class BoundarySurfaceTest {
 	@Test
 	public void testPrepareForChecking() {
 		BoundarySurface bs = new BoundarySurface(SurfaceFeatureType.BUILDING, BoundarySurfaceType.WALL, null);
-		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);
 		bs.addGeometry(spyGeom);
 		bs.prepareForChecking();