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

Make it explicit that functions operate on tile sources

Browse Source
This commit is contained in:
Tom Payne
2013-02-21 16:12:45 +01:00
parent 528caa08c2
commit e513b8cc39
1 changed files with 15 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -14,7 +14,6 @@ goog.require('ol.TileState');
goog.require('ol.layer.Layer'); goog.require('ol.layer.Layer');
goog.require('ol.layer.LayerProperty'); goog.require('ol.layer.LayerProperty');
goog.require('ol.layer.LayerState'); goog.require('ol.layer.LayerState');
goog.require('ol.source.Source');
goog.require('ol.source.TileSource'); goog.require('ol.source.TileSource');
@@ -222,24 +221,24 @@ ol.renderer.Layer.prototype.updateAttributions =
/** /**
* @protected * @protected
* @param {Object.<string, Object.<string, ol.TileRange>>} usedTiles Used tiles. * @param {Object.<string, Object.<string, ol.TileRange>>} usedTiles Used tiles.
* @param {ol.source.Source} source Source. * @param {ol.source.TileSource} tileSource Tile source.
* @param {number} z Z. * @param {number} z Z.
* @param {ol.TileRange} tileRange Tile range. * @param {ol.TileRange} tileRange Tile range.
*/ */
ol.renderer.Layer.prototype.updateUsedTiles = ol.renderer.Layer.prototype.updateUsedTiles =
function(usedTiles, source, z, tileRange) { function(usedTiles, tileSource, z, tileRange) {
// FIXME should we use tilesToDrawByZ instead? // FIXME should we use tilesToDrawByZ instead?
var sourceKey = goog.getUid(source).toString(); var tileSourceKey = goog.getUid(tileSource).toString();
var zKey = z.toString(); var zKey = z.toString();
if (sourceKey in usedTiles) { if (tileSourceKey in usedTiles) {
if (zKey in usedTiles[sourceKey]) { if (zKey in usedTiles[tileSourceKey]) {
usedTiles[sourceKey][zKey].extend(tileRange); usedTiles[tileSourceKey][zKey].extend(tileRange);
} else { } else {
usedTiles[sourceKey][zKey] = tileRange; usedTiles[tileSourceKey][zKey] = tileRange;
} }
} else { } else {
usedTiles[sourceKey] = {}; usedTiles[tileSourceKey] = {};
usedTiles[sourceKey][zKey] = tileRange; usedTiles[tileSourceKey][zKey] = tileRange;
} }
}; };
@@ -247,15 +246,15 @@ ol.renderer.Layer.prototype.updateUsedTiles =
/** /**
* @protected * @protected
* @param {Object.<string, Object.<string, boolean>>} wantedTiles Wanted tiles. * @param {Object.<string, Object.<string, boolean>>} wantedTiles Wanted tiles.
* @param {ol.source.Source} source Source. * @param {ol.source.TileSource} tileSource Tile source.
* @param {ol.TileCoord} tileCoord Tile coordinate. * @param {ol.TileCoord} tileCoord Tile coordinate.
*/ */
ol.renderer.Layer.prototype.updateWantedTiles = ol.renderer.Layer.prototype.updateWantedTiles =
function(wantedTiles, source, tileCoord) { function(wantedTiles, tileSource, tileCoord) {
var sourceKey = goog.getUid(source).toString(); var tileSourceKey = goog.getUid(tileSource).toString();
var coordKey = tileCoord.toString(); var coordKey = tileCoord.toString();
if (!(sourceKey in wantedTiles)) { if (!(tileSourceKey in wantedTiles)) {
wantedTiles[sourceKey] = {}; wantedTiles[tileSourceKey] = {};
} }
wantedTiles[sourceKey][coordKey] = true; wantedTiles[tileSourceKey][coordKey] = true;
}; };