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

Remove view.getView2D() method

Browse Source
This commit is contained in:
Tim Schaub
2014-06-26 16:29:21 -04:00
parent 956e1bf8b4
commit b88d2aebc9
23 changed files with 42 additions and 109 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/ol/interaction/dragrotateandzoominteraction.js
+4 -9
View File
@@ -1,5 +1,3 @@
// FIXME works for View2D only
goog.provide('ol.interaction.DragRotateAndZoom');
goog.require('goog.asserts');
@@ -82,8 +80,7 @@ ol.interaction.DragRotateAndZoom.prototype.handlePointerDrag =
size[1] / 2 - offset[1]);
var theta = Math.atan2(delta.y, delta.x);
var magnitude = delta.magnitude();
// FIXME works for View2D only
var view = map.getView().getView2D();
var view = map.getView();
var view2DState = view.getView2DState();
map.render();
if (goog.isDef(this.lastAngle_)) {
@@ -113,14 +110,12 @@ ol.interaction.DragRotateAndZoom.prototype.handlePointerUp =
}
var map = mapBrowserEvent.map;
// FIXME works for View2D only
var view = map.getView();
view.setHint(ol.ViewHint.INTERACTING, -1);
var view2D = view.getView2D();
var view2DState = view2D.getView2DState();
var view2DState = view.getView2DState();
var direction = this.lastScaleDelta_ - 1;
ol.interaction.Interaction.rotate(map, view2D, view2DState.rotation);
ol.interaction.Interaction.zoom(map, view2D, view2DState.resolution,
ol.interaction.Interaction.rotate(map, view, view2DState.rotation);
ol.interaction.Interaction.zoom(map, view, view2DState.resolution,
undefined, ol.DRAGROTATEANDZOOM_ANIMATION_DURATION,
direction);
this.lastScaleDelta_ = 0;