ol 6.12.1-dev.1642423977028 → 6.12.1-dev.1642932717618

package/renderer/webgl/TileLayer.js

@@ -27,7 +27,7 @@ import { AttributeType } from '../../webgl/Helper.js';
 import { ELEMENT_ARRAY_BUFFER, STATIC_DRAW } from '../../webgl.js';
 import { compose as composeTransform, create as createTransform, } from '../../transform.js';
 import { create as createMat4, fromTransform as mat4FromTransform, } from '../../vec/mat4.js';
-import { createOrUpdate as createTileCoord, getKeyZXY, getKey as getTileCoordKey, } from '../../tilecoord.js';
+import { createOrUpdate as createTileCoord, getKey as getTileCoordKey, } from '../../tilecoord.js';
 import { fromUserExtent } from '../../proj.js';
 import { getIntersection } from '../../extent.js';
 import { getUid } from '../../util.js';
@@ -93,7 +93,7 @@ function getRenderExtent(frameState, extent) {
         extent = getIntersection(extent, fromUserExtent(layerState.extent, frameState.viewState.projection));
     }
     var source = 
-    /** {import("../../source/Tile.js").default} */ layerState.layer.getSource();
+    /** {import("../../source/Tile.js").default} */ layerState.layer.getRenderSource();
     if (!source.getWrapX()) {
         var gridExtent = source
             .getTileGridForProjection(frameState.viewState.projection)
@@ -104,6 +104,9 @@ function getRenderExtent(frameState, extent) {
     }
     return extent;
 }
