tei/MapLibreParticleLab
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fixes #1308: normalize tile memory cache keys & allow dupe inserts

Browse Source
This commit is contained in:
Justin R. Miller
2015-04-22 00:20:03 -07:00
committed by John Firebaugh
parent 55118e5bd7
commit b43ba4089c
2 changed files with 10 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/mbgl/map/source.cpp
View File

@@ -245,7 +245,7 @@ TileData::State Source::addTile(Map &map, Worker &worker,
}
if (!new_tile.data) {
new_tile.data = cache.get(id.to_uint64());
new_tile.data = cache.get(normalized_id.to_uint64());
}
if (!new_tile.data) {
@@ -418,7 +418,7 @@ void Source::update(Map &map,
if (!obsolete) {
retain_data.insert(tile.data->id);
} else if (type != SourceType::Raster && tile.data->ready()) {
tileCache.add(tile.id.to_uint64(), tile.data);
tileCache.add(tile.id.normalized().to_uint64(), tile.data);
}
return obsolete;
});
@@ -432,7 +432,7 @@ void Source::update(Map &map,
bool obsolete = retain_data.find(tile->id) == retain_data.end();
if (obsolete) {
if (!tileCache.has(tile->id.to_uint64())) {
if (!tileCache.has(tile->id.normalized().to_uint64())) {
tile->cancel();
}
return true;

9
src/mbgl/map/tile_cache.cpp
View File

@@ -20,11 +20,16 @@ void TileCache::setSize(size_t size_) {
void TileCache::add(uint64_t key, std::shared_ptr<TileData> data) {
assert(tiles.find(key) == tiles.end());
// insert new or query existing data
if (tiles.emplace(key, data).second) {
// remove existing data key
orderedKeys.remove(key);
}
tiles.emplace(key, data);
// (re-)insert data key as newest
orderedKeys.push_back(key);
// purge oldest key/data if necessary
if (orderedKeys.size() > size) {
get(orderedKeys.front());
}