ashatora/openlayers
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Pass options to the base class

Browse Source
This commit is contained in:
Frederic Junod
2013-06-25 12:12:03 +02:00
parent a427719a22
commit cd13e700ac
2 changed files with 15 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/ol/layer/layer.js
+12 -6
View File
@@ -5,6 +5,7 @@ goog.provide('ol.layer.LayerState');
goog.require('goog.events'); goog.require('goog.events');
goog.require('goog.events.EventType'); goog.require('goog.events.EventType');
goog.require('goog.math'); goog.require('goog.math');
goog.require('goog.object');
goog.require('ol.Object'); goog.require('ol.Object');
goog.require('ol.source.Source'); goog.require('ol.source.Source');
@@ -50,12 +51,17 @@ ol.layer.Layer = function(options) {
*/ */
this.source_ = options.source; this.source_ = options.source;
this.setBrightness(goog.isDef(options.brightness) ? options.brightness : 0); var values = goog.object.clone(options);
this.setContrast(goog.isDef(options.contrast) ? options.contrast : 1); delete values.source;
this.setHue(goog.isDef(options.hue) ? options.hue : 0);
this.setOpacity(goog.isDef(options.opacity) ? options.opacity : 1); values.brightness = goog.isDef(values.brightness) ? values.brightness : 0;
this.setSaturation(goog.isDef(options.saturation) ? options.saturation : 1); values.contrast = goog.isDef(values.contrast) ? values.contrast : 1;
this.setVisible(goog.isDef(options.visible) ? options.visible : true); 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()) { if (!this.source_.isReady()) {
goog.events.listenOnce(this.source_, goog.events.EventType.LOAD, goog.events.listenOnce(this.source_, goog.events.EventType.LOAD,
test/spec/ol/layer/layer.test.js
+3 -1
View File
@@ -60,7 +60,8 @@ describe('ol.layer.Layer', function() {
hue: 180, hue: 180,
opacity: 0.5, opacity: 0.5,
saturation: 5, saturation: 5,
visible: false visible: false,
foo: 42
}); });
expect(layer.getBrightness()).to.be(0.5); 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.getOpacity()).to.be(0.5);
expect(layer.getSaturation()).to.be(5); expect(layer.getSaturation()).to.be(5);
expect(layer.getVisible()).to.be(false); expect(layer.getVisible()).to.be(false);
expect(layer.get('foo')).to.be(42);
goog.dispose(layer); goog.dispose(layer);
}); });