Merge branch 'dev' into 'master'

CityDoctor Version 3.17.3

See merge request !34

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

@@ -111,7 +111,6 @@ public class Citygml3GeometryMapper extends GeometryWalker {
             conc.addInteriorRing(currentRing);
         }
         collection.addPatchMember(conc);
-        polygons.add(conc);
     }
 
     private void parsePolygon(String id, AbstractRingProperty exterior, List<AbstractRingProperty> interior) {

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/main/java/de/hft/stuttgart/citydoctor2/utils/CheckErrorFound.java

 package de.hft.stuttgart.citydoctor2.utils;
 
+import java.io.Serial;
+
 /**
  * This Throwable signals that a requested CheckError was found.
  */
 public class CheckErrorFound extends Throwable {
 
+	@Serial
+    private static final long serialVersionUID = -2066876428396230230L;
 
 	public CheckErrorFound() {
         super("CheckError was found", null, true, false);

CityDoctorParent/CityDoctorModel/src/main/java/de/hft/stuttgart/citydoctor2/utils/visitors/CheckableErrorCollector.java

 package de.hft.stuttgart.citydoctor2.utils.visitors;
 
-import de.hft.stuttgart.citydoctor2.check.AbstractCheck;
+import de.hft.stuttgart.citydoctor2.check.CheckableUtilsVisitor;
 import de.hft.stuttgart.citydoctor2.check.CheckError;
 import de.hft.stuttgart.citydoctor2.check.Checkable;
 
@@ -9,7 +9,7 @@ import java.util.List;
 /**
  * This Visitor collects all CheckErrors in the datastructure of a checkable.
  */
-public class CheckableErrorCollector extends AbstractCheck {
+public class CheckableErrorCollector extends CheckableUtilsVisitor {
 
     List<CheckError> errors;
 

CityDoctorParent/CityDoctorModel/src/main/java/de/hft/stuttgart/citydoctor2/utils/visitors/CityObjectCollector.java

 package de.hft.stuttgart.citydoctor2.utils.visitors;
 
-import de.hft.stuttgart.citydoctor2.check.AbstractCheck;
+import de.hft.stuttgart.citydoctor2.check.CheckableUtilsVisitor;
 import de.hft.stuttgart.citydoctor2.datastructure.CityObject;
 
 import java.util.HashSet;
@@ -9,7 +9,7 @@ import java.util.Set;
 /**
  * This Visitor collects all sub-CityObjects that are in the datastructure of a CityObject (including itself) in a Set.
  */
-public class CityObjectCollector extends AbstractCheck {
+public class CityObjectCollector extends CheckableUtilsVisitor {
 
     private final Set<CityObject> objects = new HashSet<>();
 

CityDoctorParent/CityDoctorModel/src/main/java/de/hft/stuttgart/citydoctor2/utils/visitors/ClearMetaInformationVisitor.java

 package de.hft.stuttgart.citydoctor2.utils.visitors;
 
-import de.hft.stuttgart.citydoctor2.check.AbstractCheck;
+import de.hft.stuttgart.citydoctor2.check.CheckableUtilsVisitor;
 import de.hft.stuttgart.citydoctor2.datastructure.Geometry;
 
 /**
  * This Visitor removes the metadata created by the {@link PrepareForCheckingVisitor} for the low-memory consumption mode.
  */
-public class ClearMetaInformationVisitor extends AbstractCheck {
+public class ClearMetaInformationVisitor extends CheckableUtilsVisitor {
 
     @Override
     public void check(Geometry geometry) {

CityDoctorParent/CityDoctorModel/src/main/java/de/hft/stuttgart/citydoctor2/utils/visitors/ClearCheckResultsVisitor.java → CityDoctorParent/CityDoctorModel/src/main/java/de/hft/stuttgart/citydoctor2/utils/visitors/ClearVisitorResultsVisitor.java

 package de.hft.stuttgart.citydoctor2.utils.visitors;
 
-import de.hft.stuttgart.citydoctor2.check.AbstractCheck;
+import de.hft.stuttgart.citydoctor2.check.CheckableUtilsVisitor;
 import de.hft.stuttgart.citydoctor2.check.Checkable;
 
 /**
  * This Visitor removes the check results from a CityObject and the objects in its datastructure.
  */
-public class ClearCheckResultsVisitor extends AbstractCheck {
+public class ClearVisitorResultsVisitor extends CheckableUtilsVisitor {
 
     @Override
     public void check(Checkable checkable) {

CityDoctorParent/CityDoctorModel/src/main/java/de/hft/stuttgart/citydoctor2/utils/visitors/ContainsAnyErrorVisitor.java

 package de.hft.stuttgart.citydoctor2.utils.visitors;
 
-import de.hft.stuttgart.citydoctor2.check.AbstractCheck;
+import de.hft.stuttgart.citydoctor2.check.CheckableUtilsVisitor;
 import de.hft.stuttgart.citydoctor2.check.Checkable;
 import de.hft.stuttgart.citydoctor2.utils.CheckErrorFound;
 import de.hft.stuttgart.citydoctor2.utils.ThrowUtils;
@@ -11,7 +11,7 @@ import de.hft.stuttgart.citydoctor2.utils.ThrowUtils;
  * This visitor's check method terminates early by throwing an unchecked {@link CheckErrorFound},
  * use {@link #checkObject(Checkable) ContainsAnyErrorVisitor.checkObject(Checkable)} to handle the Throwable.
  */
-public class ContainsAnyErrorVisitor extends AbstractCheck {
+public class ContainsAnyErrorVisitor extends CheckableUtilsVisitor {
 
     /**
      * Checks if a Checkable, or any Object in its datastructure, contains any error.

CityDoctorParent/CityDoctorModel/src/main/java/de/hft/stuttgart/citydoctor2/utils/visitors/ContainsErrorVisitor.java

 package de.hft.stuttgart.citydoctor2.utils.visitors;
 
-import de.hft.stuttgart.citydoctor2.check.AbstractCheck;
+import de.hft.stuttgart.citydoctor2.check.CheckableUtilsVisitor;
 import de.hft.stuttgart.citydoctor2.check.CheckId;
 import de.hft.stuttgart.citydoctor2.check.Checkable;
 import de.hft.stuttgart.citydoctor2.utils.CheckErrorFound;
@@ -12,7 +12,7 @@ import de.hft.stuttgart.citydoctor2.utils.ThrowUtils;
  * This visitor's check method terminates early by throwing an unchecked {@link CheckErrorFound},
  * use {@link #checkObject(Checkable, CheckId) ContainsAnyErrorVisitor.checkObject(Checkable, CheckId)} to handle the Throwable.
  */
-public class ContainsErrorVisitor extends AbstractCheck {
+public class ContainsErrorVisitor extends CheckableUtilsVisitor {
 
     private CheckId checkId;
 

CityDoctorParent/CityDoctorModel/src/main/java/de/hft/stuttgart/citydoctor2/utils/visitors/GmlGeometryRebuilder.java

 package de.hft.stuttgart.citydoctor2.utils.visitors;
 
-import de.hft.stuttgart.citydoctor2.check.AbstractCheck;
+import de.hft.stuttgart.citydoctor2.check.CheckableUtilsVisitor;
 import de.hft.stuttgart.citydoctor2.datastructure.CityObject;
 import de.hft.stuttgart.citydoctor2.parser.ParserConfiguration;
 import org.citygml4j.core.util.geometry.GeometryFactory;
@@ -11,7 +11,7 @@ import java.util.Objects;
  * This Visitor recreates the Geometries of the original CityGml object from the associated Geometries in CityDoctor's
  * internal model.
  */
-public class GmlGeometryRebuilder extends AbstractCheck {
+public class GmlGeometryRebuilder extends CheckableUtilsVisitor {
 
     private final GeometryFactory factory;
     private final ParserConfiguration config;

CityDoctorParent/CityDoctorModel/src/main/java/de/hft/stuttgart/citydoctor2/utils/visitors/PrepareForCheckingVisitor.java

 package de.hft.stuttgart.citydoctor2.utils.visitors;
 
-import de.hft.stuttgart.citydoctor2.check.AbstractCheck;
+import de.hft.stuttgart.citydoctor2.check.CheckableUtilsVisitor;
 import de.hft.stuttgart.citydoctor2.datastructure.Geometry;
 
 /**
  * This Visitor prepares the {@link Geometry Geometries} in a Checkable for low-memory consumption mode.
  */
-public class PrepareForCheckingVisitor extends AbstractCheck {
+public class PrepareForCheckingVisitor extends CheckableUtilsVisitor {
 
     @Override
     public void check(Geometry geom) {

CityDoctorParent/CityDoctorModel/src/main/java/de/hft/stuttgart/citydoctor2/utils/visitors/UnsetGeometriesVisitor.java

 package de.hft.stuttgart.citydoctor2.utils.visitors;
 
-import de.hft.stuttgart.citydoctor2.check.AbstractCheck;
+import de.hft.stuttgart.citydoctor2.check.CheckableUtilsVisitor;
 import de.hft.stuttgart.citydoctor2.datastructure.CityObject;
 
 /**
  * This Visitor removes the GmlGeometries from the linked original GmlObjects in a CityObject's datastructure to reduce
  * memory bloat.
  */
-public class UnsetGeometriesVisitor extends AbstractCheck {
+public class UnsetGeometriesVisitor extends CheckableUtilsVisitor {
 
 
     @Override

CityDoctorParent/CityDoctorModel/src/main/resources/log4j2.xml

@@ -11,5 +11,8 @@
         <Root level="debug" additivity="false">
             <AppenderRef ref="console" />
         </Root>
+        <Logger name="org.apache.fop" level="INFO"> 
+            <AppenderRef ref="console" />
+   		</Logger>
     </Loggers>
 </Configuration>
\ No newline at end of file

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