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/dragrotateandzoominteraction.js
+6 -6
View File
@@ -81,16 +81,16 @@ ol.interaction.DragRotateAndZoom.prototype.handlePointerDrag =
var theta = Math.atan2(delta.y, delta.x);
var magnitude = delta.magnitude();
var view = map.getView();
var view2DState = view.getState();
var viewState = view.getState();
map.render();
if (goog.isDef(this.lastAngle_)) {
var angleDelta = theta - this.lastAngle_;
ol.interaction.Interaction.rotateWithoutConstraints(
map, view, view2DState.rotation - angleDelta);
map, view, viewState.rotation - angleDelta);
}
this.lastAngle_ = theta;
if (goog.isDef(this.lastMagnitude_)) {
var resolution = this.lastMagnitude_ * (view2DState.resolution / magnitude);
var resolution = this.lastMagnitude_ * (viewState.resolution / magnitude);
ol.interaction.Interaction.zoomWithoutConstraints(map, view, resolution);
}
if (goog.isDef(this.lastMagnitude_)) {
@@ -112,10 +112,10 @@ ol.interaction.DragRotateAndZoom.prototype.handlePointerUp =
var map = mapBrowserEvent.map;
var view = map.getView();
view.setHint(ol.ViewHint.INTERACTING, -1);
var view2DState = view.getState();
var viewState = view.getState();
var direction = this.lastScaleDelta_ - 1;
ol.interaction.Interaction.rotate(map, view, view2DState.rotation);
ol.interaction.Interaction.zoom(map, view, view2DState.resolution,
ol.interaction.Interaction.rotate(map, view, viewState.rotation);
ol.interaction.Interaction.zoom(map, view, viewState.resolution,
undefined, ol.DRAGROTATEANDZOOM_ANIMATION_DURATION,
direction);
this.lastScaleDelta_ = 0;