From 6e1b7d4bd22bc7edd8ac4930a73113f86c28b6ec Mon Sep 17 00:00:00 2001 From: temi Date: Thu, 20 Feb 2025 14:38:04 +1100 Subject: [PATCH] #3432 - do not include site calculation if project is state wide or nation wide --- .../au/org/ala/ecodata/ProjectService.groovy | 24 ++++++++++--------- 1 file changed, 13 insertions(+), 11 deletions(-) diff --git a/grails-app/services/au/org/ala/ecodata/ProjectService.groovy b/grails-app/services/au/org/ala/ecodata/ProjectService.groovy index 9fbd1cd2f..816f848c4 100644 --- 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