cartodb/torque
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

added zoom animation

Browse Source
This commit is contained in:
javi 2014-03-21 12:47:56 +01:00
parent 6885e69187
commit f6a123667c
1 changed files with 13 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
lib/torque/leaflet/canvas_layer.js
View File

@ -104,24 +104,25 @@ L.CanvasLayer = L.Class.extend({
// hide original // hide original
this._canvas.style.display = 'none'; this._canvas.style.display = 'none';
back.style.display = 'block'; back.style.display = 'block';
var map = this._map;
var scale = map.getZoomScale(e.zoom);
var newCenter = map._latLngToNewLayerPoint(map.getCenter(), e.zoom, e.center);
var oldCenter = map._latLngToNewLayerPoint(e.center, e.zoom, e.center);
var origin = {
x: newCenter.x - oldCenter.x,
y: newCenter.y - oldCenter.y
};
var bg = back, var bg = back;
transform = L.DomUtil.TRANSFORM, var transform = L.DomUtil.TRANSFORM;
initialTransform = e.delta ? L.DomUtil.getTranslateString(e.delta) : bg.style[transform], bg.style[transform] = L.DomUtil.getTranslateString(origin) + ' scale(' + e.scale + ') ';
scaleStr = L.DomUtil.getScaleString(e.scale, e.origin);
//scaleStr = ' scale(' + e.scale + ') ';
bg.style[transform] = scaleStr;
/*bg.style[transform] = e.backwards ?
scaleStr + ' ' + initialTransform :
initialTransform + ' ' + scaleStr;
*/
}, },
_endZoomAnim: function () { _endZoomAnim: function () {
this._animating = false; this._animating = false;
//this._canvas.style.visibility = 'block'; this._canvas.style.display = 'block';
this._backCanvas.style.display = 'none';
}, },
getCanvas: function() { getCanvas: function() {