Merge pull request #2049 from hotosm/fix/limit-routing-api

Mapper Navigation: Limit routing API call
hotosm · Jan 1, 2025 · 4e20c3c · 4e20c3c
2 parents 94b7eb2 + da9d061
commit 4e20c3c
Show file tree

Hide file tree

Showing 2 changed files with 16 additions and 4 deletions.
diff --git a/src/mapper/src/lib/components/dialog-entities-actions.svelte b/src/mapper/src/lib/components/dialog-entities-actions.svelte
@@ -55,7 +55,8 @@
 
 	const navigateToEntity = () => {
 		if (!entitiesStore.toggleGeolocation) {
-			entitiesStore.setToggleGeolocation(true);
+			alertStore.setAlert({ message: 'Please enable geolocation to navigate to the entity.', variant: 'warning' });
+			return;
 		}
 		entitiesStore.setEntityToNavigate(selectedEntityCoordinate);
 	};

diff --git a/src/mapper/src/lib/components/map/geolocation.svelte b/src/mapper/src/lib/components/map/geolocation.svelte
@@ -9,6 +9,7 @@
 	import { getCommonStore } from '$store/common.svelte.ts';
 	import { layers } from '$assets/maplibre-directions.ts';
 	import locationUrl from '$assets/images/location.png';
+	import { untrack } from 'svelte';
 
 	interface Props {
 		map: maplibregl.Map | undefined;
@@ -68,10 +69,20 @@
 		}
 	}
 
+	// set waypoints for navigation on every 10 seconds if navigation mode is on i.e. entityToNavigate is not null
+	// don't track user geolocation
 	$effect(() => {
-		if (entitiesStore.userLocationCoord && entityToNavigate) {
-			setWaypoints(entitiesStore.userLocationCoord as [number, number], entityToNavigate?.coordinate);
-		}
+		if (!untrack(() => entitiesStore.userLocationCoord) && !entityToNavigate) return;
+		entityToNavigate?.coordinate &&
+			setWaypoints(untrack(() => entitiesStore.userLocationCoord) as [number, number], entityToNavigate?.coordinate);
+		const interval = setInterval(() => {
+			entityToNavigate?.coordinate &&
+				setWaypoints(untrack(() => entitiesStore.userLocationCoord) as [number, number], entityToNavigate?.coordinate);
+		}, 10000);
+
+		return () => {
+			clearInterval(interval);
+		};
 	});
 
 	// if navigation mode on, tilt map by 50 degrees