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

Do not update geometry when other interactions handle event

Browse Source
This commit is contained in:
Andreas Hocevar
2018-01-14 22:23:53 +01:00
parent 2a64990a71
commit a93a811ba0
1 changed files with 22 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/ol/interaction/Draw.js
+22 -3
View File
@@ -4,6 +4,7 @@
import {inherits} from '../index.js'; import {inherits} from '../index.js';
import Feature from '../Feature.js'; import Feature from '../Feature.js';
import MapBrowserEventType from '../MapBrowserEventType.js'; import MapBrowserEventType from '../MapBrowserEventType.js';
import MapBrowserPointerEvent from '../MapBrowserPointerEvent.js';
import BaseObject from '../Object.js'; import BaseObject from '../Object.js';
import _ol_coordinate_ from '../coordinate.js'; import _ol_coordinate_ from '../coordinate.js';
import _ol_events_ from '../events.js'; import _ol_events_ from '../events.js';
@@ -332,7 +333,7 @@ Draw.handleEvent = function(event) {
this.freehand_ = this.mode_ !== Draw.Mode_.POINT && this.freehandCondition_(event); this.freehand_ = this.mode_ !== Draw.Mode_.POINT && this.freehandCondition_(event);
let move = event.type === MapBrowserEventType.POINTERMOVE; let move = event.type === MapBrowserEventType.POINTERMOVE;
let pass = true; let pass = true;
if (this.lastDragTime_ && event.type === MapBrowserEventType.POINTERDRAG) { if (!this.freehand_ && this.lastDragTime_ && event.type === MapBrowserEventType.POINTERDRAG) {
const now = Date.now(); const now = Date.now();
if (now - this.lastDragTime_ >= 500) { if (now - this.lastDragTime_ >= 500) {
this.downPx_ = event.pixel; this.downPx_ = event.pixel;
@@ -341,6 +342,10 @@ Draw.handleEvent = function(event) {
} else { } else {
this.lastDragTime_ = undefined; this.lastDragTime_ = undefined;
} }
if (this.shouldHandle_ && this.downTimeout_) {
clearTimeout(this.downTimeout_);
this.downTimeout_ = undefined;
}
} }
if (this.freehand_ && if (this.freehand_ &&
event.type === MapBrowserEventType.POINTERDRAG && event.type === MapBrowserEventType.POINTERDRAG &&
@@ -351,7 +356,12 @@ Draw.handleEvent = function(event) {
event.type === MapBrowserEventType.POINTERDOWN) { event.type === MapBrowserEventType.POINTERDOWN) {
pass = false; pass = false;
} else if (move) { } else if (move) {
pass = event.type === MapBrowserEventType.POINTERMOVE && this.handlePointerMove_(event); pass = event.type === MapBrowserEventType.POINTERMOVE;
if (pass && this.freehand_) {
pass = this.handlePointerMove_(event);
} else if (event.type === MapBrowserEventType.POINTERDRAG && !this.downTimeout_) {
this.handlePointerMove_(event);
}
} else if (event.type === MapBrowserEventType.DBLCLICK) { } else if (event.type === MapBrowserEventType.DBLCLICK) {
pass = false; pass = false;
} }
@@ -368,7 +378,6 @@ Draw.handleEvent = function(event) {
*/ */
Draw.handleDownEvent_ = function(event) { Draw.handleDownEvent_ = function(event) {
this.shouldHandle_ = !this.freehand_; this.shouldHandle_ = !this.freehand_;
this.lastDragTime_ = Date.now();
if (this.freehand_) { if (this.freehand_) {
this.downPx_ = event.pixel; this.downPx_ = event.pixel;
@@ -377,6 +386,11 @@ Draw.handleDownEvent_ = function(event) {
} }
return true; return true;
} else if (this.condition_(event)) { } else if (this.condition_(event)) {
this.lastDragTime_ = Date.now();
this.downTimeout_ = setTimeout(function() {
this.handlePointerMove_(new MapBrowserPointerEvent(
MapBrowserEventType.POINTERMOVE, event.map, event.pointerEvent, event.frameState));
}.bind(this), 500);
this.downPx_ = event.pixel; this.downPx_ = event.pixel;
return true; return true;
} else { } else {
@@ -394,6 +408,11 @@ Draw.handleDownEvent_ = function(event) {
Draw.handleUpEvent_ = function(event) { Draw.handleUpEvent_ = function(event) {
let pass = true; let pass = true;
if (this.downTimeout_) {
clearTimeout(this.downTimeout_);
this.downTimeout_ = undefined;
}
this.handlePointerMove_(event); this.handlePointerMove_(event);
const circleMode = this.mode_ === Draw.Mode_.CIRCLE; const circleMode = this.mode_ === Draw.Mode_.CIRCLE;