From 1f99976f97602053fce9ea6e3c1ed08c77f9c839 Mon Sep 17 00:00:00 2001
From: Jannik <jannik@picoscratch.de>
Date: Sat, 25 Oct 2025 18:49:34 +0200
Subject: [PATCH] feat: use snapped location by default

---
 src/lib/components/lnv/FullscreenMap.svelte   | 11 +------
 src/lib/components/lnv/location.svelte.ts     | 29 ++++++++++++++-----
 .../sidebar/settings/AppearanceSidebar.svelte |  7 +++++
 src/lib/services/TileMeta.ts                  |  1 +
 4 files changed, 31 insertions(+), 17 deletions(-)

diff --git a/src/lib/components/lnv/FullscreenMap.svelte b/src/lib/components/lnv/FullscreenMap.svelte
index d8027a3..a6945ff 100644
--- a/src/lib/components/lnv/FullscreenMap.svelte
+++ b/src/lib/components/lnv/FullscreenMap.svelte
@@ -7,7 +7,7 @@
 		decodePolyline,
 		routing,
 	} from "$lib/services/navigation/routing.svelte";
-	import { getSnappedLocation, location } from "./location.svelte";
+	import { location } from "./location.svelte";
 	import RoutingLayers from "$lib/services/navigation/RoutingLayers.svelte";
 	import {
 		getPMTilesURL,
@@ -137,15 +137,6 @@
 			pitchAlignment="map"
 		/>
 	{/if}
-	{#if getSnappedLocation().current}
-		<Marker
-			lnglat={{
-				lat: getSnappedLocation().current!.lat,
-				lng: getSnappedLocation().current!.lon,
-			}}
-			color="blue"
-		/>
-	{/if}
 
 	<MapLocationMarkers />
 
diff --git a/src/lib/components/lnv/location.svelte.ts b/src/lib/components/lnv/location.svelte.ts
index fd88368..00db124 100644
--- a/src/lib/components/lnv/location.svelte.ts
+++ b/src/lib/components/lnv/location.svelte.ts
@@ -34,6 +34,7 @@ export const location = $state({
 	advertiser: null as WebSocket | null,
 	code: null as string | null,
 	lastUpdate: null as Date | null,
+	useSnapped: true,
 });
 
 const _isDriving = $derived(location.speed > 7 / 3.6);
@@ -48,6 +49,9 @@ const roadMetadata: WrappedValue<GeoJSON.GeoJsonProperties> = $state({
 const roadFeature: WrappedValue<GeoJSON.Feature | null> = $state({
 	current: null,
 });
+const rawLocation: WrappedValue<WorldLocation | null> = $state({
+	current: null,
+});
 const snappedLocation: WrappedValue<WorldLocation | null> = $state({
 	current: null,
 });
@@ -69,8 +73,9 @@ function snapLocation() {
 	const feature = roadFeature.current;
 	console.log("Snapping location to road feature:", feature);
 	if (!feature) return;
+	if (!rawLocation.current) return;
 	if (feature.geometry.type === "LineString") {
-		const loc = nearestPointOnLine(lineString(feature.geometry.coordinates), point([location.lng, location.lat]));
+		const loc = nearestPointOnLine(lineString(feature.geometry.coordinates), point([rawLocation.current.lon, rawLocation.current.lat]));
 		snappedLocation.current = {
 			lat: loc.geometry.coordinates[1],
 			lon: loc.geometry.coordinates[0],
@@ -80,10 +85,10 @@ function snapLocation() {
 		let nearestLoc: GeoJSON.Feature<GeoJSON.Point> | null = null;
 		let minDist = Infinity;
 		for (const coords of feature.geometry.coordinates) {
-			const loc = nearestPointOnLine(lineString(coords), point([location.lng, location.lat]));
+			const loc = nearestPointOnLine(lineString(coords), point([rawLocation.current.lon, rawLocation.current.lat]));
 			const dist = Math.hypot(
-				loc.geometry.coordinates[0] - location.lng,
-				loc.geometry.coordinates[1] - location.lat,
+				loc.geometry.coordinates[0] - rawLocation.current.lon,
+				loc.geometry.coordinates[1] - rawLocation.current.lat,
 			);
 			if (dist < minDist) {
 				minDist = dist;
@@ -105,8 +110,14 @@ export function watchLocation() {
 			(pos) => {
 				if (location.provider !== "gps") return;
 				// console.log("Geolocation update:", pos)
-				location.lat = pos.coords.latitude;
-				location.lng = pos.coords.longitude;
+				rawLocation.current = {
+					lat: pos.coords.latitude,
+					lon: pos.coords.longitude,
+				};
+				if(!location.useSnapped) {
+					location.lat = pos.coords.latitude;
+					location.lng = pos.coords.longitude;
+				}
 				location.accuracy = pos.coords.accuracy;
 				location.speed = pos.coords.speed || 0;
 				location.available = true;
@@ -115,7 +126,7 @@ export function watchLocation() {
 
 				const blacklist = ["path", "track", "raceway", "busway", "bus_guideway", "ferry"];
 				getFeature(
-					{ lat: location.lat, lon: location.lng },
+					{ lat: rawLocation.current.lat, lon: rawLocation.current.lon },
 					"transportation",
 					{
 						filter: (f) => {
@@ -131,6 +142,10 @@ export function watchLocation() {
 					roadMetadata.current = feature ? feature.properties : null;
 					lastFeatureId = feature ? String(feature.id) : null;
 					snapLocation();
+					if(location.useSnapped && snappedLocation.current) {
+						location.lat = snappedLocation.current.lat;
+						location.lng = snappedLocation.current.lon;
+					}
 				});
 
 				if (location.locked) {
diff --git a/src/lib/components/lnv/sidebar/settings/AppearanceSidebar.svelte b/src/lib/components/lnv/sidebar/settings/AppearanceSidebar.svelte
index b05accb..aaa0462 100644
--- a/src/lib/components/lnv/sidebar/settings/AppearanceSidebar.svelte
+++ b/src/lib/components/lnv/sidebar/settings/AppearanceSidebar.svelte
@@ -1,5 +1,7 @@
 <script>
 	import { m } from "$lang/messages";
+	import { BeakerIcon } from "@lucide/svelte";
+	import { location } from "../../location.svelte";
 	import SidebarHeader from "../SidebarHeader.svelte";
 	import SettingsToggle from "./SettingsToggle.svelte";
 </script>
@@ -12,3 +14,8 @@
 	text={m["sidebar.appearance.bigger-buttons-in-drive"]()}
 	localStorageKey="bigger-buttons-in-drive"
 />
+<SettingsToggle
+	text="Use snapped location (experimental)"
+	bind:value={location.useSnapped}
+	icon={BeakerIcon}
+/>
diff --git a/src/lib/services/TileMeta.ts b/src/lib/services/TileMeta.ts
index 3e169a3..249ecbe 100644
--- a/src/lib/services/TileMeta.ts
+++ b/src/lib/services/TileMeta.ts
@@ -53,6 +53,7 @@ export async function getFeature(coord: WorldLocation, layer: string, { lastId,
 		console.log("lastId:", lastId, "a.id:", a.id, "b.id:", b.id);
 		const STAY_BIAS = getBias();
 
+		// TODO: don't bias if feature is continuing straight (split ways vs turn)
 		if (lastId && String(a.id) == lastId) {
 			console.log("Applying stay bias to B");
 			distB += STAY_BIAS;