From 3133a11c86446b678edc82c7f1959ac036e4e7a2 Mon Sep 17 00:00:00 2001
From: Dustin Carlino <dabreegster@gmail.com>
Date: Thu, 12 Sep 2024 11:34:41 +0100
Subject: [PATCH] Show snappable waypoints when transitioning from freehand to
 snapped, and remove the avoid doubling back option

---
 package-lock.json              | 4 ++--
 package.json                   | 2 +-
 src/lib/maplibre/zorder.ts     | 1 +
 src/pages/SketchSchemes.svelte | 2 +-
 4 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index 9a5c3643..f5fd9ecf 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -21,7 +21,7 @@
         "humanize-string": "^3.0.0",
         "js-cookie": "^3.0.5",
         "maplibre-gl": "^4.0.2",
-        "scheme-sketcher-lib": "github:acteng/scheme-sketcher-lib",
+        "scheme-sketcher-lib": "github:acteng/scheme-sketcher-lib#show_snappables",
         "svelte": "^4.2.10",
         "svelte-maplibre": "^0.9.7",
         "uuid": "^9.0.1"
@@ -3817,7 +3817,7 @@
     },
     "node_modules/scheme-sketcher-lib": {
       "version": "0.0.1",
-      "resolved": "git+ssh://git@github.com/acteng/scheme-sketcher-lib.git#4fa0cee61e6b2de292b6dbb7c09333b56cade723",
+      "resolved": "git+ssh://git@github.com/acteng/scheme-sketcher-lib.git#82e70a759df39bd9b9434ef0742f7c9c74a41acf",
       "dependencies": {
         "@maptiler/geocoding-control": "1.2.3",
         "@turf/mask": "^7.0.0",
diff --git a/package.json b/package.json
index b144d448..fb00372a 100644
--- a/package.json
+++ b/package.json
@@ -47,7 +47,7 @@
     "humanize-string": "^3.0.0",
     "js-cookie": "^3.0.5",
     "maplibre-gl": "^4.0.2",
-    "scheme-sketcher-lib": "github:acteng/scheme-sketcher-lib",
+    "scheme-sketcher-lib": "github:acteng/scheme-sketcher-lib#show_snappables",
     "svelte": "^4.2.10",
     "svelte-maplibre": "^0.9.7",
     "uuid": "^9.0.1"
diff --git a/src/lib/maplibre/zorder.ts b/src/lib/maplibre/zorder.ts
index be6270b8..6038461f 100644
--- a/src/lib/maplibre/zorder.ts
+++ b/src/lib/maplibre/zorder.ts
@@ -88,6 +88,7 @@ export let layerZorder = [
   sketch("route-points"),
   sketch("route-lines"),
   sketch("route-polygons"),
+  sketch("route-debug-nodes"),
 
   // Draw most things beneath text road labels. These IDs come from the
   // MapTiler basemap, and there are different ones for each basemap. Note for
diff --git a/src/pages/SketchSchemes.svelte b/src/pages/SketchSchemes.svelte
index c86cfbb8..5f2d89b7 100644
--- a/src/pages/SketchSchemes.svelte
+++ b/src/pages/SketchSchemes.svelte
@@ -141,7 +141,7 @@
         {:else if $mode.mode == "split-route"}
           <SplitRouteMode {cfg} {gjSchemes} />
         {/if}
-        <RouteSnapperLayer {cfg} />
+        <RouteSnapperLayer {gjSchemes} {cfg} />
         <PolygonToolLayer {cfg} />
       {/if}
     </MapLibreMap>