From f360dd86a0ad01bf5c7694f7d8ae59eacef4cf74 Mon Sep 17 00:00:00 2001 From: Tom Payne Date: Tue, 25 Jun 2013 17:12:29 +0200 Subject: [PATCH] Use view2DState in ol.interaction.TouchZoom --- src/ol/interaction/touchzoominteraction.js | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/src/ol/interaction/touchzoominteraction.js b/src/ol/interaction/touchzoominteraction.js index 58be7bd4bf..5d9053aa26 100644 --- a/src/ol/interaction/touchzoominteraction.js +++ b/src/ol/interaction/touchzoominteraction.js @@ -73,6 +73,7 @@ ol.interaction.TouchZoom.prototype.handleTouchMove = var map = mapBrowserEvent.map; // FIXME works for View2D only var view = map.getView().getView2D(); + var view2DState = view.getView2DState(); // scale anchor point. var viewportPosition = goog.style.getClientPosition(map.getViewport()); @@ -84,7 +85,7 @@ ol.interaction.TouchZoom.prototype.handleTouchMove = // scale, bypass the resolution constraint map.requestRenderFrame(); ol.interaction.Interaction.zoomWithoutConstraints( - map, view, view.getResolution() * scaleDelta, this.anchor_); + map, view, view2DState.resolution * scaleDelta, this.anchor_); }; @@ -98,11 +99,12 @@ ol.interaction.TouchZoom.prototype.handleTouchEnd = var map = mapBrowserEvent.map; // FIXME works for View2D only var view = map.getView().getView2D(); + var view2DState = view.getView2DState(); // Zoom to final resolution, with an animation, and provide a // direction not to zoom out/in if user was pinching in/out. // Direction is > 0 if pinching out, and < 0 if pinching in. var direction = this.lastScaleDelta_ - 1; - ol.interaction.Interaction.zoom(map, view, view.getResolution(), + ol.interaction.Interaction.zoom(map, view, view2DState.resolution, this.anchor_, ol.interaction.TOUCHZOOM_ANIMATION_DURATION, direction); return false; } else {