summaryrefslogtreecommitdiff
path: root/src/mbgl/annotation
diff options
context:
space:
mode:
authorBruno de Oliveira Abinader <bruno@mapbox.com>2015-11-25 15:06:33 +0200
committerBruno de Oliveira Abinader <bruno@mapbox.com>2015-11-27 17:47:02 +0200
commit591e0dde2fb97f4d40db6e11b5fbfbe4c3c0efc8 (patch)
tree98d5968f05ecc71cc5797901b34009526ae31ad3 /src/mbgl/annotation
parent31fd2822f516337f084f85db7e369d0633113b73 (diff)
downloadqtlocation-mapboxgl-591e0dde2fb97f4d40db6e11b5fbfbe4c3c0efc8.tar.gz
[core] Added modified, expires information to TileData
Diffstat (limited to 'src/mbgl/annotation')
-rw-r--r--src/mbgl/annotation/annotation_tile.cpp4
-rw-r--r--src/mbgl/annotation/annotation_tile.hpp4
2 files changed, 4 insertions, 4 deletions
diff --git a/src/mbgl/annotation/annotation_tile.cpp b/src/mbgl/annotation/annotation_tile.cpp
index f9ab79e4f4..f79d71cfde 100644
--- a/src/mbgl/annotation/annotation_tile.cpp
+++ b/src/mbgl/annotation/annotation_tile.cpp
@@ -36,14 +36,14 @@ AnnotationTileMonitor::~AnnotationTileMonitor() {
data.getAnnotationManager()->removeTileMonitor(*this);
}
-std::unique_ptr<FileRequest> AnnotationTileMonitor::monitorTile(std::function<void (std::exception_ptr, std::unique_ptr<GeometryTile>)> callback_) {
+std::unique_ptr<FileRequest> AnnotationTileMonitor::monitorTile(const GeometryTileMonitor::Callback& callback_) {
callback = callback_;
data.getAnnotationManager()->addTileMonitor(*this);
return nullptr;
}
void AnnotationTileMonitor::update(std::unique_ptr<GeometryTile> tile) {
- callback(nullptr, std::move(tile));
+ callback(nullptr, std::move(tile), Seconds::zero(), Seconds::zero());
}
}
diff --git a/src/mbgl/annotation/annotation_tile.hpp b/src/mbgl/annotation/annotation_tile.hpp
index 70c9f7265f..a8bb2c5677 100644
--- a/src/mbgl/annotation/annotation_tile.hpp
+++ b/src/mbgl/annotation/annotation_tile.hpp
@@ -46,13 +46,13 @@ public:
~AnnotationTileMonitor();
void update(std::unique_ptr<GeometryTile>);
- std::unique_ptr<FileRequest> monitorTile(std::function<void (std::exception_ptr, std::unique_ptr<GeometryTile>)>) override;
+ std::unique_ptr<FileRequest> monitorTile(const GeometryTileMonitor::Callback&) override;
TileID tileID;
private:
MapData& data;
- std::function<void (std::exception_ptr, std::unique_ptr<GeometryTile>)> callback;
+ GeometryTileMonitor::Callback callback;
};
}