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

Remove unused Builder/Executor functions and members

Browse Source
This commit is contained in:
ahocevar
2018-11-25 20:06:37 +01:00
parent b71a8aa006
commit f4aec3fd01
18 changed files with 160 additions and 769 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
test/spec/ol/render/canvas/replaygroup.test.js → test/spec/ol/render/canvas/executorgroup.test.js
View File

@@ -1,7 +1,7 @@
import {getCircleArray} from '../../../../../src/ol/render/canvas/BuilderGroup.js';
import {getCircleArray} from '../../../../../src/ol/render/canvas/ExecutorGroup.js';
describe('ol.render.canvas.ReplayGroup', function() {
describe('ol.render.canvas.ExecutorGroup', function() {
describe('#getCircleArray_', function() {
it('creates an array with a pixelated circle marked with true', function() {

14
test/spec/ol/render/canvas/textreplay.test.js → test/spec/ol/render/canvas/textbuilder.test.js
View File

@@ -1,13 +1,13 @@
import Feature from '../../../../../src/ol/Feature.js';
import MultiPolygon from '../../../../../src/ol/geom/MultiPolygon.js';
import Polygon from '../../../../../src/ol/geom/Polygon.js';
import CanvasTextReplay from '../../../../../src/ol/render/canvas/TextBuilder.js';
import InstructionExecutor from '../../../../../src/ol/render/canvas/Executor.js';
import TextBuilder from '../../../../../src/ol/render/canvas/TextBuilder.js';
import Executor from '../../../../../src/ol/render/canvas/Executor.js';
import Text from '../../../../../src/ol/style/Text.js';
import {create as createTransform} from '../../../../../src/ol/transform.js';
function createBuilder() {
return new CanvasTextReplay(1, [-180, -90, 180, 90], 0.02, 1, true);
return new TextBuilder(1, [-180, -90, 180, 90], 0.02, 1, true);
}
function createContext() {
@@ -25,18 +25,18 @@ function createContext() {
};
}
function executeInstructions(builder, expectedDrawTextImageCalls, expectedReplayImageCalls) {
function executeInstructions(builder, expectedDrawTextImageCalls, expectedBuilderImageCalls) {
const transform = createTransform();
const context = createContext();
const executor = new InstructionExecutor(1, [-180, -90, 180, 90], 0.02, 1, false, null, builder.finish());
const executor = new Executor([-180, -90, 180, 90], 0.02, 1, false, null, builder.finish());
sinon.spy(executor, 'drawTextImageWithPointPlacement_');
const replayImageStub = sinon.stub(executor, 'replayImage_');
executor.execute(context, transform);
expect(executor.drawTextImageWithPointPlacement_.callCount).to.be(expectedDrawTextImageCalls);
expect(replayImageStub.callCount).to.be(expectedReplayImageCalls);
expect(replayImageStub.callCount).to.be(expectedBuilderImageCalls);
}
describe('ol.render.canvas.TextReplay', function() {
describe('ol.render.canvas.TextBuilder', function() {
it('renders polygon labels only when they fit', function() {
let builder = createBuilder();

32
test/spec/ol/renderer/canvas/replay.test.js → test/spec/ol/renderer/canvas/builder.test.js
View File

@@ -9,16 +9,16 @@ import Point from '../../../../../src/ol/geom/Point.js';
import Polygon from '../../../../../src/ol/geom/Polygon.js';
import CanvasLineStringBuilder from '../../../../../src/ol/render/canvas/LineStringBuilder.js';
import CanvasPolygonBuilder from '../../../../../src/ol/render/canvas/PolygonBuilder.js';
import CanvasReplay from '../../../../../src/ol/render/canvas/Builder.js';
import CanvasInstructionsGroupBuilder from '../../../../../src/ol/render/canvas/BuilderGroup.js';
import CanvasInstructionsGroupExecutor from '../../../../../src/ol/render/canvas/ExecutorGroup.js';
import CanvasBuilder from '../../../../../src/ol/render/canvas/Builder.js';
import BuilderGroup from '../../../../../src/ol/render/canvas/BuilderGroup.js';
import ExecutorGroup from '../../../../../src/ol/render/canvas/ExecutorGroup.js';
import {renderFeature} from '../../../../../src/ol/renderer/vector.js';
import Fill from '../../../../../src/ol/style/Fill.js';
import Stroke from '../../../../../src/ol/style/Stroke.js';
import Style from '../../../../../src/ol/style/Style.js';
import {create as createTransform, scale as scaleTransform} from '../../../../../src/ol/transform.js';
describe('ol.render.canvas.ReplayGroup', function() {
describe('ol.render.canvas.BuilderGroup', function() {
describe('#replay', function() {
@@ -28,20 +28,20 @@ describe('ol.render.canvas.ReplayGroup', function() {
let fill0, fill1, style1, style2;
/**
* @param {CanvasInstructionsGroupBuilder} builder The builder to get instructions from.
* @param {BuilderGroup} builder The builder to get instructions from.
* @param {Object=} skippedUids The ids to skip.
* @param {number=} pixelRatio The pixel ratio.
* @param {boolean=} overlaps Whether there is overlaps.
*/
function execute(builder, skippedUids, pixelRatio, overlaps) {
const executor = new CanvasInstructionsGroupExecutor(1, [-180, -90, 180, 90], 1,
const executor = new ExecutorGroup([-180, -90, 180, 90], 1,
pixelRatio || 1, !!overlaps, null, builder.finish());
executor.execute(context, transform, 0, skippedUids || {});
}
beforeEach(function() {
transform = createTransform();
builder = new CanvasInstructionsGroupBuilder(1, [-180, -90, 180, 90], 1, 1, false);
builder = new BuilderGroup(1, [-180, -90, 180, 90], 1, 1, false);
feature0 = new Feature(new Polygon(
[[[-90, 0], [-45, 45], [0, 0], [1, 1], [0, -45], [-90, 0]]]));
feature1 = new Feature(new Polygon(
@@ -185,7 +185,7 @@ describe('ol.render.canvas.ReplayGroup', function() {
});
it('does not batch when overlaps is set to true', function() {
builder = new CanvasInstructionsGroupBuilder(1, [-180, -90, 180, 90], 1, 1, true);
builder = new BuilderGroup(1, [-180, -90, 180, 90], 1, 1, true);
renderFeature(builder, feature1, style1, 1);
renderFeature(builder, feature2, style1, 1);
renderFeature(builder, feature3, style1, 1);
@@ -197,7 +197,7 @@ describe('ol.render.canvas.ReplayGroup', function() {
it('applies the pixelRatio to the linedash array and offset', function() {
// replay with a pixelRatio of 2
builder = new CanvasInstructionsGroupBuilder(1, [-180, -90, 180, 90], 1, 2, true);
builder = new BuilderGroup(1, [-180, -90, 180, 90], 1, 2, true);
let lineDash, lineDashCount = 0,
lineDashOffset, lineDashOffsetCount = 0;
@@ -254,7 +254,7 @@ describe('ol.render.canvas.ReplayGroup', function() {
[polygon.getGeometry().getCoordinates(), polygon.getGeometry().getCoordinates()]));
const geometrycollection = new Feature(new GeometryCollection(
[point.getGeometry(), linestring.getGeometry(), polygon.getGeometry()]));
builder = new CanvasInstructionsGroupBuilder(1, [-180, -90, 180, 90], 1, 1, true);
builder = new BuilderGroup(1, [-180, -90, 180, 90], 1, 1, true);
renderFeature(builder, point, style, 1);
renderFeature(builder, multipoint, style, 1);
renderFeature(builder, linestring, style, 1);
@@ -291,15 +291,15 @@ describe('ol.render.canvas.ReplayGroup', function() {
});
describe('ol.render.canvas.Replay', function() {
describe('ol.render.canvas.Builder', function() {
describe('constructor', function() {
it('creates a new replay batch', function() {
const tolerance = 10;
const extent = [-180, -90, 180, 90];
const replay = new CanvasReplay(tolerance, extent, 1, 1, true);
expect(replay).to.be.a(CanvasReplay);
const replay = new CanvasBuilder(tolerance, extent, 1, 1, true);
expect(replay).to.be.a(CanvasBuilder);
});
});
@@ -308,7 +308,7 @@ describe('ol.render.canvas.Replay', function() {
let replay;
beforeEach(function() {
replay = new CanvasReplay(1, [-180, -90, 180, 90], 1, 1, true);
replay = new CanvasBuilder(1, [-180, -90, 180, 90], 1, 1, true);
});
it('appends coordinates that are within the max extent', function() {
@@ -451,7 +451,7 @@ describe('ol.render.canvas.Replay', function() {
});
describe('ol.render.canvas.LineStringReplay', function() {
describe('ol.render.canvas.LineStringBuilder', function() {
describe('#getBufferedMaxExtent()', function() {
@@ -473,7 +473,7 @@ describe('ol.render.canvas.LineStringReplay', function() {
});
describe('ol.render.canvas.PolygonReplay', function() {
describe('ol.render.canvas.PolygonBuilder', function() {
let replay;