Merge remote-tracking branch 'origin/dev' into feature/issue1058

AtlasOfLivingAustralia · Feb 20, 2025 · 4d67e67 · 4d67e67
2 parents e4a5817 + a0af7e4
commit 4d67e67
Showing 1 changed file with 13 additions and 11 deletions.
diff --git a/grails-app/services/au/org/ala/ecodata/ProjectService.groovy b/grails-app/services/au/org/ala/ecodata/ProjectService.groovy
@@ -1313,19 +1313,21 @@ class ProjectService {
         }
 
         Map geographicInfo = project?.geographicInfo
-        Map intersections = orderLayerIntersectionsByAreaOfProjectSites(project)
-        Map config = metadataService.getGeographicConfig()
-        List intersectionLayers = config?.checkForBoundaryIntersectionInLayers
-        intersectionLayers?.each { layer ->
-            Map facetName = metadataService.getGeographicFacetConfig(layer)
-            if (facetName.name) {
-                List intersectionValues = intersections[layer]
-                if (intersectionValues) {
-                    result["project${facetName.name.capitalize()}Facet"] = intersectionValues
+        if (!geographicInfo?.statewide && !geographicInfo?.nationwide) {
+            Map intersections = orderLayerIntersectionsByAreaOfProjectSites(project)
+            Map config = metadataService.getGeographicConfig()
+            List intersectionLayers = config?.checkForBoundaryIntersectionInLayers
+            intersectionLayers?.each { layer ->
+                Map facetName = metadataService.getGeographicFacetConfig(layer)
+                if (facetName.name) {
+                    List intersectionValues = intersections[layer]
+                    if (intersectionValues) {
+                        result["project${facetName.name.capitalize()}Facet"] = intersectionValues
+                    }
                 }
+                else
+                    log.error ("No facet config found for layer $layer.")
             }
-            else
-                log.error ("No facet config found for layer $layer.")
         }
 
         // take a copy of calculated states & electorates for comparison