version 3.10.1

fix pdf report polygon ending
fix pdf report statistics being cut with large numbers
fix gml not written when unknown error occured now set to not checked

CityDoctorParent/CityDoctorCheckResult/pom.xml

@@ -5,7 +5,7 @@
 	<parent>
 		<groupId>de.hft.stuttgart</groupId>
 		<artifactId>CityDoctorParent</artifactId>
-		<version>3.10.1-SNAPSHOT</version>
+		<version>3.10.1</version>
 	</parent>
 
 	<artifactId>CityDoctorCheckResult</artifactId>

CityDoctorParent/CityDoctorEdge/pom.xml

@@ -5,7 +5,7 @@
 	<parent>
 		<groupId>de.hft.stuttgart</groupId>
 		<artifactId>CityDoctorParent</artifactId>
-		<version>3.10.1-SNAPSHOT</version>
+		<version>3.10.1</version>
 	</parent>
 	<artifactId>CityDoctorEdge</artifactId>
 

CityDoctorParent/CityDoctorModel/pom.xml

@@ -5,7 +5,7 @@
 	<parent>
 		<groupId>de.hft.stuttgart</groupId>
 		<artifactId>CityDoctorParent</artifactId>
-		<version>3.10.1-SNAPSHOT</version>
+		<version>3.10.1</version>
 	</parent>
 
 	<properties>

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

@@ -49,6 +49,12 @@ public class UnknownCheckError implements CheckError {
 		this.e = e;
 		checkId = check.getCheckId();
 	}
