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

Merge pull request #9592 from fredj/f9587_layerIndex

Browse Source 
Remove `layerState` param from `prepareFrame` and `renderFrame` function
This commit is contained in:
Frédéric Junod
2019-05-29 09:27:38 +02:00
committed by GitHub
parent 6675f9be57 bfea858306
commit c4e465dcf9
17 changed files with 87 additions and 40 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
test/spec/ol/renderer/canvas/vectorimage.test.js
View File

@@ -35,6 +35,8 @@ describe('ol/renderer/canvas/VectorImageLayer', function() {
projExtent[0] - 10000, -10000, projExtent[0] + 10000, 10000
];
const frameState = {
layerStatesArray: [layer.getLayerState()],
layerIndex: 0,
extent: extent,
skippedFeatureUids: {},
viewHints: [],
@@ -44,7 +46,7 @@ describe('ol/renderer/canvas/VectorImageLayer', function() {
rotation: 0
}
};
renderer.prepareFrame(frameState, {});
renderer.prepareFrame(frameState);
const expected = renderer.image_.getExtent();
scaleFromCenter(extent, 2);

18
test/spec/ol/renderer/canvas/vectorlayer.test.js
View File

@@ -243,7 +243,7 @@ describe('ol.renderer.canvas.VectorLayer', function() {
frameState.extent =
[projExtent[0] - 10000, -10000, projExtent[0] + 10000, 10000];
renderer.prepareFrame(frameState, {});
renderer.prepareFrame(frameState);
expect(renderer.replayGroup_.maxExtent_).to.eql(bufferExtent([
projExtent[0] - worldWidth + buffer,
-10000, projExtent[2] + worldWidth - buffer, 10000
@@ -255,7 +255,7 @@ describe('ol.renderer.canvas.VectorLayer', function() {
frameState.extent =
[projExtent[0] - 10000, -10000, projExtent[1] - 10000, 10000];
renderer.prepareFrame(frameState, {});
renderer.prepareFrame(frameState);
expect(renderer.replayGroup_.maxExtent_).to.eql(bufferExtent([
projExtent[0] - worldWidth + buffer,
-10000, projExtent[2] + worldWidth - buffer, 10000
@@ -266,7 +266,7 @@ describe('ol.renderer.canvas.VectorLayer', function() {
frameState.extent =
[2 * projExtent[0] - 10000, -10000, 2 * projExtent[1] + 10000, 10000];
renderer.prepareFrame(frameState, {});
renderer.prepareFrame(frameState);
expect(renderer.replayGroup_.maxExtent_).to.eql(bufferExtent([
projExtent[0] - worldWidth + buffer,
-10000, projExtent[2] + worldWidth - buffer, 10000
@@ -279,7 +279,7 @@ describe('ol.renderer.canvas.VectorLayer', function() {
projExtent[0] - 2 * worldWidth - 10000,
-10000, projExtent[1] + 2 * worldWidth + 10000, 10000
];
renderer.prepareFrame(frameState, {});
renderer.prepareFrame(frameState);
expect(renderer.replayGroup_.maxExtent_).to.eql(bufferExtent([
projExtent[0] - 2 * worldWidth - 10000,
-10000, projExtent[2] + 2 * worldWidth + 10000, 10000
@@ -288,9 +288,9 @@ describe('ol.renderer.canvas.VectorLayer', function() {
it('sets replayGroupChanged correctly', function() {
frameState.extent = [-10000, -10000, 10000, 10000];
renderer.prepareFrame(frameState, {});
renderer.prepareFrame(frameState);
expect(renderer.replayGroupChanged).to.be(true);
renderer.prepareFrame(frameState, {});
renderer.prepareFrame(frameState);
expect(renderer.replayGroupChanged).to.be(false);
});
@@ -301,13 +301,15 @@ describe('ol.renderer.canvas.VectorLayer', function() {
expect(true);
done();
});
frameState.layerStatesArray = [layer.getLayerState()];
frameState.layerIndex = 0;
frameState.extent = [-10000, -10000, 10000, 10000];
frameState.size = [100, 100];
frameState.viewState.center = [0, 0];
let rendered = false;
if (renderer.prepareFrame(frameState, {})) {
if (renderer.prepareFrame(frameState)) {
rendered = true;
renderer.renderFrame(frameState, layer.getLayerState(), null);
renderer.renderFrame(frameState, null);
}
expect(rendered).to.be(true);
});

8
test/spec/ol/renderer/canvas/vectortilelayer.test.js
View File

@@ -234,6 +234,8 @@ describe('ol.renderer.canvas.VectorTileLayer', function() {
};
const proj = getProjection('EPSG:3857');
const frameState = {
layerStatesArray: [layer.getLayerState()],
layerIndex: 0,
extent: proj.getExtent(),
pixelRatio: 1,
time: Date.now(),
@@ -247,13 +249,13 @@ describe('ol.renderer.canvas.VectorTileLayer', function() {
usedTiles: {},
wantedTiles: {}
};
renderer.renderFrame(frameState, {});
renderer.renderFrame(frameState);
const replayState = renderer.renderedTiles[0].getReplayState(layer);
const revision = replayState.renderedTileRevision;
renderer.renderFrame(frameState, {}, null);
renderer.renderFrame(frameState, null);
expect(replayState.renderedTileRevision).to.be(revision);
layer.changed();
renderer.renderFrame(frameState, {}, null);
renderer.renderFrame(frameState, null);
expect(replayState.renderedTileRevision).to.be(revision + 1);
expect(Object.keys(renderer.tileListenerKeys_).length).to.be(0);
});