From 0c5fbae5d6ef120cfd73ae8ad9107c715a2a8d2a Mon Sep 17 00:00:00 2001
From: Riegel <alexander.riegel@hft-stuttgart.de>
Date: Tue, 21 Jan 2025 17:00:13 +0100
Subject: [PATCH] Fix: Add missing Object types to reports
---
.../citydoctor2/checkresult/CheckReport.java | 3 ++
.../checkresult/ValidationResults.java | 45 +++++++++++++++++--
2 files changed, 45 insertions(+), 3 deletions(-)
diff --git a/CityDoctorParent/CityDoctorCheckResult/src/main/java/de/hft/stuttgart/citydoctor2/checkresult/CheckReport.java b/CityDoctorParent/CityDoctorCheckResult/src/main/java/de/hft/stuttgart/citydoctor2/checkresult/CheckReport.java
index 2f2c756..5f6d0e8 100644
--- a/CityDoctorParent/CityDoctorCheckResult/src/main/java/de/hft/stuttgart/citydoctor2/checkresult/CheckReport.java
+++ b/CityDoctorParent/CityDoctorCheckResult/src/main/java/de/hft/stuttgart/citydoctor2/checkresult/CheckReport.java
@@ -105,6 +105,9 @@ public class CheckReport {
addFeatureReports(report, valResults.getTransportationReports());
addFeatureReports(report, valResults.getVegetationReports());
addFeatureReports(report, valResults.getWaterReports());
+ addFeatureReports(report, valResults.getTunnelReports());
+ addFeatureReports(report, valResults.getCityFurnitureReports());
+ addFeatureReports(report, valResults.getGenericCityObjectReports());
}
}
diff --git a/CityDoctorParent/CityDoctorCheckResult/src/main/java/de/hft/stuttgart/citydoctor2/checkresult/ValidationResults.java b/CityDoctorParent/CityDoctorCheckResult/src/main/java/de/hft/stuttgart/citydoctor2/checkresult/ValidationResults.java
index 403d651..073ad53 100644
--- a/CityDoctorParent/CityDoctorCheckResult/src/main/java/de/hft/stuttgart/citydoctor2/checkresult/ValidationResults.java
+++ b/CityDoctorParent/CityDoctorCheckResult/src/main/java/de/hft/stuttgart/citydoctor2/checkresult/ValidationResults.java
@@ -50,7 +50,15 @@ public class ValidationResults {
@XmlElement(name = "water_object_report")
private List<FeatureReport> waterReports;
-
+
+ @XmlElement(name = "tunnel_report")
+ private List<FeatureReport> tunnelReports;
+
+ @XmlElement(name = "city_furniture_report")
+ private List<FeatureReport> cityFurnitureReports;
+
+ @XmlElement(name = "generic_city_object_report")
+ private List<FeatureReport> genericCityObjectReports;
public List<FeatureReport> getBuildingReports() {
if (buildingReports == null) {
@@ -128,7 +136,38 @@ public class ValidationResults {
public void setWaterReports(List<FeatureReport> waterReports) {
this.waterReports = waterReports;
}
-
-
+
+ public List<FeatureReport> getTunnelReports() {
+ if (tunnelReports == null) {
+ tunnelReports = new ArrayList<>();
+ }
+ return tunnelReports;
+ }
+
+ public void setTunnelReports(List<FeatureReport> tunnelReports) {
+ this.tunnelReports = tunnelReports;
+ }
+
+ public List<FeatureReport> getCityFurnitureReports() {
+ if (cityFurnitureReports == null) {
+ cityFurnitureReports = new ArrayList<>();
+ }
+ return cityFurnitureReports;
+ }
+
+ public void setCityFurnitureReports(List<FeatureReport> cityFurnitureReports) {
+ this.cityFurnitureReports = cityFurnitureReports;
+ }
+
+ public List<FeatureReport> getGenericCityObjectReports() {
+ if (genericCityObjectReports == null) {
+ genericCityObjectReports = new ArrayList<>();
+ }
+ return genericCityObjectReports;
+ }
+
+ public void setGenericCityObjectReports(List<FeatureReport> genericCityObjectReports) {
+ this.genericCityObjectReports = genericCityObjectReports;
+ }
}
--
GitLab