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

Change View2D function names

Browse Source 
Also make the TouchZoom interaction no longer use a private View2D function.
This commit is contained in:
Éric Lemoine
2013-03-04 17:59:43 +01:00
parent faef495cfd
commit 03ae41a68c
7 changed files with 32 additions and 29 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/ol/interaction/dblclickzoominteraction.js
View File

@@ -41,7 +41,7 @@ ol.interaction.DblClickZoom.prototype.handleMapBrowserEvent =
// FIXME works for View2D only
var view = map.getView();
goog.asserts.assert(view instanceof ol.View2D);
view.zoom(map, delta, anchor);
view.zoomByDelta(map, delta, anchor);
mapBrowserEvent.preventDefault();
browserEvent.preventDefault();
}

2
src/ol/interaction/dragrotateandzoominteraction.js
View File

@@ -66,7 +66,7 @@ ol.interaction.DragRotateAndZoom.prototype.handleDrag =
this.lastAngle_ = theta;
if (goog.isDef(this.lastMagnitude_)) {
var resolution = this.lastMagnitude_ * (view.getResolution() / magnitude);
view.zoomToResolution(map, resolution);
view.zoom(map, resolution);
}
this.lastMagnitude_ = magnitude;
};

3
src/ol/interaction/keyboardzoominteraction.js
View File

@@ -40,7 +40,8 @@ ol.interaction.KeyboardZoom.prototype.handleMapBrowserEvent =
// FIXME works for View2D only
var view = map.getView();
goog.asserts.assert(view instanceof ol.View2D);
view.zoom(map, delta, undefined, ol.interaction.KEYBOARD_ZOOM_DURATION);
view.zoomByDelta(map, delta, undefined,
ol.interaction.KEYBOARD_ZOOM_DURATION);
keyEvent.preventDefault();
mapBrowserEvent.preventDefault();
}

2
src/ol/interaction/mousewheelzoominteraction.js
View File

@@ -111,7 +111,7 @@ ol.interaction.MouseWheelZoom.prototype.doZoom_ = function(map) {
goog.asserts.assert(view instanceof ol.View2D);
map.requestRenderFrame();
view.zoom(map, -delta, this.lastAnchor_,
view.zoomByDelta(map, -delta, this.lastAnchor_,
ol.interaction.MOUSEWHEELZOOM_ANIMATION_DURATION);
this.delta_ = 0;

4
src/ol/interaction/touchzoominteraction.js
View File

@@ -59,7 +59,7 @@ ol.interaction.TouchZoom.prototype.handleTouchMove =
var anchor = map.getCoordinateFromPixel(centroid);
// scale, bypass the resolution constraint
view.zoom_(map, view.getResolution() * scaleDelta, anchor);
view.zoomNoConstraint(map, view.getResolution() * scaleDelta, anchor);
};
@@ -73,7 +73,7 @@ ol.interaction.TouchZoom.prototype.handleTouchEnd =
var map = mapBrowserEvent.map;
var view = map.getView();
// take the resolution constraint into account
view.zoomToResolution(map, view.getResolution());
view.zoom(map, view.getResolution());
view.setHint(ol.ViewHint.INTERACTING, -1);
return false;
} else {