Remove layers array from frame state

This commit is contained in:
Tim Schaub
2014-04-03 12:02:58 -06:00
parent aa3a20e911
commit 78324fb54b
3 changed files with 3 additions and 8 deletions

View File

@@ -64,10 +64,6 @@ oli.FrameState.prototype.focus;
oli.FrameState.prototype.index; oli.FrameState.prototype.index;
/** @type {Array.<ol.layer.Layer>} */
oli.FrameState.prototype.layersArray;
/** @type {Object.<number, ol.layer.LayerState>} */ /** @type {Object.<number, ol.layer.LayerState>} */
oli.FrameState.prototype.layerStates; oli.FrameState.prototype.layerStates;

View File

@@ -74,13 +74,13 @@ ol.control.Attribution.prototype.getSourceAttributions =
function(frameState) { function(frameState) {
var i, ii, j, jj, tileRanges, source, sourceAttribution, var i, ii, j, jj, tileRanges, source, sourceAttribution,
sourceAttributionKey, sourceAttributions, sourceKey; sourceAttributionKey, sourceAttributions, sourceKey;
var layers = frameState.layersArray; var layerStatesArray = frameState.layerStatesArray;
/** @type {Object.<string, ol.Attribution>} */ /** @type {Object.<string, ol.Attribution>} */
var attributions = goog.object.clone(frameState.attributions); var attributions = goog.object.clone(frameState.attributions);
/** @type {Object.<string, ol.Attribution>} */ /** @type {Object.<string, ol.Attribution>} */
var hiddenAttributions = {}; var hiddenAttributions = {};
for (i = 0, ii = layers.length; i < ii; i++) { for (i = 0, ii = layerStatesArray.length; i < ii; i++) {
source = layers[i].getSource(); source = layerStatesArray[i].layer.getSource();
sourceKey = goog.getUid(source).toString(); sourceKey = goog.getUid(source).toString();
sourceAttributions = source.getAttributions(); sourceAttributions = source.getAttributions();
if (goog.isNull(sourceAttributions)) { if (goog.isNull(sourceAttributions)) {

View File

@@ -1224,7 +1224,6 @@ ol.Map.prototype.renderFrame_ = function(time) {
extent: null, extent: null,
focus: goog.isNull(this.focus_) ? view2DState.center : this.focus_, focus: goog.isNull(this.focus_) ? view2DState.center : this.focus_,
index: this.frameIndex_++, index: this.frameIndex_++,
layersArray: layersArray,
layerStates: layerStates, layerStates: layerStates,
layerStatesArray: layerStatesArray, layerStatesArray: layerStatesArray,
logos: {}, logos: {},