Merge pull request #448 from AuScope/AUS-4262

AUS-4262 Fix broken map click popup
AuScope · Oct 17, 2024 · 9d3f03d · 9d3f03d
2 parents 9f832cf + cee3e53
commit 9d3f03d
Showing 1 changed file with 8 additions and 6 deletions.
diff --git a/src/app/cesium-map/csmap.component.ts b/src/app/cesium-map/csmap.component.ts
@@ -385,12 +385,14 @@ export class CsMapComponent implements AfterViewInit {
     // we will use this to filter calls to the backend i.e. wmsMarkerPopup.do
     let optProviderList = [];
     for (const maplayer of mapClickInfo.clickedLayerList) {
-      for (const optFil of maplayer.filterCollection.optionalFilters) {
-        if (optFil.value !== null) {
-          if (optFil.type === 'OPTIONAL.PROVIDER') {
-            for (const [key, value] of Object.entries(optFil.value)) {
-              if (value === true) {
-                optProviderList.push(key); // key is the Provider e.g. sarigdata.pir.sa.gov.au
+      if (maplayer?.filterCollection?.optionalFilters) {
+        for (const optFil of maplayer.filterCollection.optionalFilters) {
+          if (optFil.value !== null) {
+            if (optFil.type === 'OPTIONAL.PROVIDER') {
+              for (const [key, value] of Object.entries(optFil.value)) {
+                if (value === true) {
+                  optProviderList.push(key); // key is the Provider e.g. sarigdata.pir.sa.gov.au
+                }
               }
             }
           }