Merge pull request #4887 from AntonKhorev/full-encode-wikipedia-value

[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 a58b0af16abc956471170020435ab0c916a8c508..ae01cb566f5732fcb088900ad7c028aa2d7a43b7 100644 (file)
--- a/app/assets/javascripts/index/directions.js
+++ b/app/assets/javascripts/index/directions.js
@@ -3,7 +3,6 @@
 //= require qs/dist/qs
 
 OSM.Directions = function (map) {
 //= require qs/dist/qs
 
 OSM.Directions = function (map) {

-  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 awaitingRoute; // true if we've asked the engine for a route and are waiting to hear back
   var chosenEngine;
 


@@ -21,9 +20,18 @@ OSM.Directions = function (map) {
     weight: 12
   });
 
     weight: 12
   });
 

+  var endpointDragCallback = function (dragging) {
+    if (map.hasLayer(polyline)) {
+      getRoute(false, !dragging);
+    }
+  };
+  var endpointGeocodeCallback = function () {
+    getRoute(true, true);
+  };
+

   var endpoints = [
   var endpoints = [

-    Endpoint($("input[name='route_from']"), OSM.MARKER_GREEN),
-    Endpoint($("input[name='route_to']"), OSM.MARKER_RED)
+    Endpoint($("input[name='route_from']"), OSM.MARKER_GREEN, endpointDragCallback, endpointGeocodeCallback),
+    Endpoint($("input[name='route_to']"), OSM.MARKER_RED, endpointDragCallback, endpointGeocodeCallback)

   ];
 
   var expiry = new Date();
   ];
 
   var expiry = new Date();


@@ -43,7 +51,7 @@ OSM.Directions = function (map) {
     select.append("<option value='" + i + "'>" + I18n.t("javascripts.directions.engines." + engine.id) + "</option>");
   });
 
     select.append("<option value='" + i + "'>" + I18n.t("javascripts.directions.engines." + engine.id) + "</option>");
   });
 

-  function Endpoint(input, iconUrl) {
+  function Endpoint(input, iconUrl, dragCallback, geocodeCallback) {

     var endpoint = {};
 
     endpoint.marker = L.marker([0, 0], {
     var endpoint = {};
 
     endpoint.marker = L.marker([0, 0], {


@@ -64,18 +72,14 @@ OSM.Directions = function (map) {
       if (dragging && !chosenEngine.draggable) return;
       if (dragging && awaitingRoute) return;
       endpoint.setLatLng(e.target.getLatLng());
       if (dragging && !chosenEngine.draggable) return;
       if (dragging && awaitingRoute) return;
       endpoint.setLatLng(e.target.getLatLng());

-      if (map.hasLayer(polyline)) {
-        getRoute(false, !dragging);
-      }
+      dragCallback(dragging);

     });
 
     input.on("keydown", function () {
     });
 
     input.on("keydown", function () {

-      input.removeClass("error");
+      input.removeClass("is-invalid");

     });
 
     input.on("change", function (e) {
     });
 
     input.on("change", function (e) {

-      awaitingGeocode = true;
-

       // make text the same in both text boxes
       var value = e.target.value;
       endpoint.setValue(value);
       // make text the same in both text boxes
       var value = e.target.value;
       endpoint.setValue(value);


@@ -84,7 +88,7 @@ OSM.Directions = function (map) {
     endpoint.setValue = function (value, latlng) {
       endpoint.value = value;
       delete endpoint.latlng;
     endpoint.setValue = function (value, latlng) {
       endpoint.value = value;
       delete endpoint.latlng;

-      input.removeClass("error");
+      input.removeClass("is-invalid");

       input.val(value);
 
       if (latlng) {
       input.val(value);
 
       if (latlng) {


@@ -109,7 +113,7 @@ OSM.Directions = function (map) {
         endpoint.awaitingGeocode = false;
         endpoint.hasGeocode = true;
         if (json.length === 0) {
         endpoint.awaitingGeocode = false;
         endpoint.hasGeocode = true;
         if (json.length === 0) {

-          input.addClass("error");
+          input.addClass("is-invalid");

           alert(I18n.t("javascripts.directions.errors.no_place", { place: endpoint.value }));
           return;
         }
           alert(I18n.t("javascripts.directions.errors.no_place", { place: endpoint.value }));
           return;
         }


@@ -118,10 +122,7 @@ OSM.Directions = function (map) {
 
         input.val(json[0].display_name);
 
 
         input.val(json[0].display_name);
 

-        if (awaitingGeocode) {
-          awaitingGeocode = false;
-          getRoute(true, true);
-        }
+        geocodeCallback();

       });
     };
 
       });
     };
 


@@ -157,7 +158,7 @@ OSM.Directions = function (map) {
     }));
   });
 
     }));
   });
 

