1 files changed, 17 insertions, 21 deletions

diff --git a/src/mbgl/annotation/render_annotation_source.hpp b/src/mbgl/annotation/render_annotation_source.hpp
index 9ae9340477..9536b2e101 100644
--- a/src/mbgl/annotation/render_annotation_source.hpp
+++ b/src/mbgl/annotation/render_annotation_source.hpp
@@ -8,46 +8,42 @@ namespace mbgl {
 
 class RenderAnnotationSource : public RenderSource {
 public:
-    RenderAnnotationSource(const AnnotationSource::Impl&);
+    RenderAnnotationSource(Immutable<AnnotationSource::Impl>);
 
     bool isLoaded() const final;
 
-    // Called when the camera has changed. May load new tiles, unload obsolete tiles, or
-    // trigger re-placement of existing complete tiles.
-    void updateTiles(const TileParameters&) final;
+    void update(Immutable<style::Source::Impl>,
+                const std::vector<Immutable<style::Layer::Impl>>&,
+                bool needsRendering,
+                bool needsRelayout,
+                const TileParameters&) final;
 
-    // Removes all tiles (by putting them into the cache).
-    void removeTiles() final;
+    void startRender(PaintParameters&) final;
+    void finishRender(PaintParameters&) final;
 
-    // Remove all tiles and clear the cache.
-    void invalidateTiles() final;
-
-    // Request that all loaded tiles re-run the layout operation on the existing source
-    // data with fresh style information.
-    void reloadTiles() final;
-
-    void startRender(algorithm::ClipIDGenerator&,
-                     const mat4& projMatrix,
-                     const mat4& clipMatrix,
-                     const TransformState&) final;
-    void finishRender(Painter&) final;
-
-    std::map<UnwrappedTileID, RenderTile>& getRenderTiles() final;
+    std::vector<std::reference_wrapper<RenderTile>> getRenderTiles() final;
 
     std::unordered_map<std::string, std::vector<Feature>>
     queryRenderedFeatures(const ScreenLineString& geometry,
                           const TransformState& transformState,
+                          const std::vector<const RenderLayer*>& layers,
                           const RenderedQueryOptions& options) const final;
 
     std::vector<Feature>
     querySourceFeatures(const SourceQueryOptions&) const final;
 
-    void setCacheSize(size_t) final;
     void onLowMemory() final;
     void dumpDebugLogs() const final;
 
 private:
+    const AnnotationSource::Impl& impl() const;
+
     TilePyramid tilePyramid;
 };
 
+template <>
+inline bool RenderSource::is<RenderAnnotationSource>() const {
+    return baseImpl->type == SourceType::Annotations;
+}
+
 } // namespace mbgl