From 41d231a4c70864021de7d7e77bd6e704fb568104 Mon Sep 17 00:00:00 2001 From: Frederic Junod Date: Thu, 7 Feb 2019 11:43:43 +0100 Subject: [PATCH] Remove opt_this param in forEachTileCoordParentTileRange function The function is only called by `ol/renderer/canvas/TileLayer` and `opt_this` was always `null`. --- src/ol/renderer/canvas/TileLayer.js | 2 +- src/ol/tilegrid/TileGrid.js | 8 +++----- 2 files changed, 4 insertions(+), 6 deletions(-) diff --git a/src/ol/renderer/canvas/TileLayer.js b/src/ol/renderer/canvas/TileLayer.js index 412005f9a4..6d2a53843a 100644 --- a/src/ol/renderer/canvas/TileLayer.js +++ b/src/ol/renderer/canvas/TileLayer.js @@ -199,7 +199,7 @@ class CanvasTileLayerRenderer extends CanvasLayerRenderer { covered = findLoadedTiles(z + 1, childTileRange); } if (!covered) { - tileGrid.forEachTileCoordParentTileRange(tile.tileCoord, findLoadedTiles, null, tmpTileRange, tmpExtent); + tileGrid.forEachTileCoordParentTileRange(tile.tileCoord, findLoadedTiles, tmpTileRange, tmpExtent); } } diff --git a/src/ol/tilegrid/TileGrid.js b/src/ol/tilegrid/TileGrid.js index 6a7bc89c1d..9b391c8725 100644 --- a/src/ol/tilegrid/TileGrid.js +++ b/src/ol/tilegrid/TileGrid.js @@ -203,14 +203,12 @@ class TileGrid { /** * @param {import("../tilecoord.js").TileCoord} tileCoord Tile coordinate. - * @param {function(this: T, number, import("../TileRange.js").default): boolean} callback Callback. - * @param {T=} opt_this The object to use as `this` in `callback`. + * @param {function(number, import("../TileRange.js").default): boolean} callback Callback. * @param {import("../TileRange.js").default=} opt_tileRange Temporary import("../TileRange.js").default object. * @param {import("../extent.js").Extent=} opt_extent Temporary import("../extent.js").Extent object. * @return {boolean} Callback succeeded. - * @template T */ - forEachTileCoordParentTileRange(tileCoord, callback, opt_this, opt_tileRange, opt_extent) { + forEachTileCoordParentTileRange(tileCoord, callback, opt_tileRange, opt_extent) { let tileRange, x, y; let tileCoordExtent = null; let z = tileCoord[0] - 1; @@ -228,7 +226,7 @@ class TileGrid { } else { tileRange = this.getTileRangeForExtentAndZ(tileCoordExtent, z, opt_tileRange); } - if (callback.call(opt_this, z, tileRange)) { + if (callback(z, tileRange)) { return true; } --z;