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

Use view2DState in ol.interaction.DragRotate

Browse Source
This commit is contained in:
Tom Payne
2013-06-25 17:11:53 +02:00
parent ec4110ee54
commit 79e0c81301
1 changed files with 6 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -1,7 +1,6 @@
goog.provide('ol.interaction.DragRotate'); goog.provide('ol.interaction.DragRotate');
goog.require('goog.asserts'); goog.require('goog.asserts');
goog.require('ol.View2D');
goog.require('ol.interaction.ConditionType'); goog.require('ol.interaction.ConditionType');
goog.require('ol.interaction.Drag'); goog.require('ol.interaction.Drag');
goog.require('ol.interaction.Interaction'); goog.require('ol.interaction.Interaction');
@@ -54,12 +53,12 @@ ol.interaction.DragRotate.prototype.handleDrag = function(mapBrowserEvent) {
Math.atan2(size[1] / 2 - offset[1], offset[0] - size[0] / 2); Math.atan2(size[1] / 2 - offset[1], offset[0] - size[0] / 2);
if (goog.isDef(this.lastAngle_)) { if (goog.isDef(this.lastAngle_)) {
var delta = theta - this.lastAngle_; var delta = theta - this.lastAngle_;
var view = map.getView();
// FIXME works for View2D only // FIXME works for View2D only
goog.asserts.assertInstanceof(view, ol.View2D); var view = map.getView().getView2D();
var view2DState = view.getView2DState();
map.requestRenderFrame(); map.requestRenderFrame();
ol.interaction.Interaction.rotateWithoutConstraints( ol.interaction.Interaction.rotateWithoutConstraints(
map, view, view.getRotation() - delta); map, view, view2DState.rotation - delta);
} }
this.lastAngle_ = theta; this.lastAngle_ = theta;
}; };
@@ -71,9 +70,9 @@ ol.interaction.DragRotate.prototype.handleDrag = function(mapBrowserEvent) {
ol.interaction.DragRotate.prototype.handleDragEnd = function(mapBrowserEvent) { ol.interaction.DragRotate.prototype.handleDragEnd = function(mapBrowserEvent) {
var map = mapBrowserEvent.map; var map = mapBrowserEvent.map;
// FIXME works for View2D only // FIXME works for View2D only
var view = map.getView(); var view = map.getView().getView2D();
goog.asserts.assertInstanceof(view, ol.View2D); var view2DState = view.getView2DState();
ol.interaction.Interaction.rotate(map, view, view.getRotation(), undefined, ol.interaction.Interaction.rotate(map, view, view2DState.rotation, undefined,
ol.interaction.DRAGROTATE_ANIMATION_DURATION); ol.interaction.DRAGROTATE_ANIMATION_DURATION);
}; };
@@ -86,9 +85,6 @@ ol.interaction.DragRotate.prototype.handleDragStart =
var browserEvent = mapBrowserEvent.browserEvent; var browserEvent = mapBrowserEvent.browserEvent;
if (browserEvent.isMouseActionButton() && this.condition_(browserEvent)) { if (browserEvent.isMouseActionButton() && this.condition_(browserEvent)) {
var map = mapBrowserEvent.map; var map = mapBrowserEvent.map;
// FIXME supports View2D only
var view = map.getView();
goog.asserts.assertInstanceof(view, ol.View2D);
map.requestRenderFrame(); map.requestRenderFrame();
this.lastAngle_ = undefined; this.lastAngle_ = undefined;
return true; return true;