Merge branch 'refs/heads/dev' into dev_embedded_geodb

# Conflicts:
#	CityDoctorParent/CityDoctorModel/src/main/java/de/hft/stuttgart/citydoctor2/datastructure/GenericAttribute.java

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);

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

@@ -38,6 +38,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.parser.ParserConfiguration;
 
 /**
@@ -49,7 +50,7 @@ public class RingSelfIntCheckTest {
 
 	@Test
 	public void testIntersect() {
-		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);
@@ -88,7 +89,7 @@ public class RingSelfIntCheckTest {
 	
 	@Test
 	public void testNonIntersect() {
-		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);
@@ -121,7 +122,7 @@ public class RingSelfIntCheckTest {
 	
 	@Test
 	public void testTouching() {
-		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);
@@ -159,7 +160,7 @@ public class RingSelfIntCheckTest {
 	
 	@Test
 	public void testNotTouching() {
-		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/semantics/IsWallCheckTest.java

@@ -38,6 +38,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.parser.ParserConfiguration;
 
 /**
@@ -64,7 +65,7 @@ public class IsWallCheckTest {
 		Polygon p = new ConcretePolygon();
 		p.setExteriorRing(lr);
 		
-		Geometry geom = new Geometry(GeometryType.MULTI_SURFACE, Lod.LOD2);
+		Geometry geom = new Geometry(GeometryType.MULTI_SURFACE, Lod.LOD2, Orientation.OUTWARD);
 		geom.addPolygon(p);
 		
 		BoundarySurface bs = new BoundarySurface(null);
@@ -97,7 +98,7 @@ public class IsWallCheckTest {
 		Polygon p = new ConcretePolygon();
 		p.setExteriorRing(lr);
 		
-		Geometry geom = new Geometry(GeometryType.MULTI_SURFACE, Lod.LOD2);
+		Geometry geom = new Geometry(GeometryType.MULTI_SURFACE, Lod.LOD2, Orientation.OUTWARD);
 		geom.addPolygon(p);
 		
 		BoundarySurface bs = new BoundarySurface(null);
@@ -129,7 +130,7 @@ public class IsWallCheckTest {
 		Polygon p = new ConcretePolygon();
 		p.setExteriorRing(lr);
 		
-		Geometry geom = new Geometry(GeometryType.MULTI_SURFACE, Lod.LOD2);
+		Geometry geom = new Geometry(GeometryType.MULTI_SURFACE, Lod.LOD2, Orientation.OUTWARD);
 		geom.addPolygon(p);
 		
 		BoundarySurface bs = new BoundarySurface(null);
@@ -162,7 +163,7 @@ public class IsWallCheckTest {
 		Polygon p = new ConcretePolygon();
 		p.setExteriorRing(lr);
 		
-		Geometry geom = new Geometry(GeometryType.MULTI_SURFACE, Lod.LOD2);
+		Geometry geom = new Geometry(GeometryType.MULTI_SURFACE, Lod.LOD2, Orientation.OUTWARD);
 		geom.addPolygon(p);
 		
 		BoundarySurface bs = new BoundarySurface(null);

CityDoctorParent/CityDoctorValidation/src/test/java/de/hft/stuttgart/citydoctor2/checks/semantics/PolygonWithoutSurfaceCheckTest.java

@@ -20,12 +20,13 @@ 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.Polygon;
+import de.hft.stuttgart.citydoctor2.datastructure.Geometry.Orientation;
 
 public class PolygonWithoutSurfaceCheckTest {
 
 	@Test
 	public void testPolygonWithoutSurface() {
-		Geometry geom = new Geometry(GeometryType.SOLID, Lod.LOD2);
+		Geometry geom = new Geometry(GeometryType.SOLID, Lod.LOD2, Orientation.OUTWARD);
 		Polygon poly = new ConcretePolygon();
 		geom.addPolygon(poly);
 		PolygonWithoutSurfaceCheck check = new PolygonWithoutSurfaceCheck();
@@ -44,7 +45,7 @@ public class PolygonWithoutSurfaceCheckTest {
 	
 	@Test
 	public void testPolygonWithSurface() {
-		Geometry geom = new Geometry(GeometryType.SOLID, Lod.LOD2);
+		Geometry geom = new Geometry(GeometryType.SOLID, Lod.LOD2, Orientation.OUTWARD);
 		Polygon poly = new ConcretePolygon();
 		BoundarySurface bs = new BoundarySurface(null);
 		bs.addGeometry(geom);
@@ -61,7 +62,7 @@ public class PolygonWithoutSurfaceCheckTest {
 	
 	@Test
 	public void testPolygonWithWrongLod() {
-		Geometry geom = new Geometry(GeometryType.SOLID, Lod.LOD1);
+		Geometry geom = new Geometry(GeometryType.SOLID, Lod.LOD1, Orientation.OUTWARD);
 		Polygon poly = new ConcretePolygon();
 		BoundarySurface bs = new BoundarySurface(null);
 		bs.addGeometry(geom);

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>