Make getLayerStatesArray return an array of layer states

src/ol/layer/layer.js

@@ -57,15 +57,10 @@ ol.layer.Layer.prototype.getLayersArray = function(opt_array) {
 /**
  * @inheritDoc
  */
-ol.layer.Layer.prototype.getLayerStatesArray = function(opt_obj) {
+ol.layer.Layer.prototype.getLayerStatesArray = function(opt_states) {
-  var obj = (goog.isDef(opt_obj)) ? opt_obj : {
+  var states = (goog.isDef(opt_states)) ? opt_states : [];
-    layers: [],
+  states.push(this.getLayerState());
-    layerStates: []
+  return states;
-  };
-  goog.asserts.assert(obj.layers.length === obj.layerStates.length);
-  obj.layers.push(this);
-  obj.layerStates.push(this.getLayerState());
-  return obj;
 };
 
 

src/ol/layer/layerbase.js

@@ -150,14 +150,9 @@ ol.layer.Base.prototype.getLayersArray = goog.abstractMethod;
 
 
 /**
- * @param {{
+ * @param {Array.<ol.layer.LayerState>=} opt_states Optional list of layer
- *     layers: Array.<ol.layer.Layer>,
+ *     states (to be modified in place).
- *     layerStates: Array.<ol.layer.LayerState>}=} opt_obj Object that store
+ * @return {Array.<ol.layer.LayerState>} List of layer states.
- *     both the layers and the layerStates (to be modified in place).
- * @return {{
- *     layers: Array.<ol.layer.Layer>,
- *     layerStates: Array.<ol.layer.LayerState>}} Object that store both the
- *     layers and the layerStates.
  */
 ol.layer.Base.prototype.getLayerStatesArray = goog.abstractMethod;
 

src/ol/layer/layergroup.js

@@ -183,22 +183,19 @@ ol.layer.Group.prototype.getLayersArray = function(opt_array) {
 /**
  * @inheritDoc
  */
-ol.layer.Group.prototype.getLayerStatesArray = function(opt_obj) {
+ol.layer.Group.prototype.getLayerStatesArray = function(opt_states) {
-  var obj = (goog.isDef(opt_obj)) ? opt_obj : {
+  var states = (goog.isDef(opt_states)) ? opt_states : [];
-    layers: [],
+
-    layerStates: []
+  var pos = states.length;
-  };
-  goog.asserts.assert(obj.layers.length === obj.layerStates.length);
-  var pos = obj.layers.length;
 
   this.getLayers().forEach(function(layer) {
-    layer.getLayerStatesArray(obj);
+    layer.getLayerStatesArray(states);
   });
 
   var ownLayerState = this.getLayerState();
   var i, ii, layerState;
-  for (i = pos, ii = obj.layerStates.length; i < ii; i++) {
+  for (i = pos, ii = states.length; i < ii; i++) {
-    layerState = obj.layerStates[i];
+    layerState = states[i];
     layerState.brightness = goog.math.clamp(
         layerState.brightness + ownLayerState.brightness, -1, 1);
     layerState.contrast *= ownLayerState.contrast;
@@ -212,7 +209,7 @@ ol.layer.Group.prototype.getLayerStatesArray = function(opt_obj) {
         layerState.minResolution, ownLayerState.minResolution);
   }
 
-  return obj;
+  return states;
 };
 
 

src/ol/map.js

@@ -1207,14 +1207,10 @@ ol.Map.prototype.renderFrame_ = function(time) {
   if (goog.isDef(size) && hasArea(size) &&
       goog.isDef(view2D) && view2D.isDef()) {
     var viewHints = view.getHints();
-    var obj = this.getLayerGroup().getLayerStatesArray();
+    var layerStatesArray = this.getLayerGroup().getLayerStatesArray();
-    var layersArray = obj.layers;
-    var layerStatesArray = obj.layerStates;
     var layerStates = {};
-    var layer;
+    for (i = 0, ii = layerStatesArray.length; i < ii; ++i) {
-    for (i = 0, ii = layersArray.length; i < ii; ++i) {
+      layerStates[goog.getUid(layerStatesArray[i].layer)] = layerStatesArray[i];
-      layer = layersArray[i];
-      layerStates[goog.getUid(layer)] = layerStatesArray[i];
     }
     view2DState = view2D.getView2DState();
     frameState = /** @type {oli.FrameState} */ ({

src/ol/renderer/maprenderer.js

@@ -97,15 +97,12 @@ ol.renderer.Map.prototype.disposeInternal = function() {
 ol.renderer.Map.prototype.forEachFeatureAtPixel =
     function(coordinate, frameState, callback, thisArg,
         layerFilter, thisArg2) {
-  var obj = this.map_.getLayerGroup().getLayerStatesArray();
+  var layerStates = this.map_.getLayerGroup().getLayerStatesArray();
-  var layers = obj.layers;
+  var numLayers = layerStates.length;
-  var layerStates = obj.layerStates;
-  goog.asserts.assert(layers.length == layerStates.length);
-  var numLayers = layers.length;
   var i;
   for (i = numLayers - 1; i >= 0; --i) {
     var layerState = layerStates[i];
-    var layer = layers[i];
+    var layer = layerState.layer;
     if (layerState.visible && layerFilter.call(thisArg2, layer)) {
       var layerRenderer = this.getLayerRenderer(layer);
       var result = layerRenderer.forEachFeatureAtPixel(

test/spec/ol/layer/layergroup.test.js

@@ -297,19 +297,10 @@ describe('ol.layer.Group', function() {
 
   describe('#getLayerStatesArray', function() {
 
-    var layerGroup;
-    var layersArray;
-    var layerStatesArray;
-    var obj;
-
     it('returns an empty array if no layer', function() {
-      layerGroup = new ol.layer.Group();
+      var layerGroup = new ol.layer.Group();
 
-      obj = layerGroup.getLayerStatesArray();
+      var layerStatesArray = layerGroup.getLayerStatesArray();
-      layersArray = obj.layers;
-      layerStatesArray = obj.layerStates;
-      expect(layersArray).to.be.a(Array);
-      expect(layersArray.length).to.be(0);
       expect(layerStatesArray).to.be.a(Array);
       expect(layerStatesArray.length).to.be(0);
 
@@ -336,17 +327,11 @@ describe('ol.layer.Group', function() {
     });
 
     it('does not transform layerStates by default', function() {
-      layerGroup = new ol.layer.Group({
+      var layerGroup = new ol.layer.Group({
         layers: [layer1, layer2]
       });
 
-      obj = layerGroup.getLayerStatesArray();
+      var layerStatesArray = layerGroup.getLayerStatesArray();
-      layersArray = obj.layers;
-      layerStatesArray = obj.layerStates;
-      expect(layersArray).to.be.a(Array);
-      expect(layersArray.length).to.be(2);
-      expect(layersArray[0]).to.be(layer1);
-      expect(layersArray[1]).to.be(layer2);
       expect(layerStatesArray).to.be.a(Array);
       expect(layerStatesArray.length).to.be(2);
       expect(layerStatesArray[0]).to.eql(layer1.getLayerState());
@@ -364,7 +349,7 @@ describe('ol.layer.Group', function() {
     });
 
     it('transforms layerStates correctly', function() {
-      layerGroup = new ol.layer.Group({
+      var layerGroup = new ol.layer.Group({
         layers: [layer1, layer2],
         brightness: 0.5,
         contrast: 10,
@@ -376,9 +361,7 @@ describe('ol.layer.Group', function() {
         minResolution: 0.2
       });
 
-      obj = layerGroup.getLayerStatesArray();
+      var layerStatesArray = layerGroup.getLayerStatesArray();
-      layersArray = obj.layers;
-      layerStatesArray = obj.layerStates;
 
       // compare layer state to group state
       var groupState, layerState;