Merge remote-tracking branch 'openstreetmap/pull/1445'

[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 6149228ecb22ad02c79a5b10a5f9e8e33d2479b0..2a1e045dae4efc2bf61a5c5c75ce80ac54849f65 100644 (file)
--- a/app/assets/javascripts/index/directions.js
+++ b/app/assets/javascripts/index/directions.js
@@ -108,7 +108,7 @@ OSM.Directions = function (map) {
     return endpoint;
   }
 
-  $(".directions_form a.directions_close").on("click", function(e) {
+  $(".directions_form .close").on("click", function(e) {
     e.preventDefault();
     var route_from = endpoints[0].value;
     if (route_from) {
@@ -145,6 +145,9 @@ OSM.Directions = function (map) {
   }
 
   function getRoute() {
+    // Cancel any route that is already in progress
+    if (awaitingRoute) awaitingRoute.abort();
+
     // go fetch geocodes for any endpoints which have not already
     // been geocoded.
     for (var ep_i = 0; ep_i < 2; ++ep_i) {
@@ -177,17 +180,16 @@ OSM.Directions = function (map) {
     // just using it in-place and replacing it in case it has to be used
     // again.
     $('#sidebar_content').html($('.directions_form .loader_copy').html());
-    awaitingRoute = true;
     map.setSidebarOverlaid(false);
 
-    chosenEngine.getRoute([o, d], function (err, route) {
-      awaitingRoute = false;
+    awaitingRoute = chosenEngine.getRoute([o, d], function (err, route) {
+      awaitingRoute = null;
 
       if (err) {
         map.removeLayer(polyline);
 
         if (!dragging) {
-          alert(I18n.t('javascripts.directions.errors.no_route'));
+          $('#sidebar_content').html('<p class="search_results_error">' + I18n.t('javascripts.directions.errors.no_route') + '</p>');
         }
 
         return;
@@ -300,10 +302,14 @@ OSM.Directions = function (map) {
   });
 
   $(".routing_marker").on('dragstart', function (e) {
-    e.originalEvent.dataTransfer.effectAllowed = 'move';
-    e.originalEvent.dataTransfer.setData('id', this.id);
-    var img = $("<img>").attr("src", $(e.originalEvent.target).attr("src"));
-    e.originalEvent.dataTransfer.setDragImage(img.get(0), 12, 21);
+    var dt = e.originalEvent.dataTransfer;
+    dt.effectAllowed = 'move';
+    var dragData = { type: $(this).data('type') };
+    dt.setData('text', JSON.stringify(dragData));
+    if (dt.setDragImage) {
+      var img = $("<img>").attr("src", $(e.originalEvent.target).attr("src"));
+      dt.setDragImage(img.get(0), 12, 21);
+    }
   });
 
   var page = {};
@@ -319,11 +325,12 @@ OSM.Directions = function (map) {
     $("#map").on('drop', function (e) {
       e.preventDefault();
       var oe = e.originalEvent;
-      var id = oe.dataTransfer.getData('id');
+      var dragData = JSON.parse(oe.dataTransfer.getData('text'));
+      var type = dragData.type;
       var pt = L.DomEvent.getMousePosition(oe, map.getContainer());  // co-ordinates of the mouse pointer at present
       pt.y += 20;
       var ll = map.containerPointToLatLng(pt);
-      endpoints[id === 'marker_from' ? 0 : 1].setLatLng(ll);
+      endpoints[type === 'from' ? 0 : 1].setLatLng(ll);
       getRoute();
     });
 
@@ -334,13 +341,8 @@ OSM.Directions = function (map) {
       setEngine(params.engine);
     }
 
-    if (params.from) {
-      endpoints[0].setValue(params.from);
-      endpoints[1].setValue("");
-    } else {
-      endpoints[0].setValue("");
-      endpoints[1].setValue("");
-    }
+    endpoints[0].setValue(params.from || "");
+    endpoints[1].setValue(params.to || "");
 
     var o = route[0] && L.latLng(route[0].split(',')),
         d = route[1] && L.latLng(route[1].split(','));