Updated the SciStarter initiator to use the projectArea

AtlasOfLivingAustralia · Oct 3, 2024 · 16e030f · 16e030f
1 parent ec01f60
commit 16e030f
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 24 deletions.
diff --git a/src/main/groovy/au/org/ala/biocollect/projectresult/BioCollect.groovy b/src/main/groovy/au/org/ala/biocollect/projectresult/BioCollect.groovy
@@ -39,17 +39,10 @@ class BioCollect {
                 ]
             }
 
-            Map siteGeom;
-            doc?.sites?.each { site ->
-                if (doc?.projectSiteId == site.siteId) {
-                    siteGeom = site.extent?.geometry;
-                }
-            }
-
             [
                 projectId              : doc.projectId,
                 aim                    : doc.aim,
-                coverage               : siteGeom,
+                coverage               : doc.projectArea?.geoIndex,
                 description            : doc.description,
                 difficulty             : doc.difficulty,
                 endDate                : doc.plannedEndDate,

diff --git a/src/main/groovy/au/org/ala/biocollect/projectresult/SciStarter.groovy b/src/main/groovy/au/org/ala/biocollect/projectresult/SciStarter.groovy
@@ -39,13 +39,6 @@ class SciStarter {
                 ]
             }
 
-            Map siteGeom;
-            doc?.sites?.each { site ->
-                if (doc?.projectSiteId == site.siteId) {
-                    siteGeom = site.geoIndex
-                }
-            }
-
             [
                 projectId              : doc.projectId,
                 name                   : doc.name,
@@ -76,7 +69,7 @@ class SciStarter {
                 plannedStartDate       : doc.plannedStartDate,
                 plannedEndDate         : doc.plannedEndDate,
                 endDate                : doc.plannedEndDate,
-                coverage               : siteGeom,
+                coverage               : doc.projectArea?.geoIndex,
                 links                  : trimmedLinks,
                 startDate              : doc.plannedStartDate,
                 url                    : params.url + "/acsa/project/index/" + doc.projectId,

diff --git a/src/main/groovy/au/org/ala/biocollect/projectresult/Seed.groovy b/src/main/groovy/au/org/ala/biocollect/projectresult/Seed.groovy
@@ -39,13 +39,6 @@ class Seed {
                 ]
             }
 
-            Map siteGeom;
-            doc?.sites?.each { site ->
-                if (doc?.projectSiteId == site.siteId) {
-                    siteGeom = site.extent?.geometry;
-                }
-            }
-
             def projectActivities = doc.projectActivities?.collect {
                 def pActivity = [
                         name: it.name,
@@ -63,7 +56,7 @@ class Seed {
             [
                 projectId              : doc.projectId,
                 aim                    : doc.aim,
-                coverage               : siteGeom,
+                coverage               : doc.projectArea?.geoIndex,
                 description            : doc.description,
                 difficulty             : doc.difficulty,
                 endDate                : doc.plannedEndDate,