summaryrefslogtreecommitdiff
path: root/src/mbgl/annotation
diff options
context:
space:
mode:
Diffstat (limited to 'src/mbgl/annotation')
-rw-r--r--src/mbgl/annotation/annotation_manager.cpp2
-rw-r--r--src/mbgl/annotation/annotation_source.cpp8
-rw-r--r--src/mbgl/annotation/annotation_source.hpp5
3 files changed, 5 insertions, 10 deletions
diff --git a/src/mbgl/annotation/annotation_manager.cpp b/src/mbgl/annotation/annotation_manager.cpp
index 2ca32aaa36..b3edbf857d 100644
--- a/src/mbgl/annotation/annotation_manager.cpp
+++ b/src/mbgl/annotation/annotation_manager.cpp
@@ -107,7 +107,7 @@ std::unique_ptr<AnnotationTileData> AnnotationManager::getTileData(const Canonic
void AnnotationManager::updateStyle(Style& style) {
// Create annotation source, point layer, and point bucket
if (!style.getSource(SourceID)) {
- std::unique_ptr<Source> source = std::make_unique<AnnotationSource>(SourceID, "", util::tileSize, std::make_unique<Tileset>());
+ std::unique_ptr<Source> source = std::make_unique<AnnotationSource>();
source->enabled = true;
style.addSource(std::move(source));
diff --git a/src/mbgl/annotation/annotation_source.cpp b/src/mbgl/annotation/annotation_source.cpp
index 024bd4be98..1589370f09 100644
--- a/src/mbgl/annotation/annotation_source.cpp
+++ b/src/mbgl/annotation/annotation_source.cpp
@@ -1,12 +1,10 @@
#include <mbgl/annotation/annotation_source.hpp>
+#include <mbgl/annotation/annotation_manager.hpp>
namespace mbgl {
-AnnotationSource::AnnotationSource(std::string id_,
- std::string url_,
- uint16_t tileSize_,
- std::unique_ptr<Tileset>&& tileset_)
- : Source(SourceType::Annotations, std::move(id_), std::move(url_), tileSize_, std::move(tileset_)) {
+AnnotationSource::AnnotationSource()
+ : Source(SourceType::Annotations, AnnotationManager::SourceID, "", util::tileSize, std::make_unique<Tileset>()) {
}
} // namespace mbgl
diff --git a/src/mbgl/annotation/annotation_source.hpp b/src/mbgl/annotation/annotation_source.hpp
index 358e94688d..befff2de85 100644
--- a/src/mbgl/annotation/annotation_source.hpp
+++ b/src/mbgl/annotation/annotation_source.hpp
@@ -6,10 +6,7 @@ namespace mbgl {
class AnnotationSource : public style::Source {
public:
- AnnotationSource(std::string id,
- std::string url,
- uint16_t tileSize,
- std::unique_ptr<Tileset>&&);
+ AnnotationSource();
};
} // namespace mbgl