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

Use getAnimating and getInteracting from ol.View

Browse Source
This commit is contained in:
Frederic Junod
2017-11-08 11:38:07 +01:00
parent 0fceb2f3e3
commit 82da43af35
2 changed files with 2 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/ol/interaction/dragpan.js
+1 -1
View File
@@ -151,7 +151,7 @@ ol.interaction.DragPan.handleDownEvent_ = function(mapBrowserEvent) {
view.setHint(ol.ViewHint.INTERACTING, 1); view.setHint(ol.ViewHint.INTERACTING, 1);
} }
// stop any current animation // stop any current animation
if (view.getHints()[ol.ViewHint.ANIMATING]) { if (view.getAnimating()) {
view.setCenter(mapBrowserEvent.frameState.viewState.center); view.setCenter(mapBrowserEvent.frameState.viewState.center);
} }
if (this.kinetic_) { if (this.kinetic_) {
src/ol/interaction/modify.js
+1 -2
View File
@@ -6,7 +6,6 @@ goog.require('ol.CollectionEventType');
goog.require('ol.Feature'); goog.require('ol.Feature');
goog.require('ol.MapBrowserEventType'); goog.require('ol.MapBrowserEventType');
goog.require('ol.MapBrowserPointerEvent'); goog.require('ol.MapBrowserPointerEvent');
goog.require('ol.ViewHint');
goog.require('ol.array'); goog.require('ol.array');
goog.require('ol.coordinate'); goog.require('ol.coordinate');
goog.require('ol.events'); goog.require('ol.events');
@@ -804,7 +803,7 @@ ol.interaction.Modify.handleEvent = function(mapBrowserEvent) {
this.lastPointerEvent_ = mapBrowserEvent; this.lastPointerEvent_ = mapBrowserEvent;
var handled; var handled;
if (!mapBrowserEvent.map.getView().getHints()[ol.ViewHint.INTERACTING] && if (!mapBrowserEvent.map.getView().getInteracting() &&
mapBrowserEvent.type == ol.MapBrowserEventType.POINTERMOVE && mapBrowserEvent.type == ol.MapBrowserEventType.POINTERMOVE &&
!this.handlingDownUpSequence) { !this.handlingDownUpSequence) {
this.handlePointerMove_(mapBrowserEvent); this.handlePointerMove_(mapBrowserEvent);