Added test for getSimpleProjectArea method, fixed config retrieval

AtlasOfLivingAustralia · Sep 25, 2024 · 02ebb01 · 02ebb01
1 parent e726a1b
commit 02ebb01
Show file tree

Hide file tree

Showing 2 changed files with 18 additions and 2 deletions.
diff --git a/grails-app/services/au/org/ala/ecodata/SiteService.groovy b/grails-app/services/au/org/ala/ecodata/SiteService.groovy
@@ -256,8 +256,8 @@ class SiteService {
     }
 
     def getSimpleProjectArea(projectSiteId) {
-        def threshold = grailsApplication.config.getProperty('biocollect.projectArea.simplificationThreshold', 10000)
-        def tolerance = grailsApplication.config.getProperty('biocollect.projectArea.simplificationTolerance', 0.0001)
+        def threshold = grailsApplication.config.getProperty('biocollect.projectArea.simplificationThreshold', Integer, 10000)
+        def tolerance = grailsApplication.config.getProperty('biocollect.projectArea.simplificationTolerance', Double, 0.0001)
         log.info("Threshhold ${threshold} Tolerance ${tolerance}")
 
         def site = get(projectSiteId, [SiteService.FLAT, SiteService.INDEXING])

diff --git a/src/test/groovy/au/org/ala/ecodata/SiteServiceSpec.groovy b/src/test/groovy/au/org/ala/ecodata/SiteServiceSpec.groovy
@@ -350,6 +350,22 @@ class SiteServiceSpec extends MongoSpec implements ServiceUnitTest<SiteService>
 
     }
 
+    def "Site service returns simplified geometry for siteId"() {
+        when:
+        def coordinates = [[148.260498046875, -37.26530995561874], [148.260498046875, -37.26531995561874], [148.310693359375, -37.26531995561874], [148.310693359375, -37.26531995561874], [148.260498046875, -37.26530995561874]]
+        def extent = [
+                geometry: [
+                        type       : "Polygon",
+                        coordinates: coordinates
+                ]
+        ]
+        def newSite = service.create([name:'Site 1', extent: extent])
+
+        then:
+        def site = service.getSimpleProjectArea(newSite.siteId)
+        site.geoIndex != null
+    }
+
     private Map buildExtent(source, type, coordinates, pid = '') {
         return [source:source, geometry:[type:type, coordinates: coordinates, pid:pid]]
     }