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

Merge pull request #11698 from ahocevar/draw-pointer

Browse Source 
Draw pointer improvements
This commit is contained in:
Andreas Hocevar
2020-11-02 18:40:12 +01:00
committed by GitHub
parent 0ac52b2511 4fe8c54146
commit 88fa3942d8
3 changed files with 59 additions and 31 deletions
Download Patch File Download Diff File Expand all files Collapse all files

79
src/ol/interaction/Draw.js
View File

@@ -215,6 +215,13 @@ class Draw extends PointerInteraction {
*/
this.lastDragTime_;
/**
* Pointer type of the last pointermove event
* @type {string}
* @private
*/
this.pointerType_;
/**
* @type {boolean}
* @private
@@ -535,7 +542,7 @@ class Draw extends PointerInteraction {
event.type === MapBrowserEventType.POINTERDOWN
) {
pass = false;
} else if (move) {
} else if (move && this.getPointerCount() < 2) {
pass = event.type === MapBrowserEventType.POINTERMOVE;
if (pass && this.freehand_) {
this.handlePointerMove_(event);
@@ -603,34 +610,37 @@ class Draw extends PointerInteraction {
handleUpEvent(event) {
let pass = true;
if (this.downTimeout_) {
clearTimeout(this.downTimeout_);
this.downTimeout_ = undefined;
}
this.handlePointerMove_(event);
const circleMode = this.mode_ === Mode.CIRCLE;
if (this.shouldHandle_) {
if (!this.finishCoordinate_) {
this.startDrawing_(event);
if (this.mode_ === Mode.POINT) {
this.finishDrawing();
}
} else if (this.freehand_ || circleMode) {
this.finishDrawing();
} else if (this.atFinish_(event)) {
if (this.finishCondition_(event)) {
this.finishDrawing();
}
} else {
this.addToDrawing_(event.coordinate);
if (this.getPointerCount() === 0) {
if (this.downTimeout_) {
clearTimeout(this.downTimeout_);
this.downTimeout_ = undefined;
}
this.handlePointerMove_(event);
const circleMode = this.mode_ === Mode.CIRCLE;
if (this.shouldHandle_) {
if (!this.finishCoordinate_) {
this.startDrawing_(event);
if (this.mode_ === Mode.POINT) {
this.finishDrawing();
}
} else if (this.freehand_ || circleMode) {
this.finishDrawing();
} else if (this.atFinish_(event)) {
if (this.finishCondition_(event)) {
this.finishDrawing();
}
} else {
this.addToDrawing_(event.coordinate);
}
pass = false;
} else if (this.freehand_) {
this.abortDrawing();
}
pass = false;
} else if (this.freehand_) {
this.abortDrawing();
}
if (!pass && this.stopClick_) {
event.stopPropagation();
}
@@ -643,6 +653,7 @@ class Draw extends PointerInteraction {
* @private
*/
handlePointerMove_(event) {
this.pointerType_ = event.originalEvent.pointerType;
if (
this.downPx_ &&
((!this.freehand_ && this.shouldHandle_) ||
@@ -884,14 +895,26 @@ class Draw extends PointerInteraction {
if (this.mode_ === Mode.LINE_STRING) {
coordinates = /** @type {LineCoordType} */ (this.sketchCoords_);
coordinates.splice(-2, 1);
this.geometryFunction_(coordinates, geometry, projection);
if (coordinates.length >= 2) {
this.finishCoordinate_ = coordinates[coordinates.length - 2].slice();
if (this.pointerType_ !== 'mouse') {
const finishCoordinate = this.finishCoordinate_.slice();
coordinates.pop();
coordinates.push(finishCoordinate);
this.sketchPoint_.setGeometry(new Point(finishCoordinate));
}
}
this.geometryFunction_(coordinates, geometry, projection);
} else if (this.mode_ === Mode.POLYGON) {
coordinates = /** @type {PolyCoordType} */ (this.sketchCoords_)[0];
coordinates.splice(-2, 1);
sketchLineGeom = this.sketchLine_.getGeometry();
if (this.pointerType_ !== 'mouse') {
const finishCoordinate = coordinates[coordinates.length - 2].slice();
coordinates.pop();
coordinates.push(finishCoordinate);
this.sketchPoint_.setGeometry(new Point(finishCoordinate));
}
sketchLineGeom.setCoordinates(coordinates);
this.geometryFunction_(this.sketchCoords_, geometry, projection);
}