1 files changed, 32 insertions, 31 deletions
diff --git a/src/mbgl/annotation/render_annotation_source.cpp b/src/mbgl/annotation/render_annotation_source.cpp
index a62d2d51d3..8fb11785fd 100644
--- a/src/mbgl/annotation/render_annotation_source.cpp
+++ b/src/mbgl/annotation/render_annotation_source.cpp
@@ -1,6 +1,7 @@
 #include <mbgl/annotation/render_annotation_source.hpp>
 #include <mbgl/annotation/annotation_tile.hpp>
 #include <mbgl/renderer/render_tile.hpp>
+#include <mbgl/renderer/painter.hpp>
 
 #include <mbgl/algorithm/generate_clip_ids.hpp>
 #include <mbgl/algorithm/generate_clip_ids_impl.hpp>
@@ -9,22 +10,43 @@ namespace mbgl {
 
 using namespace style;
 
-RenderAnnotationSource::RenderAnnotationSource(const AnnotationSource::Impl& impl_)
+RenderAnnotationSource::RenderAnnotationSource(Immutable<AnnotationSource::Impl> impl_)
     : RenderSource(impl_) {
     tilePyramid.setObserver(this);
 }
 
+const AnnotationSource::Impl& RenderAnnotationSource::impl() const {
+    return static_cast<const AnnotationSource::Impl&>(*baseImpl);
+}
+
 bool RenderAnnotationSource::isLoaded() const {
     return tilePyramid.isLoaded();
 }
 
-void RenderAnnotationSource::invalidateTiles() {
-    tilePyramid.invalidateTiles();
+void RenderAnnotationSource::update(Immutable<style::Source::Impl> baseImpl_,
+                                    const std::vector<Immutable<Layer::Impl>>& layers,
+                                    const bool needsRendering,
+                                    const bool needsRelayout,
+                                    const TileParameters& parameters) {
+    std::swap(baseImpl, baseImpl_);
+
+    enabled = needsRendering;
+
+    tilePyramid.update(layers,
+                       needsRendering,
+                       needsRelayout,
+                       parameters,
+                       SourceType::Annotations,
+                       util::tileSize,
+                       { 0, 22 },
+                       [&] (const OverscaledTileID& tileID) {
+                           return std::make_unique<AnnotationTile>(tileID, parameters);
+                       });
 }
 
-void RenderAnnotationSource::startRender(algorithm::ClipIDGenerator& generator, const mat4& projMatrix, const mat4& clipMatrix, const TransformState& transform) {
-    generator.update(tilePyramid.getRenderTiles());
-    tilePyramid.startRender(projMatrix, clipMatrix, transform);
+void RenderAnnotationSource::startRender(Painter& painter) {
+    painter.clipIDGenerator.update(tilePyramid.getRenderTiles());
+    tilePyramid.startRender(painter);
 }
 
 void RenderAnnotationSource::finishRender(Painter& painter) {
@@ -35,39 +57,18 @@ std::map<UnwrappedTileID, RenderTile>& RenderAnnotationSource::getRenderTiles()
     return tilePyramid.getRenderTiles();
 }
 
-void RenderAnnotationSource::updateTiles(const TileParameters& parameters) {
-    tilePyramid.updateTiles(parameters,
-                            SourceType::Annotations,
-                            util::tileSize,
-                            { 0, 22 },
-                            [&] (const OverscaledTileID& tileID) {
-                                return std::make_unique<AnnotationTile>(tileID, parameters);
-                            });
-}
-
-void RenderAnnotationSource::removeTiles() {
-    tilePyramid.removeTiles();
-}
-
-void RenderAnnotationSource::reloadTiles() {
-    tilePyramid.reloadTiles();
-}
-
 std::unordered_map<std::string, std::vector<Feature>>
 RenderAnnotationSource::queryRenderedFeatures(const ScreenLineString& geometry,
-                                          const TransformState& transformState,
-                                          const RenderedQueryOptions& options) const {
-    return tilePyramid.queryRenderedFeatures(geometry, transformState, options);
+                                              const TransformState& transformState,
+                                              const RenderStyle& style,
+                                              const RenderedQueryOptions& options) const {
+    return tilePyramid.queryRenderedFeatures(geometry, transformState, style, options);
 }
 
 std::vector<Feature> RenderAnnotationSource::querySourceFeatures(const SourceQueryOptions&) const {
     return {};
 }
 
-void RenderAnnotationSource::setCacheSize(size_t size) {
-    tilePyramid.setCacheSize(size);
-}
-
 void RenderAnnotationSource::onLowMemory() {
     tilePyramid.onLowMemory();
 }