Merge branch 'develop' into 237-exporting-point-geometry

# Conflicts:
#	grails-app/conf/application.yml

Author: Adam Collins

grails-app/conf/application.yml

@@ -467,6 +467,9 @@ openapi:
   version: '@info.app.version@'
   cachetimeoutms: 4000
 
+# Allow setting a fixed locale to prevent number formatting issues: https://github.com/AtlasOfLivingAustralia/spatial-service/issues/247
+#useFixedLocale: en
+
 # Internal sandbox service for processing uploaded CSV files
 sandboxEnabled: true
 sandboxSolrUrl: http://localhost:8983/solr

grails-app/conf/spring/resources.groovy

@@ -5,6 +5,7 @@ import au.org.ala.spatial.web.NoSSOStrategy
 import com.github.ziplet.filter.compression.CompressingFilter
 import org.springframework.boot.web.servlet.FilterRegistrationBean
 import org.springframework.core.Ordered
+import org.springframework.web.servlet.i18n.FixedLocaleResolver
 
 beans = {
     compressionFilter(FilterRegistrationBean) {
@@ -17,4 +18,10 @@ beans = {
     if (!application.config.security.cas.enabled && !application.config.security.oidc.enabled) {
         noSSOStrategy(NoSSOStrategy) {}
     }
+
+    if (grailsApplication.config.useFixedLocale) {
+        // Use fixed English locale, prevents issues with parsing of BBox decimal values in some locales
+        // https://github.com/AtlasOfLivingAustralia/spatial-service/issues/247
+        localeResolver(FixedLocaleResolver, new Locale(grailsApplication.config.useFixedLocale))
+    }
 }

grails-app/services/au/org/ala/spatial/ManageLayersService.groovy

@@ -621,19 +621,22 @@ class ManageLayersService {
             }
         }
 
-        //raw upload
-        //TODO: tidy messages for id == name (layer already deleted)
-//        String[] result;
-//        result = httpCall("DELETE",
-//                geoserverUrl + "/rest/workspaces/ALA/datastores/" + id + "?recurse=true", ///external.shp",
-//                geoserverUsername, geoserverPassword,
-//                null,null,
-//                "text/plain");
-//        result = httpCall("DELETE",
-//                geoserverUrl + "/rest/workspaces/ALA/coveragestores/" + id + "?recurse=true", //"/external.geotiff",
-//                geoserverUsername, geoserverPassword,
-//                null,null,
-//                "text/plain");
+        //Delete raw upload
+        httpCall("DELETE",
+                geoserverUrl + "/rest/workspaces/ALA/datastores/" + id + "?recurse=true", ///external.shp",
+                geoserverUsername, geoserverPassword,
+                null, null,
+                "text/plain");
+        httpCall("DELETE",
+                geoserverUrl + "/rest/workspaces/ALA/coveragestores/" + id + "?recurse=true", //"/external.geotiff",
+                geoserverUsername, geoserverPassword,
+                null, null,
+                "text/plain");
+
+        def layerDataFolder = new File(spatialConfig.data.dir.toString() + "/uploads/" + id)
+        if (layerDataFolder.exists()) {
+            FileUtils.deleteDirectory(layerDataFolder)
+        }
     }
 
     def deleteField(String fieldId) {

src/main/groovy/au/org/ala/spatial/process/LayerCreation.groovy

@@ -92,7 +92,7 @@ class LayerCreation extends SlaveProcess {
             new File(outPath + "_tmp.bil").delete()
 
             taskWrapper.task.message = 'bil > diva'
-            Bil2diva.bil2diva(outPath, outPath, layer.environmentalvalueunits.toString())
+            Bil2diva.bil2diva(outPath, outPath, layer.environmentalvalueunits.toString(), spatialConfig.gdal.dir.toString(), 36000000)
 
             if ("Contextual".equalsIgnoreCase(layer.type.toString())) {
                 taskWrapper.task.message = "process grid file to shapes"

src/main/groovy/au/org/ala/spatial/util/OccurrenceData.groovy

@@ -35,7 +35,7 @@ class OccurrenceData {
 
         //remove sensitive records that will not be LSID matched
         try {
-            Records r = new Records(bs, q + "&fq=" + UriEncoder.encode("-sensitive:[* TO *]"), null, records_filename, null, facetName)
+            Records r = new Records(bs, q + "&fq=" + URLEncoder.encode("-sensitive:[* TO *]", "utf-8"), null, records_filename, null, facetName)
 
             StringBuilder sb = null
             if (r.getRecordsSize() > 0) {