-  $(".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) {


@@ -169,14 +170,18 @@ OSM.Directions = function (map) {
 
   function formatDistance(m) {
     if (m < 1000) {
 
   function formatDistance(m) {
     if (m < 1000) {

-      return Math.round(m) + "m";
+      return I18n.t("javascripts.directions.distance_m", { distance: Math.round(m) });

     } else if (m < 10000) {
     } else if (m < 10000) {

-      return (m / 1000.0).toFixed(1) + "km";
+      return I18n.t("javascripts.directions.distance_km", { distance: (m / 1000.0).toFixed(1) });

     } else {
     } else {

-      return Math.round(m / 1000) + "km";
+      return I18n.t("javascripts.directions.distance_km", { distance: Math.round(m / 1000) });

     }
   }
 
     }
   }
 

+  function formatHeight(m) {
+    return I18n.t("javascripts.directions.distance_m", { distance: Math.round(m) });
+  }
+

   function formatTime(s) {
     var m = Math.round(s / 60);
     var h = Math.floor(m / 60);
   function formatTime(s) {
     var m = Math.round(s / 60);
     var h = Math.floor(m / 60);


@@ -205,11 +210,9 @@ OSM.Directions = function (map) {
       var endpoint = endpoints[ep_i];
       if (!endpoint.hasGeocode && !endpoint.awaitingGeocode) {
         endpoint.getGeocode();
       var endpoint = endpoints[ep_i];
       if (!endpoint.hasGeocode && !endpoint.awaitingGeocode) {
         endpoint.getGeocode();

-        awaitingGeocode = true;

       }
     }
     if (endpoints[0].awaitingGeocode || endpoints[1].awaitingGeocode) {
       }
     }
     if (endpoints[0].awaitingGeocode || endpoints[1].awaitingGeocode) {

-      awaitingGeocode = true;

       return;
     }
 
       return;
     }
 


@@ -240,7 +243,7 @@ OSM.Directions = function (map) {
         map.removeLayer(polyline);
 
         if (reportErrors) {
         map.removeLayer(polyline);
 
         if (reportErrors) {

-          $("#sidebar_content").html("<p class=\"search_results_error\">" + I18n.t("javascripts.directions.errors.no_route") + "</p>");
+          $("#sidebar_content").html("<div class=\"alert alert-danger\">" + I18n.t("javascripts.directions.errors.no_route") + "</div>");

         }
 
         return;
         }
 
         return;


@@ -254,20 +257,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 />" +
-          I18n.t("javascripts.directions.ascend") + ": " + Math.round(route.ascend) + "m. " +
-          I18n.t("javascripts.directions.descend") + ": " + Math.round(route.descend) + "m.";
+        distanceText.append(
+          $("<br>"),
+          I18n.t("javascripts.directions.ascend") + ": " + formatHeight(route.ascend) + ". " +
+          I18n.t("javascripts.directions.descend") + ": " + formatHeight(route.descend) + ".");

       }
       }

-      html += "</p><table id=\"turnbyturn\" />";
+
+      var turnByTurnTable = $("<table class='table table-hover table-sm mb-3'>")
+        .append($("<tbody>"));
+      var directionsCloseButton = $("<button type='button' class='btn-close'>")
+        .attr("aria-label", I18n.t("javascripts.close"));

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

-        .html(html);
+        .empty()
+        .append(
+          $("<div class='d-flex'>").append(
+            $("<h2 class='flex-grow-1 text-break'>")
+              .text(I18n.t("javascripts.directions.directions")),
+            $("<div>").append(directionsCloseButton)),
+          distanceText,
+          turnByTurnTable
+        );

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


@@ -290,9 +304,9 @@ OSM.Directions = function (map) {
         }
 
         var row = $("<tr class='turn'/>");
         }
 
         var row = $("<tr class='turn'/>");

-        row.append("<td><div class='direction i" + direction + "'/></td> ");
-        row.append("<td class='instruction'>" + instruction);
-        row.append("<td class='distance'>" + dist);
+        row.append("<td class='border-0'><div class='direction i" + direction + "'/></td> ");
+        row.append("<td>" + instruction);
+        row.append("<td class='distance text-body-secondary text-end'>" + dist);

 
         row.on("click", function () {
           popup
 
         row.on("click", function () {
           popup


@@ -309,15 +323,14 @@ 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>");
 

-      $("#sidebar_content a.geolink").on("click", function (e) {
-        e.preventDefault();
+      directionsCloseButton.on("click", function () {

         map.removeLayer(polyline);
         $("#sidebar_content").html("");
         map.setSidebarOverlaid(true);
         map.removeLayer(polyline);
         $("#sidebar_content").html("");
         map.setSidebarOverlaid(true);


@@ -327,14 +340,14 @@ 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, { secure: true, expires: expiry, path: "/" });
+    Cookies.set("_osm_directions_engine", chosenEngine.id, { secure: true, expires: expiry, path: "/", samesite: "lax" });

     getRoute(true, true);
   });
 
     getRoute(true, true);
   });
 


@@ -343,7 +356,7 @@ OSM.Directions = function (map) {
     getRoute(true, true);
   });
 
     getRoute(true, true);
   });
 

-  $(".routing_marker").on("dragstart", function (e) {
+  $(".routing_marker_column img").on("dragstart", function (e) {

     var dt = e.originalEvent.dataTransfer;
     dt.effectAllowed = "move";
     var dragData = { type: $(this).data("type") };
     var dt = e.originalEvent.dataTransfer;
     dt.effectAllowed = "move";
     var dragData = { type: $(this).data("type") };