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 2f2c756e792d4e865598822dc7cc1d014cdac067..5f6d0e84a13d85651254267814d2324a30653bd0 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 403d65137748af5141a20e0a58962bd1288da2cf..073ad53bed436f6c00d718c3b3281cd64907acba 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; + } }