Remove global "awaiting geocode" routing state

[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 500610e26dfc9c4f3ed3529614f60c54a05a0757..f07aa7f072fdb9e0b2f03bf17f6feba763884000 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;
 


@@ -74,8 +73,6 @@ OSM.Directions = function (map) {
     });
 
     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);


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

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

       });
     };
 
       });
     };
 


@@ -169,14 +163,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 +203,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 +236,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;


@@ -260,12 +256,14 @@ OSM.Directions = function (map) {
       if (typeof route.ascend !== "undefined" && typeof route.descend !== "undefined") {
         distanceText.append(
           $("<br>"),
       if (typeof route.ascend !== "undefined" && typeof route.descend !== "undefined") {
         distanceText.append(
           $("<br>"),

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

       }
 
       }
 

-      var turnByTurnTable = $("<table class='mb-3'>");
-      var directionsCloseButton = $("<button type='button' class='btn-close'>");
+      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")
         .empty()
 
       $("#sidebar_content")
         .empty()


@@ -299,9 +297,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


@@ -351,7 +349,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") };