From 74a628ac85815b9a194e37cbeb21a4e9927fc1d1 Mon Sep 17 00:00:00 2001
From: Andreas Hocevar <andreas.hocevar@gmail.com>
Date: Thu, 23 Sep 2021 19:47:10 +0000
Subject: [PATCH] Remove unused tile image render queue

---
 src/ol/renderer/canvas/VectorTileLayer.js | 45 +----------------------
 1 file changed, 2 insertions(+), 43 deletions(-)

diff --git a/src/ol/renderer/canvas/VectorTileLayer.js b/src/ol/renderer/canvas/VectorTileLayer.js
index d575ba0934..653ccf0c84 100644
--- a/src/ol/renderer/canvas/VectorTileLayer.js
+++ b/src/ol/renderer/canvas/VectorTileLayer.js
@@ -109,12 +109,6 @@ class CanvasVectorTileLayerRenderer extends CanvasTileLayerRenderer {
      */
     this.renderedRotation_;
 
-    /**
-     * @private
-     * @type {!Object<string, import("../../VectorRenderTile.js").default>}
-     */
-    this.renderTileImageQueue_ = {};
-
     /**
      * @private
      * @type {import("../../transform.js").Transform}
@@ -126,20 +120,15 @@ class CanvasVectorTileLayerRenderer extends CanvasTileLayerRenderer {
    * @param {import("../../VectorRenderTile.js").default} tile Tile.
    * @param {number} pixelRatio Pixel ratio.
    * @param {import("../../proj/Projection").default} projection Projection.
-   * @param {boolean} queue Queue tile for rendering.
    * @return {boolean|undefined} Tile needs to be rendered.
    */
-  prepareTile(tile, pixelRatio, projection, queue) {
+  prepareTile(tile, pixelRatio, projection) {
     let render;
-    const tileUid = getUid(tile);
     const state = tile.getState();
     if (state === TileState.LOADED || state === TileState.ERROR) {
       this.updateExecutorGroup_(tile, pixelRatio, projection);
       if (this.tileImageNeedsRender_(tile)) {
         render = true;
-        if (queue) {
-          this.renderTileImageQueue_[tileUid] = tile;
-        }
       }
     }
     return render;
@@ -166,7 +155,7 @@ class CanvasVectorTileLayerRenderer extends CanvasTileLayerRenderer {
     if (hifi || !tile.wantedResolution) {
       tile.wantedResolution = resolution;
     }
-    const render = this.prepareTile(tile, pixelRatio, projection, false);
+    const render = this.prepareTile(tile, pixelRatio, projection);
     if (render && layer.getRenderMode() !== VectorTileRenderType.VECTOR) {
       this.renderTileImage_(tile, frameState);
     }
@@ -558,7 +547,6 @@ class CanvasVectorTileLayerRenderer extends CanvasTileLayerRenderer {
    * Perform action necessary to get the layer rendered after new fonts have loaded
    */
   handleFontsChanged() {
-    clear(this.renderTileImageQueue_);
     const layer = this.getLayer();
     if (layer.getVisible() && this.renderedLayerRevision_ !== undefined) {
       layer.changed();
@@ -655,7 +643,6 @@ class CanvasVectorTileLayerRenderer extends CanvasTileLayerRenderer {
     const hifi = !(
       viewHints[ViewHint.ANIMATING] || viewHints[ViewHint.INTERACTING]
     );
-    this.renderQueuedTileImages_(hifi, frameState);
 
     super.renderFrame(frameState, target);
     this.renderedPixelToCoordinateTransform_ =
@@ -666,16 +653,6 @@ class CanvasVectorTileLayerRenderer extends CanvasTileLayerRenderer {
       this.getLayer()
     );
     const renderMode = layer.getRenderMode();
-
-    const source = layer.getSource();
-    // Unqueue tiles from the image queue when we don't need any more
-    const usedTiles = frameState.usedTiles[getUid(source)];
-    for (const tileUid in this.renderTileImageQueue_) {
-      if (!usedTiles || !(tileUid in usedTiles)) {
-        delete this.renderTileImageQueue_[tileUid];
-      }
-    }
-
     const context = this.context;
     const alpha = context.globalAlpha;
     context.globalAlpha = layer.getOpacity();
@@ -748,24 +725,6 @@ class CanvasVectorTileLayerRenderer extends CanvasTileLayerRenderer {
     return this.container;
   }
 
-  /**
-   * @param {boolean} hifi We have time to render a high fidelity map image.
-   * @param {import('../../PluggableMap.js').FrameState} frameState Frame state.
-   */
-  renderQueuedTileImages_(hifi, frameState) {
-    // When we don't have time to render hifi, only render tiles until we have used up
-    // half of the frame budget of 16 ms
-    for (const uid in this.renderTileImageQueue_) {
-      if (!hifi && Date.now() - frameState.time > 8) {
-        frameState.animate = true;
-        break;
-      }
-      const tile = this.renderTileImageQueue_[uid];
-      delete this.renderTileImageQueue_[uid];
-      this.renderTileImage_(tile, frameState);
-    }
-  }
-
   /**
    * @param {import("../../Feature.js").FeatureLike} feature Feature.
    * @param {number} squaredTolerance Squared tolerance.