Merge pull request #1337 from matkoniecz/fix/caching

Unbreak tile caching.
colouring-cities · Feb 15, 2024 · cbf6d8e · cbf6d8e
2 parents 3628973 + c3cd365
commit cbf6d8e
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 2 deletions.
diff --git a/app/src/tiles/rendererDefinition.ts b/app/src/tiles/rendererDefinition.ts
@@ -40,12 +40,14 @@ if(!allLayersCacheSwitch) {
 }
 
 const MIN_ZOOM_FOR_RENDERING_TILES = 9
+const MAX_ZOOM_FOR_RENDERING_TILES = 19
 
 const tileCache = new TileCache(
     process.env.TILECACHE_PATH,
     {
         tilesets: getBuildingLayerNames(),
         minZoom: MIN_ZOOM_FOR_RENDERING_TILES,
+        maxZoom: MAX_ZOOM_FOR_RENDERING_TILES,
         scales: [1, 2]
     },
     shouldCacheFn,
@@ -70,8 +72,11 @@ function stitchOrRenderBuildingTile(tileParams: TileParams, dataParams: any): Pr
 }
 
 function renderTile(tileParams: TileParams, dataParams: any): Promise<Tile> {
-    if (isOutsideExtent(tileParams, EXTENT_BBOX) || tileParams.z < MIN_ZOOM_FOR_RENDERING_TILES) {
-        // if tiles are on lower zoom level then producing/caching is expected
+    if (isOutsideExtent(tileParams, EXTENT_BBOX) 
+        || tileParams.z < MIN_ZOOM_FOR_RENDERING_TILES
+        || tileParams.z > MAX_ZOOM_FOR_RENDERING_TILES
+        ) {
+        // if tiles are outside cache zoom level then producing/caching is expected
         // then we should short-circuit tile generation
         // otherwise tile would be generated and not cached
 

diff --git a/app/src/tiles/tileCache.ts b/app/src/tiles/tileCache.ts
@@ -52,6 +52,11 @@ interface CacheDomain {
      */
     minZoom: number;
 
+    /**
+     * The highest zoom level to cache
+     */
+    maxZoom: number;
+
     /**
      * An array of scale factors to cache
      */
@@ -132,6 +137,7 @@ class TileCache {
     private shouldUseCache(tileParams: TileParams): boolean {
         return this.cacheDomain.tilesets.includes(tileParams.tileset) &&
             this.cacheDomain.minZoom <= tileParams.z &&
+            this.cacheDomain.maxZoom >= tileParams.z &&
             this.cacheDomain.scales.includes(tileParams.scale) &&
             (this.shouldCacheFn == undefined || this.shouldCacheFn(tileParams));
     }