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

Merge pull request #61 from twpayne/z-sort-in-dom-renderer

Browse Source 
Z sort in dom renderer
This commit is contained in:
Tim Schaub
2012-10-17 21:24:40 -07:00
parent e21c182641 3e6d374859
commit eef4eb0eea
1 changed files with 10 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
src/ol/renderer/dom/tilelayer.js
View File

@@ -169,10 +169,10 @@ ol.renderer.dom.TileLayer.prototype.render = function() {
}
/**
* @type {Object.<string, Object.<string, ol.Tile>>}
* @type {Object.<number, Object.<string, ol.Tile>>}
*/
var tilesToDrawByZ = {};
tilesToDrawByZ[String(z)] = {};
tilesToDrawByZ[z] = {};
var tileRange =
tileGrid.getTileRangeForExtentAndResolution(mapExtent, mapResolution);
@@ -188,7 +188,7 @@ ol.renderer.dom.TileLayer.prototype.render = function() {
var key = tile.tileCoord.toString();
if (tile.getState() == ol.TileState.LOADED) {
tilesToDrawByZ[String(z)][key] = tile;
tilesToDrawByZ[z][key] = tile;
return;
} else {
if (!(key in this.loadingTiles_)) {
@@ -198,7 +198,7 @@ ol.renderer.dom.TileLayer.prototype.render = function() {
tile.load();
}
// TODO: only append after load?
tilesToDrawByZ[String(z)][key] = tile;
tilesToDrawByZ[z][key] = tile;
}
/**
@@ -210,12 +210,10 @@ ol.renderer.dom.TileLayer.prototype.render = function() {
tileGrid.forEachTileCoordParentTileRange(
tileCoord,
function(altZ, altTileRange) {
altZ = String(altZ);
var fullyCovered = true;
altTileRange.forEachTileCoord(altZ, function(altTileCoord) {
var tileKey = altTileCoord.toString();
if (tilesToDrawByZ[altZ] &&
tilesToDrawByZ[altZ][tileKey]) {
if (tilesToDrawByZ[altZ] && tilesToDrawByZ[altZ][tileKey]) {
return;
}
var altTile = tileSource.getTile(altTileCoord);
@@ -234,16 +232,17 @@ ol.renderer.dom.TileLayer.prototype.render = function() {
}, this);
var zs = goog.object.getKeys(tilesToDrawByZ);
zs.sort(function(a, b) {return a - b});
/** @type {Array.<number>} */
var zs = goog.array.map(goog.object.getKeys(tilesToDrawByZ), Number);
goog.array.sort(zs);
var fragment = document.createDocumentFragment();
var altFragment = document.createDocumentFragment();
var newTiles = false;
var newAltTiles = false;
for (var i = 0, ii = zs.length; i < ii; ++i) {
var tileZ = +zs[i];
var tilesToDraw = tilesToDrawByZ[String(tileZ)];
var tileZ = zs[i];
var tilesToDraw = tilesToDrawByZ[tileZ];
var tileOffset = this.getTileOffset_(tileZ, mapResolution);
for (var key in tilesToDraw) {
var tile = tilesToDraw[key];