From 2875685b3c350f15f0e11eb37d196c82fe0b6809 Mon Sep 17 00:00:00 2001
From: Andreas Hocevar <andreas.hocevar@gmail.com>
Date: Sun, 5 Jan 2020 12:25:44 +0100
Subject: [PATCH] Use TileCache instead of custom structure

---
 src/ol/VectorTile.js                          |  5 ---
 src/ol/source/VectorTile.js                   | 31 ++++++-------------
 .../renderer/canvas/vectortilelayer.test.js   |  2 +-
 3 files changed, 10 insertions(+), 28 deletions(-)

diff --git a/src/ol/VectorTile.js b/src/ol/VectorTile.js
index 7c79cbc36f..ecf13ed8ea 100644
--- a/src/ol/VectorTile.js
+++ b/src/ol/VectorTile.js
@@ -18,11 +18,6 @@ class VectorTile extends Tile {
 
     super(tileCoord, state, opt_options);
 
-    /**
-     * @type {number}
-     */
-    this.consumers = 0;
-
     /**
      * Extent of this tile; set by the source.
      * @type {import("./extent.js").Extent}
diff --git a/src/ol/source/VectorTile.js b/src/ol/source/VectorTile.js
index abd76c21db..e2ec40c495 100644
--- a/src/ol/source/VectorTile.js
+++ b/src/ol/source/VectorTile.js
@@ -13,6 +13,7 @@ import {buffer as bufferExtent, getIntersection, intersects} from '../extent.js'
 import EventType from '../events/EventType.js';
 import {loadFeaturesXhr} from '../featureloader.js';
 import {equals} from '../array.js';
+import TileCache from '../TileCache.js';
 
 /**
  * @typedef {Object} Options
@@ -139,9 +140,9 @@ class VectorTile extends UrlTile {
 
     /**
      * @private
-     * @type {Object<string, import("../VectorTile.js").default>}
+     * @type {TileCache}
      */
-    this.sourceTileByKey_ = {};
+    this.sourceTileCache = new TileCache(this.tileCache.highWaterMark);
 
     /**
      * @private
@@ -227,7 +228,7 @@ class VectorTile extends UrlTile {
    */
   clear() {
     this.tileCache.clear();
-    this.sourceTileByKey_ = {};
+    this.sourceTileCache.clear();
     this.sourceTilesByTileKey_ = {};
   }
 
@@ -269,8 +270,8 @@ class VectorTile extends UrlTile {
           const tileUrl = this.tileUrlFunction(sourceTileCoord, pixelRatio, projection);
           let sourceTile;
           if (tileUrl !== undefined) {
-            if (tileUrl in this.sourceTileByKey_) {
-              sourceTile = this.sourceTileByKey_[tileUrl];
+            if (this.sourceTileCache.containsKey(tileUrl)) {
+              sourceTile = this.sourceTileCache.get(tileUrl);
               const state = sourceTile.getState();
               if (state === TileState.LOADED || state === TileState.ERROR || state === TileState.EMPTY) {
                 sourceTiles.push(sourceTile);
@@ -282,7 +283,7 @@ class VectorTile extends UrlTile {
               sourceTile.extent = sourceTileGrid.getTileCoordExtent(sourceTileCoord);
               sourceTile.projection = projection;
               sourceTile.resolution = sourceTileGrid.getResolution(sourceTileCoord[0]);
-              this.sourceTileByKey_[tileUrl] = sourceTile;
+              this.sourceTileCache.set(tileUrl, sourceTile);
               sourceTile.addEventListener(EventType.CHANGE, this.handleTileChange.bind(this));
               sourceTile.load();
             }
@@ -333,6 +334,7 @@ class VectorTile extends UrlTile {
         this.addSourceTiles(tile, sourceTiles);
       }
     }
+    this.sourceTileCache.expireCache({});
     return sourceTiles;
   }
 
@@ -342,28 +344,13 @@ class VectorTile extends UrlTile {
    */
   addSourceTiles(tile, sourceTiles) {
     this.sourceTilesByTileKey_[tile.getKey()] = sourceTiles;
-    for (let i = 0, ii = sourceTiles.length; i < ii; ++i) {
-      sourceTiles[i].consumers++;
-    }
   }
 
   /**
    * @param {VectorRenderTile} tile Tile.
    */
   removeSourceTiles(tile) {
-    const tileKey = tile.getKey();
-    if (tileKey in this.sourceTilesByTileKey_) {
-      const sourceTiles = this.sourceTilesByTileKey_[tileKey];
-      for (let i = 0, ii = sourceTiles.length; i < ii; ++i) {
-        const sourceTile = sourceTiles[i];
-        sourceTile.consumers--;
-        if (sourceTile.consumers === 0) {
-          sourceTile.dispose();
-          delete this.sourceTileByKey_[sourceTile.getKey()];
-        }
-      }
-    }
-    delete this.sourceTilesByTileKey_[tileKey];
+    delete this.sourceTilesByTileKey_[tile.getKey()];
   }
 
   /**
diff --git a/test/spec/ol/renderer/canvas/vectortilelayer.test.js b/test/spec/ol/renderer/canvas/vectortilelayer.test.js
index 570a693f6d..aaeb91d0ca 100644
--- a/test/spec/ol/renderer/canvas/vectortilelayer.test.js
+++ b/test/spec/ol/renderer/canvas/vectortilelayer.test.js
@@ -315,7 +315,7 @@ describe('ol.renderer.canvas.VectorTileLayer', function() {
         tileClass: TileClass,
         tileGrid: createXYZ()
       });
-      source.sourceTileByKey_[sourceTile.getKey()] = sourceTile;
+      source.sourceTileCache.set('0/0/0.mvt', sourceTile);
       source.sourceTilesByTileKey_[sourceTile.getKey()] = [sourceTile];
       executorGroup = {};
       source.getTile = function() {