Merge remote-tracking branch 'remotes/origin/dev' into citygml3

.gitlab-ci.yml

-image: maven:3.8.4-openjdk-17
+image: maven:3.8.6-eclipse-temurin-17
 
 
 build:

CityDoctorParent/CityDoctorCheckResult/pom.xml

 <project xmlns="http://maven.apache.org/POM/4.0.0"
 	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-	xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd">
+	xsi:schemaLocation="https://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
 	<modelVersion>4.0.0</modelVersion>
 	<parent>
 		<groupId>de.hft.stuttgart</groupId>

CityDoctorParent/CityDoctorEdge/pom.xml

 <project xmlns="http://maven.apache.org/POM/4.0.0"
 	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-	xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd">
+	xsi:schemaLocation="https://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
 	<modelVersion>4.0.0</modelVersion>
 	<parent>
 		<groupId>de.hft.stuttgart</groupId>

CityDoctorParent/CityDoctorModel/pom.xml

-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd">
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="https://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
 	<modelVersion>4.0.0</modelVersion>
 	<parent>
 		<groupId>de.hft.stuttgart</groupId>

CityDoctorParent/CityDoctorModel/src/main/java/de/hft/stuttgart/citydoctor2/check/Check.java

@@ -38,6 +38,8 @@ import de.hft.stuttgart.citydoctor2.datastructure.LandObject;
 import de.hft.stuttgart.citydoctor2.datastructure.LinearRing;
 import de.hft.stuttgart.citydoctor2.datastructure.Opening;
 import de.hft.stuttgart.citydoctor2.datastructure.Polygon;
+import de.hft.stuttgart.citydoctor2.datastructure.ReliefObject;
+import de.hft.stuttgart.citydoctor2.datastructure.TinObject;
 import de.hft.stuttgart.citydoctor2.datastructure.TransportationObject;
 import de.hft.stuttgart.citydoctor2.datastructure.Vegetation;
 import de.hft.stuttgart.citydoctor2.datastructure.WaterObject;
