From 3197e278f85334022bd17426e962f53f59e50630 Mon Sep 17 00:00:00 2001
From: Tom Payne <twpayne@gmail.com>
Date: Sat, 6 Apr 2013 19:14:37 +0200
Subject: [PATCH] Be more consistent with layer options

---
 src/ol/layer/imagelayer.js  |  6 +++---
 src/ol/layer/layer.js       | 24 +++++++++---------------
 src/ol/layer/tilelayer.js   |  2 +-
 src/ol/layer/vectorlayer.js | 12 ++++++------
 4 files changed, 19 insertions(+), 25 deletions(-)

diff --git a/src/ol/layer/imagelayer.js b/src/ol/layer/imagelayer.js
index 8b61efce0e..2d2dd1b2b5 100644
--- a/src/ol/layer/imagelayer.js
+++ b/src/ol/layer/imagelayer.js
@@ -8,10 +8,10 @@ goog.require('ol.source.ImageSource');
 /**
  * @constructor
  * @extends {ol.layer.Layer}
- * @param {ol.layer.LayerOptions} layerOptions Layer options.
+ * @param {ol.layer.LayerOptions} options Layer options.
  */
-ol.layer.ImageLayer = function(layerOptions) {
-  goog.base(this, layerOptions);
+ol.layer.ImageLayer = function(options) {
+  goog.base(this, options);
 };
 goog.inherits(ol.layer.ImageLayer, ol.layer.Layer);
 
diff --git a/src/ol/layer/layer.js b/src/ol/layer/layer.js
index cb06bed1ba..6c0166ff3f 100644
--- a/src/ol/layer/layer.js
+++ b/src/ol/layer/layer.js
@@ -38,9 +38,9 @@ ol.layer.LayerState;
 /**
  * @constructor
  * @extends {ol.Object}
- * @param {ol.layer.LayerOptions} layerOptions LayerOptions.
+ * @param {ol.layer.LayerOptions} options Layer options.
  */
-ol.layer.Layer = function(layerOptions) {
+ol.layer.Layer = function(options) {
 
   goog.base(this);
 
@@ -48,20 +48,14 @@ ol.layer.Layer = function(layerOptions) {
    * @private
    * @type {ol.source.Source}
    */
-  this.source_ = layerOptions.source;
+  this.source_ = options.source;
 
-  this.setBrightness(
-      goog.isDef(layerOptions.brightness) ? layerOptions.brightness : 0);
-  this.setContrast(
-      goog.isDef(layerOptions.contrast) ? layerOptions.contrast : 1);
-  this.setHue(
-      goog.isDef(layerOptions.hue) ? layerOptions.hue : 0);
-  this.setOpacity(
-      goog.isDef(layerOptions.opacity) ? layerOptions.opacity : 1);
-  this.setSaturation(
-      goog.isDef(layerOptions.saturation) ? layerOptions.saturation : 1);
-  this.setVisible(
-      goog.isDef(layerOptions.visible) ? layerOptions.visible : true);
+  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);
 
   if (!this.source_.isReady()) {
     goog.events.listenOnce(this.source_, goog.events.EventType.LOAD,
diff --git a/src/ol/layer/tilelayer.js b/src/ol/layer/tilelayer.js
index bc27f66982..bc3ee50d9c 100644
--- a/src/ol/layer/tilelayer.js
+++ b/src/ol/layer/tilelayer.js
@@ -16,7 +16,7 @@ ol.layer.TileLayerProperty = {
 /**
  * @constructor
  * @extends {ol.layer.Layer}
- * @param {ol.layer.TileLayerOptions} options Options.
+ * @param {ol.layer.TileLayerOptions} options Tile layer options.
  */
 ol.layer.TileLayer = function(options) {
 
diff --git a/src/ol/layer/vectorlayer.js b/src/ol/layer/vectorlayer.js
index 9b2a42d9cb..a50719c9ab 100644
--- a/src/ol/layer/vectorlayer.js
+++ b/src/ol/layer/vectorlayer.js
@@ -155,21 +155,21 @@ ol.layer.FeatureCache.prototype.getFeaturesByIds_ = function(ids) {
 /**
  * @constructor
  * @extends {ol.layer.Layer}
- * @param {ol.layer.VectorLayerOptions} layerOptions Layer options.
+ * @param {ol.layer.VectorLayerOptions} options Vector layer options.
  */
-ol.layer.Vector = function(layerOptions) {
+ol.layer.Vector = function(options) {
 
   goog.base(this, {
-    opacity: layerOptions.opacity,
-    source: layerOptions.source,
-    visible: layerOptions.visible
+    opacity: options.opacity,
+    source: options.source,
+    visible: options.visible
   });
 
   /**
    * @private
    * @type {ol.style.Style}
    */
-  this.style_ = goog.isDef(layerOptions.style) ? layerOptions.style : null;
+  this.style_ = goog.isDef(options.style) ? options.style : null;
 
   /**
    * @type {ol.layer.FeatureCache}