From 1c344ffa9f933804312e158df01350589a95b250 Mon Sep 17 00:00:00 2001
From: Tom Payne <twpayne@gmail.com>
Date: Mon, 9 Jul 2012 14:26:53 +0200
Subject: [PATCH] s/LayerView/LayerRendererOptions/

---
 doc/ol3.md                     | 14 ++++----
 src/all.js                     |  2 +-
 src/ol/layerrendereroptions.js | 63 ++++++++++++++++++++++++++++++++++
 src/ol/layerview.js            | 61 --------------------------------
 4 files changed, 71 insertions(+), 69 deletions(-)
 create mode 100644 src/ol/layerrendereroptions.js
 delete mode 100644 src/ol/layerview.js

diff --git a/doc/ol3.md b/doc/ol3.md
index 3616345d42..3b78e33c8c 100644
--- a/doc/ol3.md
+++ b/doc/ol3.md
@@ -42,7 +42,7 @@ goog.events.EventTarget
 |  |
 |  +- LayerRenderer
 |  |
-|  +- LayerView
+|  +- LayerRendererOptions
 |  |
 |  +- Map
 |  |
@@ -151,7 +151,7 @@ LayerArray
    getResolutions() -> Array.<number>|null
    getMaxResolution() = this.getResolutions()[0] | null
 
-LayerView
+LayerRendererOptions
    layer Layer
    visible boolean
    opacity number
@@ -238,12 +238,12 @@ Layer
 - A layer advertizes the projections it supports.
 - A layer returns no data if asked data for an unsupported projection.
 
-LayerView
+LayerRendererOptions
 
-- A layer view stores view-related states for a layer.
-- View-related states include visibility, opacity, saturation, hue, etc.
-- A layer view has a layer.
-- Multiple layer views can share the same layer.
+- A layer renderer options object stores view-related states for a layer.
+- Options include visibility, opacity, saturation, hue, etc.
+- A layer renderer options object has a layer.
+- Multiple layer renderer options can share the same layer.
 - In other words a layer can be viewed in different manners.
 
 Renderer
diff --git a/src/all.js b/src/all.js
index f28582c646..1d8f95810e 100644
--- a/src/all.js
+++ b/src/all.js
@@ -5,7 +5,7 @@ goog.require('ol.Bounds');
 goog.require('ol.Camera');
 goog.require('ol.Extent');
 goog.require('ol.Layer');
-goog.require('ol.LayerView');
+goog.require('ol.LayerRendererOptions');
 goog.require('ol.Object');
 goog.require('ol.Projection');
 goog.require('ol.TileBounds');
diff --git a/src/ol/layerrendereroptions.js b/src/ol/layerrendereroptions.js
new file mode 100644
index 0000000000..f3922b3de8
--- /dev/null
+++ b/src/ol/layerrendereroptions.js
@@ -0,0 +1,63 @@
+goog.provide('ol.LayerRendererOptions');
+
+goog.require('ol.Object');
+
+
+/**
+ * @enum {string}
+ * @private
+ */
+ol.LayerRendererOptionsProperty_ = {
+  OPACITY: 'opacity',
+  VISIBLE: 'visible'
+};
+
+
+
+/**
+ * @constructor
+ * @extends {ol.Object}
+ */
+ol.LayerRendererOptions = function() {
+
+  goog.base(this);
+
+  this.setVisible(true);
+  this.setOpacity(1);
+
+};
+goog.inherits(ol.LayerRendererOptions, ol.Object);
+
+
+/**
+ * @return {number} Opacity.
+ */
+ol.LayerRendererOptions.prototype.getOpacity = function() {
+  return /** @type {number} */ (
+      this.get(ol.LayerRendererOptionsProperty_.OPACITY));
+};
+
+
+/**
+ * @return {boolean} Visible.
+ */
+ol.LayerRendererOptions.prototype.getVisible = function() {
+  return /** @type {boolean} */ (
+      this.get(ol.LayerRendererOptionsProperty_.VISIBLE));
+};
+
+
+/**
+ * @param {number} opacity Opacity.
+ */
+ol.LayerRendererOptions.prototype.setOpacity = function(opacity) {
+  this.set(ol.LayerRendererOptionsProperty_.OPACITY, opacity);
+};
+
+
+/**
+ * @param {boolean} visible Visible.
+ */
+ol.LayerRendererOptions.prototype.setVisible = function(visible) {
+  this.set(ol.LayerRendererOptionsProperty_.VISIBLE, visible);
+};
diff --git a/src/ol/layerview.js b/src/ol/layerview.js
deleted file mode 100644
index b5a3e6cf25..0000000000
--- a/src/ol/layerview.js
+++ /dev/null
@@ -1,61 +0,0 @@
-goog.provide('ol.LayerView');
-
-goog.require('ol.Object');
-
-
-/**
- * @enum {string}
- * @private
- */
-ol.LayerViewProperty_ = {
-  OPACITY: 'opacity',
-  VISIBLE: 'visible'
-};
-
-
-
-/**
- * @constructor
- * @extends {ol.Object}
- */
-ol.LayerView = function() {
-
-  goog.base(this);
-
-  this.setVisible(true);
-  this.setOpacity(1);
-
-};
-goog.inherits(ol.LayerView, ol.Object);
-
-
-/**
- * @return {number} Opacity.
- */
-ol.LayerView.prototype.getOpacity = function() {
-  return /** @type {number} */ (this.get(ol.LayerViewProperty_.OPACITY));
-};
-
-
-/**
- * @return {boolean} Visible.
- */
-ol.LayerView.prototype.getVisible = function() {
-  return /** @type {boolean} */ (this.get(ol.LayerViewProperty_.VISIBLE));
-};
-
-
-/**
- * @param {number} opacity Opacity.
- */
-ol.LayerView.prototype.setOpacity = function(opacity) {
-  this.set(ol.LayerViewProperty_.OPACITY, opacity);
-};
-
-
-/**
- * @param {boolean} visible Visible.
- */
-ol.LayerView.prototype.setVisible = function(visible) {
-  this.set(ol.LayerViewProperty_.VISIBLE, visible);
-};