@@ -301,6 +303,14 @@ public abstract class Check {
 	 */
 	public void check(LinearRing ring) {
 
+	}
+	
+	public void check(TinObject tin) {
+		
+	}
+	
+	public void check(ReliefObject relief) {
+		
 	}
 
 	/**

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

@@ -56,7 +56,7 @@ public class CityDoctorModel {
 	private List<Building> buildings;
 	private List<Vegetation> vegetation;
 	private List<BridgeObject> bridges;
-	private List<LandObject> land;
+	private List<CityObject> land;
 	private List<TransportationObject> roads;
 	private List<WaterObject> water;
 	private CityModel cModel;
@@ -260,7 +260,7 @@ public class CityDoctorModel {
 		return water;
 	}
 
-	public List<LandObject> getLand() {
+	public List<CityObject> getLand() {
 		return land;
 	}
 
@@ -369,6 +369,10 @@ public class CityDoctorModel {
 			land.add(lo);
 		} else if (co instanceof WaterObject wo) {
 			water.add(wo);
+		} else if (co instanceof ReliefObject) {
+			land.add(co);
+		} else if (co instanceof TinObject) {
+			land.add(co);
 		}
 	}
 
@@ -379,4 +383,12 @@ public class CityDoctorModel {
 	public CityGMLVersion getCityGMLVersion() {
 		return cityGMLVersion;
 	}
+
+	public void addRelief(ReliefObject relief) {
+		addCityObject(relief);
+	}
+
+	public void addTin(TinObject tin) {
+		addCityObject(tin);
+	}
 }

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

+/*-
+ *  Copyright 2022 Beuth Hochschule für Technik Berlin, Hochschule für Technik Stuttgart
+ * 
+ *  This file is part of CityDoctor2.
+ *
+ *  CityDoctor2 is free software: you can redistribute it and/or modify
+ *  it under the terms of the GNU Lesser General Public License as published by
+ *  the Free Software Foundation, either version 3 of the License, or
+ *  (at your option) any later version.
+ *
+ *  CityDoctor2 is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *  GNU Lesser General Public License for more details.
+ *
+ *  You should have received a copy of the GNU Lesser General Public License
+ *  along with CityDoctor2.  If not, see <https://www.gnu.org/licenses/>.
+ */
+package de.hft.stuttgart.citydoctor2.datastructure;
+
+import java.util.ArrayList;
+import java.util.List;
+
+import org.citygml4j.core.model.relief.ReliefFeature;
+import org.citygml4j.core.util.geometry.GeometryFactory;
+
+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.parser.ParserConfiguration;
+import de.hft.stuttgart.citydoctor2.utils.CopyHandler;
+import de.hft.stuttgart.citydoctor2.utils.Copyable;
+
+public class ReliefObject extends CityObject {
+	
+	private static final long serialVersionUID = -9162169874426519903L;
+
+	private ReliefFeature feature;
+	
+	private List<TinObject> components = new ArrayList<>();
+	
+	public ReliefObject(ReliefFeature feature) {
+		this.feature = feature;
+	}
+	
+	@Override
+	public void accept(Check c) {
+		super.accept(c);
+		if (c.canExecute(this)) {
+			c.check(this);
+		}
+		for (TinObject tin : components) {
+			tin.accept(c);
+		}
+	}
+
+	@Override
+	public void collectInstances(CopyHandler handler) {
+		handler.addInstance(components);
+	}
+	
+	@Override
+	public void fillValues(Copyable original, CopyHandler handler) {
+		super.fillValues(original, handler);
+		ReliefObject originalRelief = (ReliefObject) original;
+		for (TinObject tin : originalRelief.components) {
+			components.add(handler.getCopyInstance(tin));
+		}
+	}
+	
+	@Override
+	public Copyable createCopyInstance() {
+		return new ReliefObject(feature);
+	}
+
+	@Override
+	public void prepareForChecking() {
+		for (TinObject component : components) {
+			component.prepareForChecking();
+		}
+	}
+
+	@Override
+	public void clearMetaInformation() {
+		for (TinObject component : components) {
+			component.clearMetaInformation();
+		}		
+	}
+
+	@Override
+	public void clearAllContainedCheckResults() {
+		for (TinObject component : components) {
+			component.clearAllContainedCheckResults();
+		}			
+	}
+	
+	@Override
+	public void collectContainedErrors(List<CheckError> errors) {
+		super.collectContainedErrors(errors);
+		for (TinObject tin : components) {
+			tin.collectContainedErrors(errors);
+		}
+	}
+	
+	@Override
+	public boolean containsAnyError() {
+		boolean containsError = super.containsAnyError();
+		if (containsError) {
+			return true;
+		}
+		for (TinObject tin : components) {
+			if (tin.containsAnyError()) {
+				return true;
+			}
+		}
+		return false;
+	}
+	
+	@Override
+	public boolean containsError(CheckId checkIdentifier) {
+		boolean hasError = super.containsError(checkIdentifier);
+		if (hasError) {
+			return true;
+		}
+		for (TinObject tin : components) {
+			if (tin.containsError(checkIdentifier)) {
+				return true;
+			}
+		}
+		return false;
+	}
+
+	@Override
+	public void reCreateGeometries(GeometryFactory factory, ParserConfiguration config) {
+		// no geometries
+	}
+
+	@Override
+	public ReliefFeature getGmlObject() {
+		return feature;
+	}
+
+	@Override
+	public void unsetGmlGeometries() {
+		// no geometries
+	}
+
+	@Override
+	public FeatureType getFeatureType() {
+		return FeatureType.LAND;
+	}
+	
+	public List<TinObject> getComponents() {
+		return components;
+	}
+
+}

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

+/*-
+ *  Copyright 2022 Beuth Hochschule für Technik Berlin, Hochschule für Technik Stuttgart
+ * 
+ *  This file is part of CityDoctor2.
+ *
+ *  CityDoctor2 is free software: you can redistribute it and/or modify
+ *  it under the terms of the GNU Lesser General Public License as published by
+ *  the Free Software Foundation, either version 3 of the License, or
+ *  (at your option) any later version.
+ *
+ *  CityDoctor2 is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *  GNU Lesser General Public License for more details.
+ *
+ *  You should have received a copy of the GNU Lesser General Public License
+ *  along with CityDoctor2.  If not, see <https://www.gnu.org/licenses/>.
+ */
+package de.hft.stuttgart.citydoctor2.datastructure;
+
+import java.util.ArrayList;
+import java.util.List;
+
+import org.apache.logging.log4j.LogManager;
+import org.apache.logging.log4j.Logger;
+import org.citygml4j.core.model.relief.TINRelief;
+import org.citygml4j.core.util.geometry.GeometryFactory;
+import org.xmlobjects.gml.model.geometry.primitives.AbstractRingProperty;
+import org.xmlobjects.gml.model.geometry.primitives.Triangle;
+import org.xmlobjects.gml.model.geometry.primitives.TriangleArrayProperty;
+import org.xmlobjects.gml.model.geometry.primitives.TriangulatedSurface;
+
+import de.hft.stuttgart.citydoctor2.check.Check;
+import de.hft.stuttgart.citydoctor2.parser.ParserConfiguration;
+import de.hft.stuttgart.citydoctor2.utils.CityGmlUtils;
+
+public class TinObject extends CityObject {
+
+	private static final Logger logger = LogManager.getLogger(TinObject.class);
+
+	private static final long serialVersionUID = 1910744427384724422L;
+
+	private TINRelief gmlRelief;
+
+	public TinObject(TINRelief gmlRelief) {
+		this.gmlRelief = gmlRelief;
+	}
+
+	@Override
+	public void accept(Check c) {
+		super.accept(c);
+		if (c.canExecute(this)) {
+			c.check(this);
+		}
+	}
+
+	@Override
+	public TinObject createCopyInstance() {
+		return new TinObject(gmlRelief);
+	}
+
+	@Override
+	public void reCreateGeometries(GeometryFactory factory, ParserConfiguration config) {
+		if (getGeometries().isEmpty()) {
+			return;
+		}
+		if (getGeometries().size() > 1) {
+			logger.warn("A TINRelief can only have one geometry but found {}. Using the first geometry found",
+					getGeometries().size());
+		}
+		Geometry geom = getGeometries().get(0);
+		List<Triangle> triangles = new ArrayList<>();
+		TriangulatedSurface surface = new TriangulatedSurface();
+		surface.setPatches(new TriangleArrayProperty(triangles));
+		for (Polygon poly : geom.getPolygons()) {
+			LinearRing ring = poly.getExteriorRing();
+			Triangle t = new Triangle();
+			t.setExterior(new AbstractRingProperty(CityGmlUtils.createGmlRing(factory, config, ring)));
+			triangles.add(t);
+		}
+	}
+
+	@Override
+	public TINRelief getGmlObject() {
+		return gmlRelief;
+	}
+
+	@Override
+	public void unsetGmlGeometries() {
+		gmlRelief.setTin(null);
+	}
+
+	@Override
+	public FeatureType getFeatureType() {
+		return FeatureType.LAND;
+	}
+
+}

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

@@ -71,7 +71,7 @@ public final class CityGmlUtils {
 		return gmlPoly;
 	}
 
-	private static org.xmlobjects.gml.model.geometry.primitives.LinearRing createGmlRing(GeometryFactory factory,
+	public static org.xmlobjects.gml.model.geometry.primitives.LinearRing createGmlRing(GeometryFactory factory,
 			ParserConfiguration config, LinearRing lr) {
 		ProjCoordinate p1 = new ProjCoordinate();
 		ProjCoordinate p2 = new ProjCoordinate();

CityDoctorParent/CityDoctorValidation/pom.xml

 <project xmlns="http://maven.apache.org/POM/4.0.0"
 	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-	xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd">
+	xsi:schemaLocation="https://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
 	<modelVersion>4.0.0</modelVersion>
 	<parent>
 		<groupId>de.hft.stuttgart</groupId>

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

@@ -84,6 +84,7 @@ import de.hft.stuttgart.quality.model.properties.RequirementProperty;
 import de.hft.stuttgart.quality.model.types.Checking;
 import de.hft.stuttgart.quality.model.types.Parameter;
 import de.hft.stuttgart.quality.model.types.ValidationPlan;
+import net.sf.saxon.lib.ResourceResolverWrappingURIResolver;
 import net.sf.saxon.s9api.DOMDestination;
 import net.sf.saxon.s9api.Destination;
 import net.sf.saxon.s9api.Processor;
@@ -444,14 +445,14 @@ public class Checker {
 			}
 			Processor processor = new Processor(false);
 			XsltCompiler xsltCompiler = processor.newXsltCompiler();
-			xsltCompiler.setURIResolver(new URIResolver() {
+			xsltCompiler.setResourceResolver(new ResourceResolverWrappingURIResolver(new URIResolver() {
 
 				@Override
 				public Source resolve(String href, String base) throws TransformerException {
 					return new StreamSource(Checker.class.getResourceAsStream(href));
 				}
 
-			});
+			}));
 			try {
 				XsltExecutable includeExecutable = xsltCompiler
 						.compile(new StreamSource(Checker.class.getResourceAsStream("iso_dsdl_include.xsl")));

CityDoctorParent/CityDoctorValidation/src/main/java/de/hft/stuttgart/citydoctor2/reporting/XmlValidationReporter.java

@@ -27,7 +27,7 @@ import de.hft.stuttgart.citydoctor2.checks.Checks;
 import de.hft.stuttgart.citydoctor2.datastructure.BridgeObject;
 import de.hft.stuttgart.citydoctor2.datastructure.Building;
 import de.hft.stuttgart.citydoctor2.datastructure.CityDoctorModel;
-import de.hft.stuttgart.citydoctor2.datastructure.LandObject;
+import de.hft.stuttgart.citydoctor2.datastructure.CityObject;
 import de.hft.stuttgart.citydoctor2.datastructure.TransportationObject;
 import de.hft.stuttgart.citydoctor2.datastructure.Vegetation;
 import de.hft.stuttgart.citydoctor2.datastructure.WaterObject;
@@ -51,7 +51,7 @@ public class XmlValidationReporter implements Reporter {
 		for (TransportationObject to : model.getTransportation()) {
 			streamReporter.report(to);
 		}
-		for (LandObject lo : model.getLand()) {
+		for (CityObject lo : model.getLand()) {
 			streamReporter.report(lo);
 		}
 		for (Vegetation v : model.getVegetation()) {

CityDoctorParent/pom.xml

-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd">
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="https://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
 	<modelVersion>4.0.0</modelVersion>
 	<groupId>de.hft.stuttgart</groupId>
 	<artifactId>CityDoctorParent</artifactId>
@@ -81,13 +81,13 @@
 			<dependency>
 				<groupId>net.sf.saxon</groupId>
 				<artifactId>Saxon-HE</artifactId>
-				<version>10.6</version>
+				<version>11.3</version>
 			</dependency>
 			<!-- https://mvnrepository.com/artifact/org.hibernate/hibernate-core -->
 			<dependency>
 				<groupId>org.hibernate</groupId>
 				<artifactId>hibernate-core</artifactId>
-				<version>5.4.3.Final</version>
+				<version>5.6.9.Final</version>
 			</dependency>
 			<dependency>
 				<groupId>org.citygml4j</groupId>
@@ -108,19 +108,19 @@
 			<dependency>
 				<groupId>org.apache.xmlgraphics</groupId>
 				<artifactId>fop</artifactId>
-				<version>2.6</version>
+				<version>2.7</version>
 			</dependency>
 			<!-- https://mvnrepository.com/artifact/org.jdom/jdom2 -->
 			<dependency>
 				<groupId>org.jdom</groupId>
 				<artifactId>jdom2</artifactId>
-				<version>2.0.6</version>
+				<version>2.0.6.1</version>
 			</dependency>
 			<!-- https://mvnrepository.com/artifact/junit/junit -->
 			<dependency>
 				<groupId>junit</groupId>
 				<artifactId>junit</artifactId>
-				<version>4.12</version>
+				<version>4.13.2</version>
 				<scope>test</scope>
 			</dependency>
 			<!-- https://mvnrepository.com/artifact/org.jogamp.gluegen/gluegen-rt-main -->
@@ -144,39 +144,39 @@
 			<dependency>
 				<groupId>org.apache.logging.log4j</groupId>
 				<artifactId>log4j-api</artifactId>
-				<version>2.17.1</version>
+				<version>2.17.2</version>
 			</dependency>
 			<!-- https://mvnrepository.com/artifact/org.apache.logging.log4j/log4j-core -->
 			<dependency>
 				<groupId>org.apache.logging.log4j</groupId>
 				<artifactId>log4j-core</artifactId>
-				<version>2.17.1</version>
+				<version>2.17.2</version>
 			</dependency>
 			<dependency>
 				<groupId>org.yaml</groupId>
 				<artifactId>snakeyaml</artifactId>
-				<version>1.24</version>
+				<version>1.30</version>
 			</dependency>
 			<!-- https://mvnrepository.com/artifact/org.apache.logging.log4j/log4j-slf4j18-impl -->
 			<dependency>
 				<groupId>org.apache.logging.log4j</groupId>
 				<artifactId>log4j-slf4j18-impl</artifactId>
-				<version>2.17.1</version>
+				<version>2.17.2</version>
 			</dependency>
 			<dependency>
 				<groupId>org.locationtech.proj4j</groupId>
 				<artifactId>proj4j</artifactId>
-				<version>1.1.2</version>
+				<version>1.1.5</version>
 			</dependency>
 			<dependency>
 				<groupId>org.hibernate</groupId>
 				<artifactId>hibernate-search-orm</artifactId>
-				<version>5.11.3.Final</version>
+				<version>5.11.9.Final</version>
 			</dependency>
 			<dependency>
 				<groupId>org.locationtech.jts</groupId>
 				<artifactId>jts-core</artifactId>
-				<version>1.18.1</version>
+				<version>1.19.0</version>
 			</dependency>
 			<dependency>
 				<groupId>com.sun.xml.bind</groupId>
@@ -194,7 +194,7 @@
 		<dependency>
 			<groupId>org.mockito</groupId>
 			<artifactId>mockito-core</artifactId>
-			<version>3.8.0</version>
+			<version>4.6.1</version>
 			<scope>test</scope>
 		</dependency>
 	</dependencies>

README.md

@@ -6,6 +6,8 @@ CityDoctor2 is a Java program for validating CityGML files. It checks whether ce
 
 ## Installation
 
+You can download releases from the BHT page [here](https://projekt.bht-berlin.de/citydoctor2/downloads/) or from a git repository [here](https://gitlab.com/volkercoors/CiD4Sim/-/tree/master/CityDoctorExtension).
+
 Use [Maven](https://maven.apache.org/) to build CityDoctor2.
 
 ```bash
@@ -28,4 +30,4 @@ Note:
 
 
 ## License
-[LGPL](http://www.gnu.org/licenses/lgpl-3.0.de.html)
+[LGPL](http://www.gnu.org/licenses/lgpl-3.0.de.html)
\ No newline at end of file