Fix: Add newly added top-level types

CityDoctorParent/CityDoctorCheckResult/src/main/java/de/hft/stuttgart/citydoctor2/checkresult/GlobalErrorStatistics.java

@@ -43,6 +43,15 @@ public class GlobalErrorStatistics {
 	@XmlElement(name = "num_error_transportation")
 	private int numErrorTransportation;
 
+	@XmlElement(name = "num_error_tunnel_objects")
+	private int numErrorTunnelObjects;
+
+	@XmlElement(name = "num_error_city_furniture")
+	private int numErrorCityFurniture;
+
+	@XmlElement(name = "num_error_generic_city_objects")
+	private int numErrorGenericCityObjects;
+
 	public int getNumErrorBuildings() {
 		return numErrorBuildings;
 	}
@@ -91,5 +100,27 @@ public class GlobalErrorStatistics {
 		this.numErrorTransportation = numErrorTransportation;
 	}
 
-	
+	public int getNumErrorTunnelObjects() {
+		return numErrorTunnelObjects;
+	}
+
+	public void setNumErrorTunnelObjects(int numErrorTunnelObjects) {
+		this.numErrorTunnelObjects = numErrorTunnelObjects;
+	}
+
+	public int getNumErrorCityFurniture() {
+		return numErrorCityFurniture;
+	}
+
+	public void setNumErrorCityFurniture(int numErrorCityFurniture) {
+		this.numErrorCityFurniture = numErrorCityFurniture;
+	}
+
+	public int getNumErrorGenericCityObjects() {
+		return numErrorGenericCityObjects;
+	}
+
+	public void setNumErrorGenericCityObjects(int numErrorGenericCityObjects) {
+		this.numErrorGenericCityObjects = numErrorGenericCityObjects;
+	}
 }

CityDoctorParent/CityDoctorCheckResult/src/main/java/de/hft/stuttgart/citydoctor2/checkresult/ModelStatistics.java

@@ -43,6 +43,16 @@ public class ModelStatistics {
     @XmlElement(name = "num_water_objects", required = true)
     private int numWaterObjects;
 
+	@XmlElement(name = "num_tunnel_objects", required = true)
+	private int numTunnelObjects;
+
+	@XmlElement(name = "num_city_furniture", required = true)
+	private int numCityFurniture;
+
+	@XmlElement(name = "num_generic_city_objects", required = true)
+	private int numGenericCityObjects;
+
+
 	public int getNumBuildings() {
 		return numBuildings;
 	}
@@ -91,4 +101,27 @@ public class ModelStatistics {
 		this.numWaterObjects = numWaterObjects;
 	}
 
+	public int getNumTunnelObjects() {
+		return numTunnelObjects;
+	}
+
+	public void setNumTunnelObjects(int numTunnelObjects) {
+		this.numTunnelObjects = numTunnelObjects;
+	}
+
+	public int getNumCityFurniture() {
+		return numCityFurniture;
+	}
+
+	public void setNumCityFurniture(int numCityFurniture) {
+		this.numCityFurniture = numCityFurniture;
+	}
+
+	public int getNumGenericCityObjects() {
+		return numGenericCityObjects;
+	}
+
+	public void setNumGenericCityObjects(int numGenericCityObjects) {
+		this.numGenericCityObjects = numGenericCityObjects;
+	}
 }

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

@@ -32,6 +32,7 @@ import java.util.concurrent.atomic.AtomicInteger;
 import de.hft.stuttgart.citydoctor2.datastructure.CityFurniture;
 import de.hft.stuttgart.citydoctor2.datastructure.GenericCityObject;
 import de.hft.stuttgart.citydoctor2.datastructure.Tunnel;
+import de.hft.stuttgart.citydoctor2.datastructure.TunnelPart;
 import org.apache.logging.log4j.LogManager;
 import org.apache.logging.log4j.Logger;
 