+	
+	public UnknownCheckError(Checkable c, Exception e, CheckId checkId) {
+		this.c = c;
+		this.e = e;
+		this.checkId = checkId;
+	}
 
 	public CheckId getCheck() {
 		return checkId;

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

@@ -288,7 +288,12 @@ public class CityDoctorModel {
 		for (Entry<ErrorId, AtomicInteger> e : errorCount.entrySet()) {
 			ErrorStatistics stats = new ErrorStatistics();
 			stats.setAmount(e.getValue().get());
-			stats.setName(QualityADEUtils.mapErrorIdToAdeId(e.getKey()));
+			de.hft.stuttgart.quality.model.jaxb.ErrorId adeId = QualityADEUtils.mapErrorIdToAdeId(e.getKey());
+			if (adeId == null) {
+				// error that is not part of the ade standard
+				continue;
+			}
+			stats.setName(adeId);
 			statistics.getErrorStatistics().add(stats);
 		}
 		statistics.setNumErrorBuildings(countValidatedCityObjects(buildings));

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

@@ -29,6 +29,7 @@ import org.citygml4j.model.gml.geometry.primitives.DirectPosition;
 
 import de.hft.stuttgart.citydoctor2.check.CheckError;
 import de.hft.stuttgart.citydoctor2.check.ErrorId;
+import de.hft.stuttgart.citydoctor2.check.error.UnknownCheckError;
 import de.hft.stuttgart.citydoctor2.datastructure.CityObject;
 import de.hft.stuttgart.citydoctor2.math.Vector3d;
 import de.hft.stuttgart.quality.model.Edge;
@@ -69,7 +70,13 @@ public class QualityADEUtils {
 				res.setResult(ResultType.ERROR);
 				Set<CheckError> errorSet = new HashSet<>(errors);
 				for (CheckError e : errorSet) {
-					e.convertToQualityAdeDatastructure().ifPresent(res.getErrors()::add);
+					if (e instanceof UnknownCheckError) {
+						// an error happened while checking
+						// set to not checked
+						res.setResult(ResultType.NOT_CHECKED);
+					} else {
+						e.convertToQualityAdeDatastructure().ifPresent(res.getErrors()::add);
+					}
 				}
 			}
 		} else {
@@ -141,7 +148,8 @@ public class QualityADEUtils {
 		case "SE_ATTRIBUTE_MISSING":
 			return de.hft.stuttgart.quality.model.jaxb.ErrorId.SE_ATTRIBUTE_MISSING;
 		default:
-			throw new IllegalStateException("Cannot map " + key + " to ADE Error Id");
+			return null;
+//			throw new IllegalStateException("Cannot map " + key + " to ADE Error Id");
 		}
 	}
 

CityDoctorParent/CityDoctorModel/src/test/java/de/hft/stuttgart/citydoctor2/utils/QualityADEUtilsTest.java

+/*-
+ *  Copyright 2020 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.utils;
+
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertFalse;
+import static org.junit.Assert.assertTrue;
+
+import java.util.List;
+
+import org.citygml4j.model.citygml.ade.ADEComponent;
+import org.junit.Test;
+
+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.check.error.UnknownCheckError;
+import de.hft.stuttgart.citydoctor2.datastructure.Building;
+import de.hft.stuttgart.quality.model.ValidationResult;
+import de.hft.stuttgart.quality.model.jaxb.ResultType;
+
+public class QualityADEUtilsTest {
+
+	@Test
+	public void testWriteQualityADE() {
+		Building b = new Building();
+		org.citygml4j.model.citygml.building.Building gmlB = new org.citygml4j.model.citygml.building.Building();
+		b.setGmlObject(gmlB);
+		List<ADEComponent> coADE = gmlB.getGenericApplicationPropertyOfCityObject();
+		assertTrue(coADE.isEmpty());
+		b.addCheckResult(new CheckResult(CheckId.C_GE_P_HOLE_OUTSIDE, ResultStatus.ERROR, new UnknownCheckError(b, new NullPointerException(), CheckId.C_GE_P_HOLE_OUTSIDE)));
+		QualityADEUtils.writeQualityAde(b);
+		coADE = gmlB.getGenericApplicationPropertyOfCityObject();
+		assertFalse(coADE.isEmpty());
+		assertEquals(1, coADE.size());
+		ADEComponent adeComponent = coADE.get(0);
+		ValidationResult valResult = (ValidationResult) adeComponent;
+		assertEquals(ResultType.NOT_CHECKED, valResult.getResult());
+	}
+
+}

CityDoctorParent/CityDoctorValidation/pom.xml

@@ -5,7 +5,7 @@
 	<parent>
 		<groupId>de.hft.stuttgart</groupId>
 		<artifactId>CityDoctorParent</artifactId>
-		<version>3.10.1-SNAPSHOT</version>
+		<version>3.10.1</version>
 	</parent>
 	<artifactId>CityDoctorValidation</artifactId>
 	<name>CityDoctorValidation</name>

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

@@ -158,7 +158,7 @@ public class Checker {
 		if (pdfFile.getParentFile() != null) {
 			pdfFile.getParentFile().mkdirs();
 		}
-		Reporter reporter = new PdfReporter("assets/Logo.png");
+		Reporter reporter = new PdfReporter();
 		try (BufferedOutputStream bos = new BufferedOutputStream(new FileOutputStream(pdfFile.getAbsolutePath()))) {
 			reporter.writeReport(checkConfig, bos, model, config);
 		} catch (IOException | CheckReportWriteException e) {
@@ -721,7 +721,7 @@ public class Checker {
 			}
 			if (layer.isEmpty()) {
 				throw new IllegalStateException(
-						"There are checks that have dependencies that are not executed or are unknown");
+						"There are checks that have dependencies that are not executed or are unknown, aborting");
 			}
 			result.add(layer);
 			for (Check c : layer) {
@@ -744,12 +744,11 @@ public class Checker {
 
 	public static void streamCheck(File inputFile, String xmlOutput, String pdfOutput, ValidationConfiguration config,
 			String outputFile) throws IOException, CityGmlParseException {
-		streamCheck(inputFile, xmlOutput, pdfOutput, config, "assets/Logo.png", null, outputFile);
+		streamCheck(inputFile, xmlOutput, pdfOutput, config, null, outputFile);
 	}
 
 	public static void streamCheck(File inputFile, String xmlOutput, String pdfOutput, ValidationConfiguration config,
-			String logoLocation, FeatureCheckedListener l, String outputFile)
-			throws IOException, CityGmlParseException {
+			FeatureCheckedListener l, String outputFile) throws IOException, CityGmlParseException {
 		try (BufferedOutputStream xmlBos = getXmlOutputMaybe(xmlOutput);
 				BufferedOutputStream pdfBos = getPdfOutputMaybe(pdfOutput)) {
 			Checker c = new Checker(config, null);
@@ -757,7 +756,7 @@ public class Checker {
 
 			// create reporter if available
 			XmlStreamReporter xmlReporter = getXmlReporter(config, xmlBos, fileName);
-			PdfStreamReporter pdfReporter = getPdfReporter(config, logoLocation, pdfBos, fileName);
+			PdfStreamReporter pdfReporter = getPdfReporter(config, pdfBos, fileName);
 
 			// execute schematron first
 			SvrlContentHandler handler = executeSchematronValidationIfAvailable(config, inputFile);
@@ -784,11 +783,11 @@ public class Checker {
 		return xmlReporter;
 	}
 
-	private static PdfStreamReporter getPdfReporter(ValidationConfiguration config, String logoLocation,
-			BufferedOutputStream pdfBos, String fileName) {
+	private static PdfStreamReporter getPdfReporter(ValidationConfiguration config, BufferedOutputStream pdfBos,
+			String fileName) {
 		PdfStreamReporter pdfReporter;
 		if (pdfBos != null) {
-			pdfReporter = new PdfStreamReporter(pdfBos, fileName, config, logoLocation);
+			pdfReporter = new PdfStreamReporter(pdfBos, fileName, config);
 		} else {
 			pdfReporter = null;
 		}

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

@@ -168,7 +168,11 @@ public class StreamCityGmlConsumer implements CityGmlConsumer {
 		for (Entry<ErrorId, AtomicInteger> e : errorCount.entrySet()) {
 			ErrorStatistics stats = new ErrorStatistics();
 			stats.setAmount(e.getValue().get());
-			stats.setName(QualityADEUtils.mapErrorIdToAdeId(e.getKey()));
+			de.hft.stuttgart.quality.model.jaxb.ErrorId adeId = QualityADEUtils.mapErrorIdToAdeId(e.getKey());
+			if (adeId == null) {
+				// error that is not part of the ade standard
+				continue;
+			}
 			statistics.getErrorStatistics().add(stats);
 		}
 		val.setStatistics(statistics);

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

@@ -73,25 +73,26 @@ public class PdfErrorHandler implements ErrorReport {
 		}
 		block.newLine(10);
 		block.addText("</Exterior Ring>", TAG_COLOR);
-		if (p.getInnerRings().isEmpty()) {
-			return;
-		}
-		block.newLine(10);
-		block.addText("<Interior Rings>", TAG_COLOR);
-		for (LinearRing ring : p.getInnerRings()) {
-			block.newLine(20);
-			block.addText("<Interior Ring", TAG_COLOR);
-			addGmlId(ring, block);
-			block.addText(">", TAG_COLOR);
-			for (Vertex v : p.getExteriorRing().getVertices()) {
-				block.newLine(30);
-				addVertexToBlock(block, v);
+		if (!p.getInnerRings().isEmpty()) {
+			block.newLine(10);
+			block.addText("<Interior Rings>", TAG_COLOR);
+			for (LinearRing ring : p.getInnerRings()) {
+				block.newLine(20);
+				block.addText("<Interior Ring", TAG_COLOR);
+				addGmlId(ring, block);
+				block.addText(">", TAG_COLOR);
+				for (Vertex v : p.getExteriorRing().getVertices()) {
+					block.newLine(30);
+					addVertexToBlock(block, v);
+				}
+				block.newLine(20);
+				block.addText("</Interior Ring>", TAG_COLOR);
 			}
-			block.newLine(20);
-			block.addText("</Interior Ring>", TAG_COLOR);
+			block.newLine(10);
+			block.addText("</Interior Rings>", TAG_COLOR);
 		}
-		block.newLine(10);
-		block.addText("</Interior Rings>", TAG_COLOR);
+		block.newLine(0);
+		block.addText("</Polygon>", TAG_COLOR);
 
 	}
 

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

@@ -19,7 +19,6 @@
 package de.hft.stuttgart.citydoctor2.reporting.pdf;
 
 import java.io.OutputStream;
-import java.util.Objects;
 
 import de.hft.stuttgart.citydoctor2.check.ValidationConfiguration;
 import de.hft.stuttgart.citydoctor2.checkresult.utility.CheckReportWriteException;
@@ -35,17 +34,10 @@ import de.hft.stuttgart.citydoctor2.reporting.Reporter;
  */
 public class PdfReporter implements Reporter {
 
-	private String logoPath;
-
-	public PdfReporter(String logoPath) {
-		Objects.requireNonNull(logoPath);
-		this.logoPath = logoPath;
-	}
-
 	@Override
 	public void writeReport(Checks checks, OutputStream outFile, CityDoctorModel model, ValidationConfiguration config)
 			throws CheckReportWriteException {
-		PdfStreamReporter reporter = new PdfStreamReporter(outFile, model.getFileName(), config, logoPath);
+		PdfStreamReporter reporter = new PdfStreamReporter(outFile, model.getFileName(), config);
 		model.createFeatureStream().forEach(reporter::report);
 		reporter.finishReport();
 	}

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

@@ -108,8 +108,7 @@ public class PdfStreamReporter implements StreamReporter {
 
 	private Map<String, Section> sectionMap = new HashMap<>();
 
-	public PdfStreamReporter(OutputStream pdfOutputFile, String fileName, ValidationConfiguration config,
-			String logoPath) {
+	public PdfStreamReporter(OutputStream pdfOutputFile, String fileName, ValidationConfiguration config) {
 		this.config = config;
 		errorStatistics = new HashMap<>();
 		outFile = pdfOutputFile;

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

@@ -85,7 +85,7 @@ public class PdfUtils {
 			Element val2Text = new Element("text", svgNs);
 			svgElement.addContent(val2Text);
 			String val2String = "" + val2;
-			val2Text.setAttribute("x", "" + (WIDTH - val2String.length() * 10));
+			val2Text.setAttribute("x", "" + (WIDTH - val2String.length() * 13));
 			val2Text.setAttribute("y", "20");
 			val2Text.setAttribute("font-size", "18pt");
 			

CityDoctorParent/pom.xml

@@ -4,7 +4,7 @@
 	<modelVersion>4.0.0</modelVersion>
 	<groupId>de.hft.stuttgart</groupId>
 	<artifactId>CityDoctorParent</artifactId>
-	<version>3.10.1-SNAPSHOT</version>
+	<version>3.10.1</version>
 	<packaging>pom</packaging>
 	<name>CityDoctorParent</name>
 
@@ -144,12 +144,13 @@
 			<dependency>
 				<groupId>org.apache.logging.log4j</groupId>
 				<artifactId>log4j-api</artifactId>
-				<version>2.11.2</version>
+				<version>2.15.0</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.11.2</version>
+				<version>2.15.0</version>
 			</dependency>
 			<dependency>
 				<groupId>org.yaml</groupId>