Merge pull request #258 from StefanVanDyck/fix-grid-layer-upload

Fix grid layer upload and MaxEnt predictions

Author: adam-collins

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) {