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

Rename tileUsage to usedTiles

Browse Source
This commit is contained in:
Tom Payne
2013-01-18 16:46:32 +01:00
parent 1c524caae6
commit 3ec2014ad1
7 changed files with 22 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/ol/renderer/canvas/canvastilelayerrenderer.js
View File

@@ -216,7 +216,7 @@ ol.renderer.canvas.TileLayer.prototype.renderFrame =
frameState.animate = true;
}
this.updateTileUsage(frameState.tileUsage, tileSource, z, tileRange);
this.updateUsedTiles(frameState.usedTiles, tileSource, z, tileRange);
this.updateWantedTiles(frameState.wantedTiles, tileSource, z, tileRange);
var transform = this.transform_;

2
src/ol/renderer/dom/domtilelayerrenderer.js
View File

@@ -237,7 +237,7 @@ ol.renderer.dom.TileLayer.prototype.renderFrame =
frameState.animate = true;
}
this.updateTileUsage(frameState.tileUsage, tileSource, z, tileRange);
this.updateUsedTiles(frameState.usedTiles, tileSource, z, tileRange);
this.updateWantedTiles(frameState.wantedTiles, tileSource, z, tileRange);
};

18
src/ol/renderer/layerrenderer.js
View File

@@ -130,25 +130,25 @@ ol.renderer.Layer.prototype.handleLayerVisibleChange = goog.nullFunction;
/**
* @protected
* @param {Object.<string, Object.<string, ol.TileRange>>} tileUsage Tile usage.
* @param {Object.<string, Object.<string, ol.TileRange>>} usedTiles Used tiles.
* @param {ol.source.Source} source Source.
* @param {number} z Z.
* @param {ol.TileRange} tileRange Tile range.
*/
ol.renderer.Layer.prototype.updateTileUsage =
function(tileUsage, source, z, tileRange) {
ol.renderer.Layer.prototype.updateUsedTiles =
function(usedTiles, source, z, tileRange) {
// FIXME should we use tilesToDrawByZ instead?
var sourceKey = goog.getUid(source).toString();
var zKey = z.toString();
if (sourceKey in tileUsage) {
if (zKey in tileUsage[sourceKey]) {
tileUsage[sourceKey][zKey].extend(tileRange);
if (sourceKey in usedTiles) {
if (zKey in usedTiles[sourceKey]) {
usedTiles[sourceKey][zKey].extend(tileRange);
} else {
tileUsage[sourceKey][zKey] = tileRange;
usedTiles[sourceKey][zKey] = tileRange;
}
} else {
tileUsage[sourceKey] = {};
tileUsage[sourceKey][zKey] = tileRange;
usedTiles[sourceKey] = {};
usedTiles[sourceKey][zKey] = tileRange;
}
};

2
src/ol/renderer/webgl/webgltilelayerrenderer.js
View File

@@ -460,7 +460,7 @@ ol.renderer.webgl.TileLayer.prototype.renderFrame =
}
this.updateTileUsage(frameState.tileUsage, tileSource, z, tileRange);
this.updateUsedTiles(frameState.usedTiles, tileSource, z, tileRange);
this.updateWantedTiles(frameState.wantedTiles, tileSource, z, tileRange);
goog.vec.Mat4.makeIdentity(this.matrix_);