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

Merge pull request #5970 from tschaub/freehand-shape

Browse Source 
Allow circles, squares, and boxes to be drawn in freehand mode
This commit is contained in:
Tim Schaub
2016-10-15 05:36:35 -06:00
committed by GitHub
parent a80d073da9 c58d98248a
commit 8d68d68c9d
1 changed files with 26 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/ol/interaction/draw.js
+26 -5
View File
@@ -292,7 +292,8 @@ ol.interaction.Draw.prototype.setMap = function(map) {
*/ */
ol.interaction.Draw.handleEvent = function(mapBrowserEvent) { ol.interaction.Draw.handleEvent = function(mapBrowserEvent) {
if ((this.mode_ === ol.interaction.Draw.Mode.LINE_STRING || if ((this.mode_ === ol.interaction.Draw.Mode.LINE_STRING ||
this.mode_ === ol.interaction.Draw.Mode.POLYGON) && this.mode_ === ol.interaction.Draw.Mode.POLYGON ||
this.mode_ === ol.interaction.Draw.Mode.CIRCLE) &&
this.freehandCondition_(mapBrowserEvent)) { this.freehandCondition_(mapBrowserEvent)) {
this.freehand_ = true; this.freehand_ = true;
} }
@@ -340,14 +341,22 @@ ol.interaction.Draw.handleDownEvent_ = function(event) {
* @private * @private
*/ */
ol.interaction.Draw.handleUpEvent_ = function(event) { ol.interaction.Draw.handleUpEvent_ = function(event) {
this.freehand_ = false;
var downPx = this.downPx_; var downPx = this.downPx_;
var clickPx = event.pixel; var clickPx = event.pixel;
var dx = downPx[0] - clickPx[0]; var dx = downPx[0] - clickPx[0];
var dy = downPx[1] - clickPx[1]; var dy = downPx[1] - clickPx[1];
var squaredDistance = dx * dx + dy * dy; var squaredDistance = dx * dx + dy * dy;
var pass = true; var pass = true;
if (squaredDistance <= this.squaredClickTolerance_) { var shouldHandle = false;
if (this.freehand_ && squaredDistance > this.squaredClickTolerance_) {
shouldHandle = this.mode_ === ol.interaction.Draw.Mode.CIRCLE ||
(this.mode_ === ol.interaction.Draw.Mode.LINE_STRING && this.sketchCoords_.length >= this.maxPoints_) ||
(this.mode_ === ol.interaction.Draw.Mode.POLYGON && this.sketchCoords_[0].length >= this.maxPoints_);
} else {
shouldHandle = squaredDistance <= this.squaredClickTolerance_;
}
this.freehand_ = false;
if (shouldHandle) {
this.handlePointerMove_(event); this.handlePointerMove_(event);
if (!this.finishCoordinate_) { if (!this.finishCoordinate_) {
this.startDrawing_(event); this.startDrawing_(event);
@@ -541,13 +550,25 @@ ol.interaction.Draw.prototype.addToDrawing_ = function(event) {
if (this.mode_ === ol.interaction.Draw.Mode.LINE_STRING) { if (this.mode_ === ol.interaction.Draw.Mode.LINE_STRING) {
this.finishCoordinate_ = coordinate.slice(); this.finishCoordinate_ = coordinate.slice();
coordinates = this.sketchCoords_; coordinates = this.sketchCoords_;
if (coordinates.length >= this.maxPoints_) {
if (this.freehand_) {
coordinates.pop();
} else {
done = true;
}
}
coordinates.push(coordinate.slice()); coordinates.push(coordinate.slice());
done = coordinates.length > this.maxPoints_;
this.geometryFunction_(coordinates, geometry); this.geometryFunction_(coordinates, geometry);
} else if (this.mode_ === ol.interaction.Draw.Mode.POLYGON) { } else if (this.mode_ === ol.interaction.Draw.Mode.POLYGON) {
coordinates = this.sketchCoords_[0]; coordinates = this.sketchCoords_[0];
if (coordinates.length >= this.maxPoints_) {
if (this.freehand_) {
coordinates.pop();
} else {
done = true;
}
}
coordinates.push(coordinate.slice()); coordinates.push(coordinate.slice());
done = coordinates.length > this.maxPoints_;
if (done) { if (done) {
this.finishCoordinate_ = coordinates[0]; this.finishCoordinate_ = coordinates[0];
} }