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

Rename view.getView2DState() to view.getState()

Browse Source
This commit is contained in:
Tim Schaub
2014-06-26 16:32:19 -04:00
parent b88d2aebc9
commit 2e88f911dd
8 changed files with 12 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/ol/interaction/dragpaninteraction.js
View File

@@ -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);

4
src/ol/interaction/dragrotateandzoominteraction.js
View File

@@ -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,

4
src/ol/interaction/dragrotateinteraction.js
View File

@@ -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;

2
src/ol/interaction/keyboardpaninteraction.js
View File

@@ -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) {

4
src/ol/interaction/pinchrotateinteraction.js
View File

@@ -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);

4
src/ol/interaction/pinchzoominteraction.js
View File

@@ -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.

2
src/ol/map.js
View File

@@ -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: {},

2
src/ol/view2d.js
View File

@@ -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();