[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, 1 insertions, 1 deletions

diff --git a/src/mbgl/style/style.hpp b/src/mbgl/style/style.hpp
index bc1d52eed8..5d3c2899fd 100644
--- a/src/mbgl/style/style.hpp
+++ b/src/mbgl/style/style.hpp
@@ -125,6 +125,7 @@ public:
     RenderSource* getRenderSource(const std::string& id) const;
 
 private:
+    std::unordered_map<std::string, std::unique_ptr<style::Image>> images;
     std::vector<std::unique_ptr<Source>> sources;
     std::vector<std::unique_ptr<Layer>> layers;
     TransitionOptions transitionOptions;
@@ -150,7 +151,6 @@ private:
     void onGlyphsError(const FontStack&, const GlyphRange&, std::exception_ptr) override;
 
     // SpriteLoaderObserver implementation.
-    std::unordered_map<std::string, std::unique_ptr<style::Image>> spriteImages;
     void onSpriteLoaded(std::vector<std::unique_ptr<Image>>&&) override;
     void onSpriteError(std::exception_ptr) override;