Merge branch 'dev' into 'master'

CityDoctor Version 3.17.3

See merge request !34

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

@@ -18,8 +18,7 @@
  */
 package de.hft.stuttgart.citydoctor2.datastructure;
 
-import de.hft.stuttgart.citydoctor2.check.Check;
-
+import de.hft.stuttgart.citydoctor2.check.CheckableVisitor;
 import de.hft.stuttgart.citydoctor2.math.Triangle3d;
 import de.hft.stuttgart.citydoctor2.math.Vector3d;
 import de.hft.stuttgart.citydoctor2.tesselation.TesselatedPolygon;
@@ -41,6 +40,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();
 
@@ -53,11 +56,20 @@ 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) {
         this.parent = parent;
@@ -206,7 +218,7 @@ public class Geometry extends GmlElement {
 
 
     @Override
-    public void accept(Check c) {
+    public void accept(CheckableVisitor c) {
         super.accept(c);
         if (c.canExecute(this)) {
             c.check(this);

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

 package de.hft.stuttgart.citydoctor2.datastructure;
 
 import java.io.Serial;
-import java.util.List;
 
+import de.hft.stuttgart.citydoctor2.check.CheckableVisitor;
 import org.citygml4j.core.model.core.ImplicitGeometry;
 
-import de.hft.stuttgart.citydoctor2.check.Check;
-import de.hft.stuttgart.citydoctor2.check.CheckError;
-import de.hft.stuttgart.citydoctor2.check.CheckId;
 import de.hft.stuttgart.citydoctor2.math.TransformationMatrix;
 
 /**
@@ -26,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;
@@ -34,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;
@@ -58,7 +55,7 @@ public class ImplicitGeometryHolder extends Geometry {
     }
 
     @Override
-    public void accept(Check c) {
+    public void accept(CheckableVisitor c) {
         prototypeGeometry.accept(c);
     }
 

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

@@ -18,8 +18,7 @@
  */
 package de.hft.stuttgart.citydoctor2.datastructure;
 
-import de.hft.stuttgart.citydoctor2.check.Check;
-
+import de.hft.stuttgart.citydoctor2.check.CheckableVisitor;
 import de.hft.stuttgart.citydoctor2.parser.ParserConfiguration;
 import de.hft.stuttgart.citydoctor2.utils.CityGmlUtils;
 import javafx.scene.paint.Color;
@@ -130,7 +129,7 @@ public class Installation extends CityObject {
     }
 
     @Override
-    public void accept(Check c) {
+    public void accept(CheckableVisitor c) {
         super.accept(c);
         if (c.canExecute(this)) {
             c.check(this);

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

@@ -18,7 +18,7 @@
  */
 package de.hft.stuttgart.citydoctor2.datastructure;
 
-import de.hft.stuttgart.citydoctor2.check.Check;
+import de.hft.stuttgart.citydoctor2.check.CheckableVisitor;
 import de.hft.stuttgart.citydoctor2.parser.ParserConfiguration;
 import de.hft.stuttgart.citydoctor2.utils.CityGmlUtils;
 import javafx.scene.paint.Color;
@@ -89,7 +89,7 @@ public class LandObject extends CityObject {
     }
 
     @Override
-    public void accept(Check c) {
+    public void accept(CheckableVisitor c) {
         super.accept(c);
         if (c.canExecute(this)) {
             c.check(this);

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/LinearRing.java

@@ -18,7 +18,7 @@
  */
 package de.hft.stuttgart.citydoctor2.datastructure;
 
-import de.hft.stuttgart.citydoctor2.check.Check;
+import de.hft.stuttgart.citydoctor2.check.CheckableVisitor;
 import de.hft.stuttgart.citydoctor2.math.*;
 
 import java.io.Serial;
@@ -226,7 +226,7 @@ public class LinearRing extends GmlElement {
     }
 
     @Override
-    public void accept(Check c) {
+    public void accept(CheckableVisitor c) {
         super.accept(c);
         if (c.canExecute(this)) {
             c.check(this);

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

@@ -21,6 +21,7 @@ package de.hft.stuttgart.citydoctor2.datastructure;
 import de.hft.stuttgart.citydoctor2.check.Check;
 import de.hft.stuttgart.citydoctor2.check.CheckId;
 import de.hft.stuttgart.citydoctor2.check.CheckResult;
+import de.hft.stuttgart.citydoctor2.check.CheckableVisitor;
 import de.hft.stuttgart.citydoctor2.math.Vector3d;
 import de.hft.stuttgart.citydoctor2.tesselation.TesselatedPolygon;
 import javafx.scene.paint.Color;
@@ -43,9 +44,6 @@ public class LinkedPolygon extends Polygon {
     private Geometry parent;
     private ConcretePolygon poly;
 
-    private LinkedPolygon() {
-    }
-
     /**
      * @param poly   polygon this is linked to
      * @param parent the parent of the linked polygon
@@ -105,7 +103,7 @@ public class LinkedPolygon extends Polygon {
     }
 
     @Override
-    public void accept(Check c) {
+    public void accept(CheckableVisitor c) {
         // linked polygons are not checked
         setValidated(true);
     }

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

@@ -18,7 +18,7 @@
  */
 package de.hft.stuttgart.citydoctor2.datastructure;
 
-import de.hft.stuttgart.citydoctor2.check.Check;
+import de.hft.stuttgart.citydoctor2.check.CheckableVisitor;
 import de.hft.stuttgart.citydoctor2.parser.ParserConfiguration;
 import de.hft.stuttgart.citydoctor2.utils.CityGmlUtils;
 import javafx.scene.paint.Color;
@@ -114,7 +114,7 @@ public class Opening extends CityObject {
     }
 
     @Override
-    public void accept(Check c) {
+    public void accept(CheckableVisitor c) {
         super.accept(c);
         if (c.canExecute(this)) {
             c.check(this);

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/datastructure/ReliefObject.java

@@ -18,7 +18,7 @@
  */
 package de.hft.stuttgart.citydoctor2.datastructure;
 
-import de.hft.stuttgart.citydoctor2.check.Check;
+import de.hft.stuttgart.citydoctor2.check.CheckableVisitor;
 import de.hft.stuttgart.citydoctor2.parser.ParserConfiguration;
 import javafx.scene.paint.Color;
 import org.citygml4j.core.model.relief.ReliefFeature;
@@ -42,7 +42,7 @@ public class ReliefObject extends CityObject {
     }
 
     @Override
-    public void accept(Check c) {
+    public void accept(CheckableVisitor c) {
         super.accept(c);
         if (c.canExecute(this)) {
             c.check(this);

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

 package de.hft.stuttgart.citydoctor2.datastructure;
 
-import de.hft.stuttgart.citydoctor2.check.Check;
+import de.hft.stuttgart.citydoctor2.check.CheckableVisitor;
 import de.hft.stuttgart.citydoctor2.parser.ParserConfiguration;
 import org.citygml4j.core.util.geometry.GeometryFactory;
 
@@ -22,7 +22,7 @@ public class Storey extends AbstractBuildingSubdivision {
     }
 
     @Override
-    public void accept(Check c) {
+    public void accept(CheckableVisitor c) {
         super.accept(c);
         for (BuildingUnit buildingUnit : buildingUnits) {
             buildingUnit.accept(c);

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

@@ -18,7 +18,7 @@
  */
 package de.hft.stuttgart.citydoctor2.datastructure;
 
-import de.hft.stuttgart.citydoctor2.check.Check;
+import de.hft.stuttgart.citydoctor2.check.CheckableVisitor;
 import de.hft.stuttgart.citydoctor2.parser.ParserConfiguration;
 import de.hft.stuttgart.citydoctor2.utils.CityGmlUtils;
 import javafx.scene.paint.Color;
@@ -50,7 +50,7 @@ public class TinObject extends CityObject {
     }
 
     @Override
-    public void accept(Check c) {
+    public void accept(CheckableVisitor c) {
         super.accept(c);
         if (c.canExecute(this)) {
             c.check(this);

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

 package de.hft.stuttgart.citydoctor2.datastructure;
 
-import de.hft.stuttgart.citydoctor2.check.Check;
+import de.hft.stuttgart.citydoctor2.check.CheckableVisitor;
 import org.citygml4j.core.model.deprecated.transportation.TransportationComplex;
 import org.citygml4j.core.model.transportation.Railway;
 import org.citygml4j.core.model.transportation.Road;
@@ -76,7 +76,7 @@ public class TopLevelTransportFeature extends TransportationSpace {
     }
 
     @Override
-    public void accept(Check c) {
+    public void accept(CheckableVisitor c) {
         super.accept(c);
         if (c.canExecute(this)) {
             c.check(this);

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

 package de.hft.stuttgart.citydoctor2.datastructure;
 
-import de.hft.stuttgart.citydoctor2.check.Check;
+import de.hft.stuttgart.citydoctor2.check.CheckableVisitor;
 import de.hft.stuttgart.citydoctor2.parser.ParserConfiguration;
 import de.hft.stuttgart.citydoctor2.utils.CityGmlUtils;
 import org.citygml4j.core.model.core.AbstractSpace;
@@ -95,7 +95,7 @@ public class TrafficSpaceObject extends TransportationObject {
     }
 
     @Override
-    public void accept(Check c) {
+    public void accept(CheckableVisitor c) {
         super.accept(c);
         if (c.canExecute(this)) {
             c.check(this);

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

 package de.hft.stuttgart.citydoctor2.datastructure;
 
-import de.hft.stuttgart.citydoctor2.check.Check;
+import de.hft.stuttgart.citydoctor2.check.CheckableVisitor;
 import de.hft.stuttgart.citydoctor2.parser.ParserConfiguration;
 import de.hft.stuttgart.citydoctor2.utils.CityGmlUtils;
 import org.citygml4j.core.model.core.AbstractSpace;
@@ -121,7 +121,7 @@ public abstract class TransportationSpace extends TransportationObject {
     }
 
     @Override
-    public void accept(Check c) {
+    public void accept(CheckableVisitor c) {
         super.accept(c);
         if (c.canExecute(this)) {
             c.check(this);

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

 package de.hft.stuttgart.citydoctor2.datastructure;
 
-import de.hft.stuttgart.citydoctor2.check.Check;
+import de.hft.stuttgart.citydoctor2.check.CheckableVisitor;
 import org.citygml4j.core.model.core.AbstractSpaceBoundaryProperty;
 import org.citygml4j.core.model.tunnel.TunnelInstallation;
 import org.citygml4j.core.model.tunnel.TunnelInstallationProperty;
@@ -27,7 +27,7 @@ public class Tunnel extends AbstractTunnel {
     }
 
     @Override
-    public void accept(Check c) {
+    public void accept(CheckableVisitor c) {
         super.accept(c);
         if (c.canExecute(this)) {
             c.check(this);

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

 package de.hft.stuttgart.citydoctor2.datastructure;
 
-import de.hft.stuttgart.citydoctor2.check.Check;
+import de.hft.stuttgart.citydoctor2.check.CheckableVisitor;
 import de.hft.stuttgart.citydoctor2.parser.ParserConfiguration;
 import de.hft.stuttgart.citydoctor2.utils.CityGmlUtils;
 import javafx.scene.paint.Color;
@@ -87,7 +87,7 @@ public class TunnelConstructiveElement extends CityObject {
     }
 
     @Override
-    public void accept(Check c) {
+    public void accept(CheckableVisitor c) {
         super.accept(c);
         if (c.canExecute(this)) {
             c.check(this);

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

@@ -18,7 +18,7 @@
  */
 package de.hft.stuttgart.citydoctor2.datastructure;
 
-import de.hft.stuttgart.citydoctor2.check.Check;
+import de.hft.stuttgart.citydoctor2.check.CheckableVisitor;
 import de.hft.stuttgart.citydoctor2.parser.ParserConfiguration;
 import de.hft.stuttgart.citydoctor2.utils.CityGmlUtils;
 import javafx.scene.paint.Color;
@@ -27,15 +27,12 @@ import org.citygml4j.core.model.vegetation.AbstractVegetationObject;
 import org.citygml4j.core.model.vegetation.PlantCover;
 import org.citygml4j.core.model.vegetation.SolitaryVegetationObject;
 import org.citygml4j.core.util.geometry.GeometryFactory;
-import org.xmlobjects.gml.model.geometry.aggregates.MultiSolid;
-import org.xmlobjects.gml.model.geometry.aggregates.MultiSolidProperty;
 import org.xmlobjects.gml.model.geometry.aggregates.MultiSurface;
 import org.xmlobjects.gml.model.geometry.aggregates.MultiSurfaceProperty;
 import org.xmlobjects.gml.model.geometry.primitives.Solid;
 import org.xmlobjects.gml.model.geometry.primitives.SolidProperty;
 
 import java.io.Serial;
-import java.util.Collections;
 
 /**
  * Representation of CityGML vegetation objects
@@ -172,7 +169,7 @@ public class Vegetation extends CityObject {
     }
 
     @Override
-    public void accept(Check c) {
+    public void accept(CheckableVisitor c) {
         super.accept(c);
         if (c.canExecute(this)) {
             c.check(this);

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

@@ -18,7 +18,7 @@
  */
 package de.hft.stuttgart.citydoctor2.datastructure;
 
-import de.hft.stuttgart.citydoctor2.check.Check;
+import de.hft.stuttgart.citydoctor2.check.CheckableVisitor;
 import de.hft.stuttgart.citydoctor2.parser.ParserConfiguration;
 import de.hft.stuttgart.citydoctor2.utils.CityGmlUtils;
 import javafx.scene.paint.Color;
@@ -141,7 +141,7 @@ public class WaterObject extends CityObject {
     }
 
     @Override
-    public void accept(Check c) {
+    public void accept(CheckableVisitor c) {
         super.accept(c);
         if (c.canExecute(this)) {
             c.check(this);