From 98471f9c518b8cdc42505faa6385ad2e1841e4ee Mon Sep 17 00:00:00 2001
From: NSUWAL123 <suwalnishit@gmail.com>
Date: Mon, 13 Jan 2025 16:53:32 +0545
Subject: [PATCH 01/14] feat(package): turf/distance package add for distance
 calculation between two points

---
 src/mapper/package.json   |  1 +
 src/mapper/pnpm-lock.yaml | 30 ++++++++++++++++++++++++++++++
 2 files changed, 31 insertions(+)

diff --git a/src/mapper/package.json b/src/mapper/package.json
index 96d7fdd40..c420953e2 100644
--- a/src/mapper/package.json
+++ b/src/mapper/package.json
@@ -52,6 +52,7 @@
 		"@turf/bbox": "^7.1.0",
 		"@turf/buffer": "^7.1.0",
 		"@turf/centroid": "^7.1.0",
+		"@turf/distance": "^7.2.0",
 		"@turf/helpers": "^7.1.0",
 		"@watergis/maplibre-gl-terradraw": "^0.5.1",
 		"drizzle-orm": "^0.35.3",
diff --git a/src/mapper/pnpm-lock.yaml b/src/mapper/pnpm-lock.yaml
index e937886cd..ea1299321 100644
--- a/src/mapper/pnpm-lock.yaml
+++ b/src/mapper/pnpm-lock.yaml
@@ -41,6 +41,9 @@ importers:
       '@turf/centroid':
         specifier: ^7.1.0
         version: 7.1.0
+      '@turf/distance':
+        specifier: ^7.2.0
+        version: 7.2.0
       '@turf/helpers':
         specifier: ^7.1.0
         version: 7.1.0
@@ -1447,9 +1450,18 @@ packages:
   '@turf/clone@7.1.0':
     resolution: {integrity: sha512-5R9qeWvL7FDdBIbEemd0eCzOStr09oburDvJ1hRiPCFX6rPgzcZBQ0gDmZzoF4AFcNLb5IwknbLZjVLaUGWtFA==}
 
+  '@turf/distance@7.2.0':
+    resolution: {integrity: sha512-HBjjXIgEcD/wJYjv7/6OZj5yoky2oUvTtVeIAqO3lL80XRvoYmVg6vkOIu6NswkerwLDDNT9kl7+BFLJoHbh6Q==}
+
   '@turf/helpers@7.1.0':
     resolution: {integrity: sha512-dTeILEUVeNbaEeoZUOhxH5auv7WWlOShbx7QSd4s0T4Z0/iz90z9yaVCtZOLbU89umKotwKaJQltBNO9CzVgaQ==}
 
+  '@turf/helpers@7.2.0':
+    resolution: {integrity: sha512-cXo7bKNZoa7aC7ydLmUR02oB3IgDe7MxiPuRz3cCtYQHn+BJ6h1tihmamYDWWUlPHgSNF0i3ATc4WmDECZafKw==}
+
+  '@turf/invariant@7.2.0':
+    resolution: {integrity: sha512-kV4u8e7Gkpq+kPbAKNC21CmyrXzlbBgFjO1PhrHPgEdNqXqDawoZ3i6ivE3ULJj2rSesCjduUaC/wyvH/sNr2Q==}
+
   '@turf/jsts@2.7.1':
     resolution: {integrity: sha512-+nwOKme/aUprsxnLSfr2LylV6eL6T1Tuln+4Hl92uwZ8FrmjDRCH5Bi1LJNVfWCiYgk8+5K+t2zDphWNTsIFDA==}
 
@@ -5140,11 +5152,29 @@ snapshots:
       '@types/geojson': 7946.0.14
       tslib: 2.8.1
 
+  '@turf/distance@7.2.0':
+    dependencies:
+      '@turf/helpers': 7.2.0
+      '@turf/invariant': 7.2.0
+      '@types/geojson': 7946.0.14
+      tslib: 2.8.1
+
   '@turf/helpers@7.1.0':
     dependencies:
       '@types/geojson': 7946.0.14
       tslib: 2.8.1
 
+  '@turf/helpers@7.2.0':
+    dependencies:
+      '@types/geojson': 7946.0.14
+      tslib: 2.8.1
+
+  '@turf/invariant@7.2.0':
+    dependencies:
+      '@turf/helpers': 7.2.0
+      '@types/geojson': 7946.0.14
+      tslib: 2.8.1
+
   '@turf/jsts@2.7.1':
     dependencies:
       jsts: 2.7.1

