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

Improve type checking in ol.control.Zoom

Browse Source
This commit is contained in:
Tom Payne
2013-12-13 16:13:07 +01:00
parent 35768f8b48
commit 408a75426b
1 changed files with 9 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/ol/control/zoomcontrol.js
+9 -4
View File
@@ -2,10 +2,12 @@
goog.provide('ol.control.Zoom'); goog.provide('ol.control.Zoom');
goog.require('goog.asserts');
goog.require('goog.dom'); goog.require('goog.dom');
goog.require('goog.dom.TagName'); goog.require('goog.dom.TagName');
goog.require('goog.events'); goog.require('goog.events');
goog.require('goog.events.EventType'); goog.require('goog.events.EventType');
goog.require('ol.View2D');
goog.require('ol.animation'); goog.require('ol.animation');
goog.require('ol.control.Control'); goog.require('ol.control.Control');
goog.require('ol.css'); goog.require('ol.css');
@@ -77,8 +79,11 @@ ol.control.Zoom.prototype.zoomByDelta_ = function(delta, browserEvent) {
browserEvent.preventDefault(); browserEvent.preventDefault();
var map = this.getMap(); var map = this.getMap();
// FIXME works for View2D only // FIXME works for View2D only
var view = map.getView().getView2D(); var view = map.getView();
var currentResolution = view.getResolution(); goog.asserts.assert(goog.isDef(view));
var view2D = view.getView2D();
goog.asserts.assertInstanceof(view2D, ol.View2D);
var currentResolution = view2D.getResolution();
if (goog.isDef(currentResolution)) { if (goog.isDef(currentResolution)) {
if (this.duration_ > 0) { if (this.duration_ > 0) {
map.beforeRender(ol.animation.zoom({ map.beforeRender(ol.animation.zoom({
@@ -87,7 +92,7 @@ ol.control.Zoom.prototype.zoomByDelta_ = function(delta, browserEvent) {
easing: ol.easing.easeOut easing: ol.easing.easeOut
})); }));
} }
var newResolution = view.constrainResolution(currentResolution, delta); var newResolution = view2D.constrainResolution(currentResolution, delta);
view.setResolution(newResolution); view2D.setResolution(newResolution);
} }
}; };