From d760e8eea10b98a0a70b2cce73a94813a442343b Mon Sep 17 00:00:00 2001
From: Dustin Carlino <dabreegster@gmail.com>
Date: Tue, 30 May 2023 16:08:42 +0100
Subject: [PATCH] By default, don't keep appending points to the end of a route

---
 package-lock.json                       |  8 ++++----
 package.json                            |  2 +-
 src/lib/draw/route/RouteControls.svelte | 11 ++++++++++-
 src/lib/draw/route/route_tool.ts        | 11 +++++++++--
 4 files changed, 24 insertions(+), 8 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index 03e50361c..7fab6a440 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -19,7 +19,7 @@
         "@types/geojson": "^7946.0.10",
         "comlink": "^4.4.1",
         "maplibre-gl": "^2.4.0",
-        "route-snapper": "^0.1.13",
+        "route-snapper": "^0.1.14",
         "svelte": "^3.54.0"
       },
       "devDependencies": {
@@ -1952,9 +1952,9 @@
       }
     },
     "node_modules/route-snapper": {
-      "version": "0.1.13",
-      "resolved": "https://registry.npmjs.org/route-snapper/-/route-snapper-0.1.13.tgz",
-      "integrity": "sha512-GjILba/OSor8gU2LkdAtioxlNdHx8CVTtFcR1QG9XpRIXjINgzv1slnC3nfpQ2yzb8rGvCEHqqHtUFNqDy2dCg=="
+      "version": "0.1.14",
+      "resolved": "https://registry.npmjs.org/route-snapper/-/route-snapper-0.1.14.tgz",
+      "integrity": "sha512-/3zRoRI0VL+aPas+fDQ9lvp5Fqkc5WosRh0gd/JrlJ3dA4nfXCzxZG9l04NsGzvhIYoDPy/2j3ivvost6GW7BA=="
     },
     "node_modules/run-parallel": {
       "version": "1.2.0",
diff --git a/package.json b/package.json
index f6222fbd7..aaa24b376 100644
--- a/package.json
+++ b/package.json
@@ -39,7 +39,7 @@
     "@types/geojson": "^7946.0.10",
     "comlink": "^4.4.1",
     "maplibre-gl": "^2.4.0",
-    "route-snapper": "^0.1.13",
+    "route-snapper": "^0.1.14",
     "svelte": "^3.54.0"
   }
 }
diff --git a/src/lib/draw/route/RouteControls.svelte b/src/lib/draw/route/RouteControls.svelte
index 9e87d33c4..6c57915c9 100644
--- a/src/lib/draw/route/RouteControls.svelte
+++ b/src/lib/draw/route/RouteControls.svelte
@@ -7,8 +7,10 @@
 
   // TODO Save this in the route
   let avoidDoublingBack = false;
+  let extendRoute = false;
   $: routeTool.setRouteConfig({
     avoid_doubling_back: avoidDoublingBack,
+    extend_route: extendRoute,
   });
 
   // TODO Show if shift is held or not
@@ -28,7 +30,14 @@
   </ul>
 </CollapsibleCard>
 
-<label>
+<label title="Keep clicking to add more points to the end of the route">
+  <input type="checkbox" bind:checked={extendRoute} />
+  Add points to end
+</label>
+<br />
+<label
+  title="Try to make the route avoid using the same streets with multiple waypoints"
+>
   <input type="checkbox" bind:checked={avoidDoublingBack} />
   Avoid doubling back
 </label>
diff --git a/src/lib/draw/route/route_tool.ts b/src/lib/draw/route/route_tool.ts
index 1e26ca6dd..dc5c23ba0 100644
--- a/src/lib/draw/route/route_tool.ts
+++ b/src/lib/draw/route/route_tool.ts
@@ -203,7 +203,11 @@ export class RouteTool {
       return;
     }
 
-    this.inner.setConfig({ avoid_doubling_back: true, area_mode: true });
+    this.inner.setConfig({
+      avoid_doubling_back: true,
+      area_mode: true,
+      extend_route: false,
+    });
     this.active = true;
     this.map.boxZoom.disable();
     this.map.doubleClickZoom.disable();
@@ -329,7 +333,10 @@ export class RouteTool {
     this.finish();
   }
 
-  setRouteConfig(config: { avoid_doubling_back: boolean }) {
+  setRouteConfig(config: {
+    avoid_doubling_back: boolean;
+    extend_route: boolean;
+  }) {
     this.inner.setConfig({ ...config, area_mode: false });
     this.redraw();
   }