From 6fe80c41116ab4265bef7a2046f15f9d5fb1e89c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C3=89ric=20Lemoine?= Date: Tue, 28 Oct 2014 14:22:27 +0100 Subject: [PATCH] Use correct layer property names --- src/ol/layer/layerbase.js | 42 ++++++++++++++++++--------------------- 1 file changed, 19 insertions(+), 23 deletions(-) diff --git a/src/ol/layer/layerbase.js b/src/ol/layer/layerbase.js index ac63c7dc80..a7722e84d2 100644 --- a/src/ol/layer/layerbase.js +++ b/src/ol/layer/layerbase.js @@ -60,30 +60,26 @@ ol.layer.Base = function(options) { goog.base(this); + /** + * @type {Object.} + */ var properties = goog.object.clone(options); - - /** @type {number} */ - properties.brightness = goog.isDef(properties.brightness) ? - properties.brightness : 0; - /** @type {number} */ - properties.contrast = goog.isDef(properties.contrast) ? - properties.contrast : 1; - /** @type {number} */ - properties.hue = goog.isDef(properties.hue) ? properties.hue : 0; - /** @type {number} */ - properties.opacity = goog.isDef(properties.opacity) ? properties.opacity : 1; - /** @type {number} */ - properties.saturation = goog.isDef(properties.saturation) ? - properties.saturation : 1; - /** @type {boolean} */ - properties.visible = goog.isDef(properties.visible) ? - properties.visible : true; - /** @type {number} */ - properties.maxResolution = goog.isDef(properties.maxResolution) ? - properties.maxResolution : Infinity; - /** @type {number} */ - properties.minResolution = goog.isDef(properties.minResolution) ? - properties.minResolution : 0; + properties[ol.layer.LayerProperty.BRIGHTNESS] = + goog.isDef(options.brightness) ? options.brightness : 0; + properties[ol.layer.LayerProperty.CONTRAST] = + goog.isDef(options.contrast) ? options.contrast : 1; + properties[ol.layer.LayerProperty.HUE] = + goog.isDef(options.hue) ? options.hue : 0; + properties[ol.layer.LayerProperty.OPACITY] = + goog.isDef(options.opacity) ? options.opacity : 1; + properties[ol.layer.LayerProperty.SATURATION] = + goog.isDef(options.saturation) ? options.saturation : 1; + properties[ol.layer.LayerProperty.VISIBLE] = + goog.isDef(options.visible) ? options.visible : true; + properties[ol.layer.LayerProperty.MAX_RESOLUTION] = + goog.isDef(options.maxResolution) ? options.maxResolution : Infinity; + properties[ol.layer.LayerProperty.MIN_RESOLUTION] = + goog.isDef(options.minResolution) ? options.minResolution : 0; this.setProperties(properties); };