Rename view.getView2DState() to view.getState()
This commit is contained in:
@@ -75,7 +75,7 @@ ol.interaction.DragPan.prototype.handlePointerDrag = function(mapBrowserEvent) {
|
|||||||
var deltaY = centroid[1] - this.lastCentroid[1];
|
var deltaY = centroid[1] - this.lastCentroid[1];
|
||||||
var map = mapBrowserEvent.map;
|
var map = mapBrowserEvent.map;
|
||||||
var view2D = map.getView();
|
var view2D = map.getView();
|
||||||
var view2DState = view2D.getView2DState();
|
var view2DState = view2D.getState();
|
||||||
var center = [deltaX, deltaY];
|
var center = [deltaX, deltaY];
|
||||||
ol.coordinate.scale(center, view2DState.resolution);
|
ol.coordinate.scale(center, view2DState.resolution);
|
||||||
ol.coordinate.rotate(center, view2DState.rotation);
|
ol.coordinate.rotate(center, view2DState.rotation);
|
||||||
|
|||||||
@@ -81,7 +81,7 @@ ol.interaction.DragRotateAndZoom.prototype.handlePointerDrag =
|
|||||||
var theta = Math.atan2(delta.y, delta.x);
|
var theta = Math.atan2(delta.y, delta.x);
|
||||||
var magnitude = delta.magnitude();
|
var magnitude = delta.magnitude();
|
||||||
var view = map.getView();
|
var view = map.getView();
|
||||||
var view2DState = view.getView2DState();
|
var view2DState = view.getState();
|
||||||
map.render();
|
map.render();
|
||||||
if (goog.isDef(this.lastAngle_)) {
|
if (goog.isDef(this.lastAngle_)) {
|
||||||
var angleDelta = theta - this.lastAngle_;
|
var angleDelta = theta - this.lastAngle_;
|
||||||
@@ -112,7 +112,7 @@ ol.interaction.DragRotateAndZoom.prototype.handlePointerUp =
|
|||||||
var map = mapBrowserEvent.map;
|
var map = mapBrowserEvent.map;
|
||||||
var view = map.getView();
|
var view = map.getView();
|
||||||
view.setHint(ol.ViewHint.INTERACTING, -1);
|
view.setHint(ol.ViewHint.INTERACTING, -1);
|
||||||
var view2DState = view.getView2DState();
|
var view2DState = view.getState();
|
||||||
var direction = this.lastScaleDelta_ - 1;
|
var direction = this.lastScaleDelta_ - 1;
|
||||||
ol.interaction.Interaction.rotate(map, view, view2DState.rotation);
|
ol.interaction.Interaction.rotate(map, view, view2DState.rotation);
|
||||||
ol.interaction.Interaction.zoom(map, view, view2DState.resolution,
|
ol.interaction.Interaction.zoom(map, view, view2DState.resolution,
|
||||||
|
|||||||
@@ -63,7 +63,7 @@ ol.interaction.DragRotate.prototype.handlePointerDrag =
|
|||||||
if (goog.isDef(this.lastAngle_)) {
|
if (goog.isDef(this.lastAngle_)) {
|
||||||
var delta = theta - this.lastAngle_;
|
var delta = theta - this.lastAngle_;
|
||||||
var view = map.getView();
|
var view = map.getView();
|
||||||
var view2DState = view.getView2DState();
|
var view2DState = view.getState();
|
||||||
map.render();
|
map.render();
|
||||||
ol.interaction.Interaction.rotateWithoutConstraints(
|
ol.interaction.Interaction.rotateWithoutConstraints(
|
||||||
map, view, view2DState.rotation - delta);
|
map, view, view2DState.rotation - delta);
|
||||||
@@ -84,7 +84,7 @@ ol.interaction.DragRotate.prototype.handlePointerUp =
|
|||||||
var map = mapBrowserEvent.map;
|
var map = mapBrowserEvent.map;
|
||||||
var view = map.getView();
|
var view = map.getView();
|
||||||
view.setHint(ol.ViewHint.INTERACTING, -1);
|
view.setHint(ol.ViewHint.INTERACTING, -1);
|
||||||
var view2DState = view.getView2DState();
|
var view2DState = view.getState();
|
||||||
ol.interaction.Interaction.rotate(map, view, view2DState.rotation,
|
ol.interaction.Interaction.rotate(map, view, view2DState.rotation,
|
||||||
undefined, ol.DRAGROTATE_ANIMATION_DURATION);
|
undefined, ol.DRAGROTATE_ANIMATION_DURATION);
|
||||||
return false;
|
return false;
|
||||||
|
|||||||
@@ -71,7 +71,7 @@ ol.interaction.KeyboardPan.prototype.handleMapBrowserEvent =
|
|||||||
var map = mapBrowserEvent.map;
|
var map = mapBrowserEvent.map;
|
||||||
var view = map.getView();
|
var view = map.getView();
|
||||||
goog.asserts.assert(goog.isDef(view));
|
goog.asserts.assert(goog.isDef(view));
|
||||||
var view2DState = view.getView2DState();
|
var view2DState = view.getState();
|
||||||
var mapUnitsDelta = view2DState.resolution * this.pixelDelta_;
|
var mapUnitsDelta = view2DState.resolution * this.pixelDelta_;
|
||||||
var deltaX = 0, deltaY = 0;
|
var deltaX = 0, deltaY = 0;
|
||||||
if (keyCode == goog.events.KeyCodes.DOWN) {
|
if (keyCode == goog.events.KeyCodes.DOWN) {
|
||||||
|
|||||||
@@ -102,7 +102,7 @@ ol.interaction.PinchRotate.prototype.handlePointerDrag =
|
|||||||
// rotate
|
// rotate
|
||||||
if (this.rotating_) {
|
if (this.rotating_) {
|
||||||
var view = map.getView();
|
var view = map.getView();
|
||||||
var view2DState = view.getView2DState();
|
var view2DState = view.getState();
|
||||||
map.render();
|
map.render();
|
||||||
ol.interaction.Interaction.rotateWithoutConstraints(map, view,
|
ol.interaction.Interaction.rotateWithoutConstraints(map, view,
|
||||||
view2DState.rotation + rotationDelta, this.anchor_);
|
view2DState.rotation + rotationDelta, this.anchor_);
|
||||||
@@ -120,7 +120,7 @@ ol.interaction.PinchRotate.prototype.handlePointerUp =
|
|||||||
var view = map.getView();
|
var view = map.getView();
|
||||||
view.setHint(ol.ViewHint.INTERACTING, -1);
|
view.setHint(ol.ViewHint.INTERACTING, -1);
|
||||||
if (this.rotating_) {
|
if (this.rotating_) {
|
||||||
var view2DState = view.getView2DState();
|
var view2DState = view.getState();
|
||||||
ol.interaction.Interaction.rotate(
|
ol.interaction.Interaction.rotate(
|
||||||
map, view, view2DState.rotation, this.anchor_,
|
map, view, view2DState.rotation, this.anchor_,
|
||||||
ol.ROTATE_ANIMATION_DURATION);
|
ol.ROTATE_ANIMATION_DURATION);
|
||||||
|
|||||||
@@ -79,7 +79,7 @@ ol.interaction.PinchZoom.prototype.handlePointerDrag =
|
|||||||
|
|
||||||
var map = mapBrowserEvent.map;
|
var map = mapBrowserEvent.map;
|
||||||
var view = map.getView();
|
var view = map.getView();
|
||||||
var view2DState = view.getView2DState();
|
var view2DState = view.getState();
|
||||||
|
|
||||||
// scale anchor point.
|
// scale anchor point.
|
||||||
var viewportPosition = goog.style.getClientPosition(map.getViewport());
|
var viewportPosition = goog.style.getClientPosition(map.getViewport());
|
||||||
@@ -106,7 +106,7 @@ ol.interaction.PinchZoom.prototype.handlePointerUp =
|
|||||||
var map = mapBrowserEvent.map;
|
var map = mapBrowserEvent.map;
|
||||||
var view = map.getView();
|
var view = map.getView();
|
||||||
view.setHint(ol.ViewHint.INTERACTING, -1);
|
view.setHint(ol.ViewHint.INTERACTING, -1);
|
||||||
var view2DState = view.getView2DState();
|
var view2DState = view.getState();
|
||||||
// Zoom to final resolution, with an animation, and provide a
|
// Zoom to final resolution, with an animation, and provide a
|
||||||
// direction not to zoom out/in if user was pinching in/out.
|
// direction not to zoom out/in if user was pinching in/out.
|
||||||
// Direction is > 0 if pinching out, and < 0 if pinching in.
|
// Direction is > 0 if pinching out, and < 0 if pinching in.
|
||||||
|
|||||||
@@ -1192,7 +1192,7 @@ ol.Map.prototype.renderFrame_ = function(time) {
|
|||||||
for (i = 0, ii = layerStatesArray.length; i < ii; ++i) {
|
for (i = 0, ii = layerStatesArray.length; i < ii; ++i) {
|
||||||
layerStates[goog.getUid(layerStatesArray[i].layer)] = layerStatesArray[i];
|
layerStates[goog.getUid(layerStatesArray[i].layer)] = layerStatesArray[i];
|
||||||
}
|
}
|
||||||
view2DState = view.getView2DState();
|
view2DState = view.getState();
|
||||||
frameState = /** @type {olx.FrameState} */ ({
|
frameState = /** @type {olx.FrameState} */ ({
|
||||||
animate: false,
|
animate: false,
|
||||||
attributions: {},
|
attributions: {},
|
||||||
|
|||||||
@@ -387,7 +387,7 @@ ol.View2D.prototype.getValueForResolutionFunction = function(opt_power) {
|
|||||||
/**
|
/**
|
||||||
* @return {olx.View2DState} View2D state.
|
* @return {olx.View2DState} View2D state.
|
||||||
*/
|
*/
|
||||||
ol.View2D.prototype.getView2DState = function() {
|
ol.View2D.prototype.getState = function() {
|
||||||
goog.asserts.assert(this.isDef());
|
goog.asserts.assert(this.isDef());
|
||||||
var center = /** @type {ol.Coordinate} */ (this.getCenter());
|
var center = /** @type {ol.Coordinate} */ (this.getCenter());
|
||||||
var projection = this.getProjection();
|
var projection = this.getProjection();
|
||||||
|
|||||||
Reference in New Issue
Block a user