@@ -206,12 +207,21 @@ public class XmlStreamReporter implements StreamReporter {
 	}
 
 	private void reportTunnel(Tunnel to) {
+		FeatureReport fr = createCityObjectReportNode(to);
+		for (TunnelPart tp : to.getTunnelParts()) {
+			reportMap.put(tp.getGmlId().getGmlString(), fr);
+		}
+		report.getValidationResults().getTunnelReports().add(fr);
 	}
 
 	private void reportCityFurniture(CityFurniture cf) {
+		FeatureReport fr = createCityObjectReportNode(cf);
+		report.getValidationResults().getCityFurnitureReports().add(fr);
 	}
 
 	private void reportGenericCityObject(GenericCityObject gco) {
+		FeatureReport fr = createCityObjectReportNode(gco);
+		report.getValidationResults().getGenericCityObjectReports().add(fr);
 	}
 
 	private FeatureReport createCityObjectReportNode(CityObject co) {
@@ -275,6 +285,9 @@ public class XmlStreamReporter implements StreamReporter {
 		createStatistics(globalErrorCount, report.getValidationResults().getTransportationReports());
 		createStatistics(globalErrorCount, report.getValidationResults().getVegetationReports());
 		createStatistics(globalErrorCount, report.getValidationResults().getWaterReports());
+		createStatistics(globalErrorCount, report.getValidationResults().getTunnelReports());
+		createStatistics(globalErrorCount, report.getValidationResults().getCityFurnitureReports());
+		createStatistics(globalErrorCount, report.getValidationResults().getGenericCityObjectReports());
 
 		addStatisticsObjects(stats.getErrorStats(), globalErrorCount);
 		report.setGlobalStatistics(stats);
@@ -289,6 +302,9 @@ public class XmlStreamReporter implements StreamReporter {
 		modelStats.setNumTransportation(report.getValidationResults().getTransportationReports().size());
 		modelStats.setNumVegetation(report.getValidationResults().getVegetationReports().size());
 		modelStats.setNumWaterObjects(report.getValidationResults().getWaterReports().size());
+		modelStats.setNumTunnelObjects(report.getValidationResults().getTunnelReports().size());
+		modelStats.setNumCityFurniture(report.getValidationResults().getCityFurnitureReports().size());
+		modelStats.setNumGenericCityObjects(report.getValidationResults().getGenericCityObjectReports().size());
 		return modelStats;
 	}
 
@@ -303,6 +319,12 @@ public class XmlStreamReporter implements StreamReporter {
 		globErrStats
 				.setNumErrorVegetation(getNumberOfErrorFeatures(report.getValidationResults().getVegetationReports()));
 		globErrStats.setNumErrorWaterObjects(getNumberOfErrorFeatures(report.getValidationResults().getWaterReports()));
+		globErrStats.setNumErrorTunnelObjects(
+				getNumberOfErrorFeatures(report.getValidationResults().getTunnelReports()));
+		globErrStats.setNumErrorCityFurniture(
+				getNumberOfErrorFeatures(report.getValidationResults().getCityFurnitureReports()));
+		globErrStats.setNumErrorGenericCityObjects(
+				getNumberOfErrorFeatures(report.getValidationResults().getGenericCityObjectReports()));
 		return globErrStats;
 	}
 

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

@@ -672,6 +672,21 @@ public class PdfStreamReporter implements StreamReporter {
 			statistics.addDistributionBar("Land Objects", numErrorLand, numOkLand);
 		}
 
+		int numTunnel = numErrorTunnel + numOkTunnel;
+		if (numTunnel > 0) {
+			statistics.addDistributionBar("Tunnel Objects", numErrorTunnel, numOkTunnel);
+		}
+
+		int numCityFurniture = numErrorCityFurniture + numOkCityFurniture;
+		if (numCityFurniture > 0) {
+			statistics.addDistributionBar("City Furniture", numErrorCityFurniture, numOkCityFurniture);
+		}
+
+		int numGenericCityObjects = numErrorGenericCityObject + numOkGenericCityObject;
+		if (numGenericCityObjects > 0) {
+			statistics.addDistributionBar("Generic City Objects", numErrorGenericCityObject, numOkGenericCityObject);
+		}
+
 		statistics.addTextElement("Error Statistics:");
 		for (Entry<ErrorId, AtomicInteger> e : errorStatistics.entrySet()) {
 			statistics.add10PtTextElement(e.getKey().toString() + ": " + e.getValue().intValue(), 10);