summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorBruno de Oliveira Abinader <bruno@mapbox.com>2016-07-26 16:34:55 +0300
committerBruno de Oliveira Abinader <bruno@mapbox.com>2016-07-26 16:35:29 +0300
commit253a3dbc58761cfecea658ba83b469f516a98526 (patch)
treedcee2df75bc443bbb0fec5c13eac7aebb24890bc /src
parent26a9213f6ee0899e5f8cc974881364263095d3aa (diff)
downloadqtlocation-mapboxgl-253a3dbc58761cfecea658ba83b469f516a98526.tar.gz
[core] Revert annotation source maxZoom to 22
Diffstat (limited to 'src')
-rw-r--r--src/mbgl/annotation/annotation_source.cpp3
-rw-r--r--src/mbgl/annotation/shape_annotation_impl.cpp2
2 files changed, 2 insertions, 3 deletions
diff --git a/src/mbgl/annotation/annotation_source.cpp b/src/mbgl/annotation/annotation_source.cpp
index cc82b34de7..61fc4ca2e4 100644
--- a/src/mbgl/annotation/annotation_source.cpp
+++ b/src/mbgl/annotation/annotation_source.cpp
@@ -15,8 +15,7 @@ AnnotationSource::Impl::Impl(Source& base_)
}
Range<uint8_t> AnnotationSource::Impl::getZoomRange() {
- // Same as default geojson-vt-cpp.
- return { 0, 18 };
+ return { 0, 22 };
}
void AnnotationSource::Impl::load(FileSource&) {
diff --git a/src/mbgl/annotation/shape_annotation_impl.cpp b/src/mbgl/annotation/shape_annotation_impl.cpp
index 2236f179b9..445ee76511 100644
--- a/src/mbgl/annotation/shape_annotation_impl.cpp
+++ b/src/mbgl/annotation/shape_annotation_impl.cpp
@@ -27,7 +27,7 @@ void ShapeAnnotationImpl::updateTileData(const CanonicalTileID& tileID, Annotati
return Feature { std::move(geom) };
}));
mapbox::geojsonvt::Options options;
- options.maxZoom = util::clamp<uint8_t>(maxZoom, 0, 18);
+ options.maxZoom = maxZoom;
options.buffer = 255u;
options.extent = util::EXTENT;
options.tolerance = baseTolerance;