canvas layer: _animatingZoom is no more needed too.

Signed-off-by: Jan Holesovsky <[email protected]> Change-Id: If7e38c591e6b4b52fa16a47f4cc3f1c015ee0901
yuuolo · Dec 21, 2020 · e77da33 · e77da33
1 parent 51ba408
commit e77da33
Show file tree

Hide file tree

Showing 5 changed files with 2 additions and 18 deletions.
diff --git a/loleaflet/src/layer/tile/CanvasTileLayer.js b/loleaflet/src/layer/tile/CanvasTileLayer.js
@@ -601,14 +601,6 @@ L.CanvasTileLayer = L.TileLayer.extend({
 				paneOffset.x = Math.min(paneOffset.x, viewBounds.min.x);
 				paneOffset.y = Math.min(paneOffset.y, viewBounds.min.y);
 
-				// when using the pinch to zoom, set additional translation based
-				// on the pinch movement
-				if (that._map._animatingZoom) {
-					var centerOffset = this._map._getCenterOffset(this._map._animateToCenter);
-					paneOffset.x += Math.round(centerOffset.x);
-					paneOffset.y += Math.round(centerOffset.y);
-				}
-
 				// URGH -> zooming etc. (!?) ...
 				if (that.sheetGeometry._columns)
 					that.sheetGeometry._columns.forEachInCorePixelRange(

diff --git a/loleaflet/src/layer/vector/Canvas.js b/loleaflet/src/layer/vector/Canvas.js
@@ -25,8 +25,6 @@ L.Canvas = L.Renderer.extend({
 	},
 
 	_update: function () {
-		if (this._map._animatingZoom && this._bounds) { return; }
-
 		L.Renderer.prototype._update.call(this);
 
 		var b = this._bounds,
@@ -196,7 +194,7 @@ L.Canvas = L.Renderer.extend({
 	},
 
 	_onMouseMove: function (e) {
-		if (!this._map || this._map._animatingZoom) { return; }
+		if (!this._map) { return; }
 
 		var point = this._map.mouseEventToLayerPoint(e);
 

diff --git a/loleaflet/src/layer/vector/SVG.VML.js b/loleaflet/src/layer/vector/SVG.VML.js
@@ -30,7 +30,6 @@ L.SVG.include(!L.Browser.vml ? {} : {
 	},
 
 	_update: function () {
-		if (this._map._animatingZoom) { return; }
 		L.Renderer.prototype._update.call(this);
 	},
 

diff --git a/loleaflet/src/layer/vector/SVG.js b/loleaflet/src/layer/vector/SVG.js
@@ -13,8 +13,6 @@ L.SVG = L.Renderer.extend({
 	},
 
 	_update: function () {
-		if (this._map._animatingZoom && this._bounds) { return; }
-
 		L.Renderer.prototype._update.call(this);
 
 		var b = this._bounds;

diff --git a/loleaflet/src/map/Map.js b/loleaflet/src/map/Map.js
@@ -757,10 +757,7 @@ L.Map = L.Evented.extend({
 	},
 
 	getZoom: function () {
-		if (this._animatingZoom) // use animation target zoom
-			return this._animateToZoom;
-		else
-			return this._zoom;
+		return this._zoom;
 	},
 
 	getBounds: function () {
-Original file line number
+Diff line change
@@ Expand Up / @@ -30,7 +30,6 @@ L.SVG.include(!L.Browser.vml ? {} : { @@
     	},
     	_update: function () {
-    		if (this._map._animatingZoom) { return; }
     		L.Renderer.prototype._update.call(this);
     	},
@@ Expand Down @@