Merge pull request #14015 from mike-000/clear-cache
Clear cache when WebGL tile layer source reset
This commit is contained in:
@@ -392,6 +392,9 @@ class WebGLTileLayer extends BaseTileLayer {
|
|||||||
* @private
|
* @private
|
||||||
*/
|
*/
|
||||||
handleSourceUpdate_() {
|
handleSourceUpdate_() {
|
||||||
|
if (this.hasRenderer()) {
|
||||||
|
this.getRenderer().clearCache();
|
||||||
|
}
|
||||||
if (this.getSource()) {
|
if (this.getSource()) {
|
||||||
this.setStyle(this.style_);
|
this.setStyle(this.style_);
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -248,6 +248,12 @@ class WebGLTileLayerRenderer extends WebGLLayerRenderer {
|
|||||||
* @type {import("../../Map.js").FrameState|null}
|
* @type {import("../../Map.js").FrameState|null}
|
||||||
*/
|
*/
|
||||||
this.frameState_ = null;
|
this.frameState_ = null;
|
||||||
|
|
||||||
|
/**
|
||||||
|
* @private
|
||||||
|
* @type {import("../../proj/Projection.js").default}
|
||||||
|
*/
|
||||||
|
this.projection_ = undefined;
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
@@ -300,6 +306,13 @@ class WebGLTileLayerRenderer extends WebGLLayerRenderer {
|
|||||||
* @return {boolean} Layer is ready to be rendered.
|
* @return {boolean} Layer is ready to be rendered.
|
||||||
*/
|
*/
|
||||||
prepareFrameInternal(frameState) {
|
prepareFrameInternal(frameState) {
|
||||||
|
if (!this.projection_) {
|
||||||
|
this.projection_ = frameState.viewState.projection;
|
||||||
|
} else if (frameState.viewState.projection !== this.projection_) {
|
||||||
|
this.clearCache();
|
||||||
|
this.projection_ = frameState.viewState.projection;
|
||||||
|
}
|
||||||
|
|
||||||
const layer = this.getLayer();
|
const layer = this.getLayer();
|
||||||
const source = layer.getRenderSource();
|
const source = layer.getRenderSource();
|
||||||
if (!source) {
|
if (!source) {
|
||||||
@@ -855,13 +868,17 @@ class WebGLTileLayerRenderer extends WebGLLayerRenderer {
|
|||||||
return covered;
|
return covered;
|
||||||
}
|
}
|
||||||
|
|
||||||
removeHelper() {
|
clearCache() {
|
||||||
if (this.helper) {
|
|
||||||
const tileTextureCache = this.tileTextureCache_;
|
const tileTextureCache = this.tileTextureCache_;
|
||||||
tileTextureCache.forEach((tileTexture) => tileTexture.dispose());
|
tileTextureCache.forEach((tileTexture) => tileTexture.dispose());
|
||||||
tileTextureCache.clear();
|
tileTextureCache.clear();
|
||||||
}
|
}
|
||||||
|
|
||||||
|
removeHelper() {
|
||||||
|
if (this.helper) {
|
||||||
|
this.clearCache();
|
||||||
|
}
|
||||||
|
|
||||||
super.removeHelper();
|
super.removeHelper();
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
BIN
test/rendering/cases/webgl-data-tile-reset-source/expected.png
Normal file
BIN
test/rendering/cases/webgl-data-tile-reset-source/expected.png
Normal file
Binary file not shown.
|
After Width: | Height: | Size: 9.2 KiB |
66
test/rendering/cases/webgl-data-tile-reset-source/main.js
Normal file
66
test/rendering/cases/webgl-data-tile-reset-source/main.js
Normal file
@@ -0,0 +1,66 @@
|
|||||||
|
import DataTile from '../../../../src/ol/source/DataTile.js';
|
||||||
|
import Map from '../../../../src/ol/Map.js';
|
||||||
|
import TileLayer from '../../../../src/ol/layer/WebGLTile.js';
|
||||||
|
import View from '../../../../src/ol/View.js';
|
||||||
|
|
||||||
|
const size = [81, 99];
|
||||||
|
|
||||||
|
const canvas = document.createElement('canvas');
|
||||||
|
canvas.width = size[0];
|
||||||
|
canvas.height = size[1];
|
||||||
|
|
||||||
|
const context = canvas.getContext('2d');
|
||||||
|
context.strokeStyle = 'white';
|
||||||
|
context.textAlign = 'center';
|
||||||
|
const lineHeight = 16;
|
||||||
|
context.font = `${lineHeight}px sans-serif`;
|
||||||
|
|
||||||
|
const sourceRed = new DataTile({
|
||||||
|
loader: function (z, x, y) {
|
||||||
|
const halfWidth = size[0] / 2;
|
||||||
|
const halfHeight = size[1] / 2;
|
||||||
|
context.fillStyle = '#FF0000';
|
||||||
|
context.fillRect(0, 0, size[0], size[1]);
|
||||||
|
context.fillStyle = 'white';
|
||||||
|
context.fillText(`z: ${z}`, halfWidth, halfHeight - lineHeight);
|
||||||
|
context.fillText(`x: ${x}`, halfWidth, halfHeight);
|
||||||
|
context.fillText(`y: ${y}`, halfWidth, halfHeight + lineHeight);
|
||||||
|
context.strokeRect(0, 0, size[0], size[1]);
|
||||||
|
return context.getImageData(0, 0, size[0], size[1]).data;
|
||||||
|
},
|
||||||
|
tileSize: size,
|
||||||
|
});
|
||||||
|
|
||||||
|
const sourceBlue = new DataTile({
|
||||||
|
loader: function (z, x, y) {
|
||||||
|
const halfWidth = size[0] / 2;
|
||||||
|
const halfHeight = size[1] / 2;
|
||||||
|
context.fillStyle = '#00AAFF';
|
||||||
|
context.fillRect(0, 0, size[0], size[1]);
|
||||||
|
context.fillStyle = 'white';
|
||||||
|
context.fillText(`z: ${z}`, halfWidth, halfHeight - lineHeight);
|
||||||
|
context.fillText(`x: ${x}`, halfWidth, halfHeight);
|
||||||
|
context.fillText(`y: ${y}`, halfWidth, halfHeight + lineHeight);
|
||||||
|
context.strokeRect(0, 0, size[0], size[1]);
|
||||||
|
return context.getImageData(0, 0, size[0], size[1]).data;
|
||||||
|
},
|
||||||
|
tileSize: size,
|
||||||
|
});
|
||||||
|
|
||||||
|
const layer = new TileLayer({
|
||||||
|
source: sourceRed,
|
||||||
|
});
|
||||||
|
|
||||||
|
const map = new Map({
|
||||||
|
target: 'map',
|
||||||
|
layers: [layer],
|
||||||
|
view: new View({
|
||||||
|
center: [0, 0],
|
||||||
|
zoom: 4,
|
||||||
|
}),
|
||||||
|
});
|
||||||
|
|
||||||
|
map.once(`rendercomplete`, function () {
|
||||||
|
layer.setSource(sourceBlue);
|
||||||
|
render({tolerance: 0.03});
|
||||||
|
});
|
||||||
BIN
test/rendering/cases/webgl-tile-reset-projection/expected.png
Normal file
BIN
test/rendering/cases/webgl-tile-reset-projection/expected.png
Normal file
Binary file not shown.
|
After Width: | Height: | Size: 6.7 KiB |
35
test/rendering/cases/webgl-tile-reset-projection/main.js
Normal file
35
test/rendering/cases/webgl-tile-reset-projection/main.js
Normal file
@@ -0,0 +1,35 @@
|
|||||||
|
import Map from '../../../../src/ol/Map.js';
|
||||||
|
import TileLayer from '../../../../src/ol/layer/WebGLTile.js';
|
||||||
|
import View from '../../../../src/ol/View.js';
|
||||||
|
import XYZ from '../../../../src/ol/source/XYZ.js';
|
||||||
|
|
||||||
|
const map = new Map({
|
||||||
|
layers: [
|
||||||
|
new TileLayer({
|
||||||
|
source: new XYZ({
|
||||||
|
minZoom: 0,
|
||||||
|
maxZoom: 0,
|
||||||
|
url: '/data/tiles/osm/{z}/{x}/{y}.png',
|
||||||
|
}),
|
||||||
|
}),
|
||||||
|
],
|
||||||
|
target: 'map',
|
||||||
|
view: new View({
|
||||||
|
projection: 'EPSG:4326',
|
||||||
|
center: [0, 0],
|
||||||
|
zoom: 0,
|
||||||
|
multiWorld: true,
|
||||||
|
}),
|
||||||
|
});
|
||||||
|
|
||||||
|
map.once('rendercomplete', function () {
|
||||||
|
map.setView(
|
||||||
|
new View({
|
||||||
|
projection: 'EPSG:3857',
|
||||||
|
center: [0, 0],
|
||||||
|
zoom: 0,
|
||||||
|
multiWorld: true,
|
||||||
|
})
|
||||||
|
);
|
||||||
|
render({tolerance: 0.03});
|
||||||
|
});
|
||||||
Reference in New Issue
Block a user