From 247d8668d177f258dd26c527767c0c83ae914dd8 Mon Sep 17 00:00:00 2001 From: Frederic Junod Date: Mon, 26 Jan 2015 10:39:05 +0100 Subject: [PATCH] Use view.getResolution instead of view.getState --- src/ol/interaction/pinchzoominteraction.js | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/src/ol/interaction/pinchzoominteraction.js b/src/ol/interaction/pinchzoominteraction.js index 75180da053..5150281d86 100644 --- a/src/ol/interaction/pinchzoominteraction.js +++ b/src/ol/interaction/pinchzoominteraction.js @@ -84,7 +84,7 @@ ol.interaction.PinchZoom.handleDragEvent_ = function(mapBrowserEvent) { var map = mapBrowserEvent.map; var view = map.getView(); - var viewState = view.getState(); + var resolution = view.getResolution(); // scale anchor point. var viewportPosition = goog.style.getClientPosition(map.getViewport()); @@ -97,7 +97,7 @@ ol.interaction.PinchZoom.handleDragEvent_ = function(mapBrowserEvent) { // scale, bypass the resolution constraint map.render(); ol.interaction.Interaction.zoomWithoutConstraints( - map, view, viewState.resolution * scaleDelta, this.anchor_); + map, view, resolution * scaleDelta, this.anchor_); }; @@ -113,12 +113,12 @@ ol.interaction.PinchZoom.handleUpEvent_ = function(mapBrowserEvent) { var map = mapBrowserEvent.map; var view = map.getView(); view.setHint(ol.ViewHint.INTERACTING, -1); - var viewState = view.getState(); + var resolution = view.getResolution(); // 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, viewState.resolution, + ol.interaction.Interaction.zoom(map, view, resolution, this.anchor_, this.duration_, direction); return false; } else {