diff options
Diffstat (limited to 'src/mbgl/annotation')
-rw-r--r-- | src/mbgl/annotation/annotation_manager.cpp | 16 | ||||
-rw-r--r-- | src/mbgl/annotation/annotation_manager.hpp | 8 |
2 files changed, 12 insertions, 12 deletions
diff --git a/src/mbgl/annotation/annotation_manager.cpp b/src/mbgl/annotation/annotation_manager.cpp index 22cdf313bf..f52cf860cf 100644 --- a/src/mbgl/annotation/annotation_manager.cpp +++ b/src/mbgl/annotation/annotation_manager.cpp @@ -5,7 +5,7 @@ #include <mbgl/annotation/fill_annotation_impl.hpp> #include <mbgl/annotation/style_sourced_annotation_impl.hpp> #include <mbgl/style/source.hpp> -#include <mbgl/tile/annotation_tile_source.hpp> +#include <mbgl/tile/annotation_tile_data.hpp> #include <mbgl/style/style.hpp> #include <mbgl/style/layers/symbol_layer.hpp> #include <mbgl/style/layers/symbol_layer_impl.hpp> @@ -135,18 +135,18 @@ void AnnotationManager::updateStyle(Style& style) { obsoleteShapeAnnotationLayers.clear(); - for (auto& monitor : monitors) { - monitor->update(getTile(monitor->tileID.canonical)); + for (auto& data : monitors) { + data->setData(getTile(data->id.canonical), {}, {}); } } -void AnnotationManager::addTileSource(AnnotationTileSource& monitor) { - monitors.insert(&monitor); - monitor.update(getTile(monitor.tileID.canonical)); +void AnnotationManager::addTileData(AnnotationTileData& data) { + monitors.insert(&data); + data.setData(getTile(data.id.canonical), {}, {}); } -void AnnotationManager::removeTileSource(AnnotationTileSource& monitor) { - monitors.erase(&monitor); +void AnnotationManager::removeTileData(AnnotationTileData& data) { + monitors.erase(&data); } void AnnotationManager::addIcon(const std::string& name, std::shared_ptr<const SpriteImage> sprite) { diff --git a/src/mbgl/annotation/annotation_manager.hpp b/src/mbgl/annotation/annotation_manager.hpp index 6f2700ab70..2285366123 100644 --- a/src/mbgl/annotation/annotation_manager.hpp +++ b/src/mbgl/annotation/annotation_manager.hpp @@ -15,7 +15,7 @@ namespace mbgl { class AnnotationTile; -class AnnotationTileSource; +class AnnotationTileData; class SymbolAnnotationImpl; class ShapeAnnotationImpl; @@ -41,8 +41,8 @@ public: void updateStyle(style::Style&); - void addTileSource(AnnotationTileSource&); - void removeTileSource(AnnotationTileSource&); + void addTileData(AnnotationTileData&); + void removeTileData(AnnotationTileData&); static const std::string SourceID; static const std::string PointLayerID; @@ -65,7 +65,7 @@ private: SymbolAnnotationMap symbolAnnotations; ShapeAnnotationMap shapeAnnotations; std::vector<std::string> obsoleteShapeAnnotationLayers; - std::set<AnnotationTileSource*> monitors; + std::set<AnnotationTileData*> monitors; SpriteStore spriteStore; SpriteAtlas spriteAtlas; |