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

Merge pull request #9008 from ahocevar/decouple-group-creation

Browse Source 
Decouple render instruction creation from rendering
This commit is contained in:
Andreas Hocevar
2018-12-07 14:33:54 +01:00
committed by GitHub
parent 89af80241e df59b894b1
commit 0cda18f58a
9 changed files with 251 additions and 170 deletions
Download Patch File Download Diff File Expand all files Collapse all files
test/spec/ol/renderer/canvas/vectortilelayer.test.js
+11 -6
View File
@@ -75,8 +75,11 @@ describe('ol.renderer.canvas.VectorTileLayer', function() {
tileGrid: createXYZ()
});
source.getTile = function() {
arguments[1] = TileState.LOADED;
const tile = VectorTileSource.prototype.getTile.apply(source, arguments);
tile.hasContext = function() {
return true;
};
tile.sourceTilesLoaded = true;
tile.setState(TileState.LOADED);
return tile;
};
@@ -242,10 +245,9 @@ describe('ol.renderer.canvas.VectorTileLayer', function() {
sourceTile.getImage = function() {
return document.createElement('canvas');
};
const tileUrlFunction = function() {};
const tile = new VectorImageTile([0, 0, 0], undefined, undefined, undefined,
undefined, [0, 0, 0], tileUrlFunction, createXYZ(), createXYZ(), {}, undefined,
undefined, VectorTile, undefined, 0);
const tile = new VectorImageTile([0, 0, 0], undefined, 1, undefined,
undefined, [0, 0, 0], undefined, createXYZ(), createXYZ(), {'0,0,0': sourceTile}, undefined,
undefined, undefined, undefined);
tile.transition_ = 0;
tile.wrappedTileCoord = [0, 0, 0];
tile.setState(TileState.LOADED);
@@ -256,6 +258,9 @@ describe('ol.renderer.canvas.VectorTileLayer', function() {
return tile;
};
const renderer = new CanvasVectorTileLayerRenderer(layer);
renderer.isDrawableTile = function() {
return true;
};
const proj = getProjection('EPSG:3857');
const frameState = {
extent: proj.getExtent(),
@@ -333,7 +338,7 @@ describe('ol.renderer.canvas.VectorTileLayer', function() {
}
};
frameState.layerStates[getUid(layer)] = {};
renderer.renderedTiles = [new TileClass([0, 0, -1])];
renderer.renderedTiles = [new TileClass([0, 0, -1], undefined, 1)];
renderer.forEachFeatureAtCoordinate(
coordinate, frameState, 0, spy, undefined);
expect(spy.callCount).to.be(1);
test/spec/ol/vectorimagetile.test.js
+16 -11
View File
@@ -17,7 +17,7 @@ describe('ol.VectorImageTile', function() {
defaultLoadFunction, [0, 0, 0], function() {
return url;
}, createXYZ(), createXYZ(), {},
1, getProjection('EPSG:3857'), VectorTile, function() {}, 0);
1, getProjection('EPSG:3857'), VectorTile, function() {});
tile.load();
const sourceTile = tile.getTile(tile.tileKeys[0]);
@@ -30,7 +30,7 @@ describe('ol.VectorImageTile', function() {
});
});
it('sets LOADED state when previously failed source tiles are loaded', function(done) {
it('sets sourceTilesLoaded when previously failed source tiles are loaded', function(done) {
const format = new GeoJSON();
const url = 'spec/ol/data/unavailable.json';
let sourceTile;
@@ -41,13 +41,17 @@ describe('ol.VectorImageTile', function() {
}, [0, 0, 0], function() {
return url;
}, createXYZ(), createXYZ(), {},
1, getProjection('EPSG:3857'), VectorTile, function() {}, 0);
1, getProjection('EPSG:3857'), VectorTile, function() {});
tile.load();
let calls = 0;
listen(tile, 'change', function(e) {
++calls;
expect(tile.getState()).to.be(calls == 2 ? TileState.LOADED : TileState.ERROR);
if (calls === 1) {
expect(tile.sourceTilesLoaded).to.be(false);
} else if (calls === 2) {
expect(tile.sourceTilesLoaded).to.be(true);
}
if (calls == 2) {
done();
} else {
@@ -65,7 +69,7 @@ describe('ol.VectorImageTile', function() {
defaultLoadFunction, [0, 0, 0], function() {
return url;
}, createXYZ(), createXYZ(), {},
1, getProjection('EPSG:3857'), VectorTile, function() {}, 0);
1, getProjection('EPSG:3857'), VectorTile, function() {});
tile.load();
@@ -81,7 +85,7 @@ describe('ol.VectorImageTile', function() {
const tile = new VectorImageTile([0, 0, 0], 0, url, format,
defaultLoadFunction, [0, 0, 0], function() {},
createXYZ(), createXYZ(), {},
1, getProjection('EPSG:3857'), VectorTile, function() {}, 0);
1, getProjection('EPSG:3857'), VectorTile, function() {});
tile.load();
@@ -105,7 +109,7 @@ describe('ol.VectorImageTile', function() {
return url;
}, tileGrid,
createXYZ({extent: [-180, -90, 180, 90], tileSize: 512}),
sourceTiles, 1, getProjection('EPSG:4326'), VectorTile, function() {}, 1);
sourceTiles, 1, getProjection('EPSG:4326'), VectorTile, function() {});
tile.load();
expect(tile.tileKeys.length).to.be(1);
expect(tile.getTile(tile.tileKeys[0]).tileCoord).to.eql([0, 16, 9]);
@@ -118,7 +122,7 @@ describe('ol.VectorImageTile', function() {
defaultLoadFunction, [0, 0, 0], function() {
return url;
}, createXYZ(), createXYZ({tileSize: 512}), {},
1, getProjection('EPSG:3857'), VectorTile, function() {}, 0);
1, getProjection('EPSG:3857'), VectorTile, function() {});
tile.load();
expect(tile.loadListenerKeys_.length).to.be(4);
@@ -131,18 +135,19 @@ describe('ol.VectorImageTile', function() {
expect(tile.getState()).to.be(TileState.ABORT);
});
it('#dispose() when loaded', function(done) {
it('#dispose() when source tiles are loaded', function(done) {
const format = new GeoJSON();
const url = 'spec/ol/data/point.json';
const tile = new VectorImageTile([0, 0, 0], 0, url, format,
defaultLoadFunction, [0, 0, 0], function() {
return url;
}, createXYZ(), createXYZ({tileSize: 512}), {},
1, getProjection('EPSG:3857'), VectorTile, function() {}, 0);
1, getProjection('EPSG:3857'), VectorTile, function() {});
tile.load();
listenOnce(tile, 'change', function() {
expect(tile.getState()).to.be(TileState.LOADED);
expect(tile.getState()).to.be(TileState.LOADING);
expect(tile.sourceTilesLoaded).to.be.ok();
expect(tile.loadListenerKeys_.length).to.be(0);
expect(tile.tileKeys.length).to.be(4);
tile.dispose();