Allow freehand drawing without a modifier key

This commit is contained in:
Tim Schaub
2016-10-14 18:10:20 -06:00
parent 8d68d68c9d
commit fad6d368a6
2 changed files with 21 additions and 6 deletions

View File

@@ -251,8 +251,13 @@ ol.interaction.Draw = function(options) {
* @private
* @type {ol.EventsConditionType}
*/
this.freehandCondition_ = options.freehandCondition ?
options.freehandCondition : ol.events.condition.shiftKeyOnly;
this.freehandCondition_;
if (options.freehand) {
this.freehandCondition_ = ol.events.condition.always;
} else {
this.freehandCondition_ = options.freehandCondition ?
options.freehandCondition : ol.events.condition.shiftKeyOnly;
}
ol.events.listen(this,
ol.Object.getChangeEventType(ol.interaction.Interaction.Property.ACTIVE),
@@ -319,15 +324,15 @@ ol.interaction.Draw.handleEvent = function(mapBrowserEvent) {
* @private
*/
ol.interaction.Draw.handleDownEvent_ = function(event) {
if (this.condition_(event)) {
this.downPx_ = event.pixel;
return true;
} else if (this.freehand_) {
if (this.freehand_) {
this.downPx_ = event.pixel;
if (!this.finishCoordinate_) {
this.startDrawing_(event);
}
return true;
} else if (this.condition_(event)) {
this.downPx_ = event.pixel;
return true;
} else {
return false;
}