[core] Fix shape annotations disappearing after maxZoom-1

Fixes #5138.

src/mbgl/annotation/shape_annotation_impl.cpp

@@ -89,7 +89,7 @@ void ShapeAnnotationImpl::updateTileData(const CanonicalTileID& tileID, Annotati
     static const double baseTolerance = 4;
 
     if (!shapeTiler) {
-        const uint64_t maxAmountOfTiles = 1 << maxZoom;
+        const uint64_t maxAmountOfTiles = std::pow(2, maxZoom);
         const double tolerance = baseTolerance / (maxAmountOfTiles * util::EXTENT);
 
         std::vector<geojsonvt::ProjectedFeature> features = {

test/api/annotations.cpp

@@ -42,6 +42,10 @@ TEST(Annotations, SymbolAnnotation) {
     test.map.addAnnotationIcon("default_marker", namedMarker("default_marker.png"));
     test.map.addAnnotation(SymbolAnnotation { Point<double>(0, 0), "default_marker" });
     test.checkRendering("point_annotation");
+
+    // FIXME: https://github.com/mapbox/mapbox-gl-native/issues/5419
+    //test.map.setZoom(test.map.getMaxZoom());
+    //test.checkRendering("point_annotation");
 }
 
 TEST(Annotations, LineAnnotation) {
@@ -55,6 +59,9 @@ TEST(Annotations, LineAnnotation) {
     test.map.setStyleJSON(util::read_file("test/fixtures/api/empty.json"));
     test.map.addAnnotation(annotation);
     test.checkRendering("line_annotation");
+
+    test.map.setZoom(test.map.getMaxZoom());
+    test.checkRendering("line_annotation_max_zoom");
 }
 
 TEST(Annotations, FillAnnotation) {
@@ -67,6 +74,9 @@ TEST(Annotations, FillAnnotation) {
     test.map.setStyleJSON(util::read_file("test/fixtures/api/empty.json"));
     test.map.addAnnotation(annotation);
     test.checkRendering("fill_annotation");
+
+    test.map.setZoom(test.map.getMaxZoom());
+    test.checkRendering("fill_annotation_max_zoom");
 }
 
 TEST(Annotations, StyleSourcedShapeAnnotation) {