X-Git-Url: https://git.openstreetmap.org/rails.git/blobdiff_plain/c70e919b472732fd3cf0ae340af28f2624278f6d..0a15112423ebe2b2fece82f94ee67e3416d1cecb:/app/assets/javascripts/index/directions.js

diff --git a/app/assets/javascripts/index/directions.js b/app/assets/javascripts/index/directions.js
index 5f9027ec6..18466864b 100644
--- a/app/assets/javascripts/index/directions.js
+++ b/app/assets/javascripts/index/directions.js
@@ -1,10 +1,8 @@
 //= require_self
 //= require_tree ./directions
-//= require querystring
+//= require qs/dist/qs
 
 OSM.Directions = function (map) {
-  var querystring = require("querystring-component");
-
   var awaitingGeocode; // true if the user has requested a route, but we're waiting on a geocode result
   var awaitingRoute; // true if we've asked the engine for a route and are waiting to hear back
   var chosenEngine;
@@ -152,7 +150,7 @@ OSM.Directions = function (map) {
       routeTo = coordTo.lat + "," + coordTo.lng;
     }
 
-    OSM.router.route("/directions?" + querystring.stringify({
+    OSM.router.route("/directions?" + Qs.stringify({
       from: $("#route_to").val(),
       to: $("#route_from").val(),
       route: routeTo + ";" + routeFrom
@@ -223,7 +221,7 @@ OSM.Directions = function (map) {
 
     var precision = OSM.zoomPrecision(map.getZoom());
 
-    OSM.router.replace("/directions?" + querystring.stringify({
+    OSM.router.replace("/directions?" + Qs.stringify({
       engine: chosenEngine.id,
       route: o.lat.toFixed(precision) + "," + o.lng.toFixed(precision) + ";" +
              d.lat.toFixed(precision) + "," + d.lng.toFixed(precision)
@@ -329,17 +327,15 @@ OSM.Directions = function (map) {
   }
 
   var chosenEngineIndex = findEngine("fossgis_osrm_car");
-  if ($.cookie("_osm_directions_engine")) {
-    chosenEngineIndex = findEngine($.cookie("_osm_directions_engine"));
+  if (Cookies.get("_osm_directions_engine")) {
+    chosenEngineIndex = findEngine(Cookies.get("_osm_directions_engine"));
   }
   setEngine(chosenEngineIndex);
 
   select.on("change", function (e) {
     chosenEngine = engines[e.target.selectedIndex];
-    $.cookie("_osm_directions_engine", chosenEngine.id, { expires: expiry, path: "/" });
-    if (map.hasLayer(polyline)) {
-      getRoute(true, true);
-    }
+    Cookies.set("_osm_directions_engine", chosenEngine.id, { secure: true, expires: expiry, path: "/", samesite: "lax" });
+    getRoute(true, true);
   });
 
   $(".directions_form").on("submit", function (e) {
@@ -380,7 +376,7 @@ OSM.Directions = function (map) {
       getRoute(true, true);
     });
 
-    var params = querystring.parse(location.search.substring(1)),
+    var params = Qs.parse(location.search.substring(1)),
         route = (params.route || "").split(";"),
         from = route[0] && L.latLng(route[0].split(",")),
         to = route[1] && L.latLng(route[1].split(","));