Move directions listeners init code to its own function

[rails.git] / app / assets / javascripts / index / directions.js

diff --git a/app/assets/javascripts/index/directions.js b/app/assets/javascripts/index/directions.js
index 07d39974db5b30aa9cce132cd7ff49b5b52837d4..5aa773823fd193555914afc01582b6cc52ed1e12 100644 (file)
--- a/app/assets/javascripts/index/directions.js
+++ b/app/assets/javascripts/index/directions.js
@@ -4,6 +4,7 @@
 
 OSM.Directions = function (map) {
   let controller = null; // the AbortController for the current route request if a route request is in progress
+  let lastLocation = [];
   let chosenEngine;
 
   const popup = L.popup({ autoPanPadding: [100, 100] });
@@ -247,7 +248,7 @@ OSM.Directions = function (map) {
   });
 
   select.on("change", function (e) {
-    setEngine(e.target.selectedOptions[0].value + "_" + chosenEngine.mode);
+    setEngine(e.target.value + "_" + chosenEngine.mode);
     Cookies.set("_osm_directions_engine", chosenEngine.id, { secure: true, expires: expiry, path: "/", samesite: "lax" });
     getRoute(true, true);
   });
@@ -268,12 +269,32 @@ OSM.Directions = function (map) {
     }
   });
 
-  const page = {};
+  function sendstartinglocation({ latlng: { lat, lng } }) {
+    map.fire("startinglocation", { latlng: [lat, lng] });
+  }
 
-  page.pushstate = page.popstate = function () {
-    $(".search_form").hide();
-    $(".directions_form").show();
+  function startingLocationListener({ latlng }) {
+    if (endpoints[0].value) return;
+    endpoints[0].setValue(latlng.join(", "));
+  }
+
+  map.on("locationfound", ({ latlng: { lat, lng } }) =>
+    lastLocation = [lat, lng]
+  ).on("locateactivate", () => {
+    map.once("startinglocation", startingLocationListener);
+  });
+
+  function initializeFromParams() {
+    const params = new URLSearchParams(location.search),
+          route = (params.get("route") || "").split(";");
+
+    if (params.has("engine")) setEngine(params.get("engine"));
+
+    endpoints[0].setValue(params.get("from") || route[0] || lastLocation.join(", "));
+    endpoints[1].setValue(params.get("to") || route[1] || "");
+  }
 
+  function enableListeners() {
     $("#map").on("dragend dragover", function (e) {
       e.preventDefault();
     });
@@ -290,16 +311,21 @@ OSM.Directions = function (map) {
       endpoints[type === "from" ? 0 : 1].setValue(llWithPrecision.join(", "));
     });
 
-    endpoints[0].enable();
-    endpoints[1].enable();
+    map.on("locationfound", sendstartinglocation);
 
-    const params = new URLSearchParams(location.search),
-          route = (params.get("route") || "").split(";");
+    endpoints[0].enableListeners();
+    endpoints[1].enableListeners();
+  }
 
-    if (params.has("engine")) setEngine(params.get("engine"));
+  const page = {};
 
-    endpoints[0].setValue(params.get("from") || route[0] || "");
-    endpoints[1].setValue(params.get("to") || route[1] || "");
+  page.pushstate = page.popstate = function () {
+    initializeFromParams();
+
+    $(".search_form").hide();
+    $(".directions_form").show();
+
+    enableListeners();
 
     map.setSidebarOverlaid(!endpoints[0].latlng || !endpoints[1].latlng);
   };
@@ -312,9 +338,13 @@ OSM.Directions = function (map) {
     $(".search_form").show();
     $(".directions_form").hide();
     $("#map").off("dragend dragover drop");
+    map.off("locationfound", sendstartinglocation);
+
+    endpoints[0].disableListeners();
+    endpoints[1].disableListeners();
 
-    endpoints[0].disable();
-    endpoints[1].disable();
+    endpoints[0].clearValue();
+    endpoints[1].clearValue();
 
     map
       .removeLayer(popup)
@@ -327,7 +357,7 @@ OSM.Directions = function (map) {
 OSM.Directions.engines = [];
 
 OSM.Directions.addEngine = function (engine, supportsHTTPS) {
-  if (document.location.protocol === "http:" || supportsHTTPS) {
+  if (location.protocol === "http:" || supportsHTTPS) {
     engine.id = engine.provider + "_" + engine.mode;
     OSM.Directions.engines.push(engine);
   }