Refactor: Move function

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

@@ -18,6 +18,8 @@
  */
 package de.hft.stuttgart.citydoctor2.datastructure;
 
+import de.hft.stuttgart.quality.model.enums.TopLevelFeatureType;
+
 /**
  * Possible feature types in CityGML
  *
@@ -27,5 +29,17 @@ public enum FeatureType {
 
     BUILDING, TRANSPORTATION, VEGETATION, BRIDGE, LAND, WATER, BOUNDARY_SURFACE, INSTALLATION, OPENING,
     BUILDING_PART, BUILDING_SUBDIVISION, BRIDGE_CONSTRUCTION_ELEMENT, BRIDGE_INSTALLATION, ROOM, FURNITURE, CITY_FURNITURE,
-    OTHER_CITY_OBJECT, TUNNEL, TUNNEL_PART, TUNNEL_CONSTRUCTION_ELEMENT, TUNNEL_INSTALLATION,
+    OTHER_CITY_OBJECT, TUNNEL, TUNNEL_PART, TUNNEL_CONSTRUCTION_ELEMENT, TUNNEL_INSTALLATION;
+
+     public TopLevelFeatureType mapToTopLevelFeatureType() {
+         return switch (this) {
+             case BRIDGE -> TopLevelFeatureType.BRIDGE;
+             case BUILDING -> TopLevelFeatureType.BUILDING;
+             case LAND -> TopLevelFeatureType.LAND;
+             case TRANSPORTATION -> TopLevelFeatureType.TRANSPORTATION;
+             case VEGETATION -> TopLevelFeatureType.VEGETATION;
+             case WATER -> TopLevelFeatureType.WATER;
+             default -> null;
+         };
+    }
 }

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

@@ -150,6 +150,7 @@ public class Checker {
         if (!model.isValidated() || xmlOutput == null) {
             return;
         }
+        Checker c = new Checker(null, null);
         File xmlFile = new File(xmlOutput);
         if (xmlFile.getParentFile() != null && xmlFile.getParentFile().mkdirs()) {
             logger.trace("Xml dir created");
@@ -389,12 +390,11 @@ public class Checker {
         if (excludeFilters != null) {
             for (Filter f : excludeFilters) {
                 if (f instanceof TypeFilter tf) {
-                    FeatureType type = tf.getType();
-                    TopLevelFeatureType tlft = mapToTopLevelFeatureType(type);
-                    if (tlft == null) {
+                    TopLevelFeatureType type = tf.getType().mapToTopLevelFeatureType();
+                    if (type == null) {
                         continue;
                     }
-                    removeFilter(tlft, filter);
+                    removeFilter(type, filter);
                 }
             }
         }
@@ -408,13 +408,12 @@ public class Checker {
         } else {
             for (Filter f : includeFilters) {
                 if (f instanceof TypeFilter tf) {
-                    FeatureType type = tf.getType();
-                    TopLevelFeatureType tlft = mapToTopLevelFeatureType(type);
-                    if (tlft == null) {
+                    TopLevelFeatureType type = tf.getType().mapToTopLevelFeatureType();
+                    if (type == null) {
                         continue;
                     }
                     Checking c = new Checking();
-                    c.setFeatureType(tlft);
+                    c.setFeatureType(type);
                     filter.getChecking().add(new CheckingProperty(c));
                 }
             }
@@ -462,18 +461,6 @@ public class Checker {
         }
     }
 
-    private TopLevelFeatureType mapToTopLevelFeatureType(FeatureType type) {
-        return switch (type) {
-            case BRIDGE -> TopLevelFeatureType.BRIDGE;
-            case BUILDING -> TopLevelFeatureType.BUILDING;
-            case LAND -> TopLevelFeatureType.LAND;
-            case TRANSPORTATION -> TopLevelFeatureType.TRANSPORTATION;
-            case VEGETATION -> TopLevelFeatureType.VEGETATION;
-            case WATER -> TopLevelFeatureType.WATER;
-            default -> null;
-        };
-    }
-
     private RequirementId mapToRequirement(String requirementName) {
         try {
             return RequirementId.valueOf(requirementName);