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

Ensure drawing is not finished prematurely

Browse Source
This commit is contained in:
Tim Schaub
2013-10-30 16:17:18 -06:00
parent 45ba000df5
commit 7c197252ed
1 changed files with 20 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

30
src/ol/interaction/drawinteraction.js
View File

@@ -173,12 +173,25 @@ ol.interaction.Draw.prototype.handleMove_ = function(event) {
* @private * @private
*/ */
ol.interaction.Draw.prototype.atFinish_ = function(event) { ol.interaction.Draw.prototype.atFinish_ = function(event) {
var map = event.map; var at = false;
var finishPixel = map.getPixelFromCoordinate(this.finishCoordinate_); if (this.sketchFeature_) {
var pixel = event.getPixel(); var geometry = this.sketchFeature_.getGeometry();
var dx = pixel[0] - finishPixel[0]; var potentiallyDone = false;
var dy = pixel[1] - finishPixel[1]; if (this.mode_ === ol.interaction.DrawMode.LINESTRING) {
return Math.sqrt(dx * dx + dy * dy) <= this.snapTolerance_; potentiallyDone = geometry.getCoordinates().length > 2;
} else if (this.mode_ === ol.interaction.DrawMode.POLYGON) {
potentiallyDone = geometry.getRings()[0].getCoordinates().length > 3;
}
if (potentiallyDone) {
var map = event.map;
var finishPixel = map.getPixelFromCoordinate(this.finishCoordinate_);
var pixel = event.getPixel();
var dx = pixel[0] - finishPixel[0];
var dy = pixel[1] - finishPixel[1];
at = Math.sqrt(dx * dx + dy * dy) <= this.snapTolerance_;
}
}
return at;
}; };
@@ -233,16 +246,13 @@ ol.interaction.Draw.prototype.modifyDrawing_ = function(event) {
last[1] = coordinate[1]; last[1] = coordinate[1];
geometry.setCoordinates(last); geometry.setCoordinates(last);
} else { } else {
var potentiallyDone = false;
if (this.mode_ === ol.interaction.DrawMode.LINESTRING) { if (this.mode_ === ol.interaction.DrawMode.LINESTRING) {
coordinates = geometry.getCoordinates(); coordinates = geometry.getCoordinates();
potentiallyDone = coordinates.length > 2;
} else if (this.mode_ === ol.interaction.DrawMode.POLYGON) { } else if (this.mode_ === ol.interaction.DrawMode.POLYGON) {
geometry = geometry.getRings()[0]; geometry = geometry.getRings()[0];
coordinates = geometry.getCoordinates(); coordinates = geometry.getCoordinates();
potentiallyDone = coordinates.length > 3;
} }
if (potentiallyDone && this.atFinish_(event)) { if (this.atFinish_(event)) {
// snap to finish // snap to finish
coordinate = this.finishCoordinate_.slice(); coordinate = this.finishCoordinate_.slice();
} }