[test] Updates related to the prefetch API

7 files changed, 58 insertions, 52 deletions

diff --git a/test/algorithm/update_renderables.test.cpp b/test/algorithm/update_renderables.test.cpp
index 22d8d79443..127ea22301 100644
--- a/test/algorithm/update_renderables.test.cpp
+++ b/test/algorithm/update_renderables.test.cpp
@@ -129,7 +129,7 @@ TEST(UpdateRenderables, SingleTile) {
     tile_1_1_1_1->renderable = true;
 
     algorithm::updateRenderables(getTileData, createTileData, retainTileData, renderTile,
-                                 source.idealTiles, source.zoomRange, 1);
+                                 source.idealTiles, source.zoomRange, 1, true);
     EXPECT_EQ(ActionLog({
                   GetTileDataAction{ { 1, 0, { 1, 1, 1 } }, Found },       // found ideal tile
                   RetainTileDataAction{ { 1, 0, { 1, 1, 1 } }, TileNecessity::Required }, //
@@ -140,7 +140,7 @@ TEST(UpdateRenderables, SingleTile) {
     // Check a repeated render with the same data.
     log.clear();
     algorithm::updateRenderables(getTileData, createTileData, retainTileData, renderTile,
-                                 source.idealTiles, source.zoomRange, 1);
+                                 source.idealTiles, source.zoomRange, 1, true);
     EXPECT_EQ(ActionLog({
                   GetTileDataAction{ { 1, 0, { 1, 1, 1 } }, Found },       // found ideal tile
                   RetainTileDataAction{ { 1, 0, { 1, 1, 1 } }, TileNecessity::Required }, //
@@ -152,7 +152,7 @@ TEST(UpdateRenderables, SingleTile) {
     log.clear();
     source.idealTiles.emplace(UnwrappedTileID{ 1, 0, 1 });
     algorithm::updateRenderables(getTileData, createTileData, retainTileData, renderTile,
-                                 source.idealTiles, source.zoomRange, 1);
+                                 source.idealTiles, source.zoomRange, 1, true);
     EXPECT_EQ(ActionLog({
                   GetTileDataAction{ { 1, 0, { 1, 0, 1 } }, NotFound },    // missing ideal tile
                   CreateTileDataAction{ { 1, 0, { 1, 0, 1 } } },           // create ideal tile
@@ -173,7 +173,7 @@ TEST(UpdateRenderables, SingleTile) {
     log.clear();
     source.dataTiles[{ 1, 0, { 1, 0, 1 } }]->triedOptional = true;
     algorithm::updateRenderables(getTileData, createTileData, retainTileData, renderTile,
-                                 source.idealTiles, source.zoomRange, 1);
+                                 source.idealTiles, source.zoomRange, 1, true);
     EXPECT_EQ(ActionLog({
                   GetTileDataAction{ { 1, 0, { 1, 0, 1 } }, Found },       // missing ideal tile
                   RetainTileDataAction{ { 1, 0, { 1, 0, 1 } }, TileNecessity::Required }, //
@@ -196,7 +196,7 @@ TEST(UpdateRenderables, SingleTile) {
     auto tile_1_1_0_1 = source.createTileData(OverscaledTileID{ 1, 0, 1 });
     tile_1_1_0_1->renderable = true;
     algorithm::updateRenderables(getTileData, createTileData, retainTileData, renderTile,
-                                 source.idealTiles, source.zoomRange, 1);
+                                 source.idealTiles, source.zoomRange, 1, true);
     EXPECT_EQ(ActionLog({
                   GetTileDataAction{ { 1, 0, { 1, 0, 1 } }, Found },       // newly added tile
                   RetainTileDataAction{ { 1, 0, { 1, 0, 1 } }, TileNecessity::Required }, //
@@ -215,7 +215,7 @@ TEST(UpdateRenderables, SingleTile) {
     auto tile_1_1_0_0 = source.createTileData(OverscaledTileID{ 1, 0, 0 });
 
     algorithm::updateRenderables(getTileData, createTileData, retainTileData, renderTile,
-                                 source.idealTiles, source.zoomRange, 1);
+                                 source.idealTiles, source.zoomRange, 1, true);
     EXPECT_EQ(ActionLog({
                   GetTileDataAction{ { 1, 0, { 1, 0, 0 } }, Found },       // found tile, not ready
                   RetainTileDataAction{ { 1, 0, { 1, 0, 0 } }, TileNecessity::Required }, //
@@ -241,7 +241,7 @@ TEST(UpdateRenderables, SingleTile) {
     log.clear();
     tile_1_1_0_0->renderable = true;
     algorithm::updateRenderables(getTileData, createTileData, retainTileData, renderTile,
-                                 source.idealTiles, source.zoomRange, 1);
+                                 source.idealTiles, source.zoomRange, 1, true);
     EXPECT_EQ(ActionLog({
                   GetTileDataAction{ { 1, 0, { 1, 0, 0 } }, Found },       // found tile, now ready
                   RetainTileDataAction{ { 1, 0, { 1, 0, 0 } }, TileNecessity::Required }, //
@@ -274,7 +274,7 @@ TEST(UpdateRenderables, UseParentTile) {
     auto tile_0_0_0_0 = source.createTileData(OverscaledTileID{ 0, 0, 0 });
     tile_0_0_0_0->renderable = true;
     algorithm::updateRenderables(getTileData, createTileData, retainTileData, renderTile,
-                                 source.idealTiles, source.zoomRange, 1);
+                                 source.idealTiles, source.zoomRange, 1, true);
     EXPECT_EQ(ActionLog({
                   GetTileDataAction{ { 1, 0, { 1, 0, 1 } }, NotFound },    // missing ideal tile
                   CreateTileDataAction{ { 1, 0, { 1, 0, 1 } } },           //
@@ -317,7 +317,7 @@ TEST(UpdateRenderables, DontUseWrongParentTile) {
     auto tile_1_1_1_0 = source.createTileData(OverscaledTileID{ 1, 1, 0 });
     tile_1_1_1_0->renderable = true;
     algorithm::updateRenderables(getTileData, createTileData, retainTileData, renderTile,
-                                 source.idealTiles, source.zoomRange, 2);
+                                 source.idealTiles, source.zoomRange, 2, true);
     EXPECT_EQ(ActionLog({
                   GetTileDataAction{ { 2, 0, { 2, 0, 0 } }, NotFound },    // missing ideal tile
                   CreateTileDataAction{ { 2, 0, { 2, 0, 0 } } },           //
@@ -335,7 +335,7 @@ TEST(UpdateRenderables, DontUseWrongParentTile) {
     log.clear();
     source.dataTiles[{ 2, 0, { 2, 0, 0 } }]->triedOptional = true;
     algorithm::updateRenderables(getTileData, createTileData, retainTileData, renderTile,
-                                 source.idealTiles, source.zoomRange, 2);
+                                 source.idealTiles, source.zoomRange, 2, true);
     EXPECT_EQ(ActionLog({
                   GetTileDataAction{ { 2, 0, { 2, 0, 0 } }, Found },       // non-ready ideal tile
                   RetainTileDataAction{ { 2, 0, { 2, 0, 0 } }, TileNecessity::Required }, //
@@ -354,7 +354,7 @@ TEST(UpdateRenderables, DontUseWrongParentTile) {
     log.clear();
     source.idealTiles.emplace(UnwrappedTileID{ 2, 2, 0 });
     algorithm::updateRenderables(getTileData, createTileData, retainTileData, renderTile,
-                                 source.idealTiles, source.zoomRange, 2);
+                                 source.idealTiles, source.zoomRange, 2, true);
     EXPECT_EQ(ActionLog({
                   GetTileDataAction{ { 2, 0, { 2, 0, 0 } }, Found },       // non-ready ideal tile
                   RetainTileDataAction{ { 2, 0, { 2, 0, 0 } }, TileNecessity::Required }, //
@@ -399,7 +399,7 @@ TEST(UpdateRenderables, UseParentTileWhenChildNotReady) {
 
     // Make sure that it renders the parent tile.
     algorithm::updateRenderables(getTileData, createTileData, retainTileData, renderTile,
-                                 source.idealTiles, source.zoomRange, 1);
+                                 source.idealTiles, source.zoomRange, 1, true);
     EXPECT_EQ(ActionLog({
                   GetTileDataAction{ { 1, 0, { 1, 0, 1 } }, Found },       // found, but not ready
                   RetainTileDataAction{ { 1, 0, { 1, 0, 1 } }, TileNecessity::Required }, //
@@ -417,7 +417,7 @@ TEST(UpdateRenderables, UseParentTileWhenChildNotReady) {
     log.clear();
     tile_1_1_0_1->renderable = true;
     algorithm::updateRenderables(getTileData, createTileData, retainTileData, renderTile,
-                                 source.idealTiles, source.zoomRange, 1);
+                                 source.idealTiles, source.zoomRange, 1, true);
     EXPECT_EQ(ActionLog({
                   GetTileDataAction{ { 1, 0, { 1, 0, 1 } }, Found },       // found and ready
                   RetainTileDataAction{ { 1, 0, { 1, 0, 1 } }, TileNecessity::Required }, //
@@ -444,7 +444,7 @@ TEST(UpdateRenderables, UseOverlappingParentTile) {
     tile_1_1_0_1->renderable = true;
 
     algorithm::updateRenderables(getTileData, createTileData, retainTileData, renderTile,
-                                 source.idealTiles, source.zoomRange, 1);
+                                 source.idealTiles, source.zoomRange, 1, true);
     EXPECT_EQ(ActionLog({
                   GetTileDataAction{ { 1, 0, { 1, 0, 0 } }, NotFound },    // ideal tile not found
                   CreateTileDataAction{ { 1, 0, { 1, 0, 0 } } },           //
@@ -480,7 +480,7 @@ TEST(UpdateRenderables, UseChildTiles) {
     tile_1_1_1_0->renderable = true;
 
     algorithm::updateRenderables(getTileData, createTileData, retainTileData, renderTile,
-                                 source.idealTiles, source.zoomRange, 0);
+                                 source.idealTiles, source.zoomRange, 0, true);
     EXPECT_EQ(ActionLog({
                   GetTileDataAction{ { 0, 0, { 0, 0, 0 } }, NotFound },    // ideal tile, missing
                   CreateTileDataAction{ { 0, 0, { 0, 0, 0 } } },           //
@@ -514,7 +514,7 @@ TEST(UpdateRenderables, PreferChildTiles) {
     tile_2_2_0_0->renderable = true;
 
     algorithm::updateRenderables(getTileData, createTileData, retainTileData, renderTile,
-                                 source.idealTiles, source.zoomRange, 1);
+                                 source.idealTiles, source.zoomRange, 1, true);
     EXPECT_EQ(ActionLog({
                   GetTileDataAction{ { 1, 0, { 1, 0, 0 } }, NotFound },    // ideal tile, not found
                   CreateTileDataAction{ { 1, 0, { 1, 0, 0 } } },           //
@@ -537,7 +537,7 @@ TEST(UpdateRenderables, PreferChildTiles) {
     auto tile_2_2_0_1 = source.createTileData(OverscaledTileID{ 2, 0, 1 });
     tile_2_2_0_1->renderable = true;
     algorithm::updateRenderables(getTileData, createTileData, retainTileData, renderTile,
-                                 source.idealTiles, source.zoomRange, 1);
+                                 source.idealTiles, source.zoomRange, 1, true);
     EXPECT_EQ(ActionLog({
                   GetTileDataAction{ { 1, 0, { 1, 0, 0 } }, Found }, // ideal tile, not ready
                   // ideal tile was added in previous invocation, but is not yet ready
@@ -560,7 +560,7 @@ TEST(UpdateRenderables, PreferChildTiles) {
     auto tile_2_2_1_0 = source.createTileData(OverscaledTileID{ 2, 1, 0 });
     tile_2_2_1_0->renderable = true;
     algorithm::updateRenderables(getTileData, createTileData, retainTileData, renderTile,
-                                 source.idealTiles, source.zoomRange, 1);
+                                 source.idealTiles, source.zoomRange, 1, true);
     EXPECT_EQ(ActionLog({
                   GetTileDataAction{ { 1, 0, { 1, 0, 0 } }, Found }, // ideal tile, not ready
                   // ideal tile was added in first invocation, but is not yet ready
@@ -586,7 +586,7 @@ TEST(UpdateRenderables, PreferChildTiles) {
     auto tile_2_2_1_1 = source.createTileData(OverscaledTileID{ 2, 1, 1 });
     tile_2_2_1_1->renderable = true;
     algorithm::updateRenderables(getTileData, createTileData, retainTileData, renderTile,
-                                 source.idealTiles, source.zoomRange, 1);
+                                 source.idealTiles, source.zoomRange, 1, true);
     EXPECT_EQ(ActionLog({
                   GetTileDataAction{ { 1, 0, { 1, 0, 0 } }, Found }, // ideal tile, not ready
                   // ideal tile was added in first invocation, but is not yet ready
@@ -624,7 +624,7 @@ TEST(UpdateRenderables, UseParentAndChildTiles) {
 
     // Check that it uses the child tile and the parent tile to cover the rest.
     algorithm::updateRenderables(getTileData, createTileData, retainTileData, renderTile,
-                                 source.idealTiles, source.zoomRange, 1);
+                                 source.idealTiles, source.zoomRange, 1, true);
     EXPECT_EQ(ActionLog({
                   GetTileDataAction{ { 1, 0, { 1, 0, 0 } }, NotFound },    // ideal tile, missing
                   CreateTileDataAction{ { 1, 0, { 1, 0, 0 } } },           //
@@ -645,7 +645,7 @@ TEST(UpdateRenderables, UseParentAndChildTiles) {
     log.clear();
     source.dataTiles.erase(OverscaledTileID{ 2, 0, 0 });
     algorithm::updateRenderables(getTileData, createTileData, retainTileData, renderTile,
-                                 source.idealTiles, source.zoomRange, 1);
+                                 source.idealTiles, source.zoomRange, 1, true);
     EXPECT_EQ(ActionLog({
                   GetTileDataAction{ { 1, 0, { 1, 0, 0 } }, Found },       // ideal tile, not ready
                   RetainTileDataAction{ { 1, 0, { 1, 0, 0 } }, TileNecessity::Required }, //
@@ -675,7 +675,7 @@ TEST(UpdateRenderables, DontUseTilesLowerThanMinzoom) {
     tile_1_1_0_0->renderable = true;
 
     algorithm::updateRenderables(getTileData, createTileData, retainTileData, renderTile,
-                                 source.idealTiles, source.zoomRange, 2);
+                                 source.idealTiles, source.zoomRange, 2, true);
     EXPECT_EQ(ActionLog({
                   GetTileDataAction{ { 2, 0, { 2, 0, 0 } }, NotFound },    // ideal tile, missing
                   CreateTileDataAction{ { 2, 0, { 2, 0, 0 } } },           //
@@ -704,7 +704,7 @@ TEST(UpdateRenderables, UseOverzoomedTileAfterMaxzoom) {
     auto tile_3_3_0_0 = source.createTileData(OverscaledTileID{ 3, 0, 0 });
     tile_3_3_0_0->renderable = true;
     algorithm::updateRenderables(getTileData, createTileData, retainTileData, renderTile,
-                                 source.idealTiles, source.zoomRange, 2);
+                                 source.idealTiles, source.zoomRange, 2, true);
     EXPECT_EQ(
         ActionLog({
             GetTileDataAction{ { 2, 0, { 2, 0, 0 } }, NotFound },    // ideal tile, missing
@@ -720,7 +720,7 @@ TEST(UpdateRenderables, UseOverzoomedTileAfterMaxzoom) {
     log.clear();
     source.dataTiles[{ 2, 0, { 2, 0, 0 } }]->triedOptional = true;
     algorithm::updateRenderables(getTileData, createTileData, retainTileData, renderTile,
-                                 source.idealTiles, source.zoomRange, 2);
+                                 source.idealTiles, source.zoomRange, 2, true);
     EXPECT_EQ(
         ActionLog({
             GetTileDataAction{ { 2, 0, { 2, 0, 0 } }, Found },       // ideal tile, missing
@@ -738,7 +738,7 @@ TEST(UpdateRenderables, UseOverzoomedTileAfterMaxzoom) {
     auto tile_2_2_0_0 = source.createTileData(OverscaledTileID{ 2, 0, { 2, 0, 0 } });
     tile_2_2_0_0->renderable = true;
     algorithm::updateRenderables(getTileData, createTileData, retainTileData, renderTile,
-                                 source.idealTiles, source.zoomRange, 3);
+                                 source.idealTiles, source.zoomRange, 3, true);
     EXPECT_EQ(ActionLog({
                   GetTileDataAction{ { 3, 0, { 2, 0, 0 } }, NotFound },    // ideal tile, missing
                   CreateTileDataAction{ { 3, 0, { 2, 0, 0 } } },           //
@@ -755,7 +755,7 @@ TEST(UpdateRenderables, UseOverzoomedTileAfterMaxzoom) {
     auto tile_3_2_0_0 = source.createTileData(OverscaledTileID{ 3, 0, { 2, 0, 0 } });
     tile_3_2_0_0->renderable = true;
     algorithm::updateRenderables(getTileData, createTileData, retainTileData, renderTile,
-                                 source.idealTiles, source.zoomRange, 3);
+                                 source.idealTiles, source.zoomRange, 3, true);
     EXPECT_EQ(ActionLog({
                   GetTileDataAction{ { 3, 0, { 2, 0, 0 } }, Found },       //
                   RetainTileDataAction{ { 3, 0, { 2, 0, 0 } }, TileNecessity::Required }, //
@@ -766,7 +766,7 @@ TEST(UpdateRenderables, UseOverzoomedTileAfterMaxzoom) {
     // Check that it's switching back to the tile that has the matching overzoom value.
     log.clear();
     algorithm::updateRenderables(getTileData, createTileData, retainTileData, renderTile,
-                                 source.idealTiles, source.zoomRange, 2);
+                                 source.idealTiles, source.zoomRange, 2, true);
     EXPECT_EQ(ActionLog({
                   GetTileDataAction{ { 2, 0, { 2, 0, 0 } }, Found },       //
                   RetainTileDataAction{ { 2, 0, { 2, 0, 0 } }, TileNecessity::Required }, //
@@ -781,7 +781,7 @@ TEST(UpdateRenderables, UseOverzoomedTileAfterMaxzoom) {
 
     // Use the overzoomed tile even though it doesn't match the zoom level.
     algorithm::updateRenderables(getTileData, createTileData, retainTileData, renderTile,
-                                 source.idealTiles, source.zoomRange, 2);
+                                 source.idealTiles, source.zoomRange, 2, true);
     EXPECT_EQ(ActionLog({
                   GetTileDataAction{ { 2, 0, { 2, 0, 0 } }, NotFound },    //
                   CreateTileDataAction{ { 2, 0, { 2, 0, 0 } } },           //
@@ -808,7 +808,7 @@ TEST(UpdateRenderables, AscendToNonOverzoomedTiles) {
     auto tile_3_2_0_0 = source.createTileData(OverscaledTileID{ 3, 0, { 2, 0, 0 } });
     tile_3_2_0_0->renderable = true;
     algorithm::updateRenderables(getTileData, createTileData, retainTileData, renderTile,
-                                 source.idealTiles, source.zoomRange, 3);
+                                 source.idealTiles, source.zoomRange, 3, true);
     EXPECT_EQ(ActionLog({
                   GetTileDataAction{ { 3, 0, { 2, 0, 0 } }, Found },       //
                   RetainTileDataAction{ { 3, 0, { 2, 0, 0 } }, TileNecessity::Required }, //
@@ -823,7 +823,7 @@ TEST(UpdateRenderables, AscendToNonOverzoomedTiles) {
     auto tile_2_2_0_0 = source.createTileData(OverscaledTileID{ 2, 0, { 2, 0, 0 } });
     tile_2_2_0_0->renderable = true;
     algorithm::updateRenderables(getTileData, createTileData, retainTileData, renderTile,
-                                 source.idealTiles, source.zoomRange, 3);
+                                 source.idealTiles, source.zoomRange, 3, true);
     EXPECT_EQ(ActionLog({
                   GetTileDataAction{ { 3, 0, { 2, 0, 0 } }, NotFound },    //
                   CreateTileDataAction{ { 3, 0, { 2, 0, 0 } } },           //
@@ -842,7 +842,7 @@ TEST(UpdateRenderables, AscendToNonOverzoomedTiles) {
     auto tile_1_1_0_0 = source.createTileData(OverscaledTileID{ 1, 0, { 1, 0, 0 } });
     tile_1_1_0_0->renderable = true;
     algorithm::updateRenderables(getTileData, createTileData, retainTileData, renderTile,
-                                 source.idealTiles, source.zoomRange, 3);
+                                 source.idealTiles, source.zoomRange, 3, true);
     EXPECT_EQ(ActionLog({
                   GetTileDataAction{ { 3, 0, { 2, 0, 0 } }, Found },       // ideal tile, not ready
                   RetainTileDataAction{ { 3, 0, { 2, 0, 0 } }, TileNecessity::Required }, //
@@ -858,7 +858,7 @@ TEST(UpdateRenderables, AscendToNonOverzoomedTiles) {
     log.clear();
     source.dataTiles[{ 3, 0, { 2, 0, 0 } }]->triedOptional = true;
     algorithm::updateRenderables(getTileData, createTileData, retainTileData, renderTile,
-                                 source.idealTiles, source.zoomRange, 3);
+                                 source.idealTiles, source.zoomRange, 3, true);
     EXPECT_EQ(ActionLog({
                   GetTileDataAction{ { 3, 0, { 2, 0, 0 } }, Found },       // ideal tile, not ready
                   RetainTileDataAction{ { 3, 0, { 2, 0, 0 } }, TileNecessity::Required }, //
@@ -885,7 +885,7 @@ TEST(UpdateRenderables, DoNotAscendMultipleTimesIfNotFound) {
     source.idealTiles.emplace(UnwrappedTileID{ 8, 1, 0 });
 
     algorithm::updateRenderables(getTileData, createTileData, retainTileData, renderTile,
-                                 source.idealTiles, source.zoomRange, 8);
+                                 source.idealTiles, source.zoomRange, 8, true);
     EXPECT_EQ(ActionLog({
                   GetTileDataAction{ { 8, 0, { 8, 0, 0 } }, NotFound },    // ideal tile
                   CreateTileDataAction{ { 8, 0, { 8, 0, 0 } } },           //
@@ -920,7 +920,7 @@ TEST(UpdateRenderables, DoNotAscendMultipleTimesIfNotFound) {
     tile_4_0_0_0->renderable = true;
 
     algorithm::updateRenderables(getTileData, createTileData, retainTileData, renderTile,
-                                 source.idealTiles, source.zoomRange, 8);
+                                 source.idealTiles, source.zoomRange, 8, true);
     EXPECT_EQ(ActionLog({
                   GetTileDataAction{ { 8, 0, { 8, 0, 0 } }, Found },       // ideal tile, not ready
                   RetainTileDataAction{ { 8, 0, { 8, 0, 0 } }, TileNecessity::Required }, //
@@ -960,7 +960,7 @@ TEST(UpdateRenderables, DontRetainUnusedNonIdealTiles) {
     source.createTileData(OverscaledTileID{ 2, 0, 0 });
 
     algorithm::updateRenderables(getTileData, createTileData, retainTileData, renderTile,
-                                 source.idealTiles, source.zoomRange, 2);
+                                 source.idealTiles, source.zoomRange, 2, true);
     EXPECT_EQ(ActionLog({
                   GetTileDataAction{ { 2, 0, { 2, 0, 0 } }, Found },       // ideal tile, not ready
                   RetainTileDataAction{ { 2, 0, { 2, 0, 0 } }, TileNecessity::Required }, //
@@ -992,7 +992,7 @@ TEST(UpdateRenderables, WrappedTiles) {
     tile_0_0_0_0->renderable = true;
 
     algorithm::updateRenderables(getTileData, createTileData, retainTileData, renderTile,
-                                 source.idealTiles, source.zoomRange, 1);
+                                 source.idealTiles, source.zoomRange, 1, true);
     EXPECT_EQ(ActionLog({
                   GetTileDataAction{ { 1, -1, { 1, 1, 0 } }, NotFound },    // ideal tile 1/-1/0 (wrapped to -1)
                   CreateTileDataAction{ { 1, -1, { 1, 1, 0 } } },           //
@@ -1046,7 +1046,7 @@ TEST(UpdateRenderables, RepeatedRenderWithMissingOptionals) {
     source.idealTiles.emplace(UnwrappedTileID{ 6, 0, 0 });
 
     algorithm::updateRenderables(getTileData, createTileData, retainTileData, renderTile,
-                                 source.idealTiles, source.zoomRange, 6);
+                                 source.idealTiles, source.zoomRange, 6, true);
     EXPECT_EQ(ActionLog({
                   GetTileDataAction{ { 6, 0, { 6, 0, 0 } }, NotFound },    // ideal tile, not found
                   CreateTileDataAction{ { 6, 0, { 6, 0, 0 } } },           //
@@ -1067,7 +1067,7 @@ TEST(UpdateRenderables, RepeatedRenderWithMissingOptionals) {
     // Repeat.
     log.clear();
     algorithm::updateRenderables(getTileData, createTileData, retainTileData, renderTile,
-                                 source.idealTiles, source.zoomRange, 6);
+                                 source.idealTiles, source.zoomRange, 6, true);
     EXPECT_EQ(ActionLog({
                   GetTileDataAction{ { 6, 0, { 6, 0, 0 } }, Found },       // ideal tile, not ready
                   RetainTileDataAction{ { 6, 0, { 6, 0, 0 } }, TileNecessity::Required }, //
@@ -1088,7 +1088,7 @@ TEST(UpdateRenderables, RepeatedRenderWithMissingOptionals) {
     log.clear();
     source.dataTiles[{ 6, 0, { 6, 0, 0 } }]->triedOptional = true;
     algorithm::updateRenderables(getTileData, createTileData, retainTileData, renderTile,
-                                 source.idealTiles, source.zoomRange, 6);
+                                 source.idealTiles, source.zoomRange, 6, true);
     EXPECT_EQ(ActionLog({
                   GetTileDataAction{ { 6, 0, { 6, 0, 0 } }, Found },       // ideal tile, not ready
                   RetainTileDataAction{ { 6, 0, { 6, 0, 0 } }, TileNecessity::Required }, //
@@ -1110,7 +1110,7 @@ TEST(UpdateRenderables, RepeatedRenderWithMissingOptionals) {
     // Repeat.
     log.clear();
     algorithm::updateRenderables(getTileData, createTileData, retainTileData, renderTile,
-                                 source.idealTiles, source.zoomRange, 6);
+                                 source.idealTiles, source.zoomRange, 6, true);
     EXPECT_EQ(ActionLog({
                   GetTileDataAction{ { 6, 0, { 6, 0, 0 } }, Found },       // ideal tile, not ready
                   RetainTileDataAction{ { 6, 0, { 6, 0, 0 } }, TileNecessity::Required }, //
@@ -1132,7 +1132,7 @@ TEST(UpdateRenderables, RepeatedRenderWithMissingOptionals) {
     log.clear();
     source.dataTiles[{ 5, 0, { 5, 0, 0 } }]->triedOptional = true;
     algorithm::updateRenderables(getTileData, createTileData, retainTileData, renderTile,
-                                 source.idealTiles, source.zoomRange, 6);
+                                 source.idealTiles, source.zoomRange, 6, true);
     EXPECT_EQ(ActionLog({
                   GetTileDataAction{ { 6, 0, { 6, 0, 0 } }, Found },       // ideal tile, not ready
                   RetainTileDataAction{ { 6, 0, { 6, 0, 0 } }, TileNecessity::Required }, //
@@ -1156,7 +1156,7 @@ TEST(UpdateRenderables, RepeatedRenderWithMissingOptionals) {
     log.clear();
     source.dataTiles[{ 4, 0, { 4, 0, 0 } }]->triedOptional = true;
     algorithm::updateRenderables(getTileData, createTileData, retainTileData, renderTile,
-                                 source.idealTiles, source.zoomRange, 6);
+                                 source.idealTiles, source.zoomRange, 6, true);
     EXPECT_EQ(ActionLog({
                   GetTileDataAction{ { 6, 0, { 6, 0, 0 } }, Found },       // ideal tile, not ready
                   RetainTileDataAction{ { 6, 0, { 6, 0, 0 } }, TileNecessity::Required }, //
@@ -1181,7 +1181,7 @@ TEST(UpdateRenderables, RepeatedRenderWithMissingOptionals) {
     log.clear();
     source.dataTiles[{ 3, 0, { 3, 0, 0 } }]->triedOptional = true;
     algorithm::updateRenderables(getTileData, createTileData, retainTileData, renderTile,
-                                 source.idealTiles, source.zoomRange, 6);
+                                 source.idealTiles, source.zoomRange, 6, true);
     EXPECT_EQ(ActionLog({
                   GetTileDataAction{ { 6, 0, { 6, 0, 0 } }, Found },       // ideal tile, not ready
                   RetainTileDataAction{ { 6, 0, { 6, 0, 0 } }, TileNecessity::Required }, //
@@ -1208,7 +1208,7 @@ TEST(UpdateRenderables, RepeatedRenderWithMissingOptionals) {
     auto tile_3_3_0_0 = source.dataTiles[{ 3, 0, { 3, 0, 0 } }].get();
     tile_3_3_0_0->renderable = true;
     algorithm::updateRenderables(getTileData, createTileData, retainTileData, renderTile,
-                                 source.idealTiles, source.zoomRange, 6);
+                                 source.idealTiles, source.zoomRange, 6, true);
     EXPECT_EQ(ActionLog({
                   GetTileDataAction{ { 6, 0, { 6, 0, 0 } }, Found },       // ideal tile, not ready
                   RetainTileDataAction{ { 6, 0, { 6, 0, 0 } }, TileNecessity::Required }, //
@@ -1243,7 +1243,7 @@ TEST(UpdateRenderables, LoadRequiredIfIdealTileCantBeFound) {
     tile_6_6_0_0->loaded = true;
 
     algorithm::updateRenderables(getTileData, createTileData, retainTileData, renderTile,
-                                 source.idealTiles, source.zoomRange, 6);
+                                 source.idealTiles, source.zoomRange, 6, true);
     EXPECT_EQ(ActionLog({
                   GetTileDataAction{ { 6, 0, { 6, 0, 0 } }, Found }, // ideal tile, not found
                   RetainTileDataAction{ { 6, 0, { 6, 0, 0 } }, TileNecessity::Required }, //
@@ -1294,7 +1294,7 @@ TEST(UpdateRenderables, LoadOverscaledMaxZoomTile) {
     tile_1_1_0_0->loaded = true;
 
     algorithm::updateRenderables(getTileData, createTileData, retainTileData, renderTile,
-                                 source.idealTiles, source.zoomRange, 4);
+                                 source.idealTiles, source.zoomRange, 4, true);
     EXPECT_EQ(ActionLog({
                   GetTileDataAction{ { 4, 0, { 2, 0, 0 } }, Found },
                   RetainTileDataAction{ { 4, 0, { 2, 0, 0 } }, TileNecessity::Required },
diff --git a/test/style/source.test.cpp b/test/style/source.test.cpp
index ca0e79f46a..d955b07532 100644
--- a/test/style/source.test.cpp
+++ b/test/style/source.test.cpp
@@ -69,7 +69,8 @@ public:
         annotationManager,
         imageManager,
         glyphManager,
-        0
+        0,
+        true
     };
 
     SourceTest() {
diff --git a/test/tile/custom_geometry_tile.test.cpp b/test/tile/custom_geometry_tile.test.cpp
index fb905ac076..aafe0c186c 100644
--- a/test/tile/custom_geometry_tile.test.cpp
+++ b/test/tile/custom_geometry_tile.test.cpp
@@ -39,7 +39,8 @@ public:
         annotationManager,
         imageManager,
         glyphManager,
-        0
+        0,
+        true
     };
 };
 
diff --git a/test/tile/geojson_tile.test.cpp b/test/tile/geojson_tile.test.cpp
index cc2dbfced8..e32bd148ba 100644
--- a/test/tile/geojson_tile.test.cpp
+++ b/test/tile/geojson_tile.test.cpp
@@ -39,7 +39,8 @@ public:
         annotationManager,
         imageManager,
         glyphManager,
-        0
+        0,
+        true
     };
 };
 
diff --git a/test/tile/raster_dem_tile.test.cpp b/test/tile/raster_dem_tile.test.cpp
index 42e7594720..cada72a51e 100644
--- a/test/tile/raster_dem_tile.test.cpp
+++ b/test/tile/raster_dem_tile.test.cpp
@@ -34,7 +34,8 @@ public:
         annotationManager,
         imageManager,
         glyphManager,
-        0
+        0,
+        true
     };
 };
 
diff --git a/test/tile/raster_tile.test.cpp b/test/tile/raster_tile.test.cpp
index f19bd26260..a6445e49f3 100644
--- a/test/tile/raster_tile.test.cpp
+++ b/test/tile/raster_tile.test.cpp
@@ -34,7 +34,8 @@ public:
         annotationManager,
         imageManager,
         glyphManager,
-        0
+        0,
+        true
     };
 };
 
diff --git a/test/tile/vector_tile.test.cpp b/test/tile/vector_tile.test.cpp
index 940c0272db..27447e7a3e 100644
--- a/test/tile/vector_tile.test.cpp
+++ b/test/tile/vector_tile.test.cpp
@@ -40,7 +40,8 @@ public:
         annotationManager,
         imageManager,
         glyphManager,
-        0
+        0,
+        true
     };
 };