ashatora/openlayers
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Rename olx.View2DState to olx.ViewState and use viewState property

Browse Source
This commit is contained in:
Tim Schaub
2014-06-26 16:38:11 -04:00
parent 2e88f911dd
commit b9f444a008
27 changed files with 146 additions and 146 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/ol/interaction/pinchzoominteraction.js
+4 -4
View File
@@ -79,7 +79,7 @@ ol.interaction.PinchZoom.prototype.handlePointerDrag =
var map = mapBrowserEvent.map;
var view = map.getView();
var view2DState = view.getState();
var viewState = view.getState();
// scale anchor point.
var viewportPosition = goog.style.getClientPosition(map.getViewport());
@@ -92,7 +92,7 @@ ol.interaction.PinchZoom.prototype.handlePointerDrag =
// scale, bypass the resolution constraint
map.render();
ol.interaction.Interaction.zoomWithoutConstraints(
map, view, view2DState.resolution * scaleDelta, this.anchor_);
map, view, viewState.resolution * scaleDelta, this.anchor_);
};
@@ -106,12 +106,12 @@ ol.interaction.PinchZoom.prototype.handlePointerUp =
var map = mapBrowserEvent.map;
var view = map.getView();
view.setHint(ol.ViewHint.INTERACTING, -1);
var view2DState = view.getState();
var viewState = view.getState();
// 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, view2DState.resolution,
ol.interaction.Interaction.zoom(map, view, viewState.resolution,
this.anchor_, this.duration_, direction);
return false;
} else {