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

Merge pull request #6445 from tschaub/fix-pinch

Browse Source 
Fix pinch zooming
This commit is contained in:
Tim Schaub
2017-02-03 15:04:59 -07:00
committed by GitHub
parent bbf4c449e6 67e2d02046
commit 35d254902f
2 changed files with 7 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/ol/interaction/dragpan.js
+5
View File
@@ -112,6 +112,11 @@ ol.interaction.DragPan.handleUpEvent_ = function(mapBrowserEvent) {
view.setHint(ol.ViewHint.INTERACTING, -1); view.setHint(ol.ViewHint.INTERACTING, -1);
return false; return false;
} else { } else {
if (this.kinetic_) {
// reset so we don't overestimate the kinetic energy after
// after one finger up, tiny drag, second finger up
this.kinetic_.begin();
}
this.lastCentroid = null; this.lastCentroid = null;
return true; return true;
} }
src/ol/interaction/pointer.js
+2 -2
View File
@@ -187,8 +187,8 @@ ol.interaction.Pointer.handleEvent = function(mapBrowserEvent) {
if (mapBrowserEvent.type == ol.MapBrowserEventType.POINTERDRAG) { if (mapBrowserEvent.type == ol.MapBrowserEventType.POINTERDRAG) {
this.handleDragEvent_(mapBrowserEvent); this.handleDragEvent_(mapBrowserEvent);
} else if (mapBrowserEvent.type == ol.MapBrowserEventType.POINTERUP) { } else if (mapBrowserEvent.type == ol.MapBrowserEventType.POINTERUP) {
this.handleUpEvent_(mapBrowserEvent); var handledUp = this.handleUpEvent_(mapBrowserEvent);
this.handlingDownUpSequence = false; this.handlingDownUpSequence = handledUp && this.targetPointers.length > 0;
} }
} else { } else {
if (mapBrowserEvent.type == ol.MapBrowserEventType.POINTERDOWN) { if (mapBrowserEvent.type == ol.MapBrowserEventType.POINTERDOWN) {