wip

src/mbgl/annotation/annotation_source.cpp

@@ -16,7 +16,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&) {

src/mbgl/annotation/shape_annotation_impl.cpp

@@ -87,12 +87,10 @@ struct ToGeoJSONVT {
 };
 
 void ShapeAnnotationImpl::updateTileData(const CanonicalTileID& tileID, AnnotationTileData& data) {
-    static const double baseTolerance = 4;
+    const uint64_t maxAmountOfTileFeatures = (1ull << maxZoom) * util::EXTENT;
+    const double tolerance = 4 / maxAmountOfTileFeatures;
 
     if (!shapeTiler) {
-        const uint64_t maxAmountOfTileFeatures = (1ull << maxZoom) * util::EXTENT;
-        const double tolerance = baseTolerance / maxAmountOfTileFeatures;
-
         std::vector<geojsonvt::ProjectedFeature> features = {
             ShapeAnnotationGeometry::visit(geometry(), ToGeoJSONVT(tolerance))
         };
@@ -101,7 +99,7 @@ void ShapeAnnotationImpl::updateTileData(const CanonicalTileID& tileID, Annotati
         options.maxZoom = maxZoom;
         options.buffer = 255u;
         options.extent = util::EXTENT;
-        options.tolerance = baseTolerance;
+        options.tolerance = tolerance;
         shapeTiler = std::make_unique<mapbox::geojsonvt::GeoJSONVT>(features, options);
     }
 
@@ -124,6 +122,9 @@ void ShapeAnnotationImpl::updateTileData(const CanonicalTileID& tileID, Annotati
 
         assert(featureType != FeatureType::Unknown);
 
+        const auto& ring = shapeFeature.tileGeometry.get<geojsonvt::TileRings>().front();
+        printf("shapeFeature.tileGeometry.shapeRing.size: %u\n", uint32_t(ring.size()));
+
         GeometryCollection renderGeometry;
         for (const auto& shapeRing : shapeFeature.tileGeometry.get<geojsonvt::TileRings>()) {
             GeometryCoordinates renderLine;

test/api/annotations.cpp

@@ -64,6 +64,27 @@ TEST(Annotations, LineAnnotation) {
     test.checkRendering("line_annotation_max_zoom");
 }
 
+TEST(Annotations, AnnotationZoomRange) {
+    AnnotationTest test;
+
+    LineString<double> line = {{ { 0, 0 }, { 45, 45 } }};
+    LineAnnotation annotation { line };
+
+    test.map.setStyleJSON(util::read_file("test/fixtures/api/empty.json"));
+    test.map.addAnnotation(annotation);
+
+    const auto pixel = test.map.pixelForLatLng({ 0, 0 });
+    const uint8_t maxZoom = test.map.getMaxZoom();
+    for (uint8_t zoom = test.map.getMinZoom(); zoom <= maxZoom; ++zoom) {
+        test.map.setZoom(zoom);
+        test::render(test.map);
+        const auto features = test.map.queryRenderedFeatures(pixel);
+        if (features.empty()) {
+            printf("zoom: %lf (empty)\n", test.map.getZoom());
+        }
+    }
+}
+
 TEST(Annotations, FillAnnotation) {
     AnnotationTest test;