Remove Map dependency from Source::invalidateTiles

3 files changed, 4 insertions, 5 deletions

diff --git a/src/mbgl/map/map.cpp b/src/mbgl/map/map.cpp
index 5d8bf45473..333be1e030 100644
--- a/src/mbgl/map/map.cpp
+++ b/src/mbgl/map/map.cpp
@@ -621,10 +621,10 @@ void Map::updateAnnotationTiles(const std::vector<Tile::ID>& ids) {
     if (!style) return;
     for (const auto &source : style->sources) {
         if (source->info.type == SourceType::Annotations) {
-            source->invalidateTiles(*this, ids);
-            return;
+            source->invalidateTiles(ids);
         }
     }
+    triggerUpdate();
 }
 
 #pragma mark - Toggles
diff --git a/src/mbgl/map/source.cpp b/src/mbgl/map/source.cpp
index 4db7f466a3..4697d70181 100644
--- a/src/mbgl/map/source.cpp
+++ b/src/mbgl/map/source.cpp
@@ -427,12 +427,11 @@ void Source::update(Map &map,
     updated = map.getTime();
 }
 
-void Source::invalidateTiles(Map& map, const std::vector<Tile::ID>& ids) {
+void Source::invalidateTiles(const std::vector<Tile::ID>& ids) {
     for (auto& id : ids) {
         tiles.erase(id);
         tile_data.erase(id);
     }
-    map.triggerUpdate();
 }
 
 }
diff --git a/src/mbgl/map/source.hpp b/src/mbgl/map/source.hpp
index 636b463005..9c59acfc47 100644
--- a/src/mbgl/map/source.hpp
+++ b/src/mbgl/map/source.hpp
@@ -58,7 +58,7 @@ public:
     void update(Map &, uv::worker &, util::ptr<Style>, GlyphAtlas &, GlyphStore &,
                 SpriteAtlas &, util::ptr<Sprite>, TexturePool &, std::function<void()> callback);
 
-    void invalidateTiles(Map&, const std::vector<Tile::ID>&);
+    void invalidateTiles(const std::vector<Tile::ID>&);
 
     void updateMatrices(const mat4 &projMatrix, const TransformState &transform);
     void drawClippingMasks(Painter &painter);