+function getCacheKey(source, tileCoord) {
+    return source.getKey() + "," + getTileCoordKey(tileCoord);
+}
 /**
  * @typedef {Object} Options
  * @property {string} vertexShader Vertex shader source.
@@ -132,6 +135,11 @@ var WebGLTileLayerRenderer = /** @class */ (function (_super) {
         var _this = _super.call(this, tileLayer, {
             uniforms: options.uniforms,
         }) || this;
+        /**
+         * The last call to `renderFrame` was completed with all tiles loaded
+         * @type {boolean}
+         */
+        _this.renderComplete = false;
         /**
          * This transform converts tile i, j coordinates to screen coordinates.
          * @type {import("../../transform.js").Transform}
@@ -241,7 +249,7 @@ var WebGLTileLayerRenderer = /** @class */ (function (_super) {
      */
     WebGLTileLayerRenderer.prototype.prepareFrameInternal = function (frameState) {
         var layer = this.getLayer();
-        var source = layer.getSource();
+        var source = layer.getRenderSource();
         if (!source) {
             return false;
         }
@@ -259,7 +267,7 @@ var WebGLTileLayerRenderer = /** @class */ (function (_super) {
     WebGLTileLayerRenderer.prototype.enqueueTiles = function (frameState, extent, z, tileTexturesByZ) {
         var viewState = frameState.viewState;
         var tileLayer = this.getLayer();
-        var tileSource = tileLayer.getSource();
+        var tileSource = tileLayer.getRenderSource();
         var tileGrid = tileSource.getTileGridForProjection(viewState.projection);
         var tileTextureCache = this.tileTextureCache_;
         var tileRange = tileGrid.getTileRangeForExtentAndZ(extent, z, this.tempTileRange_);
@@ -272,7 +280,7 @@ var WebGLTileLayerRenderer = /** @class */ (function (_super) {
         for (var x = tileRange.minX; x <= tileRange.maxX; ++x) {
             for (var y = tileRange.minY; y <= tileRange.maxY; ++y) {
                 var tileCoord = createTileCoord(z, x, y, this.tempTileCoord_);
-                var tileCoordKey = getTileCoordKey(tileCoord);
+                var cacheKey = getCacheKey(tileSource, tileCoord);
                 /**
                  * @type {TileTexture}
                  */
@@ -281,15 +289,15 @@ var WebGLTileLayerRenderer = /** @class */ (function (_super) {
                  * @type {import("../../webgl/TileTexture").TileType}
                  */
                 var tile = void 0;
-                if (tileTextureCache.containsKey(tileCoordKey)) {
-                    tileTexture = tileTextureCache.get(tileCoordKey);
+                if (tileTextureCache.containsKey(cacheKey)) {
+                    tileTexture = tileTextureCache.get(cacheKey);
                     tile = tileTexture.tile;
                 }
                 if (!tileTexture || tileTexture.tile.key !== tileSource.getKey()) {
                     tile = tileSource.getTile(z, x, y, frameState.pixelRatio, viewState.projection);
                     if (!tileTexture) {
                         tileTexture = new TileTexture(tile, tileGrid, this.helper);
-                        tileTextureCache.set(tileCoordKey, tileTexture);
+                        tileTextureCache.set(cacheKey, tileTexture);
                     }
                     else {
                         if (this.isDrawableTile_(tile)) {
@@ -324,11 +332,12 @@ var WebGLTileLayerRenderer = /** @class */ (function (_super) {
      * @return {HTMLElement} The rendered element.
      */
     WebGLTileLayerRenderer.prototype.renderFrame = function (frameState) {
+        this.renderComplete = true;
         var gl = this.helper.getGL();
         this.preRender(gl, frameState);
         var viewState = frameState.viewState;
         var tileLayer = this.getLayer();
-        var tileSource = tileLayer.getSource();
+        var tileSource = tileLayer.getRenderSource();
         var tileGrid = tileSource.getTileGridForProjection(viewState.projection);
         var extent = getRenderExtent(frameState, frameState.extent);
         var z = tileGrid.getZForResolution(viewState.resolution, tileSource.zDirection);
@@ -369,6 +378,7 @@ var WebGLTileLayerRenderer = /** @class */ (function (_super) {
                 var tileCoordKey = getTileCoordKey(tileCoord);
                 alphaLookup[tileCoordKey] = alpha;
             }
+            this.renderComplete = false;
             // first look for child tiles (at z + 1)
             var coveredByChildren = this.findAltTiles_(tileGrid, tileCoord, z + 1, tileTexturesByZ);
             if (coveredByChildren) {
@@ -484,9 +494,10 @@ var WebGLTileLayerRenderer = /** @class */ (function (_super) {
         }
         var covered = true;
         var tileTextureCache = this.tileTextureCache_;
+        var source = this.getLayer().getRenderSource();
         for (var x = tileRange.minX; x <= tileRange.maxX; ++x) {
             for (var y = tileRange.minY; y <= tileRange.maxY; ++y) {
-                var cacheKey = getKeyZXY(altZ, x, y);
+                var cacheKey = getCacheKey(source, [altZ, x, y]);
                 var loaded = false;
                 if (tileTextureCache.containsKey(cacheKey)) {
                     var tileTexture = tileTextureCache.get(cacheKey);

package/renderer/webgl/TileLayer.js.map

@@ -1 +1 @@
-{"version":3,"file":"TileLayer.js","sourceRoot":"","sources":["../../src/renderer/webgl/TileLayer.js"],"names":[],"mappings":"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"}
+{"version":3,"file":"TileLayer.js","sourceRoot":"","sources":["../../src/renderer/webgl/TileLayer.js"],"names":[],"mappings":"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"}

package/source.d.ts

@@ -1,3 +1,16 @@
+/**
+ * Creates a sources function from a tile grid. This function can be used as value for the
+ * `sources` property of the {@link module:ol/layer/Layer~Layer} subclasses that support it.
+ * @param {import("./tilegrid/TileGrid.js").default} tileGrid Tile grid.
+ * @param {function(import("./tilecoord.js").TileCoord): import("./source/Source.js").default} factory Source factory.
+ * This function takes a {@link module:ol/tilecoord~TileCoord} as argument and is expected to return a
+ * {@link module:ol/source/Source~Source}. **Note**: The returned sources should have a tile grid with
+ * a limited set of resolutions, matching the resolution range of a single zoom level of the pyramid
+ * `tileGrid` that `createFromTileGrid` was called with.
+ * @return {function(import("./extent.js").Extent, number): Array<import("./source/Source.js").default>} Sources function.
+ * @api
+ */
+export function sourcesFromTileGrid(tileGrid: import("./tilegrid/TileGrid.js").default, factory: (arg0: number[]) => import("./source/Source.js").default): (arg0: number[], arg1: number) => import("./source/Source.js").default[];
 export { default as BingMaps } from "./source/BingMaps.js";
 export { default as CartoDB } from "./source/CartoDB.js";
 export { default as Cluster } from "./source/Cluster.js";

package/source.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"source.d.ts","sourceRoot":"","sources":["src/source.js"],"names":[],"mappings":""}
+{"version":3,"file":"source.d.ts","sourceRoot":"","sources":["src/source.js"],"names":[],"mappings":"AAqCA;;;;;;;;;;;GAWG;AACH,qOAoBC"}

package/source.js

@@ -1,6 +1,8 @@
 /**
  * @module ol/source
  */
+import LRUCache from './structs/LRUCache.js';
+import { getIntersection } from './extent.js';
 export { default as BingMaps } from './source/BingMaps.js';
 export { default as CartoDB } from './source/CartoDB.js';
 export { default as Cluster } from './source/Cluster.js';
@@ -30,4 +32,37 @@ export { default as VectorTile } from './source/VectorTile.js';
 export { default as WMTS } from './source/WMTS.js';
 export { default as XYZ } from './source/XYZ.js';
 export { default as Zoomify } from './source/Zoomify.js';
+/**
+ * Creates a sources function from a tile grid. This function can be used as value for the
+ * `sources` property of the {@link module:ol/layer/Layer~Layer} subclasses that support it.
+ * @param {import("./tilegrid/TileGrid.js").default} tileGrid Tile grid.
+ * @param {function(import("./tilecoord.js").TileCoord): import("./source/Source.js").default} factory Source factory.
+ * This function takes a {@link module:ol/tilecoord~TileCoord} as argument and is expected to return a
+ * {@link module:ol/source/Source~Source}. **Note**: The returned sources should have a tile grid with
+ * a limited set of resolutions, matching the resolution range of a single zoom level of the pyramid
+ * `tileGrid` that `createFromTileGrid` was called with.
+ * @return {function(import("./extent.js").Extent, number): Array<import("./source/Source.js").default>} Sources function.
+ * @api
+ */
+export function sourcesFromTileGrid(tileGrid, factory) {
+    var sourceCache = new LRUCache(32);
+    var tileGridExtent = tileGrid.getExtent();
+    return function (extent, resolution) {
+        sourceCache.expireCache();
+        if (tileGridExtent) {
+            extent = getIntersection(tileGridExtent, extent);
+        }
+        var z = tileGrid.getZForResolution(resolution);
+        var wantedSources = [];
+        tileGrid.forEachTileCoord(extent, z, function (tileCoord) {
+            var key = tileCoord.toString();
+            if (!sourceCache.containsKey(key)) {
+                var source = factory(tileCoord);
+                sourceCache.set(key, source);
+            }
+            wantedSources.push(sourceCache.get(key));
+        });
+        return wantedSources;
+    };
+}
 //# sourceMappingURL=source.js.map

package/source.js.map

@@ -1 +1 @@
-{"version":3,"file":"source.js","sourceRoot":"","sources":["src/source.js"],"names":[],"mappings":"AAAA;;GAEG;AAEH,OAAO,EAAC,OAAO,IAAI,QAAQ,EAAC,MAAM,sBAAsB,CAAC;AACzD,OAAO,EAAC,OAAO,IAAI,OAAO,EAAC,MAAM,qBAAqB,CAAC;AACvD,OAAO,EAAC,OAAO,IAAI,OAAO,EAAC,MAAM,qBAAqB,CAAC;AACvD,OAAO,EAAC,OAAO,IAAI,QAAQ,EAAC,MAAM,sBAAsB,CAAC;AACzD,OAAO,EAAC,OAAO,IAAI,OAAO,EAAC,MAAM,qBAAqB,CAAC;AACvD,OAAO,EAAC,OAAO,IAAI,IAAI,EAAC,MAAM,kBAAkB,CAAC;AACjD,OAAO,EAAC,OAAO,IAAI,KAAK,EAAC,MAAM,mBAAmB,CAAC;AACnD,OAAO,EAAC,OAAO,IAAI,eAAe,EAAC,MAAM,6BAA6B,CAAC;AACvE,OAAO,EAAC,OAAO,IAAI,WAAW,EAAC,MAAM,yBAAyB,CAAC;AAC/D,OAAO,EAAC,OAAO,IAAI,aAAa,EAAC,MAAM,2BAA2B,CAAC;AACnE,OAAO,EAAC,OAAO,IAAI,WAAW,EAAC,MAAM,yBAAyB,CAAC;AAC/D,OAAO,EAAC,OAAO,IAAI,QAAQ,EAAC,MAAM,sBAAsB,CAAC;AACzD,OAAO,EAAC,OAAO,IAAI,GAAG,EAAC,MAAM,iBAAiB,CAAC;AAC/C,OAAO,EAAC,OAAO,IAAI,MAAM,EAAC,MAAM,oBAAoB,CAAC;AACrD,OAAO,EAAC,OAAO,IAAI,MAAM,EAAC,MAAM,oBAAoB,CAAC;AACrD,OAAO,EAAC,OAAO,IAAI,MAAM,EAAC,MAAM,oBAAoB,CAAC;AACrD,OAAO,EAAC,OAAO,IAAI,IAAI,EAAC,MAAM,kBAAkB,CAAC;AACjD,OAAO,EAAC,OAAO,IAAI,cAAc,EAAC,MAAM,4BAA4B,CAAC;AACrE,OAAO,EAAC,OAAO,IAAI,SAAS,EAAC,MAAM,uBAAuB,CAAC;AAC3D,OAAO,EAAC,OAAO,IAAI,SAAS,EAAC,MAAM,uBAAuB,CAAC;AAC3D,OAAO,EAAC,OAAO,IAAI,QAAQ,EAAC,MAAM,sBAAsB,CAAC;AACzD,OAAO,EAAC,OAAO,IAAI,OAAO,EAAC,MAAM,qBAAqB,CAAC;AACvD,OAAO,EAAC,OAAO,IAAI,OAAO,EAAC,MAAM,qBAAqB,CAAC;AACvD,OAAO,EAAC,OAAO,IAAI,OAAO,EAAC,MAAM,qBAAqB,CAAC;AACvD,OAAO,EAAC,OAAO,IAAI,MAAM,EAAC,MAAM,oBAAoB,CAAC;AACrD,OAAO,EAAC,OAAO,IAAI,UAAU,EAAC,MAAM,wBAAwB,CAAC;AAC7D,OAAO,EAAC,OAAO,IAAI,IAAI,EAAC,MAAM,kBAAkB,CAAC;AACjD,OAAO,EAAC,OAAO,IAAI,GAAG,EAAC,MAAM,iBAAiB,CAAC;AAC/C,OAAO,EAAC,OAAO,IAAI,OAAO,EAAC,MAAM,qBAAqB,CAAC"}
+{"version":3,"file":"source.js","sourceRoot":"","sources":["src/source.js"],"names":[],"mappings":"AAAA;;GAEG;AAEH,OAAO,QAAQ,MAAM,uBAAuB,CAAC;AAC7C,OAAO,EAAC,eAAe,EAAC,MAAM,aAAa,CAAC;AAE5C,OAAO,EAAC,OAAO,IAAI,QAAQ,EAAC,MAAM,sBAAsB,CAAC;AACzD,OAAO,EAAC,OAAO,IAAI,OAAO,EAAC,MAAM,qBAAqB,CAAC;AACvD,OAAO,EAAC,OAAO,IAAI,OAAO,EAAC,MAAM,qBAAqB,CAAC;AACvD,OAAO,EAAC,OAAO,IAAI,QAAQ,EAAC,MAAM,sBAAsB,CAAC;AACzD,OAAO,EAAC,OAAO,IAAI,OAAO,EAAC,MAAM,qBAAqB,CAAC;AACvD,OAAO,EAAC,OAAO,IAAI,IAAI,EAAC,MAAM,kBAAkB,CAAC;AACjD,OAAO,EAAC,OAAO,IAAI,KAAK,EAAC,MAAM,mBAAmB,CAAC;AACnD,OAAO,EAAC,OAAO,IAAI,eAAe,EAAC,MAAM,6BAA6B,CAAC;AACvE,OAAO,EAAC,OAAO,IAAI,WAAW,EAAC,MAAM,yBAAyB,CAAC;AAC/D,OAAO,EAAC,OAAO,IAAI,aAAa,EAAC,MAAM,2BAA2B,CAAC;AACnE,OAAO,EAAC,OAAO,IAAI,WAAW,EAAC,MAAM,yBAAyB,CAAC;AAC/D,OAAO,EAAC,OAAO,IAAI,QAAQ,EAAC,MAAM,sBAAsB,CAAC;AACzD,OAAO,EAAC,OAAO,IAAI,GAAG,EAAC,MAAM,iBAAiB,CAAC;AAC/C,OAAO,EAAC,OAAO,IAAI,MAAM,EAAC,MAAM,oBAAoB,CAAC;AACrD,OAAO,EAAC,OAAO,IAAI,MAAM,EAAC,MAAM,oBAAoB,CAAC;AACrD,OAAO,EAAC,OAAO,IAAI,MAAM,EAAC,MAAM,oBAAoB,CAAC;AACrD,OAAO,EAAC,OAAO,IAAI,IAAI,EAAC,MAAM,kBAAkB,CAAC;AACjD,OAAO,EAAC,OAAO,IAAI,cAAc,EAAC,MAAM,4BAA4B,CAAC;AACrE,OAAO,EAAC,OAAO,IAAI,SAAS,EAAC,MAAM,uBAAuB,CAAC;AAC3D,OAAO,EAAC,OAAO,IAAI,SAAS,EAAC,MAAM,uBAAuB,CAAC;AAC3D,OAAO,EAAC,OAAO,IAAI,QAAQ,EAAC,MAAM,sBAAsB,CAAC;AACzD,OAAO,EAAC,OAAO,IAAI,OAAO,EAAC,MAAM,qBAAqB,CAAC;AACvD,OAAO,EAAC,OAAO,IAAI,OAAO,EAAC,MAAM,qBAAqB,CAAC;AACvD,OAAO,EAAC,OAAO,IAAI,OAAO,EAAC,MAAM,qBAAqB,CAAC;AACvD,OAAO,EAAC,OAAO,IAAI,MAAM,EAAC,MAAM,oBAAoB,CAAC;AACrD,OAAO,EAAC,OAAO,IAAI,UAAU,EAAC,MAAM,wBAAwB,CAAC;AAC7D,OAAO,EAAC,OAAO,IAAI,IAAI,EAAC,MAAM,kBAAkB,CAAC;AACjD,OAAO,EAAC,OAAO,IAAI,GAAG,EAAC,MAAM,iBAAiB,CAAC;AAC/C,OAAO,EAAC,OAAO,IAAI,OAAO,EAAC,MAAM,qBAAqB,CAAC;AAEvD;;;;;;;;;;;GAWG;AACH,MAAM,UAAU,mBAAmB,CAAC,QAAQ,EAAE,OAAO;IACnD,IAAM,WAAW,GAAG,IAAI,QAAQ,CAAC,EAAE,CAAC,CAAC;IACrC,IAAM,cAAc,GAAG,QAAQ,CAAC,SAAS,EAAE,CAAC;IAC5C,OAAO,UAAU,MAAM,EAAE,UAAU;QACjC,WAAW,CAAC,WAAW,EAAE,CAAC;QAC1B,IAAI,cAAc,EAAE;YAClB,MAAM,GAAG,eAAe,CAAC,cAAc,EAAE,MAAM,CAAC,CAAC;SAClD;QACD,IAAM,CAAC,GAAG,QAAQ,CAAC,iBAAiB,CAAC,UAAU,CAAC,CAAC;QACjD,IAAM,aAAa,GAAG,EAAE,CAAC;QACzB,QAAQ,CAAC,gBAAgB,CAAC,MAAM,EAAE,CAAC,EAAE,UAAC,SAAS;YAC7C,IAAM,GAAG,GAAG,SAAS,CAAC,QAAQ,EAAE,CAAC;YACjC,IAAI,CAAC,WAAW,CAAC,WAAW,CAAC,GAAG,CAAC,EAAE;gBACjC,IAAM,MAAM,GAAG,OAAO,CAAC,SAAS,CAAC,CAAC;gBAClC,WAAW,CAAC,GAAG,CAAC,GAAG,EAAE,MAAM,CAAC,CAAC;aAC9B;YACD,aAAa,CAAC,IAAI,CAAC,WAAW,CAAC,GAAG,CAAC,GAAG,CAAC,CAAC,CAAC;QAC3C,CAAC,CAAC,CAAC;QACH,OAAO,aAAa,CAAC;IACvB,CAAC,CAAC;AACJ,CAAC"}

package/src/layer/Base.js

@@ -163,7 +163,6 @@ class BaseLayer extends BaseObject {
       });
     const zIndex = this.getZIndex();
     state.opacity = clamp(Math.round(this.getOpacity() * 100) / 100, 0, 1);
-    state.sourceState = this.getSourceState();
     state.visible = this.getVisible();
     state.extent = this.getExtent();
     state.zIndex = zIndex === undefined && !state.managed ? Infinity : zIndex;

package/src/layer/Layer.js

@@ -57,7 +57,7 @@ import {listen, unlistenByKey} from '../events.js';
  * @typedef {Object} State
  * @property {import("./Layer.js").default} layer Layer.
  * @property {number} opacity Opacity, the value is rounded to two digits to appear after the decimal point.
- * @property {import("../source/State.js").default} sourceState SourceState.
+ * @property {import("../source/Source.js").default|undefined} source Source being rendered (only for multi-source layers).
  * @property {boolean} visible Visible.
  * @property {boolean} managed Managed.
  * @property {import("../extent.js").Extent} [extent] Extent.
@@ -196,6 +196,13 @@ class Layer extends BaseLayer {
     return /** @type {SourceType} */ (this.get(LayerProperty.SOURCE)) || null;
   }
 
+  /**
+   * @return {SourceType} The source being rendered.
+   */
+  getRenderSource() {
+    return this.getSource();
+  }
+
   /**
    * @return {import("../source/State.js").default} Source state.
    */

package/src/layer/WebGLTile.js

@@ -3,6 +3,7 @@
  */
 import BaseTileLayer from './BaseTile.js';
 import LayerProperty from '../layer/Property.js';
+import SourceState from '../source/State.js';
 import WebGLTileLayerRenderer, {
   Attributes,
   Uniforms,
@@ -64,6 +65,11 @@ import {assign} from '../obj.js';
  * @property {number} [preload=0] Preload. Load low-resolution tiles up to `preload` levels. `0`
  * means no preloading.
  * @property {SourceType} [source] Source for this layer.
+ * @property {Array<SourceType>|function(import("../extent.js").Extent, number):Array<SourceType>} [sources] Array
+ * of sources for this layer. Takes precedence over `source`. Can either be an array of sources, or a function that
+ * expects an extent and a resolution (in view projection units per pixel) and returns an array of sources. See
+ * {@link module:ol/source.sourcesFromTileGrid} for a helper function to generate sources that are organized in a
+ * pyramid following the same pattern as a tile grid.
  * @property {import("../PluggableMap.js").default} [map] Sets the layer as overlay on a map. The map will not manage
  * this layer in its layers collection, and the layer will be rendered on top. This is useful for
  * temporary layers. The standard way to add a layer to a map and have it managed by the map is to
@@ -291,6 +297,18 @@ class WebGLTileLayer extends BaseTileLayer {
 
     super(options);
 
+    /**
+     * @type {Array<SourceType>|function(import("../extent.js").Extent, number):Array<SourceType>}
+     * @private
+     */
+    this.sources_ = options.sources;
+
+    /**
+     * @type {number}
+     * @private
+     */
+    this.renderedResolution_ = NaN;
+
     /**
      * @type {Style}
      * @private
@@ -312,6 +330,41 @@ class WebGLTileLayer extends BaseTileLayer {
     this.addChangeListener(LayerProperty.SOURCE, this.handleSourceUpdate_);
   }
 
+  /**
+   * Gets the sources for this layer, for a given extent and resolution.
+   * @param {import("../extent.js").Extent} extent Extent.
+   * @param {number} resolution Resolution.
+   * @return {Array<SourceType>} Sources.
+   */
+  getSources(extent, resolution) {
+    const source = this.getSource();
+    return this.sources_
+      ? typeof this.sources_ === 'function'
+        ? this.sources_(extent, resolution)
+        : this.sources_
+      : source
+      ? [source]
+      : [];
+  }
+
+  /**
+   * @return {SourceType} The source being rendered.
+   */
+  getRenderSource() {
+    return (
+      /** @type {SourceType} */ (this.getLayerState().source) ||
+      this.getSource()
+    );
+  }
+
+  /**
+   * @return {import("../source/State.js").default} Source state.
+   */
+  getSourceState() {
+    const source = this.getRenderSource();
+    return source ? source.getState() : SourceState.UNDEFINED;
+  }
+
   /**
    * @private
    */
@@ -340,6 +393,66 @@ class WebGLTileLayer extends BaseTileLayer {
     });
   }
 
+  /**
+   * @param {import("../PluggableMap").FrameState} frameState Frame state.
+   * @param {Array<SourceType>} sources Sources.
+   * @return {HTMLElement} Canvas.
+   */
+  renderSources(frameState, sources) {
+    const layerRenderer = this.getRenderer();
+    let canvas;
+    for (let i = 0, ii = sources.length; i < ii; ++i) {
+      this.getLayerState().source = sources[i];
+      if (layerRenderer.prepareFrame(frameState)) {
+        canvas = layerRenderer.renderFrame(frameState);
+      }
+    }
+    return canvas;
+  }
+
+  /**
+   * @param {?import("../PluggableMap.js").FrameState} frameState Frame state.
+   * @param {HTMLElement} target Target which the renderer may (but need not) use
+   * for rendering its content.
+   * @return {HTMLElement} The rendered element.
+   */
+  render(frameState, target) {
+    const viewState = frameState.viewState;
+    const sources = this.getSources(frameState.extent, viewState.resolution);
+    let ready = true;
+    for (let i = 0, ii = sources.length; i < ii; ++i) {
+      const source = sources[i];
+      const sourceState = source.getState();
+      if (sourceState == SourceState.LOADING) {
+        const onChange = () => {
+          if (source.getState() == SourceState.READY) {
+            source.removeEventListener('change', onChange);
+            this.changed();
+          }
+        };
+        source.addEventListener('change', onChange);
+      }
+      ready = ready && sourceState == SourceState.READY;
+    }
+    const canvas = this.renderSources(frameState, sources);
+    if (this.getRenderer().renderComplete && ready) {
+      // Fully rendered, done.
+      this.renderedResolution_ = viewState.resolution;
+      return canvas;
+    }
+    // Render sources from previously fully rendered frames
+    if (this.renderedResolution_ > 0.5 * viewState.resolution) {
+      const altSources = this.getSources(
+        frameState.extent,
+        this.renderedResolution_
+      ).filter((source) => !sources.includes(source));
+      if (altSources.length > 0) {
+        return this.renderSources(frameState, altSources);
+      }
+    }
+    return canvas;
+  }
+
   /**
    * Update the layer style.  The `updateStyleVariables` function is a more efficient
    * way to update layer rendering.  In cases where the whole style needs to be updated,

package/src/renderer/Composite.js

@@ -110,15 +110,17 @@ class CompositeMapRenderer extends MapRenderer {
     for (let i = 0, ii = layerStatesArray.length; i < ii; ++i) {
       const layerState = layerStatesArray[i];
       frameState.layerIndex = i;
+
+      const layer = layerState.layer;
+      const sourceState = layer.getSourceState();
       if (
         !inView(layerState, viewState) ||
-        (layerState.sourceState != SourceState.READY &&
-          layerState.sourceState != SourceState.UNDEFINED)
+        (sourceState != SourceState.READY &&
+          sourceState != SourceState.UNDEFINED)
       ) {
         continue;
       }
 
-      const layer = layerState.layer;
       const element = layer.render(frameState, previousElement);
       if (!element) {
         continue;

package/src/renderer/webgl/Layer.js

@@ -161,7 +161,7 @@ class WebGLLayerRenderer extends LayerRenderer {
    * @return {boolean} Layer is ready to be rendered.
    */
   prepareFrame(frameState) {
-    if (this.getLayer().getSource()) {
+    if (this.getLayer().getRenderSource()) {
       let incrementGroup = true;
       let groupNumber = -1;
       let className;

package/src/renderer/webgl/TileLayer.js

@@ -20,7 +20,6 @@ import {
 } from '../../vec/mat4.js';
 import {
   createOrUpdate as createTileCoord,
-  getKeyZXY,
   getKey as getTileCoordKey,
 } from '../../tilecoord.js';
 import {fromUserExtent} from '../../proj.js';
@@ -98,7 +97,7 @@ function getRenderExtent(frameState, extent) {
     );
   }
   const source =
-    /** {import("../../source/Tile.js").default} */ layerState.layer.getSource();
+    /** {import("../../source/Tile.js").default} */ layerState.layer.getRenderSource();
   if (!source.getWrapX()) {
     const gridExtent = source
       .getTileGridForProjection(frameState.viewState.projection)
@@ -110,6 +109,10 @@ function getRenderExtent(frameState, extent) {
   return extent;
 }
 
+function getCacheKey(source, tileCoord) {
+  return `${source.getKey()},${getTileCoordKey(tileCoord)}`;
+}
+
 /**
  * @typedef {Object} Options
  * @property {string} vertexShader Vertex shader source.
@@ -140,6 +143,12 @@ class WebGLTileLayerRenderer extends WebGLLayerRenderer {
       uniforms: options.uniforms,
     });
 
+    /**
+     * The last call to `renderFrame` was completed with all tiles loaded
+     * @type {boolean}
+     */
+    this.renderComplete = false;
+
     /**
      * This transform converts tile i, j coordinates to screen coordinates.
      * @type {import("../../transform.js").Transform}
@@ -273,7 +282,7 @@ class WebGLTileLayerRenderer extends WebGLLayerRenderer {
    */
   prepareFrameInternal(frameState) {
     const layer = this.getLayer();
-    const source = layer.getSource();
+    const source = layer.getRenderSource();
     if (!source) {
       return false;
     }
@@ -293,7 +302,7 @@ class WebGLTileLayerRenderer extends WebGLLayerRenderer {
   enqueueTiles(frameState, extent, z, tileTexturesByZ) {
     const viewState = frameState.viewState;
     const tileLayer = this.getLayer();
-    const tileSource = tileLayer.getSource();
+    const tileSource = tileLayer.getRenderSource();
     const tileGrid = tileSource.getTileGridForProjection(viewState.projection);
     const tileTextureCache = this.tileTextureCache_;
     const tileRange = tileGrid.getTileRangeForExtentAndZ(
@@ -314,7 +323,7 @@ class WebGLTileLayerRenderer extends WebGLLayerRenderer {
     for (let x = tileRange.minX; x <= tileRange.maxX; ++x) {
       for (let y = tileRange.minY; y <= tileRange.maxY; ++y) {
         const tileCoord = createTileCoord(z, x, y, this.tempTileCoord_);
-        const tileCoordKey = getTileCoordKey(tileCoord);
+        const cacheKey = getCacheKey(tileSource, tileCoord);
 
         /**
          * @type {TileTexture}
@@ -326,8 +335,8 @@ class WebGLTileLayerRenderer extends WebGLLayerRenderer {
          */
         let tile;
 
-        if (tileTextureCache.containsKey(tileCoordKey)) {
-          tileTexture = tileTextureCache.get(tileCoordKey);
+        if (tileTextureCache.containsKey(cacheKey)) {
+          tileTexture = tileTextureCache.get(cacheKey);
           tile = tileTexture.tile;
         }
         if (!tileTexture || tileTexture.tile.key !== tileSource.getKey()) {
@@ -340,7 +349,7 @@ class WebGLTileLayerRenderer extends WebGLLayerRenderer {
           );
           if (!tileTexture) {
             tileTexture = new TileTexture(tile, tileGrid, this.helper);
-            tileTextureCache.set(tileCoordKey, tileTexture);
+            tileTextureCache.set(cacheKey, tileTexture);
           } else {
             if (this.isDrawableTile_(tile)) {
               tileTexture.setTile(tile);
@@ -379,12 +388,13 @@ class WebGLTileLayerRenderer extends WebGLLayerRenderer {
    * @return {HTMLElement} The rendered element.
    */
   renderFrame(frameState) {
+    this.renderComplete = true;
     const gl = this.helper.getGL();
     this.preRender(gl, frameState);
 
     const viewState = frameState.viewState;
     const tileLayer = this.getLayer();
-    const tileSource = tileLayer.getSource();
+    const tileSource = tileLayer.getRenderSource();
     const tileGrid = tileSource.getTileGridForProjection(viewState.projection);
     const extent = getRenderExtent(frameState, frameState.extent);
     const z = tileGrid.getZForResolution(
@@ -438,6 +448,7 @@ class WebGLTileLayerRenderer extends WebGLLayerRenderer {
         const tileCoordKey = getTileCoordKey(tileCoord);
         alphaLookup[tileCoordKey] = alpha;
       }
+      this.renderComplete = false;
 
       // first look for child tiles (at z + 1)
       const coveredByChildren = this.findAltTiles_(
@@ -635,9 +646,10 @@ class WebGLTileLayerRenderer extends WebGLLayerRenderer {
 
     let covered = true;
     const tileTextureCache = this.tileTextureCache_;
+    const source = this.getLayer().getRenderSource();
     for (let x = tileRange.minX; x <= tileRange.maxX; ++x) {
       for (let y = tileRange.minY; y <= tileRange.maxY; ++y) {
-        const cacheKey = getKeyZXY(altZ, x, y);
+        const cacheKey = getCacheKey(source, [altZ, x, y]);
         let loaded = false;
         if (tileTextureCache.containsKey(cacheKey)) {
           const tileTexture = tileTextureCache.get(cacheKey);

package/src/source.js

@@ -2,6 +2,9 @@
  * @module ol/source
  */
 
+import LRUCache from './structs/LRUCache.js';
+import {getIntersection} from './extent.js';
+
 export {default as BingMaps} from './source/BingMaps.js';
 export {default as CartoDB} from './source/CartoDB.js';
 export {default as Cluster} from './source/Cluster.js';
@@ -31,3 +34,37 @@ export {default as VectorTile} from './source/VectorTile.js';
 export {default as WMTS} from './source/WMTS.js';
 export {default as XYZ} from './source/XYZ.js';
 export {default as Zoomify} from './source/Zoomify.js';
+
+/**
+ * Creates a sources function from a tile grid. This function can be used as value for the
+ * `sources` property of the {@link module:ol/layer/Layer~Layer} subclasses that support it.
+ * @param {import("./tilegrid/TileGrid.js").default} tileGrid Tile grid.
+ * @param {function(import("./tilecoord.js").TileCoord): import("./source/Source.js").default} factory Source factory.
+ * This function takes a {@link module:ol/tilecoord~TileCoord} as argument and is expected to return a
+ * {@link module:ol/source/Source~Source}. **Note**: The returned sources should have a tile grid with
+ * a limited set of resolutions, matching the resolution range of a single zoom level of the pyramid
+ * `tileGrid` that `createFromTileGrid` was called with.
+ * @return {function(import("./extent.js").Extent, number): Array<import("./source/Source.js").default>} Sources function.
+ * @api
+ */
+export function sourcesFromTileGrid(tileGrid, factory) {
+  const sourceCache = new LRUCache(32);
+  const tileGridExtent = tileGrid.getExtent();
+  return function (extent, resolution) {
+    sourceCache.expireCache();
+    if (tileGridExtent) {
+      extent = getIntersection(tileGridExtent, extent);
+    }
+    const z = tileGrid.getZForResolution(resolution);
+    const wantedSources = [];
+    tileGrid.forEachTileCoord(extent, z, (tileCoord) => {
+      const key = tileCoord.toString();
+      if (!sourceCache.containsKey(key)) {
+        const source = factory(tileCoord);
+        sourceCache.set(key, source);
+      }
+      wantedSources.push(sourceCache.get(key));
+    });
+    return wantedSources;
+  };
+}