only wait for map load if polygon filters not loaded yet

dimagi · Dec 19, 2024 · 8499f2a · 8499f2a
1 parent 1d8fc89
commit 8499f2a
Showing 1 changed file with 14 additions and 6 deletions.
diff --git a/corehq/apps/geospatial/static/geospatial/js/case_management.js b/corehq/apps/geospatial/static/geospatial/js/case_management.js
@@ -440,6 +440,13 @@ hqDefine("geospatial/js/case_management", [
         }
     }
 
+    function beforeLoadCases(caseData) {
+        loadCases(caseData);
+        if (mapModel.hasDisbursementLayer()) {
+            mapModel.removeDisbursementLayer();
+        }
+    }
+
     function loadCases(caseData) {
         mapModel.removeItemTypeFromSource('case');
         mapModel.caseMapItems([]);
@@ -516,12 +523,13 @@ hqDefine("geospatial/js/case_management", [
                 );
             }
         } else if (xhr.responseJSON.aaData.length && mapModel.mapInstance) {
-            mapModel.mapInstance.on('load', () => {
-                loadCases(xhr.responseJSON.aaData);
-                if (mapModel.hasDisbursementLayer()) {
-                    mapModel.removeDisbursementLayer();
-                }
-            });
+            if (polygonFilterModel) {
+                beforeLoadCases(xhr.responseJSON.aaData);
+            } else {
+                mapModel.mapInstance.on('load', () => {
+                    beforeLoadCases(xhr.responseJSON.aaData);
+                });
+            }
         }
     });
 });