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

Disable kinetic when multiple touches on screen

Browse Source
This commit is contained in:
Éric Lemoine
2013-04-03 09:18:29 +02:00
parent 676bcc6cc7
commit 5f47ee9a9c
1 changed files with 11 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
src/ol/interaction/touchpaninteraction.js
View File

@@ -38,6 +38,12 @@ ol.interaction.TouchPan = function(opt_kinetic) {
*/
this.lastCentroid = null;
/**
* @private
* @type {boolean}
*/
this.noKinetic_ = false;
};
goog.inherits(ol.interaction.TouchPan, ol.interaction.Touch);
@@ -74,7 +80,7 @@ ol.interaction.TouchPan.prototype.handleTouchEnd =
var view = map.getView();
if (this.targetTouches.length == 0) {
view.setHint(ol.ViewHint.INTERACTING, -1);
if (this.kinetic_ && this.kinetic_.end()) {
if (!this.noKinetic_ && this.kinetic_ && this.kinetic_.end()) {
var distance = this.kinetic_.getDistance();
var angle = this.kinetic_.getAngle();
var center = view.getCenter();
@@ -100,7 +106,7 @@ ol.interaction.TouchPan.prototype.handleTouchEnd =
*/
ol.interaction.TouchPan.prototype.handleTouchStart =
function(mapBrowserEvent) {
if (this.targetTouches.length >= 1) {
if (this.targetTouches.length > 0) {
var map = mapBrowserEvent.map;
var view = map.getView();
this.lastCentroid = null;
@@ -114,6 +120,9 @@ ol.interaction.TouchPan.prototype.handleTouchStart =
this.kinetic_.begin();
}
view.setHint(ol.ViewHint.INTERACTING, 1);
// No kinetic as soon as more than one fingers on the screen is
// detected. This is to prevent nasty pans after pinch.
this.noKinetic_ = this.targetTouches.length > 1;
return true;
} else {
return false;