From cd13e700acf82706a2207749ed4acd2152b0bc93 Mon Sep 17 00:00:00 2001
From: Frederic Junod <frederic.junod@camptocamp.com>
Date: Tue, 25 Jun 2013 12:12:03 +0200
Subject: [PATCH] Pass options to the base class

---
 src/ol/layer/layer.js            | 18 ++++++++++++------
 test/spec/ol/layer/layer.test.js |  4 +++-
 2 files changed, 15 insertions(+), 7 deletions(-)

diff --git a/src/ol/layer/layer.js b/src/ol/layer/layer.js
index b5f69761f1..ec9d5fe960 100644
--- a/src/ol/layer/layer.js
+++ b/src/ol/layer/layer.js
@@ -5,6 +5,7 @@ goog.provide('ol.layer.LayerState');
 goog.require('goog.events');
 goog.require('goog.events.EventType');
 goog.require('goog.math');
+goog.require('goog.object');
 goog.require('ol.Object');
 goog.require('ol.source.Source');
 
@@ -50,12 +51,17 @@ ol.layer.Layer = function(options) {
    */
   this.source_ = options.source;
 
-  this.setBrightness(goog.isDef(options.brightness) ? options.brightness : 0);
-  this.setContrast(goog.isDef(options.contrast) ? options.contrast : 1);
-  this.setHue(goog.isDef(options.hue) ? options.hue : 0);
-  this.setOpacity(goog.isDef(options.opacity) ? options.opacity : 1);
-  this.setSaturation(goog.isDef(options.saturation) ? options.saturation : 1);
-  this.setVisible(goog.isDef(options.visible) ? options.visible : true);
+  var values = goog.object.clone(options);
+  delete values.source;
+
+  values.brightness = goog.isDef(values.brightness) ? values.brightness : 0;
+  values.contrast = goog.isDef(values.contrast) ? values.contrast : 1;
+  values.hue = goog.isDef(values.hue) ? values.hue : 0;
+  values.opacity = goog.isDef(values.opacity) ? values.opacity : 1;
+  values.saturation = goog.isDef(values.saturation) ? values.saturation : 1;
+  values.visible = goog.isDef(values.visible) ? values.visible : true;
+
+  this.setValues(values);
 
   if (!this.source_.isReady()) {
     goog.events.listenOnce(this.source_, goog.events.EventType.LOAD,
diff --git a/test/spec/ol/layer/layer.test.js b/test/spec/ol/layer/layer.test.js
index 2f23523426..218e88b7c3 100644
--- a/test/spec/ol/layer/layer.test.js
+++ b/test/spec/ol/layer/layer.test.js
@@ -60,7 +60,8 @@ describe('ol.layer.Layer', function() {
         hue: 180,
         opacity: 0.5,
         saturation: 5,
-        visible: false
+        visible: false,
+        foo: 42
       });
 
       expect(layer.getBrightness()).to.be(0.5);
@@ -69,6 +70,7 @@ describe('ol.layer.Layer', function() {
       expect(layer.getOpacity()).to.be(0.5);
       expect(layer.getSaturation()).to.be(5);
       expect(layer.getVisible()).to.be(false);
+      expect(layer.get('foo')).to.be(42);
 
       goog.dispose(layer);
     });