Only update kinetic when number of touches has not changed

This commit is contained in:
Andreas Hocevar
2017-02-14 00:48:59 +01:00
parent 8e35b7a1ad
commit 186935c147
+17 -15
View File
@@ -70,21 +70,23 @@ ol.interaction.DragPan.handleDragEvent_ = function(mapBrowserEvent) {
var targetPointers = this.targetPointers; var targetPointers = this.targetPointers;
var centroid = var centroid =
ol.interaction.Pointer.centroid(targetPointers); ol.interaction.Pointer.centroid(targetPointers);
if (this.kinetic_) { if (targetPointers.length == this.lastPointersCount_) {
this.kinetic_.update(centroid[0], centroid[1]); if (this.kinetic_) {
} this.kinetic_.update(centroid[0], centroid[1]);
if (this.lastCentroid && targetPointers.length == this.lastPointersCount_) { }
var deltaX = this.lastCentroid[0] - centroid[0]; if (this.lastCentroid) {
var deltaY = centroid[1] - this.lastCentroid[1]; var deltaX = this.lastCentroid[0] - centroid[0];
var map = mapBrowserEvent.map; var deltaY = centroid[1] - this.lastCentroid[1];
var view = map.getView(); var map = mapBrowserEvent.map;
var viewState = view.getState(); var view = map.getView();
var center = [deltaX, deltaY]; var viewState = view.getState();
ol.coordinate.scale(center, viewState.resolution); var center = [deltaX, deltaY];
ol.coordinate.rotate(center, viewState.rotation); ol.coordinate.scale(center, viewState.resolution);
ol.coordinate.add(center, viewState.center); ol.coordinate.rotate(center, viewState.rotation);
center = view.constrainCenter(center); ol.coordinate.add(center, viewState.center);
view.setCenter(center); center = view.constrainCenter(center);
view.setCenter(center);
}
} }
this.lastCentroid = centroid; this.lastCentroid = centroid;
this.lastPointersCount_ = targetPointers.length; this.lastPointersCount_ = targetPointers.length;