[kml/collada] feature type filter is not used when exporting objects …

…via their gml:id
3dcitydb · Apr 17, 2015 · 58a9a9d · 58a9a9d
1 parent 68b3a55
commit 58a9a9d
Showing 1 changed file with 12 additions and 11 deletions.
diff --git a/src/org/citydb/modules/kml/database/KmlSplitter.java b/src/org/citydb/modules/kml/database/KmlSplitter.java
@@ -76,56 +76,57 @@ public KmlSplitter(DatabaseConnectionPool dbConnectionPool,
 		this.filterConfig = config.getProject().getKmlExporter().getFilter();
 
 		CURRENTLY_ALLOWED_CITY_OBJECT_TYPES.clear();
+		boolean allowAllTypes = !filterConfig.isSetComplexFilter();
 
-		if (filterConfig.getComplexFilter().getFeatureClass().isSetBuilding()) {
+		if (allowAllTypes || filterConfig.getComplexFilter().getFeatureClass().isSetBuilding()) {
 			CURRENTLY_ALLOWED_CITY_OBJECT_TYPES.add(CityGMLClass.BUILDING);
 		}
 
-		if (filterConfig.getComplexFilter().getFeatureClass().isSetWaterBody()) {
+		if (allowAllTypes || filterConfig.getComplexFilter().getFeatureClass().isSetWaterBody()) {
 			CURRENTLY_ALLOWED_CITY_OBJECT_TYPES.add(CityGMLClass.WATER_BODY);
 		}
 
-		if (filterConfig.getComplexFilter().getFeatureClass().isSetLandUse()) {
+		if (allowAllTypes || filterConfig.getComplexFilter().getFeatureClass().isSetLandUse()) {
 			CURRENTLY_ALLOWED_CITY_OBJECT_TYPES.add(CityGMLClass.LAND_USE);
 		}
 
-		if (filterConfig.getComplexFilter().getFeatureClass().isSetVegetation()
+		if (allowAllTypes || filterConfig.getComplexFilter().getFeatureClass().isSetVegetation()
 				&& config.getProject().getKmlExporter().getLodToExportFrom() > 0) {
 			CURRENTLY_ALLOWED_CITY_OBJECT_TYPES.add(CityGMLClass.SOLITARY_VEGETATION_OBJECT);
 			CURRENTLY_ALLOWED_CITY_OBJECT_TYPES.add(CityGMLClass.PLANT_COVER);
 		}
 
-		if (filterConfig.getComplexFilter().getFeatureClass().isSetTransportation()) {
+		if (allowAllTypes || filterConfig.getComplexFilter().getFeatureClass().isSetTransportation()) {
 			CURRENTLY_ALLOWED_CITY_OBJECT_TYPES.add(CityGMLClass.TRANSPORTATION_COMPLEX);
 			CURRENTLY_ALLOWED_CITY_OBJECT_TYPES.add(CityGMLClass.TRACK);
 			CURRENTLY_ALLOWED_CITY_OBJECT_TYPES.add(CityGMLClass.RAILWAY);
 			CURRENTLY_ALLOWED_CITY_OBJECT_TYPES.add(CityGMLClass.ROAD);
 			CURRENTLY_ALLOWED_CITY_OBJECT_TYPES.add(CityGMLClass.SQUARE);
 		}
 
-		if (filterConfig.getComplexFilter().getFeatureClass().isSetReliefFeature()
+		if (allowAllTypes || filterConfig.getComplexFilter().getFeatureClass().isSetReliefFeature()
 				&& config.getProject().getKmlExporter().getLodToExportFrom() > 0) {
 			CURRENTLY_ALLOWED_CITY_OBJECT_TYPES.add(CityGMLClass.RELIEF_FEATURE);
 		}
 
-		if (filterConfig.getComplexFilter().getFeatureClass().isSetGenericCityObject()) {
+		if (allowAllTypes || filterConfig.getComplexFilter().getFeatureClass().isSetGenericCityObject()) {
 			CURRENTLY_ALLOWED_CITY_OBJECT_TYPES.add(CityGMLClass.GENERIC_CITY_OBJECT);
 		}
 
-		if (filterConfig.getComplexFilter().getFeatureClass().isSetCityFurniture()
+		if (allowAllTypes || filterConfig.getComplexFilter().getFeatureClass().isSetCityFurniture()
 				&& config.getProject().getKmlExporter().getLodToExportFrom() > 0) {
 			CURRENTLY_ALLOWED_CITY_OBJECT_TYPES.add(CityGMLClass.CITY_FURNITURE);
 		}
 
-		if (filterConfig.getComplexFilter().getFeatureClass().isSetCityObjectGroup()
+		if (allowAllTypes || filterConfig.getComplexFilter().getFeatureClass().isSetCityObjectGroup()
 				&& config.getProject().getKmlExporter().getLodToExportFrom() > 0) {
 			CURRENTLY_ALLOWED_CITY_OBJECT_TYPES.add(CityGMLClass.CITY_OBJECT_GROUP);
 		}
-		if (filterConfig.getComplexFilter().getFeatureClass().isSetBridge()
+		if (allowAllTypes || filterConfig.getComplexFilter().getFeatureClass().isSetBridge()
 				&& config.getProject().getKmlExporter().getLodToExportFrom() > 0) {
 			CURRENTLY_ALLOWED_CITY_OBJECT_TYPES.add(CityGMLClass.BRIDGE);
 		}
-		if (filterConfig.getComplexFilter().getFeatureClass().isSetTunnel()
+		if (allowAllTypes || filterConfig.getComplexFilter().getFeatureClass().isSetTunnel()
 				&& config.getProject().getKmlExporter().getLodToExportFrom() > 0) {
 			CURRENTLY_ALLOWED_CITY_OBJECT_TYPES.add(CityGMLClass.TUNNEL);
 		}