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

Add optional kinetic parameter.

Browse Source
This commit is contained in:
Frederic Junod
2013-02-26 10:52:53 +01:00
parent 20e8eab142
commit 3b74f72c56
2 changed files with 13 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -1,5 +1,4 @@
// FIXME works for View2D only // FIXME works for View2D only
// FIXME opt_kinetic param
goog.provide('ol.interaction.TouchPan'); goog.provide('ol.interaction.TouchPan');
goog.require('goog.asserts'); goog.require('goog.asserts');
@@ -16,16 +15,17 @@ goog.require('ol.interaction.Touch');
/** /**
* @constructor * @constructor
* @extends {ol.interaction.Touch} * @extends {ol.interaction.Touch}
* @param {ol.Kinetic=} opt_kinetic Kinetic object.
*/ */
ol.interaction.TouchPan = function() { ol.interaction.TouchPan = function(opt_kinetic) {
goog.base(this); goog.base(this);
/** /**
* @private * @private
* @type {ol.Kinetic} * @type {ol.Kinetic|undefined}
*/ */
this.kinetic_ = new ol.Kinetic(-0.005, 0.05, 100); this.kinetic_ = opt_kinetic;
/** /**
* @private * @private
@@ -49,7 +49,9 @@ ol.interaction.TouchPan.prototype.handleTouchMove = function(mapBrowserEvent) {
goog.asserts.assert(this.targetTouches.length >= 1); goog.asserts.assert(this.targetTouches.length >= 1);
var centroid = ol.interaction.Touch.centroid(this.targetTouches); var centroid = ol.interaction.Touch.centroid(this.targetTouches);
if (!goog.isNull(this.lastCentroid)) { if (!goog.isNull(this.lastCentroid)) {
this.kinetic_.update(centroid.x, centroid.y); if (this.kinetic_) {
this.kinetic_.update(centroid.x, centroid.y);
}
var deltaX = this.lastCentroid.x - centroid.x; var deltaX = this.lastCentroid.x - centroid.x;
var deltaY = centroid.y - this.lastCentroid.y; var deltaY = centroid.y - this.lastCentroid.y;
var view = mapBrowserEvent.map.getView(); var view = mapBrowserEvent.map.getView();
@@ -72,7 +74,7 @@ ol.interaction.TouchPan.prototype.handleTouchEnd =
var view = map.getView(); var view = map.getView();
if (this.targetTouches.length == 0) { if (this.targetTouches.length == 0) {
view.setHint(ol.ViewHint.PANNING, -1); view.setHint(ol.ViewHint.PANNING, -1);
if (this.kinetic_.end()) { if (this.kinetic_ && this.kinetic_.end()) {
var distance = this.kinetic_.getDistance(); var distance = this.kinetic_.getDistance();
var angle = this.kinetic_.getAngle(); var angle = this.kinetic_.getAngle();
var center = view.getCenter(); var center = view.getCenter();
@@ -108,7 +110,9 @@ ol.interaction.TouchPan.prototype.handleTouchStart =
view.setCenter(mapBrowserEvent.frameState.view2DState.center); view.setCenter(mapBrowserEvent.frameState.view2DState.center);
this.kineticPreRenderFn_ = null; this.kineticPreRenderFn_ = null;
} }
this.kinetic_.begin(); if (this.kinetic_) {
this.kinetic_.begin();
}
view.setHint(ol.ViewHint.PANNING, 1); view.setHint(ol.ViewHint.PANNING, 1);
return true; return true;
} else { } else {

3
src/ol/map.js
View File

@@ -965,7 +965,8 @@ ol.Map.createInteractions_ = function(mapOptions) {
var touchPan = goog.isDef(mapOptions.touchPan) ? var touchPan = goog.isDef(mapOptions.touchPan) ?
mapOptions.touchPan : true; mapOptions.touchPan : true;
if (touchPan) { if (touchPan) {
interactions.push(new ol.interaction.TouchPan()); interactions.push(new ol.interaction.TouchPan(
new ol.Kinetic(-0.005, 0.05, 100)));
} }
var touchRotate = goog.isDef(mapOptions.touchRotate) ? var touchRotate = goog.isDef(mapOptions.touchRotate) ?