Merge pull request #50 from allmaps/develop

Develop

Author: sammeltassen

README.md

@@ -38,6 +38,8 @@ pnpm run dev
 
 Then open [http://localhost:5173](http://localhost:5173).
 
+The Vite dev server allows hosts ending in `.ngrok-free.dev` so the local app can be exposed through an ngrok tunnel for testing on phones and tablets. This is only for local development; production hosts are controlled by the deployed site URL and hosting provider.
+
 ### Check And build
 
 ```bash

src/lib/components/Map.svelte

@@ -183,6 +183,7 @@
 	let liveLocationInitialFlyToActive = false;
 	let liveLocationInitialFlyToPending = false;
 	let previousLiveLocationFollowSequence = 0;
+	let previousLiveLocationFollowAnnotation: string | undefined;
 	let isSyncing = false;
 	let previousLocationSyncCommandId = 0;
 	let activeLocationSyncCommandId = 0;
@@ -260,13 +261,19 @@
 			liveLocationInitialFlyToActive = false;
 			liveLocationInitialFlyToPending = false;
 			previousLiveLocationFollowSequence = 0;
+			previousLiveLocationFollowAnnotation = undefined;
 		}
 
 		if (!enableFlyTo || !mapReady || !map || trackingStatus !== 'active' || !userLocation) return;
-		if (userLocation.positionSequence === previousLiveLocationFollowSequence) return;
+		const locationChanged = userLocation.positionSequence !== previousLiveLocationFollowSequence;
+		const annotationChanged = annotationForZoom !== previousLiveLocationFollowAnnotation;
+		if (!locationChanged && !annotationChanged) return;
 
 		previousLiveLocationFollowSequence = userLocation.positionSequence;
-		followLiveUserLocation(userLocation, annotationForZoom);
+		previousLiveLocationFollowAnnotation = annotationForZoom;
+		followLiveUserLocation(userLocation, annotationForZoom, {
+			duration: annotationChanged && !locationChanged ? getCameraCorrectionDuration() : undefined
+		});
 	});
 
 	// Show saved search and locator points.
@@ -488,7 +495,8 @@
 
 	function followLiveUserLocation(
 		userLocation: LiveUserLocation,
-		annotationForZoom = activeAnnotation
+		annotationForZoom = activeAnnotation,
+		options: { duration?: number } = {}
 	) {
 		if (!map) return;
 
@@ -523,7 +531,7 @@
 			zoom,
 			bearing,
 			pitch: 0,
-			duration: LIVE_LOCATION_MOVE_DURATION_MS,
+			duration: options.duration ?? LIVE_LOCATION_MOVE_DURATION_MS,
 			essential: true
 		});
 	}
@@ -1027,10 +1035,14 @@
 			zoom: clampZoomToMapLimits(zoom),
 			bearing: map.getBearing(),
 			pitch: 0,
-			duration: config.autoplay?.flyToDurationMs ?? 100
+			duration: getCameraCorrectionDuration()
 		});
 	}
 
+	function getCameraCorrectionDuration() {
+		return config.autoplay?.flyToDurationMs ?? 100;
+	}
+
 	function finishSelectedMapZoomLimit(annotationForLimit: string) {
 		if (annotationForLimit !== activeAnnotation) return;