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

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

@@ -75,11 +75,11 @@ 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.getState();
var viewState = view2D.getState();
var center = [deltaX, deltaY];
ol.coordinate.scale(center, view2DState.resolution);
ol.coordinate.rotate(center, view2DState.rotation);
ol.coordinate.add(center, view2DState.center);
ol.coordinate.scale(center, viewState.resolution);
ol.coordinate.rotate(center, viewState.rotation);
ol.coordinate.add(center, viewState.center);
center = view2D.constrainCenter(center);
map.render();
view2D.setCenter(center);
@@ -136,7 +136,7 @@ ol.interaction.DragPan.prototype.handlePointerDown =
map.render();
if (!goog.isNull(this.kineticPreRenderFn_) &&
map.removePreRenderFunction(this.kineticPreRenderFn_)) {
view2D.setCenter(mapBrowserEvent.frameState.view2DState.center);
view2D.setCenter(mapBrowserEvent.frameState.viewState.center);
this.kineticPreRenderFn_ = null;
}
if (this.kinetic_) {

12
src/ol/interaction/dragrotateandzoominteraction.js
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;

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

@@ -63,10 +63,10 @@ ol.interaction.DragRotate.prototype.handlePointerDrag =
if (goog.isDef(this.lastAngle_)) {
var delta = theta - this.lastAngle_;
var view = map.getView();
var view2DState = view.getState();
var viewState = view.getState();
map.render();
ol.interaction.Interaction.rotateWithoutConstraints(
map, view, view2DState.rotation - delta);
map, view, viewState.rotation - delta);
}
this.lastAngle_ = theta;
};
@@ -84,8 +84,8 @@ ol.interaction.DragRotate.prototype.handlePointerUp =
var map = mapBrowserEvent.map;
var view = map.getView();
view.setHint(ol.ViewHint.INTERACTING, -1);
var view2DState = view.getState();
ol.interaction.Interaction.rotate(map, view, view2DState.rotation,
var viewState = view.getState();
ol.interaction.Interaction.rotate(map, view, viewState.rotation,
undefined, ol.DRAGROTATE_ANIMATION_DURATION);
return false;
};

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

@@ -71,8 +71,8 @@ ol.interaction.KeyboardPan.prototype.handleMapBrowserEvent =
var map = mapBrowserEvent.map;
var view = map.getView();
goog.asserts.assert(goog.isDef(view));
var view2DState = view.getState();
var mapUnitsDelta = view2DState.resolution * this.pixelDelta_;
var viewState = view.getState();
var mapUnitsDelta = viewState.resolution * this.pixelDelta_;
var deltaX = 0, deltaY = 0;
if (keyCode == goog.events.KeyCodes.DOWN) {
deltaY = -mapUnitsDelta;
@@ -84,7 +84,7 @@ ol.interaction.KeyboardPan.prototype.handleMapBrowserEvent =
deltaY = mapUnitsDelta;
}
var delta = [deltaX, deltaY];
ol.coordinate.rotate(delta, view2DState.rotation);
ol.coordinate.rotate(delta, viewState.rotation);
ol.interaction.Interaction.pan(
map, view, delta, ol.KEYBOARD_PAN_DURATION);
mapBrowserEvent.preventDefault();

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

@@ -102,10 +102,10 @@ ol.interaction.PinchRotate.prototype.handlePointerDrag =
// rotate
if (this.rotating_) {
var view = map.getView();
var view2DState = view.getState();
var viewState = view.getState();
map.render();
ol.interaction.Interaction.rotateWithoutConstraints(map, view,
view2DState.rotation + rotationDelta, this.anchor_);
viewState.rotation + rotationDelta, this.anchor_);
}
};
@@ -120,9 +120,9 @@ ol.interaction.PinchRotate.prototype.handlePointerUp =
var view = map.getView();
view.setHint(ol.ViewHint.INTERACTING, -1);
if (this.rotating_) {
var view2DState = view.getState();
var viewState = view.getState();
ol.interaction.Interaction.rotate(
map, view, view2DState.rotation, this.anchor_,
map, view, viewState.rotation, this.anchor_,
ol.ROTATE_ANIMATION_DURATION);
}
return false;

8
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.getState();
var viewState = view.getState();
// scale anchor point.
var viewportPosition = goog.style.getClientPosition(map.getViewport());
@@ -92,7 +92,7 @@ ol.interaction.PinchZoom.prototype.handlePointerDrag =
// scale, bypass the resolution constraint
map.render();
ol.interaction.Interaction.zoomWithoutConstraints(
map, view, view2DState.resolution * scaleDelta, this.anchor_);
map, view, viewState.resolution * scaleDelta, this.anchor_);
};
@@ -106,12 +106,12 @@ ol.interaction.PinchZoom.prototype.handlePointerUp =
var map = mapBrowserEvent.map;
var view = map.getView();
view.setHint(ol.ViewHint.INTERACTING, -1);
var view2DState = view.getState();
var viewState = 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.
var direction = this.lastScaleDelta_ - 1;
ol.interaction.Interaction.zoom(map, view, view2DState.resolution,
ol.interaction.Interaction.zoom(map, view, viewState.resolution,
this.anchor_, this.duration_, direction);
return false;
} else {