Merge pull request #590 from Universite-Gustave-Eiffel/fixkmlpath

Fix kml path
Universite-Gustave-Eiffel · Jul 25, 2023 · 20e40f4 · 20e40f4
2 parents ac6322e + 912220b
commit 20e40f4
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 5 deletions.
diff --git a/wps_scripts/.gitignore b/wps_scripts/.gitignore
@@ -2,4 +2,5 @@ out/
 .gradle
 build/
 .idea
-dependencies/
+dependencies/
+lib/
diff --git a/.../groovy/org/noise_planet/noisemodelling/wps/NoiseModelling/Noise_level_from_source.groovy b/.../groovy/org/noise_planet/noisemodelling/wps/NoiseModelling/Noise_level_from_source.groovy
@@ -588,17 +588,17 @@ def exec(Connection connection, input) {
     String kmlFileNamePrepend = ""
     if (input['confRaysName'] && !((input['confRaysName'] as String).isEmpty())) {
         String confRaysName = input['confRaysName'] as String
-        if(confRaysName.startsWith("file:")) {
+        if(confRaysName.toLowerCase().startsWith("file:")) {
             ldenConfig.setExportRaysMethod(LDENConfig.ExportRaysMethods.TO_MEMORY)
             URL url = new URL(confRaysName)
             File urlFile = new File(url.toURI())
             if(urlFile.isDirectory()) {
                 folderExportKML = urlFile
             } else {
                 folderExportKML = urlFile.getParentFile()
-                kmlFileNamePrepend = confRaysName.substring(
-                        Math.max(0, confRaysName.lastIndexOf(File.separator) + 1),
-                        Math.max(0, confRaysName.lastIndexOf(".")))
+                String fileName = urlFile.getName()
+                int positionExt = fileName.lastIndexOf(".")
+                kmlFileNamePrepend = fileName.substring(0, positionExt > 0 ? positionExt : fileName.length())
             }
         } else {
             ldenConfig.setExportRaysMethod(LDENConfig.ExportRaysMethods.TO_RAYS_TABLE)