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

Remove view.getView2D() method

Browse Source
This commit is contained in:
Tim Schaub
2014-06-26 16:29:21 -04:00
parent 956e1bf8b4
commit b88d2aebc9
23 changed files with 42 additions and 109 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/ol/control/zoomcontrol.js
+3 -10
View File
@@ -1,5 +1,3 @@
// FIXME works for View2D only
goog.provide('ol.control.Zoom');
goog.require('goog.asserts');
@@ -7,7 +5,6 @@ goog.require('goog.dom');
goog.require('goog.dom.TagName');
goog.require('goog.events');
goog.require('goog.events.EventType');
goog.require('ol.View2D');
goog.require('ol.animation');
goog.require('ol.control.Control');
goog.require('ol.css');
@@ -143,12 +140,8 @@ ol.control.Zoom.prototype.handlePointerUp_ = function(delta, pointerEvent) {
*/
ol.control.Zoom.prototype.zoomByDelta_ = function(delta) {
var map = this.getMap();
// FIXME works for View2D only
var view = map.getView();
goog.asserts.assert(goog.isDef(view));
var view2D = view.getView2D();
goog.asserts.assertInstanceof(view2D, ol.View2D);
var currentResolution = view2D.getResolution();
var currentResolution = view.getResolution();
if (goog.isDef(currentResolution)) {
if (this.duration_ > 0) {
map.beforeRender(ol.animation.zoom({
@@ -157,7 +150,7 @@ ol.control.Zoom.prototype.zoomByDelta_ = function(delta) {
easing: ol.easing.easeOut
}));
}
var newResolution = view2D.constrainResolution(currentResolution, delta);
view2D.setResolution(newResolution);
var newResolution = view.constrainResolution(currentResolution, delta);
view.setResolution(newResolution);
}
};