cst1/openstreetmap-website
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Cancel any outstanding route when starting a new one

Browse source 
Fixes #913
This commit is contained in:
Tom Hughes 2015-02-26 18:39:31 +00:00
parent 4b2c64fbed
commit 4254a1f291
4 changed files with 8 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

8
app/assets/javascripts/index/directions.js
View file

@ -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 // go fetch geocodes for any endpoints which have not already
// been geocoded. // been geocoded.
for (var ep_i = 0; ep_i < 2; ++ep_i) { 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 // just using it in-place and replacing it in case it has to be used
// again. // again.
$('#sidebar_content').html($('.directions_form .loader_copy').html()); $('#sidebar_content').html($('.directions_form .loader_copy').html());
awaitingRoute = true;
map.setSidebarOverlaid(false); map.setSidebarOverlaid(false);
chosenEngine.getRoute([o, d], function (err, route) { awaitingRoute = chosenEngine.getRoute([o, d], function (err, route) {
awaitingRoute = false; awaitingRoute = null;
if (err) { if (err) {
map.removeLayer(polyline); map.removeLayer(polyline);

2
app/assets/javascripts/index/directions/graphhopper.js
View file

@ -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, url: url,
dataType: 'jsonp', dataType: 'jsonp',
success: function (data) { success: function (data) {

2
app/assets/javascripts/index/directions/mapquest.js
View file

@ -42,7 +42,7 @@ function MapQuestEngine(id, vehicleParam) {
url += "&manMaps=false"; url += "&manMaps=false";
url += "&shapeFormat=raw&generalize=0&unit=k"; url += "&shapeFormat=raw&generalize=0&unit=k";
$.ajax({ return $.ajax({
url: url, url: url,
success: function (data) { success: function (data) {
if (data.info.statuscode !== 0) if (data.info.statuscode !== 0)

2
app/assets/javascripts/index/directions/osrm.js
View file

@ -44,7 +44,7 @@ function OSRMEngine() {
url += "&checksum=" + hintData.checksum; url += "&checksum=" + hintData.checksum;
} }
$.ajax({ return $.ajax({
url: url, url: url,
dataType: 'json', dataType: 'json',
success: function (data) { success: function (data) {