Changing to wkt due to issues parsing Features #929

AtlasOfLivingAustralia · Jun 13, 2024 · e6665b9 · e6665b9
1 parent 1bb8ee8
commit e6665b9
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 5 deletions.
diff --git a/grails-app/services/au/org/ala/ecodata/SpatialService.groovy b/grails-app/services/au/org/ala/ecodata/SpatialService.groovy
@@ -8,6 +8,7 @@ import org.geotools.geojson.geom.GeometryJSON
 import org.locationtech.jts.geom.Coordinate
 import org.locationtech.jts.geom.Geometry
 import org.locationtech.jts.geom.GeometryFactory
+import org.locationtech.jts.io.WKTReader
 
 import static ParatooService.deepCopy
 /**
@@ -244,12 +245,12 @@ class SpatialService {
  Geometry getGeoJsonForPidToGeometry(String pid) {
  log.debug("Cache miss for getGeoJsonForPidToMap($pid)")
  log.debug("Cache miss for getGeoJsonForPid($pid)")
- String url = grailsApplication.config.getProperty('spatial.baseUrl')+"/ws/shapes/geojson/$pid"
- String jsonText = webService.get(url)
+ String url = grailsApplication.config.getProperty('spatial.baseUrl')+"/ws/shapes/wkt/$pid"
+ String wkt = webService.get(url)
 
  Geometry geometry = null
  try {
- geometry = new GeometryJSON().read(jsonText)
+ geometry = new WKTReader().read(wkt)
  log.info("*************************************Successfully created geometry for pid $pid")
  }
  catch (Exception e) {

diff --git a/src/test/groovy/au/org/ala/ecodata/SpatialServiceSpec.groovy b/src/test/groovy/au/org/ala/ecodata/SpatialServiceSpec.groovy
@@ -58,7 +58,7 @@ class SpatialServiceSpec extends Specification implements ServiceUnitTest<Spatia
  then:
  response["cl22"].size() == 1
  response["cl22"][0].name == "ACT"
- 1 * webService.get("/ws/shapes/geojson/123") >> ([type: "Polygon", coordinates: [[[5, 0], [5, 5], [0, 5], [0, 0], [5, 0]]]] as JSON).toString()
- 1 * webService.get("/ws/shapes/geojson/456") >> ([type: "Polygon", coordinates: [[[11.5, 9.5], [11.5, 11.5], [9.5, 11.5], [9.5, 9.5], [11.5, 9.5]]]] as JSON).toString()
+ 1 * webService.get("/ws/shapes/wkt/123") >> ([type: "Polygon", coordinates: [[[5, 0], [5, 5], [0, 5], [0, 0], [5, 0]]]] as JSON).toString()
+ 1 * webService.get("/ws/shapes/wkt/456") >> ([type: "Polygon", coordinates: [[[11.5, 9.5], [11.5, 11.5], [9.5, 11.5], [9.5, 9.5], [11.5, 9.5]]]] as JSON).toString()
  }
 }