[core] Don't use a separate SpriteAtlas for annotation images

Instead, just add them to the Style as needed. Includes changes from #8905 and takes care to avoid regressing #3817.

1 files changed, 2 insertions, 5 deletions

diff --git a/src/mbgl/tile/geometry_tile.cpp b/src/mbgl/tile/geometry_tile.cpp
index e3c4e7bf3b..d25d93d6b8 100644
--- a/src/mbgl/tile/geometry_tile.cpp
+++ b/src/mbgl/tile/geometry_tile.cpp
@@ -139,9 +139,6 @@ void GeometryTile::onPlacement(PlacementResult result) {
         pending = false;
     }
     symbolBuckets = std::move(result.symbolBuckets);
-    for (auto& entry : symbolBuckets) {
-        dynamic_cast<SymbolBucket*>(entry.second.get())->spriteAtlas = &spriteAtlas;
-    }
     collisionTile = std::move(result.collisionTile);
     observer->onTileChanged(*this);
 }
@@ -165,8 +162,8 @@ void GeometryTile::onIconsAvailable(IconMap icons) {
     worker.invoke(&GeometryTileWorker::onIconsAvailable, std::move(icons));
 }
 
-void GeometryTile::getIcons(IconDependencies) {
-    spriteAtlas.getIcons(*this);
+void GeometryTile::getIcons(IconDependencies iconDependencies) {
+    spriteAtlas.getIcons(*this, std::move(iconDependencies));
 }
 
 Bucket* GeometryTile::getBucket(const Layer::Impl& layer) const {