summaryrefslogtreecommitdiff
path: root/src/mbgl/annotation/annotation_tile.cpp
diff options
context:
space:
mode:
authorJohn Firebaugh <john.firebaugh@gmail.com>2016-04-14 16:00:36 -0700
committerJohn Firebaugh <john.firebaugh@gmail.com>2016-04-15 09:56:18 -0700
commit25ff2696a1c6741a5a61334f1bd965e9d5099f05 (patch)
tree7057c8decb0b7137b372e8e6350070e8ed1419e9 /src/mbgl/annotation/annotation_tile.cpp
parentce4270b01c692bcb1af64a774e2d595438057375 (diff)
downloadqtlocation-mapboxgl-25ff2696a1c6741a5a61334f1bd965e9d5099f05.tar.gz
[core] Remove MapData dependency from AnnotationTile and StyleUpdateParameters
Diffstat (limited to 'src/mbgl/annotation/annotation_tile.cpp')
-rw-r--r--src/mbgl/annotation/annotation_tile.cpp8
1 files changed, 4 insertions, 4 deletions
diff --git a/src/mbgl/annotation/annotation_tile.cpp b/src/mbgl/annotation/annotation_tile.cpp
index ee468902cb..a8195d0dc8 100644
--- a/src/mbgl/annotation/annotation_tile.cpp
+++ b/src/mbgl/annotation/annotation_tile.cpp
@@ -28,18 +28,18 @@ util::ptr<GeometryTileLayer> AnnotationTile::getLayer(const std::string& name) c
return nullptr;
}
-AnnotationTileMonitor::AnnotationTileMonitor(const TileID& tileID_, MapData& data_)
+AnnotationTileMonitor::AnnotationTileMonitor(const TileID& tileID_, AnnotationManager& annotationManager_)
: tileID(tileID_),
- data(data_) {
+ annotationManager(annotationManager_) {
}
AnnotationTileMonitor::~AnnotationTileMonitor() {
- data.getAnnotationManager()->removeTileMonitor(*this);
+ annotationManager.removeTileMonitor(*this);
}
std::unique_ptr<AsyncRequest> AnnotationTileMonitor::monitorTile(const GeometryTileMonitor::Callback& callback_) {
callback = callback_;
- data.getAnnotationManager()->addTileMonitor(*this);
+ annotationManager.addTileMonitor(*this);
return nullptr;
}