Rename ol.ViewHint.PANNING to ol.ViewHint.INTERACTING

This commit is contained in:
Frederic Junod
2013-03-03 10:08:55 +01:00
parent 3b74f72c56
commit 66d4c44159
9 changed files with 13 additions and 13 deletions

View File

@@ -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;

View File

@@ -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;

View File

@@ -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;

View File

@@ -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;

View File

@@ -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();

View File

@@ -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();

View File

@@ -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);
}
}

View File

@@ -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();

View File

@@ -11,7 +11,7 @@ goog.require('ol.Object');
*/
ol.ViewHint = {
ANIMATING: 0,
PANNING: 1
INTERACTING: 1
};