1 files changed, 24 insertions, 16 deletions
diff --git a/src/mbgl/annotation/annotation_manager.hpp b/src/mbgl/annotation/annotation_manager.hpp
index 0ab43bec15..a028a8f1ba 100644
--- a/src/mbgl/annotation/annotation_manager.hpp
+++ b/src/mbgl/annotation/annotation_manager.hpp
@@ -2,13 +2,14 @@
 
 #include <mbgl/annotation/annotation.hpp>
 #include <mbgl/annotation/symbol_annotation_impl.hpp>
-#include <mbgl/sprite/sprite_atlas.hpp>
-#include <mbgl/map/update.hpp>
+#include <mbgl/style/image.hpp>
 #include <mbgl/util/noncopyable.hpp>
 
+#include <mutex>
 #include <string>
 #include <vector>
 #include <unordered_set>
+#include <unordered_map>
 
 namespace mbgl {
 
@@ -20,24 +21,24 @@ class ShapeAnnotationImpl;
 
 namespace style {
 class Style;
-class Image;
 } // namespace style
 
 class AnnotationManager : private util::noncopyable {
 public:
-    AnnotationManager(float pixelRatio);
+    AnnotationManager(style::Style&);
     ~AnnotationManager();
 
     AnnotationID addAnnotation(const Annotation&, const uint8_t maxZoom);
-    Update updateAnnotation(const AnnotationID&, const Annotation&, const uint8_t maxZoom);
+    bool updateAnnotation(const AnnotationID&, const Annotation&, const uint8_t maxZoom);
     void removeAnnotation(const AnnotationID&);
 
-    void addImage(const std::string&, std::unique_ptr<style::Image>);
+    void addImage(std::unique_ptr<style::Image>);
     void removeImage(const std::string&);
     double getTopOffsetPixelsForImage(const std::string&);
-    SpriteAtlas& getSpriteAtlas() { return spriteAtlas; }
 
-    void updateStyle(style::Style&);
+    void setStyle(style::Style&);
+    void onStyleLoaded();
+
     void updateData();
 
     void addTile(AnnotationTile&);
@@ -50,17 +51,23 @@ private:
     void add(const AnnotationID&, const SymbolAnnotation&, const uint8_t);
     void add(const AnnotationID&, const LineAnnotation&, const uint8_t);
     void add(const AnnotationID&, const FillAnnotation&, const uint8_t);
-    void add(const AnnotationID&, const StyleSourcedAnnotation&, const uint8_t);
 
-    Update update(const AnnotationID&, const SymbolAnnotation&, const uint8_t);
-    Update update(const AnnotationID&, const LineAnnotation&, const uint8_t);
-    Update update(const AnnotationID&, const FillAnnotation&, const uint8_t);
-    Update update(const AnnotationID&, const StyleSourcedAnnotation&, const uint8_t);
+    void update(const AnnotationID&, const SymbolAnnotation&, const uint8_t);
+    void update(const AnnotationID&, const LineAnnotation&, const uint8_t);
+    void update(const AnnotationID&, const FillAnnotation&, const uint8_t);
+
+    void remove(const AnnotationID&);
 
-    void removeAndAdd(const AnnotationID&, const Annotation&, const uint8_t);
+    void updateStyle();
 
     std::unique_ptr<AnnotationTileData> getTileData(const CanonicalTileID&);
 
+    std::reference_wrapper<style::Style> style;
+
+    std::mutex mutex;
+
+    bool dirty = false;
+    
     AnnotationID nextID = 0;
 
     using SymbolAnnotationTree = boost::geometry::index::rtree<std::shared_ptr<const SymbolAnnotationImpl>, boost::geometry::index::rstar<16, 4>>;
@@ -68,13 +75,14 @@ private:
     // <https://github.com/mapbox/mapbox-gl-native/issues/5691>
     using SymbolAnnotationMap = std::map<AnnotationID, std::shared_ptr<SymbolAnnotationImpl>>;
     using ShapeAnnotationMap = std::map<AnnotationID, std::unique_ptr<ShapeAnnotationImpl>>;
+    using ImageMap = std::unordered_map<std::string, style::Image>;
 
     SymbolAnnotationTree symbolTree;
     SymbolAnnotationMap symbolAnnotations;
     ShapeAnnotationMap shapeAnnotations;
-    std::unordered_set<std::string> obsoleteShapeAnnotationLayers;
+    ImageMap images;
+
     std::unordered_set<AnnotationTile*> tiles;
-    SpriteAtlas spriteAtlas;
 
     friend class AnnotationTile;
 };