Abort ongoing request before starting a new; close #292

Author: Per Liedman

src/L.Routing.Control.js

@@ -270,7 +270,7 @@
 				routes = routes.slice();
 				var selected = routes.splice(this._selectedRoute.routesIndex, 1)[0];
 				this._updateLines({route: selected, alternatives: routes });
-			} else {
+			} else if (err.type !== 'abort') {
 				this._clearLines();
 			}
 		},
@@ -279,6 +279,11 @@
 			var ts = ++this._requestCount,
 				wps;
 
+			if (this._pendingRequest && this._pendingRequest.abort) {
+				this._pendingRequest.abort();
+				this._pendingRequest = null;
+			}
+
 			options = options || {};
 
 			if (this._plan.isReady()) {
@@ -288,15 +293,21 @@
 
 				wps = options && options.waypoints || this._plan.getWaypoints();
 				this.fire('routingstart', {waypoints: wps});
-				this._router.route(wps, options.callback || function(err, routes) {
+				this._pendingRequest = this._router.route(wps, function(err, routes) {
+					this._pendingRequest = null;
+
+					if (options.callback) {
+						return options.callback.call(this, err, routes);
+					}
+
 					// Prevent race among multiple requests,
-					// by checking the current request's timestamp
+					// by checking the current request's count
 					// against the last request's; ignore result if
-					// this isn't the latest request.
+					// this isn't the last request.
 					if (ts === this._requestCount) {
 						this._clearLines();
 						this._clearAlts();
-						if (err) {
+						if (err && err.type !== 'abort') {
 							this.fire('routingerror', {error: err});
 							return;
 						}

src/L.Routing.OSRM.js

@@ -57,7 +57,7 @@
 				wps.push(new L.Routing.Waypoint(wp.latLng, wp.name, wp.options));
 			}
 
-			corslite(url, L.bind(function(err, resp) {
+			return corslite(url, L.bind(function(err, resp) {
 				var data,
 					errorMessage,
 					statusCode;
@@ -88,8 +88,6 @@
 					});
 				}
 			}, this));
-
-			return this;
 		},
 
 		_routeDone: function(response, inputWaypoints, callback, context) {

src/L.Routing.OSRMv1.js

@@ -42,7 +42,8 @@
 				url,
 				timer,
 				wp,
-				i;
+				i,
+				xhr;
 
 			options = L.extend({}, this.options.routingOptions, options);
 			url = this.buildRouteUrl(waypoints, options);
@@ -66,39 +67,37 @@
 				wps.push(new L.Routing.Waypoint(wp.latLng, wp.name, wp.options));
 			}
 
-			corslite(url, L.bind(function(err, resp) {
+			return xhr = corslite(url, L.bind(function(err, resp) {
 				var data,
-					errorMessage,
-					statusCode;
+					error =  {};
 
 				clearTimeout(timer);
 				if (!timedOut) {
-					errorMessage = 'HTTP request failed: ' + err;
-					statusCode = -1;
-
 					if (!err) {
 						try {
 							data = JSON.parse(resp.responseText);
 							try {
 								return this._routeDone(data, wps, options, callback, context);
 							} catch (ex) {
-								statusCode = -3;
-								errorMessage = ex.toString();
+								error.status = -3;
+								error.error = ex.toString();
 							}
 						} catch (ex) {
-							statusCode = -2;
-							errorMessage = 'Error parsing OSRM response: ' + ex.toString();
+							error.status = -2;
+							error.error = 'Error parsing OSRM response: ' + ex.toString();
 						}
+					} else {
+						error = L.extend({}, err, {
+							error: 'HTTP request failed: ' + err.type,
+							status: -1
+						})
 					}
 
-					callback.call(context || callback, {
-						status: statusCode,
-						message: errorMessage
-					});
+					callback.call(context || callback, error);
+				} else {
+					xhr.abort();
 				}
 			}, this));
-
-			return this;
 		},
 
 		requiresMoreDetail: function(route, zoom, bounds) {