From 66d4c4415949d774dc3c38b679ec8859c0f6e942 Mon Sep 17 00:00:00 2001 From: Frederic Junod Date: Sun, 3 Mar 2013 10:08:55 +0100 Subject: [PATCH] Rename ol.ViewHint.PANNING to ol.ViewHint.INTERACTING --- src/ol/interaction/dragpaninteraction.js | 4 ++-- src/ol/interaction/touchpaninteraction.js | 4 ++-- src/ol/interaction/touchrotateinteraction.js | 4 ++-- src/ol/interaction/touchzoominteraction.js | 4 ++-- src/ol/renderer/canvas/canvasimagelayerrenderer.js | 2 +- src/ol/renderer/dom/domimagelayerrenderer.js | 2 +- src/ol/renderer/dom/domtilelayerrenderer.js | 2 +- src/ol/renderer/webgl/webglimagelayerrenderer.js | 2 +- src/ol/view.js | 2 +- 9 files changed, 13 insertions(+), 13 deletions(-) diff --git a/src/ol/interaction/dragpaninteraction.js b/src/ol/interaction/dragpaninteraction.js index 4281be71fb..4827c92e2f 100644 --- a/src/ol/interaction/dragpaninteraction.js +++ b/src/ol/interaction/dragpaninteraction.js @@ -80,7 +80,7 @@ ol.interaction.DragPan.prototype.handleDragEnd = function(mapBrowserEvent) { var map = mapBrowserEvent.map; var view = map.getView(); - view.setHint(ol.ViewHint.PANNING, -1); + view.setHint(ol.ViewHint.INTERACTING, -1); if (this.kinetic_ && this.kinetic_.end()) { var distance = this.kinetic_.getDistance(); @@ -111,7 +111,7 @@ ol.interaction.DragPan.prototype.handleDragStart = function(mapBrowserEvent) { } var map = mapBrowserEvent.map; map.requestRenderFrame(); - map.getView().setHint(ol.ViewHint.PANNING, 1); + map.getView().setHint(ol.ViewHint.INTERACTING, 1); return true; } else { return false; diff --git a/src/ol/interaction/touchpaninteraction.js b/src/ol/interaction/touchpaninteraction.js index 69bad9a186..452c43159a 100644 --- a/src/ol/interaction/touchpaninteraction.js +++ b/src/ol/interaction/touchpaninteraction.js @@ -73,7 +73,7 @@ ol.interaction.TouchPan.prototype.handleTouchEnd = var map = mapBrowserEvent.map; var view = map.getView(); if (this.targetTouches.length == 0) { - view.setHint(ol.ViewHint.PANNING, -1); + view.setHint(ol.ViewHint.INTERACTING, -1); if (this.kinetic_ && this.kinetic_.end()) { var distance = this.kinetic_.getDistance(); var angle = this.kinetic_.getAngle(); @@ -113,7 +113,7 @@ ol.interaction.TouchPan.prototype.handleTouchStart = if (this.kinetic_) { this.kinetic_.begin(); } - view.setHint(ol.ViewHint.PANNING, 1); + view.setHint(ol.ViewHint.INTERACTING, 1); return true; } else { return false; diff --git a/src/ol/interaction/touchrotateinteraction.js b/src/ol/interaction/touchrotateinteraction.js index 1253866fdc..1ce5d02a77 100644 --- a/src/ol/interaction/touchrotateinteraction.js +++ b/src/ol/interaction/touchrotateinteraction.js @@ -103,7 +103,7 @@ ol.interaction.TouchRotate.prototype.handleTouchEnd = if (this.targetTouches.length < 2) { var map = mapBrowserEvent.map; var view = map.getView(); - view.setHint(ol.ViewHint.PANNING, -1); + view.setHint(ol.ViewHint.INTERACTING, -1); return false; } else { return true; @@ -121,7 +121,7 @@ ol.interaction.TouchRotate.prototype.handleTouchStart = this.lastAngle_ = undefined; this.rotating_ = false; this.rotationDelta_ = 0.0; - view.setHint(ol.ViewHint.PANNING, 1); + view.setHint(ol.ViewHint.INTERACTING, 1); return true; } else { return false; diff --git a/src/ol/interaction/touchzoominteraction.js b/src/ol/interaction/touchzoominteraction.js index 3d5bd178ae..9087c5f3b4 100644 --- a/src/ol/interaction/touchzoominteraction.js +++ b/src/ol/interaction/touchzoominteraction.js @@ -74,7 +74,7 @@ ol.interaction.TouchZoom.prototype.handleTouchEnd = var view = map.getView(); // take the resolution constraint into account view.zoomToResolution(map, view.getResolution()); - view.setHint(ol.ViewHint.PANNING, -1); + view.setHint(ol.ViewHint.INTERACTING, -1); return false; } else { return true; @@ -90,7 +90,7 @@ ol.interaction.TouchZoom.prototype.handleTouchStart = if (this.targetTouches.length >= 2) { var view = mapBrowserEvent.map.getView(); this.lastDistance_ = undefined; - view.setHint(ol.ViewHint.PANNING, 1); + view.setHint(ol.ViewHint.INTERACTING, 1); return true; } else { return false; diff --git a/src/ol/renderer/canvas/canvasimagelayerrenderer.js b/src/ol/renderer/canvas/canvasimagelayerrenderer.js index 61eb2b898d..fa62818db7 100644 --- a/src/ol/renderer/canvas/canvasimagelayerrenderer.js +++ b/src/ol/renderer/canvas/canvasimagelayerrenderer.js @@ -78,7 +78,7 @@ ol.renderer.canvas.ImageLayer.prototype.renderFrame = var hints = frameState.viewHints; - if (!hints[ol.ViewHint.ANIMATING] && !hints[ol.ViewHint.PANNING]) { + if (!hints[ol.ViewHint.ANIMATING] && !hints[ol.ViewHint.INTERACTING]) { image = imageSource.getImage(frameState.extent, viewResolution); if (!goog.isNull(image)) { var imageState = image.getState(); diff --git a/src/ol/renderer/dom/domimagelayerrenderer.js b/src/ol/renderer/dom/domimagelayerrenderer.js index 7190d8c268..769b944848 100644 --- a/src/ol/renderer/dom/domimagelayerrenderer.js +++ b/src/ol/renderer/dom/domimagelayerrenderer.js @@ -66,7 +66,7 @@ ol.renderer.dom.ImageLayer.prototype.renderFrame = var hints = frameState.viewHints; - if (!hints[ol.ViewHint.ANIMATING] && !hints[ol.ViewHint.PANNING]) { + if (!hints[ol.ViewHint.ANIMATING] && !hints[ol.ViewHint.INTERACTING]) { var image_ = imageSource.getImage(frameState.extent, viewResolution); if (!goog.isNull(image_)) { var imageState = image_.getState(); diff --git a/src/ol/renderer/dom/domtilelayerrenderer.js b/src/ol/renderer/dom/domtilelayerrenderer.js index 9b5dd26b32..0477bde451 100644 --- a/src/ol/renderer/dom/domtilelayerrenderer.js +++ b/src/ol/renderer/dom/domtilelayerrenderer.js @@ -200,7 +200,7 @@ ol.renderer.dom.TileLayer.prototype.renderFrame = } } else { if (!frameState.viewHints[ol.ViewHint.ANIMATING] && - !frameState.viewHints[ol.ViewHint.PANNING]) { + !frameState.viewHints[ol.ViewHint.INTERACTING]) { tileLayerZ.removeTilesOutsideExtent(frameState.extent); } } diff --git a/src/ol/renderer/webgl/webglimagelayerrenderer.js b/src/ol/renderer/webgl/webglimagelayerrenderer.js index 5d0341f3c1..545547d198 100644 --- a/src/ol/renderer/webgl/webglimagelayerrenderer.js +++ b/src/ol/renderer/webgl/webglimagelayerrenderer.js @@ -159,7 +159,7 @@ ol.renderer.webgl.ImageLayer.prototype.renderFrame = var hints = frameState.viewHints; - if (!hints[ol.ViewHint.ANIMATING] && !hints[ol.ViewHint.PANNING]) { + if (!hints[ol.ViewHint.ANIMATING] && !hints[ol.ViewHint.INTERACTING]) { var image_ = imageSource.getImage(frameState.extent, viewResolution); if (!goog.isNull(image_)) { var imageState = image_.getState(); diff --git a/src/ol/view.js b/src/ol/view.js index f9303af991..61fba43f46 100644 --- a/src/ol/view.js +++ b/src/ol/view.js @@ -11,7 +11,7 @@ goog.require('ol.Object'); */ ol.ViewHint = { ANIMATING: 0, - PANNING: 1 + INTERACTING: 1 };