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

Change StyleBucket::source to indirect reference

Browse Source 
This eliminates a reference loop: VectorTileData holds StyleLayers which
hold StyleBuckets which held Sources which hold VectorTileDatas. This
breaks the StyleBucket -> Source link in favor of manually resolving the
reference where necessary.
This commit is contained in:
John Firebaugh
2015-06-17 14:08:40 -07:00
committed by Thiago Marcos P. Santos
parent 044454417b
commit 0cce08b67b
6 changed files with 31 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
src/mbgl/map/map_context.cpp
View File

@@ -139,13 +139,7 @@ void MapContext::updateAnnotationTiles(const std::unordered_set<TileID, TileID::
// grab existing, single shape annotations source
const auto& shapeID = AnnotationManager::ShapeLayerID;
const auto source_it = std::find_if(style->sources.begin(), style->sources.end(),
[&shapeID](util::ptr<Source> source) {
return (source->info.source_id == shapeID);
});
assert(source_it != style->sources.end());
source_it->get()->enabled = true;
style->getSource(shapeID)->enabled = true;
// create (if necessary) layers and buckets for each shape
for (const auto &shapeAnnotationID : data.annotationManager.getOrderedShapeAnnotations()) {
@@ -202,8 +196,8 @@ void MapContext::updateAnnotationTiles(const std::unordered_set<TileID, TileID::
// create shape bucket & connect to source
util::ptr<StyleBucket> shapeBucket = std::make_shared<StyleBucket>(shapeLayer->type);
shapeBucket->name = shapeLayer->id;
shapeBucket->source = shapeID;
shapeBucket->source_layer = shapeLayer->id;
shapeBucket->source = *source_it;
// apply line layout properties to bucket
if (shapeStyle.is<LineProperties>()) {