From ecb67799815c96a6587ead54897cd62b85d913df Mon Sep 17 00:00:00 2001
From: NSUWAL123 <suwalnishit@gmail.com>
Date: Mon, 13 Jan 2025 16:53:58 +0545
Subject: [PATCH 02/14] fix(types): ProjectData type update

---
 src/mapper/src/lib/types.ts | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/src/mapper/src/lib/types.ts b/src/mapper/src/lib/types.ts
index 22165ffc4..2bc0c82e1 100644
--- a/src/mapper/src/lib/types.ts
+++ b/src/mapper/src/lib/types.ts
@@ -40,6 +40,8 @@ export interface ProjectData {
 	status: number;
 	hashtags: string[];
 	tasks: ProjectTask[];
+	geo_restrict_distance_meters: number;
+	geo_restrict_force_error: boolean;
 }
 
 export interface ZoomToTaskEventDetail {

From d2cfabd12d3ca622026d94300aa9090f97b6287e Mon Sep 17 00:00:00 2001
From: NSUWAL123 <suwalnishit@gmail.com>
Date: Mon, 13 Jan 2025 16:54:43 +0545
Subject: [PATCH 03/14] fix(geolocation): reset userLocation coordinate if
 location disabled

---
 src/mapper/src/lib/components/map/geolocation.svelte | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/mapper/src/lib/components/map/geolocation.svelte b/src/mapper/src/lib/components/map/geolocation.svelte
index bf81aed13..50e5aee18 100644
--- a/src/mapper/src/lib/components/map/geolocation.svelte
+++ b/src/mapper/src/lib/components/map/geolocation.svelte
@@ -244,6 +244,7 @@
 				on:click={() => {
 					entitiesStore.setToggleGeolocation(!entitiesStore.toggleGeolocation);
 					if (!entitiesStore.toggleGeolocation) {
+						entitiesStore.setUserLocationCoordinate(undefined);
 						exitNavigationMode();
 					}
 				}}

From c053890f8f461d9a83e40a413f86f7044f9d34f5 Mon Sep 17 00:00:00 2001
From: NSUWAL123 <suwalnishit@gmail.com>
Date: Mon, 13 Jan 2025 16:58:06 +0545
Subject: [PATCH 04/14] feat(dialog-entities-actions): function add to check
 validity of distance between user and entity

---
 .../components/dialog-entities-actions.svelte | 32 +++++++++++++++++++
 1 file changed, 32 insertions(+)

diff --git a/src/mapper/src/lib/components/dialog-entities-actions.svelte b/src/mapper/src/lib/components/dialog-entities-actions.svelte
index 991af3721..59f862786 100644
--- a/src/mapper/src/lib/components/dialog-entities-actions.svelte
+++ b/src/mapper/src/lib/components/dialog-entities-actions.svelte
@@ -1,4 +1,6 @@
 <script lang="ts">
+	import { distance } from '@turf/distance';
+	import type { Coord } from '@turf/helpers';
 	import { TaskStatusEnum, type ProjectData } from '$lib/types';
 	import { getEntitiesStatusStore } from '$store/entities.svelte.ts';
 	import { getAlertStore } from '$store/common.svelte.ts';
@@ -25,7 +27,37 @@
 	const selectedEntityCoordinate = $derived(entitiesStore.selectedEntityCoordinate);
 	const entityToNavigate = $derived(entitiesStore.entityToNavigate);
 
+	// check if distance constraint is set to projectand is valid
+	const isDistanceConstaintValid = (): boolean => {
+		if (projectData?.geo_restrict_force_error) {
+			const to = entitiesStore.selectedEntityCoordinate?.coordinate;
+			const from = entitiesStore.userLocationCoord;
+			if (!from) {
+				alertStore.setAlert({
+					message:
+						'Your project has a distance constraint set. Please enable device geolocation for optimal functionality',
+					variant: 'warning',
+				});
+				return false;
+			}
+
+			const entityDistance = distance(from as Coord, to as Coord, { units: 'kilometers' }) * 1000;
+			if (entityDistance && entityDistance > projectData?.geo_restrict_distance_meters) {
+				alertStore.setAlert({
+					message: `The feature must be within ${projectData?.geo_restrict_distance_meters} meters of your location`,
+					variant: 'warning',
+				});
+				return false;
+			}
+
+			return true;
+		}
+		return true;
+	};
+
 	const mapFeature = () => {
+		if (!isDistanceConstaintValid()) return;
+
 		const xformId = projectData?.odk_form_id;
 		const entityUuid = selectedEntity?.entity_id;
 

From 3d81fa22e74dd8922f58b803d607ecb09269ad18 Mon Sep 17 00:00:00 2001
From: NSUWAL123 <suwalnishit@gmail.com>
Date: Mon, 13 Jan 2025 17:07:12 +0545
Subject: [PATCH 05/14] fix(dialog-entities): fix typo

---
 src/mapper/src/lib/components/dialog-entities-actions.svelte | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/mapper/src/lib/components/dialog-entities-actions.svelte b/src/mapper/src/lib/components/dialog-entities-actions.svelte
index 59f862786..c27d9e41c 100644
--- a/src/mapper/src/lib/components/dialog-entities-actions.svelte
+++ b/src/mapper/src/lib/components/dialog-entities-actions.svelte
@@ -35,7 +35,7 @@
 			if (!from) {
 				alertStore.setAlert({
 					message:
-						'Your project has a distance constraint set. Please enable device geolocation for optimal functionality',
+						'This project has a distance constraint set. Please enable device geolocation for optimal functionality',
 					variant: 'warning',
 				});
 				return false;

From 4cdb79590c126044ccc4f6f9504293cb63197ed1 Mon Sep 17 00:00:00 2001
From: NSUWAL123 <suwalnishit@gmail.com>
Date: Mon, 13 Jan 2025 16:53:32 +0545
Subject: [PATCH 06/14] feat(package): turf/distance package add for distance
 calculation between two points

---
 src/mapper/package.json   |  1 +
 src/mapper/pnpm-lock.yaml | 30 ++++++++++++++++++++++++++++++
 2 files changed, 31 insertions(+)

diff --git a/src/mapper/package.json b/src/mapper/package.json
index bc9bc8601..c11e83e85 100644
--- a/src/mapper/package.json
+++ b/src/mapper/package.json
@@ -52,6 +52,7 @@
 		"@turf/bbox": "^7.1.0",
 		"@turf/buffer": "^7.1.0",
 		"@turf/centroid": "^7.1.0",
+		"@turf/distance": "^7.2.0",
 		"@turf/helpers": "^7.1.0",
 		"@watergis/maplibre-gl-terradraw": "^0.8.1",
 		"drizzle-orm": "^0.35.3",
diff --git a/src/mapper/pnpm-lock.yaml b/src/mapper/pnpm-lock.yaml
index 636aedb6d..af2ae8c66 100644
--- a/src/mapper/pnpm-lock.yaml
+++ b/src/mapper/pnpm-lock.yaml
@@ -41,6 +41,9 @@ importers:
       '@turf/centroid':
         specifier: ^7.1.0
         version: 7.1.0
+      '@turf/distance':
+        specifier: ^7.2.0
+        version: 7.2.0
       '@turf/helpers':
         specifier: ^7.1.0
         version: 7.1.0
@@ -1447,9 +1450,18 @@ packages:
   '@turf/clone@7.1.0':
     resolution: {integrity: sha512-5R9qeWvL7FDdBIbEemd0eCzOStr09oburDvJ1hRiPCFX6rPgzcZBQ0gDmZzoF4AFcNLb5IwknbLZjVLaUGWtFA==}
 
+  '@turf/distance@7.2.0':
+    resolution: {integrity: sha512-HBjjXIgEcD/wJYjv7/6OZj5yoky2oUvTtVeIAqO3lL80XRvoYmVg6vkOIu6NswkerwLDDNT9kl7+BFLJoHbh6Q==}
+
   '@turf/helpers@7.1.0':
     resolution: {integrity: sha512-dTeILEUVeNbaEeoZUOhxH5auv7WWlOShbx7QSd4s0T4Z0/iz90z9yaVCtZOLbU89umKotwKaJQltBNO9CzVgaQ==}
 
+  '@turf/helpers@7.2.0':
+    resolution: {integrity: sha512-cXo7bKNZoa7aC7ydLmUR02oB3IgDe7MxiPuRz3cCtYQHn+BJ6h1tihmamYDWWUlPHgSNF0i3ATc4WmDECZafKw==}
+
+  '@turf/invariant@7.2.0':
+    resolution: {integrity: sha512-kV4u8e7Gkpq+kPbAKNC21CmyrXzlbBgFjO1PhrHPgEdNqXqDawoZ3i6ivE3ULJj2rSesCjduUaC/wyvH/sNr2Q==}
+
   '@turf/jsts@2.7.1':
     resolution: {integrity: sha512-+nwOKme/aUprsxnLSfr2LylV6eL6T1Tuln+4Hl92uwZ8FrmjDRCH5Bi1LJNVfWCiYgk8+5K+t2zDphWNTsIFDA==}
 
@@ -5144,11 +5156,29 @@ snapshots:
       '@types/geojson': 7946.0.14
       tslib: 2.8.1
 
+  '@turf/distance@7.2.0':
+    dependencies:
+      '@turf/helpers': 7.2.0
+      '@turf/invariant': 7.2.0
+      '@types/geojson': 7946.0.14
+      tslib: 2.8.1
+
   '@turf/helpers@7.1.0':
     dependencies:
       '@types/geojson': 7946.0.14
       tslib: 2.8.1
 
+  '@turf/helpers@7.2.0':
+    dependencies:
+      '@types/geojson': 7946.0.14
+      tslib: 2.8.1
+
+  '@turf/invariant@7.2.0':
+    dependencies:
+      '@turf/helpers': 7.2.0
+      '@types/geojson': 7946.0.14
+      tslib: 2.8.1
+
   '@turf/jsts@2.7.1':
     dependencies:
       jsts: 2.7.1

From 5f63d1435ae8a5b056b5278e9aa3246cef040173 Mon Sep 17 00:00:00 2001
From: NSUWAL123 <suwalnishit@gmail.com>
Date: Mon, 13 Jan 2025 16:53:58 +0545
Subject: [PATCH 07/14] fix(types): ProjectData type update

---
 src/mapper/src/lib/types.ts | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/src/mapper/src/lib/types.ts b/src/mapper/src/lib/types.ts
index 66c2fb61a..b428652d9 100644
--- a/src/mapper/src/lib/types.ts
+++ b/src/mapper/src/lib/types.ts
@@ -42,6 +42,8 @@ export interface ProjectData {
 	hashtags: string[];
 	tasks: ProjectTask[];
 	new_geom_type: NewGeomTypes;
+	geo_restrict_distance_meters: number;
+	geo_restrict_force_error: boolean;
 }
 
 export interface ZoomToTaskEventDetail {

From f66cef416efa74216020a609b38997001e1adeb1 Mon Sep 17 00:00:00 2001
From: NSUWAL123 <suwalnishit@gmail.com>
Date: Mon, 13 Jan 2025 16:54:43 +0545
Subject: [PATCH 08/14] fix(geolocation): reset userLocation coordinate if
 location disabled

---
 src/mapper/src/lib/components/map/geolocation.svelte | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/mapper/src/lib/components/map/geolocation.svelte b/src/mapper/src/lib/components/map/geolocation.svelte
index bf81aed13..50e5aee18 100644
--- a/src/mapper/src/lib/components/map/geolocation.svelte
+++ b/src/mapper/src/lib/components/map/geolocation.svelte
@@ -244,6 +244,7 @@
 				on:click={() => {
 					entitiesStore.setToggleGeolocation(!entitiesStore.toggleGeolocation);
 					if (!entitiesStore.toggleGeolocation) {
+						entitiesStore.setUserLocationCoordinate(undefined);
 						exitNavigationMode();
 					}
 				}}

From 31e9caf4c32bc9f94c4859b77dd5c7f4e1a1542f Mon Sep 17 00:00:00 2001
From: NSUWAL123 <suwalnishit@gmail.com>
Date: Mon, 13 Jan 2025 16:58:06 +0545
Subject: [PATCH 09/14] feat(dialog-entities-actions): function add to check
 validity of distance between user and entity

---
 .../components/dialog-entities-actions.svelte | 32 +++++++++++++++++++
 1 file changed, 32 insertions(+)

diff --git a/src/mapper/src/lib/components/dialog-entities-actions.svelte b/src/mapper/src/lib/components/dialog-entities-actions.svelte
index 991af3721..59f862786 100644
--- a/src/mapper/src/lib/components/dialog-entities-actions.svelte
+++ b/src/mapper/src/lib/components/dialog-entities-actions.svelte
@@ -1,4 +1,6 @@
 <script lang="ts">
+	import { distance } from '@turf/distance';
+	import type { Coord } from '@turf/helpers';
 	import { TaskStatusEnum, type ProjectData } from '$lib/types';
 	import { getEntitiesStatusStore } from '$store/entities.svelte.ts';
 	import { getAlertStore } from '$store/common.svelte.ts';
@@ -25,7 +27,37 @@
 	const selectedEntityCoordinate = $derived(entitiesStore.selectedEntityCoordinate);
 	const entityToNavigate = $derived(entitiesStore.entityToNavigate);
 
+	// check if distance constraint is set to projectand is valid
+	const isDistanceConstaintValid = (): boolean => {
+		if (projectData?.geo_restrict_force_error) {
+			const to = entitiesStore.selectedEntityCoordinate?.coordinate;
+			const from = entitiesStore.userLocationCoord;
+			if (!from) {
+				alertStore.setAlert({
+					message:
+						'Your project has a distance constraint set. Please enable device geolocation for optimal functionality',
+					variant: 'warning',
+				});
+				return false;
+			}
+
+			const entityDistance = distance(from as Coord, to as Coord, { units: 'kilometers' }) * 1000;
+			if (entityDistance && entityDistance > projectData?.geo_restrict_distance_meters) {
+				alertStore.setAlert({
+					message: `The feature must be within ${projectData?.geo_restrict_distance_meters} meters of your location`,
+					variant: 'warning',
+				});
+				return false;
+			}
+
+			return true;
+		}
+		return true;
+	};
+
 	const mapFeature = () => {
+		if (!isDistanceConstaintValid()) return;
+
 		const xformId = projectData?.odk_form_id;
 		const entityUuid = selectedEntity?.entity_id;
 

From 3c9f4c5c52a94f4972c7c228a6e1ca6085a6d6d8 Mon Sep 17 00:00:00 2001
From: NSUWAL123 <suwalnishit@gmail.com>
Date: Mon, 13 Jan 2025 17:07:12 +0545
Subject: [PATCH 10/14] fix(dialog-entities): fix typo

---
 src/mapper/src/lib/components/dialog-entities-actions.svelte | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/mapper/src/lib/components/dialog-entities-actions.svelte b/src/mapper/src/lib/components/dialog-entities-actions.svelte
index 59f862786..c27d9e41c 100644
--- a/src/mapper/src/lib/components/dialog-entities-actions.svelte
+++ b/src/mapper/src/lib/components/dialog-entities-actions.svelte
@@ -35,7 +35,7 @@
 			if (!from) {
 				alertStore.setAlert({
 					message:
-						'Your project has a distance constraint set. Please enable device geolocation for optimal functionality',
+						'This project has a distance constraint set. Please enable device geolocation for optimal functionality',
 					variant: 'warning',
 				});
 				return false;

From b9f4c1a490c654d4ffd5800075146f3833f46617 Mon Sep 17 00:00:00 2001
From: spwoodcock <sam.woodcock@protonmail.com>
Date: Mon, 13 Jan 2025 16:06:38 +0000
Subject: [PATCH 11/14] refactor: update new feature draw warning/error logic

---
 .../components/dialog-entities-actions.svelte | 43 +++++++++++--------
 1 file changed, 25 insertions(+), 18 deletions(-)

diff --git a/src/mapper/src/lib/components/dialog-entities-actions.svelte b/src/mapper/src/lib/components/dialog-entities-actions.svelte
index c27d9e41c..f8e95c762 100644
--- a/src/mapper/src/lib/components/dialog-entities-actions.svelte
+++ b/src/mapper/src/lib/components/dialog-entities-actions.svelte
@@ -6,6 +6,7 @@
 	import { getAlertStore } from '$store/common.svelte.ts';
 	import { getTaskStore } from '$store/tasks.svelte.ts';
 	import { mapTask } from '$lib/db/events';
+	import { trusted } from 'svelte/legacy';
 
 	type Props = {
 		isTaskActionModalOpen: boolean;
@@ -29,29 +30,35 @@
 
 	// check if distance constraint is set to projectand is valid
 	const isDistanceConstaintValid = (): boolean => {
-		if (projectData?.geo_restrict_force_error) {
-			const to = entitiesStore.selectedEntityCoordinate?.coordinate;
-			const from = entitiesStore.userLocationCoord;
-			if (!from) {
-				alertStore.setAlert({
-					message:
-						'This project has a distance constraint set. Please enable device geolocation for optimal functionality',
-					variant: 'warning',
-				});
-				return false;
-			}
+		const coordTo = entitiesStore.selectedEntityCoordinate?.coordinate;
+		const coordFrom = entitiesStore.userLocationCoord;
 
-			const entityDistance = distance(from as Coord, to as Coord, { units: 'kilometers' }) * 1000;
-			if (entityDistance && entityDistance > projectData?.geo_restrict_distance_meters) {
-				alertStore.setAlert({
-					message: `The feature must be within ${projectData?.geo_restrict_distance_meters} meters of your location`,
-					variant: 'warning',
-				});
+		// Geolocation not enabled, warn user
+		if (!coordFrom) {
+			alertStore.setAlert({
+				message:
+					'This project has a distance constraint set. Please enable device geolocation for optimal functionality',
+				variant: 'warning',
+			});
+			return false;
+		}
+
+		const entityDistance = distance(coordFrom as Coord, coordTo as Coord, { units: 'kilometers' }) * 1000;
+		if (entityDistance && entityDistance > projectData?.geo_restrict_distance_meters) {
+			// Feature is far away from user, warn user
+			alertStore.setAlert({
+				message: `The feature must be within ${projectData?.geo_restrict_distance_meters} meters of your location`,
+				variant: 'warning',
+			});
+			if (projectData?.geo_restrict_force_error) {
+				// Not valid coord, prevent user from continuing
 				return false;
 			}
-
+			// Valid coord: it's outside of range, but only 'warn' user
 			return true;
 		}
+
+		// Valid coord
 		return true;
 	};
 

From 3b24cf674c75432c543bf6bc17c42ed5e437cef3 Mon Sep 17 00:00:00 2001
From: spwoodcock <sam.woodcock@protonmail.com>
Date: Mon, 13 Jan 2025 16:07:50 +0000
Subject: [PATCH 12/14] docs: update comment describing the new feat dist
 constraint

---
 src/mapper/src/lib/components/dialog-entities-actions.svelte | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/mapper/src/lib/components/dialog-entities-actions.svelte b/src/mapper/src/lib/components/dialog-entities-actions.svelte
index f8e95c762..1f13dd85b 100644
--- a/src/mapper/src/lib/components/dialog-entities-actions.svelte
+++ b/src/mapper/src/lib/components/dialog-entities-actions.svelte
@@ -28,7 +28,7 @@
 	const selectedEntityCoordinate = $derived(entitiesStore.selectedEntityCoordinate);
 	const entityToNavigate = $derived(entitiesStore.entityToNavigate);
 
-	// check if distance constraint is set to projectand is valid
+	// Check if drawn geometry is within set distance constraints from user
 	const isDistanceConstaintValid = (): boolean => {
 		const coordTo = entitiesStore.selectedEntityCoordinate?.coordinate;
 		const coordFrom = entitiesStore.userLocationCoord;

From 947725aca2e01413a20ff7ad9f81d40f008867c8 Mon Sep 17 00:00:00 2001
From: NSUWAL123 <suwalnishit@gmail.com>
Date: Thu, 16 Jan 2025 13:14:31 +0545
Subject: [PATCH 13/14] fix(dialog-entities-actions): update distance
 constraing logic

---
 .../components/dialog-entities-actions.svelte | 38 +++++++++----------
 1 file changed, 18 insertions(+), 20 deletions(-)

diff --git a/src/mapper/src/lib/components/dialog-entities-actions.svelte b/src/mapper/src/lib/components/dialog-entities-actions.svelte
index 1f13dd85b..594d41421 100644
--- a/src/mapper/src/lib/components/dialog-entities-actions.svelte
+++ b/src/mapper/src/lib/components/dialog-entities-actions.svelte
@@ -33,29 +33,27 @@
 		const coordTo = entitiesStore.selectedEntityCoordinate?.coordinate;
 		const coordFrom = entitiesStore.userLocationCoord;
 
-		// Geolocation not enabled, warn user
-		if (!coordFrom) {
-			alertStore.setAlert({
-				message:
-					'This project has a distance constraint set. Please enable device geolocation for optimal functionality',
-				variant: 'warning',
-			});
-			return false;
-		}
+		// Run only if geo_restrict_force_error is set to true
+		if (projectData?.geo_restrict_force_error) {
+			// Geolocation not enabled, warn user
+			if (!coordFrom) {
+				alertStore.setAlert({
+					message:
+						'This project has a distance constraint set. Please enable device geolocation for optimal functionality',
+					variant: 'warning',
+				});
+				return false;
+			}
 
-		const entityDistance = distance(coordFrom as Coord, coordTo as Coord, { units: 'kilometers' }) * 1000;
-		if (entityDistance && entityDistance > projectData?.geo_restrict_distance_meters) {
-			// Feature is far away from user, warn user
-			alertStore.setAlert({
-				message: `The feature must be within ${projectData?.geo_restrict_distance_meters} meters of your location`,
-				variant: 'warning',
-			});
-			if (projectData?.geo_restrict_force_error) {
-				// Not valid coord, prevent user from continuing
+			const entityDistance = distance(coordFrom as Coord, coordTo as Coord, { units: 'kilometers' }) * 1000;
+			if (entityDistance && entityDistance > projectData?.geo_restrict_distance_meters) {
+				// Feature is far away from user, warn user
+				alertStore.setAlert({
+					message: `The feature must be within ${projectData?.geo_restrict_distance_meters} meters of your location`,
+					variant: 'warning',
+				});
 				return false;
 			}
-			// Valid coord: it's outside of range, but only 'warn' user
-			return true;
 		}
 
 		// Valid coord

From fe34e78ed17b1d996d9aeb0a790230f75da32973 Mon Sep 17 00:00:00 2001
From: NSUWAL123 <suwalnishit@gmail.com>
Date: Mon, 20 Jan 2025 10:33:42 +0545
Subject: [PATCH 14/14] feat(dialog-entities-actions): show warning dialog on
 feature map if location enabled, feature far away and geo restrict false

---
 .../components/dialog-entities-actions.svelte | 153 +++++++++++++-----
 1 file changed, 116 insertions(+), 37 deletions(-)

diff --git a/src/mapper/src/lib/components/dialog-entities-actions.svelte b/src/mapper/src/lib/components/dialog-entities-actions.svelte
index 594d41421..409747f4f 100644
--- a/src/mapper/src/lib/components/dialog-entities-actions.svelte
+++ b/src/mapper/src/lib/components/dialog-entities-actions.svelte
@@ -6,7 +6,7 @@
 	import { getAlertStore } from '$store/common.svelte.ts';
 	import { getTaskStore } from '$store/tasks.svelte.ts';
 	import { mapTask } from '$lib/db/events';
-	import { trusted } from 'svelte/legacy';
+	import type { SlDialog } from '@shoelace-style/shoelace';
 
 	type Props = {
 		isTaskActionModalOpen: boolean;
@@ -17,6 +17,9 @@
 
 	let { isTaskActionModalOpen, toggleTaskActionModal, selectedTab, projectData }: Props = $props();
 
+	let dialogRef: SlDialog | null = $state(null);
+	let toggleDistanceWarningDialog = $state(false);
+
 	const entitiesStore = getEntitiesStatusStore();
 	const alertStore = getAlertStore();
 	const taskStore = getTaskStore();
@@ -28,41 +31,7 @@
 	const selectedEntityCoordinate = $derived(entitiesStore.selectedEntityCoordinate);
 	const entityToNavigate = $derived(entitiesStore.entityToNavigate);
 
-	// Check if drawn geometry is within set distance constraints from user
-	const isDistanceConstaintValid = (): boolean => {
-		const coordTo = entitiesStore.selectedEntityCoordinate?.coordinate;
-		const coordFrom = entitiesStore.userLocationCoord;
-
-		// Run only if geo_restrict_force_error is set to true
-		if (projectData?.geo_restrict_force_error) {
-			// Geolocation not enabled, warn user
-			if (!coordFrom) {
-				alertStore.setAlert({
-					message:
-						'This project has a distance constraint set. Please enable device geolocation for optimal functionality',
-					variant: 'warning',
-				});
-				return false;
-			}
-
-			const entityDistance = distance(coordFrom as Coord, coordTo as Coord, { units: 'kilometers' }) * 1000;
-			if (entityDistance && entityDistance > projectData?.geo_restrict_distance_meters) {
-				// Feature is far away from user, warn user
-				alertStore.setAlert({
-					message: `The feature must be within ${projectData?.geo_restrict_distance_meters} meters of your location`,
-					variant: 'warning',
-				});
-				return false;
-			}
-		}
-
-		// Valid coord
-		return true;
-	};
-
 	const mapFeature = () => {
-		if (!isDistanceConstaintValid()) return;
-
 		const xformId = projectData?.odk_form_id;
 		const entityUuid = selectedEntity?.entity_id;
 
@@ -90,6 +59,54 @@
 		}
 	};
 
+	const handleMapFeature = () => {
+		/**
+		 	Logic to handle mapping feature in different scenarios:
+			1. No geolocation, no force geo constraint: allow mapping, ignore / do not show warning
+			2. No geolocation, force geo constraint: block mapping, show prompt to enable geolocation
+			3. Geolocation, no force geo constraint: show warning dialog if feature is far away
+			4. Geolocation, force geo constraint: block mapping if out of range else allow
+		**/
+		const coordTo = entitiesStore.selectedEntityCoordinate?.coordinate;
+		const coordFrom = entitiesStore.userLocationCoord;
+
+		// Run only if geo_restrict_force_error is set to true
+		if (projectData?.geo_restrict_force_error) {
+			// Geolocation not enabled, warn user
+			if (!coordFrom) {
+				alertStore.setAlert({
+					message:
+						'This project has distance constraint enabled. Please enable device geolocation for optimal functionality',
+					variant: 'warning',
+				});
+				return;
+			}
+
+			const entityDistance = distance(coordFrom as Coord, coordTo as Coord, { units: 'kilometers' }) * 1000;
+			if (entityDistance && entityDistance > projectData?.geo_restrict_distance_meters) {
+				// Feature is far away from user, warn user
+				alertStore.setAlert({
+					message: `The feature must be within ${projectData?.geo_restrict_distance_meters} meters of your location`,
+					variant: 'warning',
+				});
+				return;
+			}
+		}
+
+		// Show warning dialog if geo_restrict_force_error is set to false, user location enabled and feature is far away
+		if (
+			!projectData?.geo_restrict_force_error &&
+			coordFrom &&
+			distance(coordFrom as Coord, coordTo as Coord, { units: 'kilometers' }) * 1000 >
+				projectData?.geo_restrict_distance_meters
+		) {
+			toggleDistanceWarningDialog = true;
+			return;
+		}
+
+		mapFeature();
+	};
+
 	const navigateToEntity = () => {
 		if (!entitiesStore.toggleGeolocation) {
 			alertStore.setAlert({ message: 'Please enable geolocation to navigate to the entity.', variant: 'warning' });
@@ -175,11 +192,11 @@
 							size="small"
 							class="primary flex-grow"
 							onclick={() => {
-								mapFeature();
+								handleMapFeature();
 							}}
 							onkeydown={(e: KeyboardEvent) => {
 								if (e.key === 'Enter') {
-									mapFeature();
+									handleMapFeature();
 								}
 							}}
 							role="button"
@@ -195,3 +212,65 @@
 		</div>
 	</div>
 {/if}
+
+{#if entitiesStore.selectedEntityCoordinate?.coordinate && entitiesStore.userLocationCoord}
+	<hot-dialog
+		bind:this={dialogRef}
+		class="dialog-overview z-50 font-barlow font-regular"
+		open={toggleDistanceWarningDialog}
+		onsl-hide={() => {
+			toggleDistanceWarningDialog = false;
+		}}
+		noHeader
+	>
+		<div class="flex items-start flex-col">
+			<p class="text-base mb-5 text-gray-700">
+				Your are <b
+					>{(
+						distance(
+							entitiesStore.selectedEntityCoordinate?.coordinate as Coord,
+							entitiesStore.userLocationCoord as Coord,
+							{ units: 'kilometers' },
+						) * 1000
+					).toFixed(2)}m</b
+				> away from the feature. Are you sure you want to map this feature?
+			</p>
+			<div class="flex gap-2 ml-auto">
+				<sl-button
+					variant="default"
+					size="small"
+					class="secondary flex-grow"
+					onclick={() => (toggleDistanceWarningDialog = false)}
+					onkeydown={(e: KeyboardEvent) => {
+						if (e.key === 'Enter') {
+							toggleDistanceWarningDialog = false;
+						}
+					}}
+					role="button"
+					tabindex="0"
+				>
+					<span class="font-barlow font-medium text-sm">NO</span>
+				</sl-button>
+				<sl-button
+					variant="default"
+					size="small"
+					class="primary flex-grow"
+					onclick={() => {
+						mapFeature();
+						toggleDistanceWarningDialog = false;
+					}}
+					onkeydown={(e: KeyboardEvent) => {
+						if (e.key === 'Enter') {
+							mapFeature();
+							toggleDistanceWarningDialog = false;
+						}
+					}}
+					role="button"
+					tabindex="0"
+				>
+					<span class="font-barlow font-medium text-sm">YES</span>
+				</sl-button>
+			</div>
+		</div>
+	</hot-dialog>
+{/if}