From 1d6f7e9504405d3f0c0c42e3ddb7d9f27f54e562 Mon Sep 17 00:00:00 2001 From: Frederic Junod Date: Tue, 27 Jan 2015 18:05:07 +0100 Subject: [PATCH] Disallowed undefined 'maxResolution' value --- src/ol/layer/layerbase.js | 8 ++++---- test/spec/ol/layer/layer.test.js | 4 ++++ 2 files changed, 8 insertions(+), 4 deletions(-) diff --git a/src/ol/layer/layerbase.js b/src/ol/layer/layerbase.js index 8c3bb38ee9..6e948a564d 100644 --- a/src/ol/layer/layerbase.js +++ b/src/ol/layer/layerbase.js @@ -152,7 +152,7 @@ ol.layer.Base.prototype.getLayerState = function() { sourceState: sourceState, visible: visible, extent: extent, - maxResolution: goog.isDef(maxResolution) ? maxResolution : Infinity, + maxResolution: maxResolution, minResolution: goog.isDef(minResolution) ? Math.max(minResolution, 0) : 0 }; }; @@ -190,12 +190,12 @@ goog.exportProperty( /** - * @return {number|undefined} The maximum resolution of the layer. + * @return {number} The maximum resolution of the layer. * @observable * @api stable */ ol.layer.Base.prototype.getMaxResolution = function() { - return /** @type {number|undefined} */ ( + return /** @type {number} */ ( this.get(ol.layer.LayerProperty.MAX_RESOLUTION)); }; goog.exportProperty( @@ -349,7 +349,7 @@ goog.exportProperty( /** - * @param {number|undefined} maxResolution The maximum resolution of the layer. + * @param {number} maxResolution The maximum resolution of the layer. * @observable * @api stable */ diff --git a/test/spec/ol/layer/layer.test.js b/test/spec/ol/layer/layer.test.js index 93cee8f404..8e3822ff94 100644 --- a/test/spec/ol/layer/layer.test.js +++ b/test/spec/ol/layer/layer.test.js @@ -46,6 +46,10 @@ describe('ol.layer.Layer', function() { expect(layer.getVisible()).to.be(true); }); + it('provides default max resolution', function() { + expect(layer.getMaxResolution()).to.be(Infinity); + }); + it('provides default layerState', function() { expect(layer.getLayerState()).to.eql({ layer: layer,