summaryrefslogtreecommitdiff
path: root/src/mbgl/annotation
diff options
context:
space:
mode:
authorJohn Firebaugh <john.firebaugh@gmail.com>2016-06-14 10:39:40 -0700
committerJohn Firebaugh <john.firebaugh@gmail.com>2016-06-14 11:25:45 -0700
commitb222689de835a8b83c387aff5e5f500ce17768e5 (patch)
tree2d2d381b11f6e69aa0659a6cbab36e3d878d8b22 /src/mbgl/annotation
parent9b0093e32dece62abc6fd7add789613871252a58 (diff)
downloadqtlocation-mapboxgl-b222689de835a8b83c387aff5e5f500ce17768e5.tar.gz
[core] Pass geojsonvt only to GeoJSONSource
Diffstat (limited to 'src/mbgl/annotation')
-rw-r--r--src/mbgl/annotation/annotation_manager.cpp2
-rw-r--r--src/mbgl/annotation/annotation_source.cpp5
-rw-r--r--src/mbgl/annotation/annotation_source.hpp3
3 files changed, 4 insertions, 6 deletions
diff --git a/src/mbgl/annotation/annotation_manager.cpp b/src/mbgl/annotation/annotation_manager.cpp
index 71dca16359..2ca32aaa36 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>(), nullptr);
+ std::unique_ptr<Source> source = std::make_unique<AnnotationSource>(SourceID, "", util::tileSize, std::make_unique<Tileset>());
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 8e2a5b22eb..024bd4be98 100644
--- a/src/mbgl/annotation/annotation_source.cpp
+++ b/src/mbgl/annotation/annotation_source.cpp
@@ -5,9 +5,8 @@ namespace mbgl {
AnnotationSource::AnnotationSource(std::string id_,
std::string url_,
uint16_t tileSize_,
- std::unique_ptr<Tileset>&& tileset_,
- std::unique_ptr<mapbox::geojsonvt::GeoJSONVT>&& geojsonvt_)
- : Source(SourceType::Annotations, std::move(id_), std::move(url_), tileSize_, std::move(tileset_), std::move(geojsonvt_)) {
+ std::unique_ptr<Tileset>&& tileset_)
+ : Source(SourceType::Annotations, std::move(id_), std::move(url_), tileSize_, std::move(tileset_)) {
}
} // namespace mbgl
diff --git a/src/mbgl/annotation/annotation_source.hpp b/src/mbgl/annotation/annotation_source.hpp
index 6af38f76b4..358e94688d 100644
--- a/src/mbgl/annotation/annotation_source.hpp
+++ b/src/mbgl/annotation/annotation_source.hpp
@@ -9,8 +9,7 @@ public:
AnnotationSource(std::string id,
std::string url,
uint16_t tileSize,
- std::unique_ptr<Tileset>&&,
- std::unique_ptr<mapbox::geojsonvt::GeoJSONVT>&&);
+ std::unique_ptr<Tileset>&&);
};
} // namespace mbgl