Prevent division by zero in FlyTo when currentCenter == targetCenter

Leaflet · Jul 30, 2015 · 3c6cfaa · 3c6cfaa
1 parent 5a29499
commit 3c6cfaa
Showing 1 changed file with 2 additions and 2 deletions.
diff --git a/src/map/anim/Map.FlyTo.js b/src/map/anim/Map.FlyTo.js
@@ -24,7 +24,7 @@ L.Map.include({
 		    rho2 = rho * rho;
 
 		function r(i) {
-			var b = (w1 * w1 - w0 * w0 + (i ? -1 : 1) * rho2 * rho2 * u1 * u1) / (2 * (i ? w1 : w0) * rho2 * u1);
+			var b = (w1 * w1 - w0 * w0 + (i ? -1 : 1) * rho2 * rho2 * u1) / (2 * (i ? w1 : w0) * rho2);
 			return Math.log(Math.sqrt(b * b + 1) - b);
 		}
 
@@ -51,7 +51,7 @@ L.Map.include({
 				this._flyToFrame = L.Util.requestAnimFrame(frame, this);
 
 				this._move(
-					this.unproject(from.add(to.subtract(from).multiplyBy(u(s) / u1)), startZoom),
+					this.unproject(u1 ? from.add(to.subtract(from).multiplyBy(u(s) / u1)) : from, startZoom),
 					this.getScaleZoom(w0 / w(s), startZoom));
 
 			} else {