Move Layer into ol.layer namespace.

src/ol/layer/layer.js

@@ -0,0 +1,228 @@
+goog.provide('ol.layer.Layer');
+goog.provide('ol.layer.LayerProperty');
+
+goog.require('goog.math');
+goog.require('ol.Object');
+goog.require('ol.Store');
+
+
+/**
+ * @enum {string}
+ */
+ol.layer.LayerProperty = {
+  BRIGHTNESS: 'brightness',
+  CONTRAST: 'contrast',
+  HUE: 'hue',
+  OPACITY: 'opacity',
+  SATURATION: 'saturation',
+  VISIBLE: 'visible'
+};
+
+
+
+/**
+ * @constructor
+ * @extends {ol.Object}
+ * @param {ol.Store} store Store.
+ * @param {Object.<string, *>=} opt_values Values.
+ */
+ol.layer.Layer = function(store, opt_values) {
+
+  goog.base(this);
+
+  /**
+   * @private
+   * @type {ol.Store}
+   */
+  this.store_ = store;
+
+  this.setBrightness(0);
+  this.setContrast(0);
+  this.setHue(0);
+  this.setOpacity(1);
+  this.setSaturation(0);
+  this.setVisible(true);
+
+  if (goog.isDef(opt_values)) {
+    this.setValues(opt_values);
+  }
+
+};
+goog.inherits(ol.layer.Layer, ol.Object);
+
+
+/**
+ * @return {number} Brightness.
+ */
+ol.layer.Layer.prototype.getBrightness = function() {
+  return /** @type {number} */ this.get(ol.layer.LayerProperty.BRIGHTNESS);
+};
+goog.exportProperty(
+    ol.layer.Layer.prototype,
+    'getBrightness',
+    ol.layer.Layer.prototype.getBrightness);
+
+
+/**
+ * @return {number} Contrast.
+ */
+ol.layer.Layer.prototype.getContrast = function() {
+  return /** @type {number} */ this.get(ol.layer.LayerProperty.CONTRAST);
+};
+goog.exportProperty(
+    ol.layer.Layer.prototype,
+    'getContrast',
+    ol.layer.Layer.prototype.getContrast);
+
+
+/**
+ * @return {number} Hue.
+ */
+ol.layer.Layer.prototype.getHue = function() {
+  return /** @type {number} */ this.get(ol.layer.LayerProperty.HUE);
+};
+goog.exportProperty(
+    ol.layer.Layer.prototype,
+    'getHue',
+    ol.layer.Layer.prototype.getHue);
+
+
+/**
+ * @return {number} Opacity.
+ */
+ol.layer.Layer.prototype.getOpacity = function() {
+  return /** @type {number} */ this.get(ol.layer.LayerProperty.OPACITY);
+};
+goog.exportProperty(
+    ol.layer.Layer.prototype,
+    'getOpacity',
+    ol.layer.Layer.prototype.getOpacity);
+
+
+/**
+ * @return {number} Saturation.
+ */
+ol.layer.Layer.prototype.getSaturation = function() {
+  return /** @type {number} */ this.get(ol.layer.LayerProperty.SATURATION);
+};
+goog.exportProperty(
+    ol.layer.Layer.prototype,
+    'getSaturation',
+    ol.layer.Layer.prototype.getSaturation);
+
+
+/**
+ * @return {ol.Store} Store.
+ */
+ol.layer.Layer.prototype.getStore = function() {
+  return this.store_;
+};
+
+
+/**
+ * @return {boolean} Visible.
+ */
+ol.layer.Layer.prototype.getVisible = function() {
+  return /** @type {boolean} */ this.get(ol.layer.LayerProperty.VISIBLE);
+};
+goog.exportProperty(
+    ol.layer.Layer.prototype,
+    'getVisible',
+    ol.layer.Layer.prototype.getVisible);
+
+
+/**
+ * @return {boolean} Is ready.
+ */
+ol.layer.Layer.prototype.isReady = function() {
+  return this.getStore().isReady();
+};
+
+
+/**
+ * @param {number} brightness Brightness.
+ */
+ol.layer.Layer.prototype.setBrightness = function(brightness) {
+  brightness = goog.math.clamp(brightness, -1, 1);
+  if (brightness != this.getBrightness()) {
+    this.set(ol.layer.LayerProperty.BRIGHTNESS, brightness);
+  }
+};
+goog.exportProperty(
+    ol.layer.Layer.prototype,
+    'setBrightness',
+    ol.layer.Layer.prototype.setBrightness);
+
+
+/**
+ * @param {number} contrast Contrast.
+ */
+ol.layer.Layer.prototype.setContrast = function(contrast) {
+  contrast = goog.math.clamp(contrast, -1, 1);
+  if (contrast != this.getContrast()) {
+    this.set(ol.layer.LayerProperty.CONTRAST, contrast);
+  }
+};
+goog.exportProperty(
+    ol.layer.Layer.prototype,
+    'setContrast',
+    ol.layer.Layer.prototype.setContrast);
+
+
+/**
+ * @param {number} hue Hue.
+ */
+ol.layer.Layer.prototype.setHue = function(hue) {
+  if (hue != this.getHue()) {
+    this.set(ol.layer.LayerProperty.HUE, hue);
+  }
+};
+goog.exportProperty(
+    ol.layer.Layer.prototype,
+    'setHue',
+    ol.layer.Layer.prototype.setHue);
+
+
+/**
+ * @param {number} opacity Opacity.
+ */
+ol.layer.Layer.prototype.setOpacity = function(opacity) {
+  opacity = goog.math.clamp(opacity, 0, 1);
+  if (opacity != this.getOpacity()) {
+    this.set(ol.layer.LayerProperty.OPACITY, opacity);
+  }
+};
+goog.exportProperty(
+    ol.layer.Layer.prototype,
+    'setOpacity',
+    ol.layer.Layer.prototype.setOpacity);
+
+
+/**
+ * @param {number} saturation Saturation.
+ */
+ol.layer.Layer.prototype.setSaturation = function(saturation) {
+  saturation = goog.math.clamp(saturation, -1, 1);
+  if (saturation != this.getSaturation()) {
+    this.set(ol.layer.LayerProperty.SATURATION, saturation);
+  }
+};
+goog.exportProperty(
+    ol.layer.Layer.prototype,
+    'setSaturation',
+    ol.layer.Layer.prototype.setSaturation);
+
+
+/**
+ * @param {boolean} visible Visible.
+ */
+ol.layer.Layer.prototype.setVisible = function(visible) {
+  visible = !!visible;
+  if (visible != this.getVisible()) {
+    this.set(ol.layer.LayerProperty.VISIBLE, visible);
+  }
+};
+goog.exportProperty(
+    ol.layer.Layer.prototype,
+    'setVisible',
+    ol.layer.Layer.prototype.setVisible);

src/ol/layer/xyz.js

@@ -5,7 +5,7 @@ goog.provide('ol.tilestore.XYZ');
 goog.require('goog.math');
 goog.require('ol.Attribution');
 goog.require('ol.Coordinate');
-goog.require('ol.Layer');
+goog.require('ol.layer.Layer');
 goog.require('ol.Projection');
 goog.require('ol.Size');
 goog.require('ol.TileCoord');