Fixed test #929

AtlasOfLivingAustralia · Jun 13, 2024 · 134b2f6 · 134b2f6
1 parent 7d1b615
commit 134b2f6
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 4 deletions.
diff --git a/grails-app/services/au/org/ala/ecodata/SpatialService.groovy b/grails-app/services/au/org/ala/ecodata/SpatialService.groovy
@@ -152,8 +152,8 @@ class SpatialService {
 //
 // start = end
 // Geometry boundaryGeometry = GeometryUtils.geoJsonMapToGeometry(boundaryGeoJson)
- def proxy = grailsApplication.mainContext.spatialService
- Geometry boundaryGeometry = proxy.getGeoJsonForPidToGeometry(boundaryPid)
+ //def proxy = grailsApplication.mainContext.spatialService
+ Geometry boundaryGeometry = getGeoJsonForPidToGeometry(boundaryPid)
  long end = System.currentTimeMillis()
  log.debug("Time taken to convert geojson to geometry for pid $boundaryPid: ${end-start}ms")
 

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/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()
+ 1 * webService.get("/ws/shapes/wkt/123") >> GeometryUtils.geoJsonMapToGeometry([type: "Polygon", coordinates: [[[5, 0], [5, 5], [0, 5], [0, 0], [5, 0]]]])
+ 1 * webService.get("/ws/shapes/wkt/456") >> GeometryUtils.geoJsonMapToGeometry([type: "Polygon", coordinates: [[[11.5, 9.5], [11.5, 11.5], [9.5, 11.5], [9.5, 9.5], [11.5, 9.5]]]])
  }
 }