Clean up new direction form

[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 3d6da84fc8d279d51e723dc0babfd3f721833ebb..c6f83a575e04bc2cc9f0a84a95bdf35666306f81 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
 
 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] });
   let chosenEngine;
 
   const popup = L.popup({ autoPanPadding: [100, 100] });


@@ -36,23 +37,14 @@ OSM.Directions = function (map) {
     OSM.DirectionsEndpoint(map, $("input[name='route_to']"), OSM.MARKER_RED, endpointDragCallback, endpointChangeCallback)
   ];
 
     OSM.DirectionsEndpoint(map, $("input[name='route_to']"), OSM.MARKER_RED, endpointDragCallback, endpointChangeCallback)
   ];
 

+  let downloadURL = null;
+

   const expiry = new Date();
   expiry.setYear(expiry.getFullYear() + 10);
 
   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");
 
   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;
   $(".directions_form .reverse_directions").on("click", function () {
     const coordFrom = endpoints[0].latlng,
           coordTo = endpoints[1].latlng;


@@ -96,15 +88,33 @@ OSM.Directions = function (map) {
     return h + ":" + (m < 10 ? "0" : "") + m;
   }
 
     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) {
   }
 
   function getRoute(fitRoute, reportErrors) {


@@ -189,6 +199,16 @@ OSM.Directions = function (map) {
         turnByTurnTable.append(row);
       });
 
         turnByTurnTable.append(row);
       });
 

+      const blob = new Blob([JSON.stringify(polyline.toGeoJSON())], { type: "application/json" });
+      URL.revokeObjectURL(downloadURL);
+      downloadURL = URL.createObjectURL(blob);
+
+      $("#sidebar_content").append(`<p class="text-center"><a href="${downloadURL}" download="${
+        I18n.t("javascripts.directions.filename")
+      }">${
+        I18n.t("javascripts.directions.download")
+      }</a></p>`);
+

       $("#sidebar_content").append("<p class=\"text-center\">" +
         I18n.t("javascripts.directions.instructions.courtesy", { link: chosenEngine.creditline }) +
         "</p>");
       $("#sidebar_content").append("<p class=\"text-center\">" +
         I18n.t("javascripts.directions.instructions.courtesy", { link: chosenEngine.creditline }) +
         "</p>");


@@ -218,14 +238,17 @@ OSM.Directions = function (map) {
     }
   }
 
     }
   }
 

-  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) {
 
   select.on("change", function (e) {

-    chosenEngine = engines[e.target.selectedIndex];
+    setEngine(e.target.value + "_" + chosenEngine.mode);

     Cookies.set("_osm_directions_engine", chosenEngine.id, { secure: true, expires: expiry, path: "/", samesite: "lax" });
     getRoute(true, true);
   });
     Cookies.set("_osm_directions_engine", chosenEngine.id, { secure: true, expires: expiry, path: "/", samesite: "lax" });
     getRoute(true, true);
   });


@@ -246,6 +269,19 @@ OSM.Directions = function (map) {
     }
   });
 
     }
   });
 

+  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 () {
   const page = {};
 
   page.pushstate = page.popstate = function () {


@@ -268,21 +304,17 @@ OSM.Directions = function (map) {
       endpoints[type === "from" ? 0 : 1].setValue(llWithPrecision.join(", "));
     });
 
       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(";");
 
     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);
     endpoints[1].setValue(params.get("to") || route[1] || "");
 
     map.setSidebarOverlaid(!endpoints[0].latlng || !endpoints[1].latlng);


@@ -296,6 +328,7 @@ OSM.Directions = function (map) {
     $(".search_form").show();
     $(".directions_form").hide();
     $("#map").off("dragend dragover drop");
     $(".search_form").show();
     $(".directions_form").hide();
     $("#map").off("dragend dragover drop");

+    map.off("locationfound", sendstartinglocation);

 
     endpoints[0].disable();
     endpoints[1].disable();
 
     endpoints[0].disable();
     endpoints[1].disable();


@@ -312,6 +345,7 @@ OSM.Directions.engines = [];
 
 OSM.Directions.addEngine = function (engine, supportsHTTPS) {
   if (document.location.protocol === "http:" || supportsHTTPS) {
 
 OSM.Directions.addEngine = function (engine, supportsHTTPS) {
   if (document.location.protocol === "http:" || supportsHTTPS) {

+    engine.id = engine.provider + "_" + engine.mode;

     OSM.Directions.engines.push(engine);
   }
 };
     OSM.Directions.engines.push(engine);
   }
 };