fix : modified FileLoader sub-extention correction.

Gaia3D · Apr 1, 2024 · 4474a89 · 4474a89
1 parent 367d89e
commit 4474a89
Show file tree

Hide file tree

Showing 4 changed files with 12 additions and 10 deletions.
diff --git a/tiler/src/main/java/com/gaia3d/converter/BatchedFileLoader.java b/tiler/src/main/java/com/gaia3d/converter/BatchedFileLoader.java
@@ -125,12 +125,12 @@ public List<TileInfo> loadTileInfo(File file) {
         return tileInfos;
     }
 
-    private String[] getExtensions(FormatType formatType) {
+    /*private String[] getExtensions(FormatType formatType) {
         String[] extensions = new String[4];
         extensions[0] = formatType.getExtension().toLowerCase();
         extensions[1] = formatType.getExtension().toUpperCase();
         extensions[2] = formatType.getSubExtension().toLowerCase();
         extensions[3] = formatType.getSubExtension().toUpperCase();
         return extensions;
-    }
+    }*/
 }
diff --git a/tiler/src/main/java/com/gaia3d/converter/FileLoader.java b/tiler/src/main/java/com/gaia3d/converter/FileLoader.java
@@ -1,5 +1,6 @@
 package com.gaia3d.converter;
 
+import com.gaia3d.basic.types.FormatType;
 import com.gaia3d.process.tileprocess.tile.TileInfo;
 import org.geotools.coverage.grid.GridCoverage2D;
 
@@ -10,4 +11,13 @@ public interface FileLoader {
     public List<TileInfo> loadTileInfo(File file);
     public List<File> loadFiles();
     public List<GridCoverage2D> loadGridCoverages(List<GridCoverage2D> coverages);
+
+    default String[] getExtensions(FormatType formatType) {
+        String[] extensions = new String[4];
+        extensions[0] = formatType.getExtension().toLowerCase();
+        extensions[1] = formatType.getExtension().toUpperCase();
+        extensions[2] = formatType.getSubExtension().toLowerCase();
+        extensions[3] = formatType.getSubExtension().toUpperCase();
+        return extensions;
+    }
 }
diff --git a/tiler/src/main/java/com/gaia3d/converter/InstancedFileLoader.java b/tiler/src/main/java/com/gaia3d/converter/InstancedFileLoader.java
@@ -133,8 +133,4 @@ public List<TileInfo> loadTileInfo(File file) {
         }
         return tileInfos;
     }
-
-    private String[] getExtensions(FormatType formatType) {
-        return new String[]{formatType.getExtension().toLowerCase(), formatType.getExtension().toUpperCase()};
-    }
 }
diff --git a/tiler/src/main/java/com/gaia3d/converter/PointCloudFileLoader.java b/tiler/src/main/java/com/gaia3d/converter/PointCloudFileLoader.java
@@ -63,8 +63,4 @@ public List<TileInfo> loadTileInfo(File file) {
         }
         return tileInfos;
     }
-
-    private String[] getExtensions(FormatType formatType) {
-        return new String[]{formatType.getExtension().toLowerCase(), formatType.getExtension().toUpperCase()};
-    }
 }