From c7dbd4a3038d65899e2bc3b09dcb7675a8d9b208 Mon Sep 17 00:00:00 2001 From: Frederic Junod Date: Tue, 27 Jan 2015 14:23:59 +0100 Subject: [PATCH 1/8] Disallowed undefined 'visible' value --- src/ol/layer/layerbase.js | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/src/ol/layer/layerbase.js b/src/ol/layer/layerbase.js index a7722e84d2..0effab8608 100644 --- a/src/ol/layer/layerbase.js +++ b/src/ol/layer/layerbase.js @@ -152,7 +152,7 @@ ol.layer.Base.prototype.getLayerState = function() { opacity: goog.isDef(opacity) ? goog.math.clamp(opacity, 0, 1) : 1, saturation: goog.isDef(saturation) ? Math.max(saturation, 0) : 1, sourceState: sourceState, - visible: goog.isDef(visible) ? !!visible : true, + visible: visible, extent: extent, maxResolution: goog.isDef(maxResolution) ? maxResolution : Infinity, minResolution: goog.isDef(minResolution) ? Math.max(minResolution, 0) : 0 @@ -258,13 +258,12 @@ ol.layer.Base.prototype.getSourceState = goog.abstractMethod; /** - * @return {boolean|undefined} The visiblity of the layer. + * @return {boolean} The visibility of the layer. * @observable * @api stable */ ol.layer.Base.prototype.getVisible = function() { - return /** @type {boolean|undefined} */ ( - this.get(ol.layer.LayerProperty.VISIBLE)); + return /** @type {boolean} */ (this.get(ol.layer.LayerProperty.VISIBLE)); }; goog.exportProperty( ol.layer.Base.prototype, @@ -415,7 +414,7 @@ goog.exportProperty( /** - * @param {boolean|undefined} visible The visiblity of the layer. + * @param {boolean} visible The visibility of the layer. * @observable * @api stable */ From e25cb30e5fc2077a8d2b93ef11a0c0296d03a682 Mon Sep 17 00:00:00 2001 From: Frederic Junod Date: Tue, 27 Jan 2015 14:26:21 +0100 Subject: [PATCH 2/8] Disallowed undefined 'hue' value --- src/ol/layer/layerbase.js | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/src/ol/layer/layerbase.js b/src/ol/layer/layerbase.js index 0effab8608..abbd5fd2d9 100644 --- a/src/ol/layer/layerbase.js +++ b/src/ol/layer/layerbase.js @@ -117,12 +117,12 @@ goog.exportProperty( /** - * @return {number|undefined} The hue of the layer. + * @return {number} The hue of the layer. * @observable * @api */ ol.layer.Base.prototype.getHue = function() { - return /** @type {number|undefined} */ (this.get(ol.layer.LayerProperty.HUE)); + return /** @type {number} */ (this.get(ol.layer.LayerProperty.HUE)); }; goog.exportProperty( ol.layer.Base.prototype, @@ -148,7 +148,7 @@ ol.layer.Base.prototype.getLayerState = function() { layer: /** @type {ol.layer.Layer} */ (this), brightness: goog.isDef(brightness) ? goog.math.clamp(brightness, -1, 1) : 0, contrast: goog.isDef(contrast) ? Math.max(contrast, 0) : 1, - hue: goog.isDef(hue) ? hue : 0, + hue: hue, opacity: goog.isDef(opacity) ? goog.math.clamp(opacity, 0, 1) : 1, saturation: goog.isDef(saturation) ? Math.max(saturation, 0) : 1, sourceState: sourceState, @@ -323,7 +323,7 @@ goog.exportProperty( /** * Apply a hue-rotation to the layer. A value of 0 will leave the hue * unchanged. Other values are radians around the color circle. - * @param {number|undefined} hue The hue of the layer. + * @param {number} hue The hue of the layer. * @observable * @api */ From 663f18cd29d183860a9ea020b395e6c8d5faa2db Mon Sep 17 00:00:00 2001 From: Frederic Junod Date: Tue, 27 Jan 2015 14:27:28 +0100 Subject: [PATCH 3/8] Disallowed undefined 'opacity' value --- src/ol/layer/layerbase.js | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/src/ol/layer/layerbase.js b/src/ol/layer/layerbase.js index abbd5fd2d9..212399323c 100644 --- a/src/ol/layer/layerbase.js +++ b/src/ol/layer/layerbase.js @@ -149,7 +149,7 @@ ol.layer.Base.prototype.getLayerState = function() { brightness: goog.isDef(brightness) ? goog.math.clamp(brightness, -1, 1) : 0, contrast: goog.isDef(contrast) ? Math.max(contrast, 0) : 1, hue: hue, - opacity: goog.isDef(opacity) ? goog.math.clamp(opacity, 0, 1) : 1, + opacity: goog.math.clamp(opacity, 0, 1), saturation: goog.isDef(saturation) ? Math.max(saturation, 0) : 1, sourceState: sourceState, visible: visible, @@ -222,13 +222,12 @@ goog.exportProperty( /** - * @return {number|undefined} The opacity of the layer. + * @return {number} The opacity of the layer. * @observable * @api stable */ ol.layer.Base.prototype.getOpacity = function() { - return /** @type {number|undefined} */ ( - this.get(ol.layer.LayerProperty.OPACITY)); + return /** @type {number} */ (this.get(ol.layer.LayerProperty.OPACITY)); }; goog.exportProperty( ol.layer.Base.prototype, @@ -381,7 +380,7 @@ goog.exportProperty( /** - * @param {number|undefined} opacity The opacity of the layer. + * @param {number} opacity The opacity of the layer. * @observable * @api stable */ From 007ad2c58f3db9bae136273b82410cb038556e1f Mon Sep 17 00:00:00 2001 From: Frederic Junod Date: Tue, 27 Jan 2015 14:28:25 +0100 Subject: [PATCH 4/8] Disallowed undefined 'brightness' value --- src/ol/layer/layerbase.js | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/src/ol/layer/layerbase.js b/src/ol/layer/layerbase.js index 212399323c..58870ec909 100644 --- a/src/ol/layer/layerbase.js +++ b/src/ol/layer/layerbase.js @@ -87,13 +87,12 @@ goog.inherits(ol.layer.Base, ol.Object); /** - * @return {number|undefined} The brightness of the layer. + * @return {number} The brightness of the layer. * @observable * @api */ ol.layer.Base.prototype.getBrightness = function() { - return /** @type {number|undefined} */ ( - this.get(ol.layer.LayerProperty.BRIGHTNESS)); + return /** @type {number} */ (this.get(ol.layer.LayerProperty.BRIGHTNESS)); }; goog.exportProperty( ol.layer.Base.prototype, @@ -146,7 +145,7 @@ ol.layer.Base.prototype.getLayerState = function() { var minResolution = this.getMinResolution(); return { layer: /** @type {ol.layer.Layer} */ (this), - brightness: goog.isDef(brightness) ? goog.math.clamp(brightness, -1, 1) : 0, + brightness: goog.math.clamp(brightness, -1, 1), contrast: goog.isDef(contrast) ? Math.max(contrast, 0) : 1, hue: hue, opacity: goog.math.clamp(opacity, 0, 1), @@ -288,7 +287,7 @@ goog.exportProperty( * [2] https://github.com/WebKit/webkit/commit/8f4765e569 * [3] https://www.w3.org/Bugs/Public/show_bug.cgi?id=15647 * - * @param {number|undefined} brightness The brightness of the layer. + * @param {number} brightness The brightness of the layer. * @observable * @api */ From caa842899091b00dbe6069370dcfe52da6a98781 Mon Sep 17 00:00:00 2001 From: Frederic Junod Date: Tue, 27 Jan 2015 14:29:23 +0100 Subject: [PATCH 5/8] Disallowed undefined 'contrast' value --- src/ol/layer/layerbase.js | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/src/ol/layer/layerbase.js b/src/ol/layer/layerbase.js index 58870ec909..896391c081 100644 --- a/src/ol/layer/layerbase.js +++ b/src/ol/layer/layerbase.js @@ -101,13 +101,12 @@ goog.exportProperty( /** - * @return {number|undefined} The contrast of the layer. + * @return {number} The contrast of the layer. * @observable * @api */ ol.layer.Base.prototype.getContrast = function() { - return /** @type {number|undefined} */ ( - this.get(ol.layer.LayerProperty.CONTRAST)); + return /** @type {number} */ (this.get(ol.layer.LayerProperty.CONTRAST)); }; goog.exportProperty( ol.layer.Base.prototype, @@ -146,7 +145,7 @@ ol.layer.Base.prototype.getLayerState = function() { return { layer: /** @type {ol.layer.Layer} */ (this), brightness: goog.math.clamp(brightness, -1, 1), - contrast: goog.isDef(contrast) ? Math.max(contrast, 0) : 1, + contrast: Math.max(contrast, 0), hue: hue, opacity: goog.math.clamp(opacity, 0, 1), saturation: goog.isDef(saturation) ? Math.max(saturation, 0) : 1, @@ -305,7 +304,7 @@ goog.exportProperty( * grey. A value of 1 will leave the contrast unchanged. Other values are * linear multipliers on the effect (and values over 1 are permitted). * - * @param {number|undefined} contrast The contrast of the layer. + * @param {number} contrast The contrast of the layer. * @observable * @api */ From 60ea87fdfb773a92d98cbca337253f2138266450 Mon Sep 17 00:00:00 2001 From: Frederic Junod Date: Tue, 27 Jan 2015 14:31:11 +0100 Subject: [PATCH 6/8] Disallowed undefined 'saturation' value --- src/ol/layer/layerbase.js | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/src/ol/layer/layerbase.js b/src/ol/layer/layerbase.js index 896391c081..8c3bb38ee9 100644 --- a/src/ol/layer/layerbase.js +++ b/src/ol/layer/layerbase.js @@ -148,7 +148,7 @@ ol.layer.Base.prototype.getLayerState = function() { contrast: Math.max(contrast, 0), hue: hue, opacity: goog.math.clamp(opacity, 0, 1), - saturation: goog.isDef(saturation) ? Math.max(saturation, 0) : 1, + saturation: Math.max(saturation, 0), sourceState: sourceState, visible: visible, extent: extent, @@ -234,13 +234,12 @@ goog.exportProperty( /** - * @return {number|undefined} The saturation of the layer. + * @return {number} The saturation of the layer. * @observable * @api */ ol.layer.Base.prototype.getSaturation = function() { - return /** @type {number|undefined} */ ( - this.get(ol.layer.LayerProperty.SATURATION)); + return /** @type {number} */ (this.get(ol.layer.LayerProperty.SATURATION)); }; goog.exportProperty( ol.layer.Base.prototype, @@ -397,7 +396,7 @@ goog.exportProperty( * values are linear multipliers of the effect (and values over 1 are * permitted). * - * @param {number|undefined} saturation The saturation of the layer. + * @param {number} saturation The saturation of the layer. * @observable * @api */ From 1d6f7e9504405d3f0c0c42e3ddb7d9f27f54e562 Mon Sep 17 00:00:00 2001 From: Frederic Junod Date: Tue, 27 Jan 2015 18:05:07 +0100 Subject: [PATCH 7/8] 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, From fc3c808209a66955154b63fdd1fd3a9da386e52a Mon Sep 17 00:00:00 2001 From: Frederic Junod Date: Tue, 27 Jan 2015 18:07:08 +0100 Subject: [PATCH 8/8] 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,