From: Tom Hughes <tom@compton.nu>
Date: Thu, 27 Feb 2025 20:31:19 +0000 (+0000)
Subject: Merge remote-tracking branch 'upstream/pull/5727'
X-Git-Tag: live~3
X-Git-Url: https://git.openstreetmap.org./rails.git/commitdiff_plain/648b8ba1f83e9923bb43a9175ea548405c9a403d?hp=-c

Merge remote-tracking branch 'upstream/pull/5727'
---

648b8ba1f83e9923bb43a9175ea548405c9a403d
diff --combined app/assets/javascripts/index/directions.js
index 07d39974d,ceda70ee0..ee8d3b8c5
--- a/app/assets/javascripts/index/directions.js
+++ b/app/assets/javascripts/index/directions.js
@@@ -4,6 -4,7 +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] });
@@@ -41,9 -42,20 +42,9 @@@
    const expiry = new Date();
    expiry.setYear(expiry.getFullYear() + 10);
  
 -  const engines = OSM.Directions.engines;
 -
 -  engines.sort(function (a, b) {
 -    const localised_a = I18n.t("javascripts.directions.engines." + a.id),
 -          localised_b = I18n.t("javascripts.directions.engines." + b.id);
 -    return localised_a.localeCompare(localised_b);
 -  });
 -
 +  const modeGroup = $(".routing_modes");
    const select = $("select.routing_engines");
  
 -  engines.forEach(function (engine, i) {
 -    select.append("<option value='" + i + "'>" + I18n.t("javascripts.directions.engines." + engine.id) + "</option>");
 -  });
 -
    $(".directions_form .reverse_directions").on("click", function () {
      const coordFrom = endpoints[0].latlng,
            coordTo = endpoints[1].latlng;
@@@ -87,33 -99,15 +88,33 @@@
      return h + ":" + (m < 10 ? "0" : "") + m;
    }
  
 -  function findEngine(id) {
 -    return engines.findIndex(function (engine) {
 -      return engine.id === id;
 -    });
 -  }
 +  function setEngine(id) {
 +    const engines = OSM.Directions.engines;
 +    const desired = engines.find(engine => engine.id === id);
 +    if (!desired || (chosenEngine && chosenEngine.id === id)) return;
 +    chosenEngine = desired;
 +
 +    const modes = engines
 +      .filter(engine => engine.provider === chosenEngine.provider)
 +      .map(engine => engine.mode);
 +    modeGroup
 +      .find("input[id]")
 +      .prop("disabled", function () {
 +        return !modes.includes(this.id);
 +      })
 +      .prop("checked", function () {
 +        return this.id === chosenEngine.mode;
 +      });
  
 -  function setEngine(index) {
 -    chosenEngine = engines[index];
 -    select.val(index);
 +    const providers = engines
 +      .filter(engine => engine.mode === chosenEngine.mode)
 +      .map(engine => engine.provider);
 +    select
 +      .find("option[value]")
 +      .prop("disabled", function () {
 +        return !providers.includes(this.value);
 +      });
 +    select.val(chosenEngine.provider);
    }
  
    function getRoute(fitRoute, reportErrors) {
@@@ -237,17 -231,14 +238,17 @@@
      }
    }
  
 -  let chosenEngineIndex = findEngine("fossgis_osrm_car");
 -  if (Cookies.get("_osm_directions_engine")) {
 -    chosenEngineIndex = findEngine(Cookies.get("_osm_directions_engine"));
 -  }
 -  setEngine(chosenEngineIndex);
 +  setEngine("fossgis_osrm_car");
 +  setEngine(Cookies.get("_osm_directions_engine"));
 +
 +  modeGroup.on("change", "input[name='modes']", function (e) {
 +    setEngine(chosenEngine.provider + "_" + e.target.id);
 +    Cookies.set("_osm_directions_engine", chosenEngine.id, { secure: true, expires: expiry, path: "/", samesite: "lax" });
 +    getRoute(true, true);
 +  });
  
    select.on("change", function (e) {
 -    chosenEngine = engines[e.target.selectedIndex];
 +    setEngine(e.target.selectedOptions[0].value + "_" + chosenEngine.mode);
      Cookies.set("_osm_directions_engine", chosenEngine.id, { secure: true, expires: expiry, path: "/", samesite: "lax" });
      getRoute(true, true);
    });
@@@ -268,6 -259,19 +269,19 @@@
      }
    });
  
+   function sendstartinglocation({ latlng: { lat, lng } }) {
+     map.fire("startinglocation", { latlng: [lat, lng] });
+   }
+ 
+   map.on("locationfound", ({ latlng: { lat, lng } }) =>
+     lastLocation = [lat, lng]
+   ).on("locateactivate", () => {
+     map.once("startinglocation", ({ latlng }) => {
+       if (endpoints[0].value) return;
+       endpoints[0].setValue(latlng.join(", "));
+     });
+   });
+ 
    const page = {};
  
    page.pushstate = page.popstate = function () {
@@@ -290,15 -294,23 +304,17 @@@
        endpoints[type === "from" ? 0 : 1].setValue(llWithPrecision.join(", "));
      });
  
+     map.on("locationfound", sendstartinglocation);
+ 
      endpoints[0].enable();
      endpoints[1].enable();
  
      const params = new URLSearchParams(location.search),
            route = (params.get("route") || "").split(";");
  
 -    if (params.has("engine")) {
 -      const engineIndex = findEngine(params.get("engine"));
 -
 -      if (engineIndex >= 0) {
 -        setEngine(engineIndex);
 -      }
 -    }
 +    if (params.has("engine")) setEngine(params.get("engine"));
  
-     endpoints[0].setValue(params.get("from") || route[0] || "");
+     endpoints[0].setValue(params.get("from") || route[0] || lastLocation.join(", "));
      endpoints[1].setValue(params.get("to") || route[1] || "");
  
      map.setSidebarOverlaid(!endpoints[0].latlng || !endpoints[1].latlng);
@@@ -312,6 -324,7 +328,7 @@@
      $(".search_form").show();
      $(".directions_form").hide();
      $("#map").off("dragend dragover drop");
+     map.off("locationfound", sendstartinglocation);
  
      endpoints[0].disable();
      endpoints[1].disable();
@@@ -328,7 -341,6 +345,7 @@@ OSM.Directions.engines = []
  
  OSM.Directions.addEngine = function (engine, supportsHTTPS) {
    if (document.location.protocol === "http:" || supportsHTTPS) {
 +    engine.id = engine.provider + "_" + engine.mode;
      OSM.Directions.engines.push(engine);
    }
  };