From fc3c808209a66955154b63fdd1fd3a9da386e52a Mon Sep 17 00:00:00 2001 From: Frederic Junod Date: Tue, 27 Jan 2015 18:07:08 +0100 Subject: [PATCH] Disallowed undefined 'minResolution' 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 6e948a564d..c1aca6f463 100644 --- a/src/ol/layer/layerbase.js +++ b/src/ol/layer/layerbase.js @@ -153,7 +153,7 @@ ol.layer.Base.prototype.getLayerState = function() { visible: visible, extent: extent, maxResolution: maxResolution, - minResolution: goog.isDef(minResolution) ? Math.max(minResolution, 0) : 0 + minResolution: Math.max(minResolution, 0) }; }; @@ -205,12 +205,12 @@ goog.exportProperty( /** - * @return {number|undefined} The minimum resolution of the layer. + * @return {number} The minimum resolution of the layer. * @observable * @api stable */ ol.layer.Base.prototype.getMinResolution = function() { - return /** @type {number|undefined} */ ( + return /** @type {number} */ ( this.get(ol.layer.LayerProperty.MIN_RESOLUTION)); }; goog.exportProperty( @@ -363,7 +363,7 @@ goog.exportProperty( /** - * @param {number|undefined} minResolution The minimum resolution of the layer. + * @param {number} minResolution The minimum 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 8e3822ff94..3ab583d9d6 100644 --- a/test/spec/ol/layer/layer.test.js +++ b/test/spec/ol/layer/layer.test.js @@ -50,6 +50,10 @@ describe('ol.layer.Layer', function() { expect(layer.getMaxResolution()).to.be(Infinity); }); + it('provides default min resolution', function() { + expect(layer.getMinResolution()).to.be(0); + }); + it('provides default layerState', function() { expect(layer.getLayerState()).to.eql({ layer: layer,