ashatora/openlayers
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge pull request #9251 from ahocevar/cache-size

Browse Source 
Fix cache size calculation
This commit is contained in:
Andreas Hocevar
2019-02-21 01:57:40 +01:00
committed by GitHub
parent 959dba169d 4166c80c6e
commit 90034e4d48
2 changed files with 5 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/ol/source/Tile.js
+1 -1
View File
@@ -75,7 +75,7 @@ class TileSource extends Source {
if (tileGrid) { if (tileGrid) {
toSize(tileGrid.getTileSize(tileGrid.getMinZoom()), tileSize); toSize(tileGrid.getTileSize(tileGrid.getMinZoom()), tileSize);
} }
const canUseScreen = 'screen ' in self; const canUseScreen = 'screen' in self;
const width = canUseScreen ? (screen.availWidth || screen.width) : 1920; const width = canUseScreen ? (screen.availWidth || screen.width) : 1920;
const height = canUseScreen ? (screen.availHeight || screen.height) : 1080; const height = canUseScreen ? (screen.availHeight || screen.height) : 1080;
cacheSize = 4 * Math.ceil(width / tileSize[0]) * Math.ceil(height / tileSize[1]); cacheSize = 4 * Math.ceil(width / tileSize[0]) * Math.ceil(height / tileSize[1]);
test/spec/ol/source/tile.test.js
+4
View File
@@ -59,6 +59,10 @@ describe('ol.source.Tile', function() {
expect(source).to.be.a(Source); expect(source).to.be.a(Source);
expect(source).to.be.a(TileSource); expect(source).to.be.a(TileSource);
}); });
it('sets a screen dependent cache size', function() {
const source = new TileSource({});
expect(source.tileCache.highWaterMark).to.be(4 * Math.ceil(screen.availWidth / 256) * Math.ceil(screen.availHeight / 256));
});
it('sets a custom cache size', function() { it('sets a custom cache size', function() {
const projection = getProjection('EPSG:4326'); const projection = getProjection('EPSG:4326');
const source = new TileSource({ const source = new TileSource({