Prune unused layers from CrossTileSymbolIndex

Fixes issue #10939 -- removed layers would leak entries in the CrossTileSymbolIndex.
This commit is contained in:
Chris Loer
2018-01-19 11:38:31 -08:00
committed by Chris Loer
parent 7c2e8c5eb1
commit b2e71abfee
3 changed files with 16 additions and 0 deletions

View File

@@ -382,8 +382,10 @@ void Renderer::Impl::render(const UpdateParameters& updateParameters) {
bool placementChanged = false;
if (!placement->stillRecent(parameters.timePoint)) {
auto newPlacement = std::make_unique<Placement>(parameters.state, parameters.mapMode);
std::set<std::string> usedSymbolLayers;
for (auto it = order.rbegin(); it != order.rend(); ++it) {
if (it->layer.is<RenderSymbolLayer>()) {
usedSymbolLayers.insert(it->layer.getID());
newPlacement->placeLayer(*it->layer.as<RenderSymbolLayer>(), parameters.projMatrix, parameters.debugOptions & MapDebugOptions::Collision);
}
}
@@ -393,6 +395,7 @@ void Renderer::Impl::render(const UpdateParameters& updateParameters) {
// started. If we violate this assumption, then we need to either make CollisionIndex completely independendent of
// FeatureIndex, or find a way for its entries to point to multiple FeatureIndexes.
commitFeatureIndexes();
crossTileSymbolIndex.pruneUnusedLayers(usedSymbolLayers);
if (placementChanged || symbolBucketsChanged) {
placement = std::move(newPlacement);
}