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

Fix incorrect Executor/Builder types

Browse Source
This commit is contained in:
Guillaume Beraudo
2018-11-15 23:27:43 +01:00
parent da92b2ab3f
commit 89fed65f07
7 changed files with 65 additions and 88 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
test/spec/ol/renderer/canvas/replay.test.js
View File

@@ -92,12 +92,12 @@ describe('ol.render.canvas.ReplayGroup', function() {
it('omits lineTo for repeated coordinates', function() {
renderFeature(builder, feature0, fill0, 1);
executor.replaceInstructions(builder.finish());
executor.replay(context, transform, 0, {});
executor.execute(context, transform, 0, {});
expect(lineToCount).to.be(4);
lineToCount = 0;
scaleTransform(transform, 0.25, 0.25);
executor.replaceInstructions(builder.finish());
executor.replay(context, transform, 0, {});
executor.execute(context, transform, 0, {});
expect(lineToCount).to.be(3);
});
@@ -105,7 +105,7 @@ describe('ol.render.canvas.ReplayGroup', function() {
renderFeature(builder, feature0, fill0, 1);
renderFeature(builder, feature1, fill1, 1);
executor.replaceInstructions(builder.finish());
executor.replay(context, transform, 0, {});
executor.execute(context, transform, 0, {});
expect(moveToCount).to.be(2);
});
@@ -114,7 +114,7 @@ describe('ol.render.canvas.ReplayGroup', function() {
renderFeature(builder, feature2, style1, 1);
renderFeature(builder, feature3, style1, 1);
executor.replaceInstructions(builder.finish());
executor.replay(context, transform, 0, {});
executor.execute(context, transform, 0, {});
expect(fillCount).to.be(1);
expect(strokeCount).to.be(1);
expect(beginPathCount).to.be(1);
@@ -125,7 +125,7 @@ describe('ol.render.canvas.ReplayGroup', function() {
renderFeature(builder, feature2, style1, 1);
renderFeature(builder, feature3, style2, 1);
executor.replaceInstructions(builder.finish());
executor.replay(context, transform, 0, {});
executor.execute(context, transform, 0, {});
expect(fillCount).to.be(2);
expect(strokeCount).to.be(2);
expect(beginPathCount).to.be(2);
@@ -136,7 +136,7 @@ describe('ol.render.canvas.ReplayGroup', function() {
renderFeature(builder, feature2, style2, 1);
renderFeature(builder, feature3, style1, 1);
executor.replaceInstructions(builder.finish());
executor.replay(context, transform, 0, {});
executor.execute(context, transform, 0, {});
expect(fillCount).to.be(3);
expect(strokeCount).to.be(3);
expect(beginPathCount).to.be(3);
@@ -149,7 +149,7 @@ describe('ol.render.canvas.ReplayGroup', function() {
const skippedUids = {};
skippedUids[getUid(feature1)] = true;
executor.replaceInstructions(builder.finish());
executor.replay(context, transform, 0, skippedUids);
executor.execute(context, transform, 0, skippedUids);
expect(fillCount).to.be(1);
expect(strokeCount).to.be(1);
expect(beginPathCount).to.be(1);
@@ -162,7 +162,7 @@ describe('ol.render.canvas.ReplayGroup', function() {
const skippedUids = {};
skippedUids[getUid(feature3)] = true;
executor.replaceInstructions(builder.finish());
executor.replay(context, transform, 0, skippedUids);
executor.execute(context, transform, 0, skippedUids);
expect(fillCount).to.be(1);
expect(strokeCount).to.be(1);
expect(beginPathCount).to.be(1);
@@ -176,7 +176,7 @@ describe('ol.render.canvas.ReplayGroup', function() {
skippedUids[getUid(feature1)] = true;
skippedUids[getUid(feature2)] = true;
executor.replaceInstructions(builder.finish());
executor.replay(context, transform, 0, skippedUids);
executor.execute(context, transform, 0, skippedUids);
expect(fillCount).to.be(1);
expect(strokeCount).to.be(1);
expect(beginPathCount).to.be(1);
@@ -189,7 +189,7 @@ describe('ol.render.canvas.ReplayGroup', function() {
renderFeature(builder, feature2, style1, 1);
renderFeature(builder, feature3, style1, 1);
executor.replaceInstructions(builder.finish());
executor.replay(context, transform, 0, {});
executor.execute(context, transform, 0, {});
expect(fillCount).to.be(3);
expect(strokeCount).to.be(3);
expect(beginPathCount).to.be(3);
@@ -218,7 +218,7 @@ describe('ol.render.canvas.ReplayGroup', function() {
renderFeature(builder, feature1, style2, 1);
renderFeature(builder, feature2, style2, 1);
executor.replaceInstructions(builder.finish());
executor.replay(context, transform, 0, {});
executor.execute(context, transform, 0, {});
expect(lineDashCount).to.be(1);
expect(style2.getStroke().getLineDash()).to.eql([3, 6]);
@@ -267,7 +267,7 @@ describe('ol.render.canvas.ReplayGroup', function() {
renderFeature(builder, geometrycollection, style, 1);
scaleTransform(transform, 0.1, 0.1);
executor.replaceInstructions(builder.finish());
executor.replay(context, transform, 0, {});
executor.execute(context, transform, 0, {});
expect(calls.length).to.be(9);
expect(calls[0].geometry).to.be(point.getGeometry());
expect(calls[0].feature).to.be(point);

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

@@ -241,10 +241,8 @@ describe('ol.renderer.canvas.VectorTileLayer', function() {
});
map.addLayer(layer2);
const spy1 = sinon.spy(VectorTile.prototype,
'getReplayGroup');
const spy2 = sinon.spy(VectorTile.prototype,
'setReplayGroup');
const spy1 = sinon.spy(VectorTile.prototype, 'getExecutorGroup');
const spy2 = sinon.spy(VectorTile.prototype, 'setExecutorGroup');
map.renderSync();
expect(spy1.callCount).to.be(4);
expect(spy2.callCount).to.be(2);
@@ -308,7 +306,7 @@ describe('ol.renderer.canvas.VectorTileLayer', function() {
});
describe('#forEachFeatureAtCoordinate', function() {
let layer, renderer, replayGroup;
let layer, renderer, executorGroup;
class TileClass extends VectorImageTile {
constructor() {
super(...arguments);
@@ -317,8 +315,8 @@ describe('ol.renderer.canvas.VectorTileLayer', function() {
const sourceTile = new VectorTile([0, 0, 0]);
sourceTile.setState(TileState.LOADED);
sourceTile.setProjection(getProjection('EPSG:3857'));
sourceTile.getReplayGroup = function() {
return replayGroup;
sourceTile.getExecutorGroup = function() {
return executorGroup;
};
const key = sourceTile.tileCoord.toString();
this.tileKeys = [key];
@@ -329,7 +327,7 @@ describe('ol.renderer.canvas.VectorTileLayer', function() {
}
beforeEach(function() {
replayGroup = {};
executorGroup = {};
layer = new VectorTileLayer({
source: new VectorTileSource({
tileClass: TileClass,
@@ -337,7 +335,7 @@ describe('ol.renderer.canvas.VectorTileLayer', function() {
})
});
renderer = new CanvasVectorTileLayerRenderer(layer);
replayGroup.forEachFeatureAtCoordinate = function(coordinate,
executorGroup.forEachFeatureAtCoordinate = function(coordinate,
resolution, rotation, hitTolerance, skippedFeaturesUids, callback) {
const feature = new Feature();
callback(feature);