Do not expire tiles from source tile caches that are still used by render tiles

This commit is contained in:
Andreas Hocevar
2021-06-15 17:26:24 +02:00
parent 93b5ec9d43
commit 3c4514aabf
2 changed files with 26 additions and 2 deletions

View File

@@ -18,7 +18,7 @@ import {
createXYZ,
extentFromProjection,
} from '../tilegrid.js';
import {fromKey, getKeyZXY} from '../tilecoord.js';
import {fromKey, getCacheKeyForTileKey, getKeyZXY} from '../tilecoord.js';
import {isEmpty} from '../obj.js';
import {loadFeaturesXhr} from '../featureloader.js';
import {toSize} from '../size.js';
@@ -237,8 +237,19 @@ class VectorTile extends UrlTile {
* @param {!Object<string, boolean>} usedTiles Used tiles.
*/
expireCache(projection, usedTiles) {
const tileCache = this.getTileCacheForProjection(projection);
const usedSourceTiles = Object.keys(usedTiles).reduce((acc, key) => {
const cacheKey = getCacheKeyForTileKey(key);
if (tileCache.containsKey(cacheKey)) {
const sourceTiles = tileCache.get(cacheKey).sourceTiles;
for (let i = 0, ii = sourceTiles.length; i < ii; ++i) {
acc[sourceTiles[i].getKey()] = true;
}
}
return acc;
}, {});
super.expireCache(projection, usedTiles);
this.sourceTileCache.expireCache({});
this.sourceTileCache.expireCache(usedSourceTiles);
}
/**

View File

@@ -46,6 +46,19 @@ export function getKey(tileCoord) {
return getKeyZXY(tileCoord[0], tileCoord[1], tileCoord[2]);
}
/**
* Get the tile cache key for a tile key obtained through `tile.getKey()`.
* @param {string} tileKey The tile key.
* @return {string} The cache key.
*/
export function getCacheKeyForTileKey(tileKey) {
const [z, x, y] = tileKey
.substring(tileKey.lastIndexOf('/') + 1, tileKey.length)
.split(',')
.map(Number);
return getKeyZXY(z, x, y);
}
/**
* Get a tile coord given a key.
* @param {string} key The tile coord key.