Cancel any outstanding route when starting a new one

Fixes #913

diff --git a/app/assets/javascripts/index/directions.js b/app/assets/javascripts/index/directions.js
index 6149228ecb22ad02c79a5b10a5f9e8e33d2479b0..f7ac876369c2f21fb7288c602b28337e6293a4cc 100644 (file)
--- a/app/assets/javascripts/index/directions.js
+++ b/app/assets/javascripts/index/directions.js
@@ -145,6 +145,9 @@ OSM.Directions = function (map) {
   }
 
   function getRoute() {
   }
 
   function getRoute() {

+    // Cancel any route that is already in progress
+    if (awaitingRoute) awaitingRoute.abourt();
+

     // go fetch geocodes for any endpoints which have not already
     // been geocoded.
     for (var ep_i = 0; ep_i < 2; ++ep_i) {
     // go fetch geocodes for any endpoints which have not already
     // been geocoded.
     for (var ep_i = 0; ep_i < 2; ++ep_i) {


@@ -177,11 +180,10 @@ 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());
     // 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);
 
     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 (err) {
         map.removeLayer(polyline);

diff --git a/app/assets/javascripts/index/directions/graphhopper.js b/app/assets/javascripts/index/directions/graphhopper.js
index deefe151755a89186b8b04e17bb66c23137bb07f..95cb29ab813c0ac61eb265281caf4a49c777b65b 100644 (file)
--- a/app/assets/javascripts/index/directions/graphhopper.js
+++ b/app/assets/javascripts/index/directions/graphhopper.js
@@ -32,7 +32,7 @@ function GraphHopperEngine(id, vehicleParam) {
         url += "&point=" + points[i].lat + ',' + points[i].lng;
       }
 
         url += "&point=" + points[i].lat + ',' + points[i].lng;
       }
 

-      $.ajax({
+      return $.ajax({

         url: url,
         dataType: 'jsonp',
         success: function (data) {
         url: url,
         dataType: 'jsonp',
         success: function (data) {

diff --git a/app/assets/javascripts/index/directions/mapquest.js b/app/assets/javascripts/index/directions/mapquest.js
index 6b24fb3bc22a426a8091828b2a03d5504a9b82d1..fbbc55a5f660f2c2e89721a4fcaf4b8c85b23725 100644 (file)
--- a/app/assets/javascripts/index/directions/mapquest.js
+++ b/app/assets/javascripts/index/directions/mapquest.js
@@ -42,7 +42,7 @@ function MapQuestEngine(id, vehicleParam) {
       url += "&manMaps=false";
       url += "&shapeFormat=raw&generalize=0&unit=k";
 
       url += "&manMaps=false";
       url += "&shapeFormat=raw&generalize=0&unit=k";
 

-      $.ajax({
+      return $.ajax({

         url: url,
         success: function (data) {
           if (data.info.statuscode !== 0)
         url: url,
         success: function (data) {
           if (data.info.statuscode !== 0)

diff --git a/app/assets/javascripts/index/directions/osrm.js b/app/assets/javascripts/index/directions/osrm.js
index 842909eabc47cb5e4dc2d920b0013846f4ccae93..b58ba30a28c3dcf347b7b11957338f01ee66afa9 100644 (file)
--- a/app/assets/javascripts/index/directions/osrm.js
+++ b/app/assets/javascripts/index/directions/osrm.js
@@ -44,7 +44,7 @@ function OSRMEngine() {
         url += "&checksum=" + hintData.checksum;
       }
 
         url += "&checksum=" + hintData.checksum;
       }
 

-      $.ajax({
+      return $.ajax({

         url: url,
         dataType: 'json',
         success: function (data) {
         url: url,
         dataType: 'json',
         success: function (data) {