#230 fix ( wkt parsing issue when a task is processed)

failed on calculate bbox on wkt, for examaple: '`POLYGON((\n 143 -39,\n 148 -39,\n 148 -44,\n 143 -44,\n 143 -39\n))`'
AtlasOfLivingAustralia · Jan 25, 2024 · f71f2e9 · f71f2e9
1 parent 14c2879
commit f71f2e9
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 2 deletions.
diff --git a/src/main/groovy/au/org/ala/spatial/intersect/SimpleShapeFile.groovy b/src/main/groovy/au/org/ala/spatial/intersect/SimpleShapeFile.groovy
@@ -274,8 +274,14 @@ class SimpleShapeFile implements Serializable {
     static ArrayList<SimpleRegion> parsePolygon(String polygon) {
         ArrayList<SimpleRegion> regions = new ArrayList<SimpleRegion>()
         for (String p : polygon.split("\\),( )*\\(")) {
+            //remove return/space that immediately occur after ','
+            p = p.replaceAll('[\\n]+', '')
+            //remove space that immediately occur after ','
+            p = p.replaceAll(',[\\s]+', ',').trim()
+
             regions.add(SimpleRegion.parseSimpleRegion(p))
         }
+
         return regions
     }
 

diff --git a/src/main/groovy/au/org/ala/spatial/process/Classification.groovy b/src/main/groovy/au/org/ala/spatial/process/Classification.groovy
@@ -27,7 +27,7 @@ import org.apache.commons.io.FileUtils
 class Classification extends SlaveProcess {
 
     void start() {
-
+        taskLog("Classification is about to start")
         //list of layers
         List<String> layers = getInput('layer').toString().split(',')
         def envnameslist = new String[layers.size()]

diff --git a/src/main/groovy/au/org/ala/spatial/process/SlaveProcess.groovy b/src/main/groovy/au/org/ala/spatial/process/SlaveProcess.groovy
@@ -1114,6 +1114,7 @@ class SlaveProcess {
     }
 
     RegionEnvelope processArea(AreaInput area) {
+        log.info("Parsing WKT ")
         def wkt = getAreaWkt(area)
 
         def region = null
@@ -1123,7 +1124,7 @@ class SlaveProcess {
         } else {
             region = SimpleShapeFile.parseWKT(wkt)
         }
-
+        log.info("Check BBox: " + region?.bounding_box)
         new RegionEnvelope(region, envelope)
     }