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

Handle ol.ViewHint.INTERACTING in ol.interaction.Drag

Browse Source
This commit is contained in:
Frederic Junod
2013-06-25 12:24:29 +02:00
parent 4ccff4e8b6
commit ae7b342ee9
3 changed files with 4 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
src/ol/interaction/draginteraction.js
View File

@@ -6,6 +6,7 @@ goog.require('goog.functions');
goog.require('ol.Coordinate'); goog.require('ol.Coordinate');
goog.require('ol.MapBrowserEvent'); goog.require('ol.MapBrowserEvent');
goog.require('ol.MapBrowserEvent.EventType'); goog.require('ol.MapBrowserEvent.EventType');
goog.require('ol.ViewHint');
goog.require('ol.interaction.Interaction'); goog.require('ol.interaction.Interaction');
@@ -113,6 +114,7 @@ ol.interaction.Drag.prototype.handleMapBrowserEvent =
this.deltaX = browserEvent.clientX - this.startX; this.deltaX = browserEvent.clientX - this.startX;
this.deltaY = browserEvent.clientY - this.startY; this.deltaY = browserEvent.clientY - this.startY;
this.handleDragEnd(mapBrowserEvent); this.handleDragEnd(mapBrowserEvent);
view.setHint(ol.ViewHint.INTERACTING, -1);
this.dragging_ = false; this.dragging_ = false;
} }
} else if (mapBrowserEvent.type == ol.MapBrowserEvent.EventType.DRAGSTART) { } else if (mapBrowserEvent.type == ol.MapBrowserEvent.EventType.DRAGSTART) {
@@ -126,6 +128,7 @@ ol.interaction.Drag.prototype.handleMapBrowserEvent =
(mapBrowserEvent.getCoordinate()); (mapBrowserEvent.getCoordinate());
var handled = this.handleDragStart(mapBrowserEvent); var handled = this.handleDragStart(mapBrowserEvent);
if (handled) { if (handled) {
view.setHint(ol.ViewHint.INTERACTING, 1);
this.dragging_ = true; this.dragging_ = true;
mapBrowserEvent.preventDefault(); mapBrowserEvent.preventDefault();
mapBrowserEvent.stopOtherInteractions(); mapBrowserEvent.stopOtherInteractions();

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

@@ -6,7 +6,6 @@ goog.require('goog.asserts');
goog.require('ol.Kinetic'); goog.require('ol.Kinetic');
goog.require('ol.PreRenderFunction'); goog.require('ol.PreRenderFunction');
goog.require('ol.View2D'); goog.require('ol.View2D');
goog.require('ol.ViewHint');
goog.require('ol.coordinate'); goog.require('ol.coordinate');
goog.require('ol.interaction.ConditionType'); goog.require('ol.interaction.ConditionType');
goog.require('ol.interaction.Drag'); goog.require('ol.interaction.Drag');
@@ -82,7 +81,6 @@ ol.interaction.DragPan.prototype.handleDragEnd = function(mapBrowserEvent) {
var map = mapBrowserEvent.map; var map = mapBrowserEvent.map;
var view = map.getView(); var view = map.getView();
var interacting = view.setHint(ol.ViewHint.INTERACTING, -1);
if (this.kinetic_ && this.kinetic_.end()) { if (this.kinetic_ && this.kinetic_.end()) {
var distance = this.kinetic_.getDistance(); var distance = this.kinetic_.getDistance();
@@ -97,9 +95,8 @@ ol.interaction.DragPan.prototype.handleDragEnd = function(mapBrowserEvent) {
centerpx[1] - distance * Math.sin(angle) centerpx[1] - distance * Math.sin(angle)
]); ]);
view.setCenter(dest); view.setCenter(dest);
} else if (interacting === 0) {
map.requestRenderFrame();
} }
map.requestRenderFrame();
}; };
@@ -115,7 +112,6 @@ ol.interaction.DragPan.prototype.handleDragStart = function(mapBrowserEvent) {
} }
var map = mapBrowserEvent.map; var map = mapBrowserEvent.map;
map.requestRenderFrame(); map.requestRenderFrame();
map.getView().setHint(ol.ViewHint.INTERACTING, 1);
return true; return true;
} else { } else {
return false; return false;

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

@@ -2,7 +2,6 @@ goog.provide('ol.interaction.DragRotate');
goog.require('goog.asserts'); goog.require('goog.asserts');
goog.require('ol.View2D'); goog.require('ol.View2D');
goog.require('ol.ViewHint');
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');
@@ -76,7 +75,6 @@ ol.interaction.DragRotate.prototype.handleDragEnd = function(mapBrowserEvent) {
goog.asserts.assertInstanceof(view, ol.View2D); goog.asserts.assertInstanceof(view, ol.View2D);
ol.interaction.Interaction.rotate(map, view, view.getRotation(), undefined, ol.interaction.Interaction.rotate(map, view, view.getRotation(), undefined,
ol.interaction.DRAGROTATE_ANIMATION_DURATION); ol.interaction.DRAGROTATE_ANIMATION_DURATION);
view.setHint(ol.ViewHint.INTERACTING, -1);
}; };
@@ -93,7 +91,6 @@ ol.interaction.DragRotate.prototype.handleDragStart =
goog.asserts.assertInstanceof(view, ol.View2D); goog.asserts.assertInstanceof(view, ol.View2D);
map.requestRenderFrame(); map.requestRenderFrame();
this.lastAngle_ = undefined; this.lastAngle_ = undefined;
view.setHint(ol.ViewHint.INTERACTING, 1);
return true; return true;
} else { } else {
return false; return false;