Merge pull request #324 from opoto/master

Fixes #304
perliedman · Oct 8, 2016 · 7211c1b · 7211c1b
2 parents bdf2c39 + 06d0264
commit 7211c1b
Showing 1 changed file with 28 additions and 25 deletions.
diff --git a/src/L.Routing.Control.js b/src/L.Routing.Control.js
@@ -48,37 +48,39 @@
 			}
 		},
 
+		onZoomEnd: function() {
+			if (!this._selectedRoute ||
+				!this._router.requiresMoreDetail) {
+				return;
+			}
+
+			var map = this._map;
+			if (this._router.requiresMoreDetail(this._selectedRoute,
+					map.getZoom(), map.getBounds())) {
+				this.route({
+					callback: L.bind(function(err, routes) {
+						var i;
+						if (!err) {
+							for (i = 0; i < routes.length; i++) {
+								this._routes[i].properties = routes[i].properties;
+							}
+							this._updateLineCallback(err, routes);
+						}
+
+					}, this),
+					simplifyGeometry: false,
+					geometryOnly: true
+				});
+			}
+		},
+
 		onAdd: function(map) {
 			var container = L.Routing.Itinerary.prototype.onAdd.call(this, map);
 
 			this._map = map;
 			this._map.addLayer(this._plan);
 
-			this._map.on('zoomend', function() {
-				if (!this._selectedRoute ||
-					!this._router.requiresMoreDetail) {
-					return;
-				}
-
-				var map = this._map;
-				if (this._router.requiresMoreDetail(this._selectedRoute,
-						map.getZoom(), map.getBounds())) {
-					this.route({
-						callback: L.bind(function(err, routes) {
-							var i;
-							if (!err) {
-								for (i = 0; i < routes.length; i++) {
-									this._routes[i].properties = routes[i].properties;
-								}
-								this._updateLineCallback(err, routes);
-							}
-
-						}, this),
-						simplifyGeometry: false,
-						geometryOnly: true
-					});
-				}
-			}, this);
+			this._map.on('zoomend', this.onZoomEnd, this);
 
 			if (this._plan.options.geocoder) {
 				container.insertBefore(this._plan.createGeocoders(), container.firstChild);
@@ -88,6 +90,7 @@
 		},
 
 		onRemove: function(map) {
+			map.off('zoomend', this.onZoomEnd, this);
 			if (this._line) {
 				map.removeLayer(this._line);
 			}