Merge pull request #3666 from AntonKhorev/flex-close-buttons

[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 b2888fd548c71fb7463621009800311325114ea1..0c867a97d69b945661328a9e283522bc16d0762d 100644 (file)
--- a/app/assets/javascripts/index/directions.js
+++ b/app/assets/javascripts/index/directions.js
@@ -1,10 +1,8 @@
 //= require_self
 //= require_tree ./directions
 //= require_self
 //= require_tree ./directions

-//= require querystring
+//= require qs/dist/qs

 
 OSM.Directions = function (map) {
 
 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;
   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;


@@ -141,25 +139,25 @@ OSM.Directions = function (map) {
   }
 
   $(".directions_form .reverse_directions").on("click", function () {
   }
 
   $(".directions_form .reverse_directions").on("click", function () {

-    var from = endpoints[0].latlng,
-        to = endpoints[1].latlng,
+    var coordFrom = endpoints[0].latlng,
+        coordTo = endpoints[1].latlng,

         routeFrom = "",
         routeTo = "";
         routeFrom = "",
         routeTo = "";

-    if (from){
-      routeFrom = from.lat + "," + from.lng;
+    if (coordFrom) {
+      routeFrom = coordFrom.lat + "," + coordFrom.lng;

     }
     }

-    if (to){
-      routeTo = to.lat + "," + to.lng;
+    if (coordTo) {
+      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
     }));
   });
 
       from: $("#route_to").val(),
       to: $("#route_from").val(),
       route: routeTo + ";" + routeFrom
     }));
   });
 

-  $(".directions_form .close").on("click", function (e) {
+  $(".directions_form .btn-close").on("click", function (e) {

     e.preventDefault();
     var route_from = endpoints[0].value;
     if (route_from) {
     e.preventDefault();
     var route_from = endpoints[0].value;
     if (route_from) {


@@ -223,7 +221,7 @@ OSM.Directions = function (map) {
 
     var precision = OSM.zoomPrecision(map.getZoom());
 
 
     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)
       engine: chosenEngine.id,
       route: o.lat.toFixed(precision) + "," + o.lng.toFixed(precision) + ";" +
              d.lat.toFixed(precision) + "," + d.lng.toFixed(precision)


@@ -256,20 +254,31 @@ OSM.Directions = function (map) {
         map.fitBounds(polyline.getBounds().pad(0.05));
       }
 
         map.fitBounds(polyline.getBounds().pad(0.05));
       }
 

-      var html = "<h2><a class=\"geolink\" href=\"#\">" +
-        "<span class=\"icon close\"></span></a>" + I18n.t("javascripts.directions.directions") +
-        "</h2><p id=\"routing_summary\">" +
+      var distanceText = $("<p>").append(

         I18n.t("javascripts.directions.distance") + ": " + formatDistance(route.distance) + ". " +
         I18n.t("javascripts.directions.distance") + ": " + formatDistance(route.distance) + ". " +

-        I18n.t("javascripts.directions.time") + ": " + formatTime(route.time) + ".";
+        I18n.t("javascripts.directions.time") + ": " + formatTime(route.time) + ".");

       if (typeof route.ascend !== "undefined" && typeof route.descend !== "undefined") {
       if (typeof route.ascend !== "undefined" && typeof route.descend !== "undefined") {

-        html += "<br />" +
+        distanceText.append(
+          $("<br>"),

           I18n.t("javascripts.directions.ascend") + ": " + Math.round(route.ascend) + "m. " +
           I18n.t("javascripts.directions.ascend") + ": " + Math.round(route.ascend) + "m. " +

-          I18n.t("javascripts.directions.descend") + ": " + Math.round(route.descend) + "m.";
+          I18n.t("javascripts.directions.descend") + ": " + Math.round(route.descend) + "m.");

       }
       }

-      html += "</p><table id=\"turnbyturn\" />";
+
+      var turnByTurnTable = $("<table class='mb-3'>");

 
       $("#sidebar_content")
 
       $("#sidebar_content")

-        .html(html);
+        .empty()
+        .append(
+          $("<div class='d-flex'>").append(
+            $("<div class='flex-grow-1 text-break'>").append(
+              $("<h2>")
+                .text(I18n.t("javascripts.directions.directions"))),
+            $("<div>").append(
+              $("<a class='geolink' href='#'>").append(
+                $("<button type='button' class='btn-close mt-1'>")))),
+          distanceText,
+          turnByTurnTable
+        );

 
       // Add each row
       route.steps.forEach(function (step) {
 
       // Add each row
       route.steps.forEach(function (step) {


@@ -311,10 +320,10 @@ OSM.Directions = function (map) {
           map.removeLayer(highlight);
         });
 
           map.removeLayer(highlight);
         });
 

-        $("#turnbyturn").append(row);
+        turnByTurnTable.append(row);

       });
 
       });
 

-      $("#sidebar_content").append("<p id=\"routing_credit\">" +
+      $("#sidebar_content").append("<p class=\"text-center\">" +

         I18n.t("javascripts.directions.instructions.courtesy", { link: chosenEngine.creditline }) +
         "</p>");
 
         I18n.t("javascripts.directions.instructions.courtesy", { link: chosenEngine.creditline }) +
         "</p>");
 


@@ -329,17 +338,15 @@ OSM.Directions = function (map) {
   }
 
   var chosenEngineIndex = findEngine("fossgis_osrm_car");
   }
 
   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];
   }
   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) {
   });
 
   $(".directions_form").on("submit", function (e) {


@@ -380,7 +387,7 @@ OSM.Directions = function (map) {
       getRoute(true, true);
     });
 
       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(","));
         route = (params.route || "").split(";"),
         from = route[0] && L.latLng(route[0].split(",")),
         to = route[1] && L.latLng(route[1].split(","));