diff options
author | John Firebaugh <john.firebaugh@gmail.com> | 2016-06-06 17:26:56 -0700 |
---|---|---|
committer | Konstantin Käfer <mail@kkaefer.com> | 2016-06-10 12:42:14 +0200 |
commit | d62baffb1b73b0dd135c253e0a52565fcc33f2ec (patch) | |
tree | 41445d9738bfe014a013abbd4c9827359394e2cd /src/mbgl/annotation/annotation_manager.cpp | |
parent | b45713e5e98b31b73ab1aaa278bf746116a345fc (diff) | |
download | qtlocation-mapboxgl-d62baffb1b73b0dd135c253e0a52565fcc33f2ec.tar.gz |
[core] Merge AnnotationTileSource into AnnotationTileData
Diffstat (limited to 'src/mbgl/annotation/annotation_manager.cpp')
-rw-r--r-- | src/mbgl/annotation/annotation_manager.cpp | 16 |
1 files changed, 8 insertions, 8 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) { |