Preserve models on tile reload

GitOrigin-RevId: 257e591ea224d07bcec55c554dbfa692730d6e7e

Author: ibesora

3d-style/data/bucket/model_bucket.ts

@@ -422,7 +422,7 @@ class ModelBucket implements Bucket {
         this.uploaded = true;
     }
 
-    destroy() {
+    destroy(reload?: boolean) {
         for (const modelId in this.instancesPerModel) {
             const perModelAttributes: PerModelAttributes = this.instancesPerModel[modelId];
             if (perModelAttributes.instancedDataArray.length === 0) continue;
@@ -431,7 +431,7 @@ class ModelBucket implements Bucket {
             }
         }
         const modelManager = this.layers[0].modelManager;
-        if (modelManager && this.modelUris && this.modelsRequested) {
+        if (reload && modelManager && this.modelUris && this.modelsRequested) {
             for (const modelUri of this.modelUris) {
                 modelManager.removeModel(modelUri, "", true);
             }

src/data/bucket.ts

@@ -135,7 +135,7 @@ export interface Bucket {
      *
      * @private
      */
-    destroy: () => void;
+    destroy: (reload?: boolean) => void;
     updateFootprints: (id: UnwrappedTileID, footprints: Array<TileFootprint>) => void;
     updateAppearances: (canonical?: CanonicalTileID, featureState?: FeatureStates, availableImages?: Array<ImageId>, globalProperties?: GlobalProperties) => void;
 }

src/source/custom_source.ts

@@ -335,7 +335,7 @@ class CustomSource<T> extends Evented<SourceEvents> implements ISource {
         if (tile.texture && tile.texture instanceof Texture) {
             // Clean everything else up owned by the tile, but preserve the texture.
             // Destroy first to prevent racing with the texture cache being popped.
-            tile.destroy(true);
+            tile.destroy(false);
 
             // Save the texture to the cache
             if (tile.texture && tile.texture instanceof Texture) {

src/source/geojson_source.ts

@@ -476,7 +476,7 @@ class GeoJSONSource extends Evented<SourceEvents> implements ISource {
             }
 
             delete tile.request;
-            tile.destroy();
+            tile.destroy(false);
 
             if (tile.aborted) {
                 return callback(null);

src/source/raster_array_tile_source.ts

@@ -168,7 +168,7 @@ class RasterArrayTileSource extends RasterTileSource<'raster-array'> {
         if (textures.size) {
             // Clean everything else up owned by the tile, but preserve the texture.
             // Destroy first to prevent racing with the texture cache being popped.
-            tile.destroy(true);
+            tile.destroy(false);
             // Preserve the textures in the cache
             for (const texture of textures.values()) {
                 // Save the texture to the cache

src/source/raster_tile_source.ts

@@ -245,7 +245,7 @@ class RasterTileSource<T = 'raster'> extends Evented<SourceEvents> implements IS
         if (tile.texture && tile.texture instanceof Texture) {
             // Clean everything else up owned by the tile, but preserve the texture.
             // Destroy first to prevent racing with the texture cache being popped.
-            tile.destroy(true);
+            tile.destroy(false);
 
             // Save the texture to the cache
             if (tile.texture && tile.texture instanceof Texture) {

src/source/tile.ts

@@ -1018,9 +1018,9 @@ class Tile {
      * @returns {undefined}
      * @private
      */
-    destroy(preserveTexture: boolean = false) {
+    destroy(reload: boolean = true) {
         for (const id in this.buckets) {
-            this.buckets[id].destroy();
+            this.buckets[id].destroy(reload);
         }
 
         this.buckets = {};
@@ -1083,7 +1083,7 @@ class Tile {
             this._globeTileDebugTextBuffer = null;
         }
 
-        if (!preserveTexture && this.texture && this.texture instanceof Texture) {
+        if (reload && this.texture && this.texture instanceof Texture) {
             this.texture.destroy();
             delete this.texture;
         }