From 6298b9e995cf20b03bcafdd3e11ace5355555be0 Mon Sep 17 00:00:00 2001
From: Azri Kahar <42867097+azrikahar@users.noreply.github.com>
Date: Mon, 18 Apr 2022 22:23:23 +0800
Subject: [PATCH] Prevent stale filter value when switching maps (#12797)

---
 app/src/layouts/map/index.ts | 9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/app/src/layouts/map/index.ts b/app/src/layouts/map/index.ts
index 1ac051be8f..63fac33ca3 100644
--- a/app/src/layouts/map/index.ts
+++ b/app/src/layouts/map/index.ts
@@ -81,6 +81,15 @@ export default defineLayout<LayoutOptions, LayoutQuery>({
 				if (!geometryField.value && fields.length > 0) {
 					geometryField.value = fields[0].field;
 				}
+
+				// clear the location filter when it is no longer using a valid geometryField
+				if (
+					geometryField.value &&
+					locationFilter.value &&
+					!Object.keys(locationFilter.value).includes(geometryField.value)
+				) {
+					locationFilter.value = undefined;
+				}
 			},
 			{ immediate: true }
 		);