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

Improve type checking in ol.interaction.TouchPan

Browse Source
This commit is contained in:
Tom Payne
2013-12-13 16:13:31 +01:00
parent 408a75426b
commit 6dedac6ed8
1 changed files with 4 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/ol/interaction/touchpaninteraction.js
+4
View File
@@ -5,6 +5,7 @@ goog.require('goog.asserts');
goog.require('ol.Kinetic'); goog.require('ol.Kinetic');
goog.require('ol.Pixel'); goog.require('ol.Pixel');
goog.require('ol.PreRenderFunction'); goog.require('ol.PreRenderFunction');
goog.require('ol.View2D');
goog.require('ol.coordinate'); goog.require('ol.coordinate');
goog.require('ol.interaction.Touch'); goog.require('ol.interaction.Touch');
@@ -65,6 +66,7 @@ ol.interaction.TouchPan.prototype.handleTouchMove = function(mapBrowserEvent) {
var deltaY = centroid[1] - this.lastCentroid[1]; var deltaY = centroid[1] - this.lastCentroid[1];
var map = mapBrowserEvent.map; var map = mapBrowserEvent.map;
var view2D = map.getView().getView2D(); var view2D = map.getView().getView2D();
goog.asserts.assertInstanceof(view2D, ol.View2D);
var view2DState = view2D.getView2DState(); var view2DState = view2D.getView2DState();
var center = [deltaX, deltaY]; var center = [deltaX, deltaY];
ol.coordinate.scale(center, view2DState.resolution); ol.coordinate.scale(center, view2DState.resolution);
@@ -85,6 +87,7 @@ ol.interaction.TouchPan.prototype.handleTouchEnd =
function(mapBrowserEvent) { function(mapBrowserEvent) {
var map = mapBrowserEvent.map; var map = mapBrowserEvent.map;
var view2D = map.getView().getView2D(); var view2D = map.getView().getView2D();
goog.asserts.assertInstanceof(view2D, ol.View2D);
if (this.targetTouches.length === 0) { if (this.targetTouches.length === 0) {
if (!this.noKinetic_ && this.kinetic_ && this.kinetic_.end()) { if (!this.noKinetic_ && this.kinetic_ && this.kinetic_.end()) {
var distance = this.kinetic_.getDistance(); var distance = this.kinetic_.getDistance();
@@ -118,6 +121,7 @@ ol.interaction.TouchPan.prototype.handleTouchStart =
if (this.targetTouches.length > 0) { if (this.targetTouches.length > 0) {
var map = mapBrowserEvent.map; var map = mapBrowserEvent.map;
var view2D = map.getView().getView2D(); var view2D = map.getView().getView2D();
goog.asserts.assertInstanceof(view2D, ol.View2D);
this.lastCentroid = null; this.lastCentroid = null;
map.requestRenderFrame(); map.requestRenderFrame();
if (!goog.isNull(this.kineticPreRenderFn_) && if (!goog.isNull(this.kineticPreRenderFn_) &&