Return features for sites with features array AtlasOfLivingAustralia/fieldcapture#3381

chrisala · chrisala · commit e0cee8838e1a · 2024-12-20T09:18:27.000+11:00
diff --git a/grails-app/services/au/org/ala/ecodata/SiteService.groovy b/grails-app/services/au/org/ala/ecodata/SiteService.groovy
@@ -207,7 +207,7 @@ class SiteService {
         ]
         Map geojson
 
-        if (site.type == Site.TYPE_COMPOUND) {
+        if (site.features) {
             geojson = [
                     type:'FeatureCollection',
                     properties: properties,
diff --git a/src/main/groovy/au/org/ala/ecodata/reporting/ShapefileBuilder.groovy b/src/main/groovy/au/org/ala/ecodata/reporting/ShapefileBuilder.groovy
@@ -96,7 +96,7 @@ class ShapefileBuilder {
             createShapefile()
         }
         try {
-            if (Site.TYPE_COMPOUND == site.type) {
+            if (site.features) {
                 site.features.each { Map feature ->
                     if (feature.geometry) {
                         Map siteProps = new HashMap(site)

Original file line number	Diff line number	Diff line change
`@@ -207,7 +207,7 @@ class SiteService {`
`207`	`207`	`]`
`208`	`208`	`Map geojson`
`209`	`209`
`210`		`- if (site.type == Site.TYPE_COMPOUND) {`
	`210`	`+ if (site.features) {`
`211`	`211`	`geojson = [`
`212`	`212`	`type:'FeatureCollection',`
`213`	`213`	`properties: properties,`
Original file line number	Diff line number	Diff line change
`@@ -96,7 +96,7 @@ class ShapefileBuilder {`
`96`	`96`	`createShapefile()`
`97`	`97`	`}`
`98`	`98`	`try {`
`99`		`- if (Site.TYPE_COMPOUND == site.type) {`
	`99`	`+ if (site.features) {`
`100`	`100`	`site.features.each { Map feature ->`
`101`	`101`	`if (feature.geometry) {`
`102`	`102`	`Map siteProps = new HashMap(site)`