diff --git a/src/ol/interaction/dragpaninteraction.js b/src/ol/interaction/dragpaninteraction.js index ab456b897a..6bad93754f 100644 --- a/src/ol/interaction/dragpaninteraction.js +++ b/src/ol/interaction/dragpaninteraction.js @@ -75,7 +75,7 @@ ol.interaction.DragPan.prototype.handlePointerDrag = function(mapBrowserEvent) { var deltaY = centroid[1] - this.lastCentroid[1]; var map = mapBrowserEvent.map; var view2D = map.getView(); - var view2DState = view2D.getView2DState(); + var view2DState = view2D.getState(); var center = [deltaX, deltaY]; ol.coordinate.scale(center, view2DState.resolution); ol.coordinate.rotate(center, view2DState.rotation); diff --git a/src/ol/interaction/dragrotateandzoominteraction.js b/src/ol/interaction/dragrotateandzoominteraction.js index e3b5fcb8cb..a0556e425d 100644 --- a/src/ol/interaction/dragrotateandzoominteraction.js +++ b/src/ol/interaction/dragrotateandzoominteraction.js @@ -81,7 +81,7 @@ ol.interaction.DragRotateAndZoom.prototype.handlePointerDrag = var theta = Math.atan2(delta.y, delta.x); var magnitude = delta.magnitude(); var view = map.getView(); - var view2DState = view.getView2DState(); + var view2DState = view.getState(); map.render(); if (goog.isDef(this.lastAngle_)) { var angleDelta = theta - this.lastAngle_; @@ -112,7 +112,7 @@ ol.interaction.DragRotateAndZoom.prototype.handlePointerUp = var map = mapBrowserEvent.map; var view = map.getView(); view.setHint(ol.ViewHint.INTERACTING, -1); - var view2DState = view.getView2DState(); + var view2DState = view.getState(); var direction = this.lastScaleDelta_ - 1; ol.interaction.Interaction.rotate(map, view, view2DState.rotation); ol.interaction.Interaction.zoom(map, view, view2DState.resolution, diff --git a/src/ol/interaction/dragrotateinteraction.js b/src/ol/interaction/dragrotateinteraction.js index 437fe1d6eb..ea6097aaf3 100644 --- a/src/ol/interaction/dragrotateinteraction.js +++ b/src/ol/interaction/dragrotateinteraction.js @@ -63,7 +63,7 @@ ol.interaction.DragRotate.prototype.handlePointerDrag = if (goog.isDef(this.lastAngle_)) { var delta = theta - this.lastAngle_; var view = map.getView(); - var view2DState = view.getView2DState(); + var view2DState = view.getState(); map.render(); ol.interaction.Interaction.rotateWithoutConstraints( map, view, view2DState.rotation - delta); @@ -84,7 +84,7 @@ ol.interaction.DragRotate.prototype.handlePointerUp = var map = mapBrowserEvent.map; var view = map.getView(); view.setHint(ol.ViewHint.INTERACTING, -1); - var view2DState = view.getView2DState(); + var view2DState = view.getState(); ol.interaction.Interaction.rotate(map, view, view2DState.rotation, undefined, ol.DRAGROTATE_ANIMATION_DURATION); return false; diff --git a/src/ol/interaction/keyboardpaninteraction.js b/src/ol/interaction/keyboardpaninteraction.js index 0f5cf4f013..d09f249c51 100644 --- a/src/ol/interaction/keyboardpaninteraction.js +++ b/src/ol/interaction/keyboardpaninteraction.js @@ -71,7 +71,7 @@ ol.interaction.KeyboardPan.prototype.handleMapBrowserEvent = var map = mapBrowserEvent.map; var view = map.getView(); goog.asserts.assert(goog.isDef(view)); - var view2DState = view.getView2DState(); + var view2DState = view.getState(); var mapUnitsDelta = view2DState.resolution * this.pixelDelta_; var deltaX = 0, deltaY = 0; if (keyCode == goog.events.KeyCodes.DOWN) { diff --git a/src/ol/interaction/pinchrotateinteraction.js b/src/ol/interaction/pinchrotateinteraction.js index 7d4c89a46b..373e285841 100644 --- a/src/ol/interaction/pinchrotateinteraction.js +++ b/src/ol/interaction/pinchrotateinteraction.js @@ -102,7 +102,7 @@ ol.interaction.PinchRotate.prototype.handlePointerDrag = // rotate if (this.rotating_) { var view = map.getView(); - var view2DState = view.getView2DState(); + var view2DState = view.getState(); map.render(); ol.interaction.Interaction.rotateWithoutConstraints(map, view, view2DState.rotation + rotationDelta, this.anchor_); @@ -120,7 +120,7 @@ ol.interaction.PinchRotate.prototype.handlePointerUp = var view = map.getView(); view.setHint(ol.ViewHint.INTERACTING, -1); if (this.rotating_) { - var view2DState = view.getView2DState(); + var view2DState = view.getState(); ol.interaction.Interaction.rotate( map, view, view2DState.rotation, this.anchor_, ol.ROTATE_ANIMATION_DURATION); diff --git a/src/ol/interaction/pinchzoominteraction.js b/src/ol/interaction/pinchzoominteraction.js index 89d9d5fa77..f3318c1341 100644 --- a/src/ol/interaction/pinchzoominteraction.js +++ b/src/ol/interaction/pinchzoominteraction.js @@ -79,7 +79,7 @@ ol.interaction.PinchZoom.prototype.handlePointerDrag = var map = mapBrowserEvent.map; var view = map.getView(); - var view2DState = view.getView2DState(); + var view2DState = view.getState(); // scale anchor point. var viewportPosition = goog.style.getClientPosition(map.getViewport()); @@ -106,7 +106,7 @@ ol.interaction.PinchZoom.prototype.handlePointerUp = var map = mapBrowserEvent.map; var view = map.getView(); view.setHint(ol.ViewHint.INTERACTING, -1); - var view2DState = view.getView2DState(); + var view2DState = 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. diff --git a/src/ol/map.js b/src/ol/map.js index aff0612b9f..c1bea1d93d 100644 --- a/src/ol/map.js +++ b/src/ol/map.js @@ -1192,7 +1192,7 @@ ol.Map.prototype.renderFrame_ = function(time) { for (i = 0, ii = layerStatesArray.length; i < ii; ++i) { layerStates[goog.getUid(layerStatesArray[i].layer)] = layerStatesArray[i]; } - view2DState = view.getView2DState(); + view2DState = view.getState(); frameState = /** @type {olx.FrameState} */ ({ animate: false, attributions: {}, diff --git a/src/ol/view2d.js b/src/ol/view2d.js index c4148986fc..73700a81be 100644 --- a/src/ol/view2d.js +++ b/src/ol/view2d.js @@ -387,7 +387,7 @@ ol.View2D.prototype.getValueForResolutionFunction = function(opt_power) { /** * @return {olx.View2DState} View2D state. */ -ol.View2D.prototype.getView2DState = function() { +ol.View2D.prototype.getState = function() { goog.asserts.assert(this.isDef()); var center = /** @type {ol.Coordinate} */ (this.getCenter()); var projection = this.getProjection();