From fb62e7928e773afb91ecfbf69d90bb2d68af0a74 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Maximilian=20Kr=C3=B6g?= Date: Fri, 11 Sep 2020 23:53:59 +0200 Subject: [PATCH] Rename method used for lines. --- src/ol/render/canvas/Builder.js | 6 +-- src/ol/render/canvas/ImageBuilder.js | 2 +- src/ol/render/canvas/LineStringBuilder.js | 2 +- src/ol/render/canvas/PolygonBuilder.js | 6 +-- src/ol/render/canvas/TextBuilder.js | 2 +- test/spec/ol/renderer/canvas/builder.test.js | 44 ++++++++++---------- 6 files changed, 31 insertions(+), 31 deletions(-) diff --git a/src/ol/render/canvas/Builder.js b/src/ol/render/canvas/Builder.js index ee7f180e02..20937fc587 100644 --- a/src/ol/render/canvas/Builder.js +++ b/src/ol/render/canvas/Builder.js @@ -149,7 +149,7 @@ class CanvasBuilder extends VectorContext { * @protected * @return {number} My end. */ - appendFlatCoordinates( + appendFlatLineCoordinates( flatCoordinates, offset, end, @@ -211,7 +211,7 @@ class CanvasBuilder extends VectorContext { drawCustomCoordinates_(flatCoordinates, offset, ends, stride, builderEnds) { for (let i = 0, ii = ends.length; i < ii; ++i) { const end = ends[i]; - const builderEnd = this.appendFlatCoordinates( + const builderEnd = this.appendFlatLineCoordinates( flatCoordinates, offset, end, @@ -290,7 +290,7 @@ class CanvasBuilder extends VectorContext { type == GeometryType.MULTI_POINT ) { flatCoordinates = geometry.getFlatCoordinates(); - builderEnd = this.appendFlatCoordinates( + builderEnd = this.appendFlatLineCoordinates( flatCoordinates, 0, flatCoordinates.length, diff --git a/src/ol/render/canvas/ImageBuilder.js b/src/ol/render/canvas/ImageBuilder.js index 4b920d4ad0..12a82c49ea 100644 --- a/src/ol/render/canvas/ImageBuilder.js +++ b/src/ol/render/canvas/ImageBuilder.js @@ -108,7 +108,7 @@ class CanvasImageBuilder extends CanvasBuilder { * @return {number} My end. */ drawCoordinates_(flatCoordinates, offset, end, stride) { - return this.appendFlatCoordinates( + return this.appendFlatLineCoordinates( flatCoordinates, offset, end, diff --git a/src/ol/render/canvas/LineStringBuilder.js b/src/ol/render/canvas/LineStringBuilder.js index 0e27feb3ef..ae8850d894 100644 --- a/src/ol/render/canvas/LineStringBuilder.js +++ b/src/ol/render/canvas/LineStringBuilder.js @@ -28,7 +28,7 @@ class CanvasLineStringBuilder extends CanvasBuilder { */ drawFlatCoordinates_(flatCoordinates, offset, end, stride) { const myBegin = this.coordinates.length; - const myEnd = this.appendFlatCoordinates( + const myEnd = this.appendFlatLineCoordinates( flatCoordinates, offset, end, diff --git a/src/ol/render/canvas/PolygonBuilder.js b/src/ol/render/canvas/PolygonBuilder.js index d53206a131..4b182289c1 100644 --- a/src/ol/render/canvas/PolygonBuilder.js +++ b/src/ol/render/canvas/PolygonBuilder.js @@ -40,7 +40,7 @@ class CanvasPolygonBuilder extends CanvasBuilder { for (let i = 0; i < numEnds; ++i) { const end = ends[i]; const myBegin = this.coordinates.length; - const myEnd = this.appendFlatCoordinates( + const myEnd = this.appendFlatLineCoordinates( flatCoordinates, offset, end, @@ -57,7 +57,7 @@ class CanvasPolygonBuilder extends CanvasBuilder { this.hitDetectionInstructions.push(moveToLineToInstruction); if (stroke) { // Performance optimization: only call closePath() when we have a stroke. - // Otherwise the ring is closed already (see appendFlatCoordinates above). + // Otherwise the ring is closed already (see appendFlatLineCoordinates above). this.instructions.push(closePathInstruction); this.hitDetectionInstructions.push(closePathInstruction); } @@ -108,7 +108,7 @@ class CanvasPolygonBuilder extends CanvasBuilder { const flatCoordinates = circleGeometry.getFlatCoordinates(); const stride = circleGeometry.getStride(); const myBegin = this.coordinates.length; - this.appendFlatCoordinates( + this.appendFlatLineCoordinates( flatCoordinates, 0, flatCoordinates.length, diff --git a/src/ol/render/canvas/TextBuilder.js b/src/ol/render/canvas/TextBuilder.js index 98216ed3d7..424e5b110a 100644 --- a/src/ol/render/canvas/TextBuilder.js +++ b/src/ol/render/canvas/TextBuilder.js @@ -276,7 +276,7 @@ class CanvasTextBuilder extends CanvasBuilder { break; default: } - end = this.appendFlatCoordinates( + end = this.appendFlatLineCoordinates( flatCoordinates, 0, end, diff --git a/test/spec/ol/renderer/canvas/builder.test.js b/test/spec/ol/renderer/canvas/builder.test.js index 473aa096a2..9ceda6f06f 100644 --- a/test/spec/ol/renderer/canvas/builder.test.js +++ b/test/spec/ol/renderer/canvas/builder.test.js @@ -331,7 +331,7 @@ describe('ol.render.canvas.Builder', function () { }); }); - describe('#appendFlatCoordinates()', function () { + describe('#appendFlatLineCoordinates()', function () { let replay; beforeEach(function () { replay = new CanvasBuilder(1, [-180, -90, 180, 90], 1, 1, true); @@ -339,19 +339,19 @@ describe('ol.render.canvas.Builder', function () { it('appends coordinates that are within the max extent', function () { const flat = [-110, 45, 110, 45, 110, -45, -110, -45]; - replay.appendFlatCoordinates(flat, 0, flat.length, 2, false, false); + replay.appendFlatLineCoordinates(flat, 0, flat.length, 2, false, false); expect(replay.coordinates).to.eql(flat); }); it('appends polygon coordinates that are within the max extent', function () { const flat = [-110, 45, 110, 45, 110, -45, -110, -45, -110, 45]; - replay.appendFlatCoordinates(flat, 0, flat.length, 2, true, false); + replay.appendFlatLineCoordinates(flat, 0, flat.length, 2, true, false); expect(replay.coordinates).to.eql(flat); }); it('appends polygon coordinates that are within the max extent (skipping first)', function () { const flat = [-110, 45, 110, 45, 110, -45, -110, -45, -110, 45]; - replay.appendFlatCoordinates(flat, 0, flat.length, 2, true, true); + replay.appendFlatLineCoordinates(flat, 0, flat.length, 2, true, true); expect(replay.coordinates).to.eql([ 110, 45, @@ -366,7 +366,7 @@ describe('ol.render.canvas.Builder', function () { it('works with a single coordinate (inside)', function () { const flat = [-110, 45]; - replay.appendFlatCoordinates(flat, 0, flat.length, 2, false, false); + replay.appendFlatLineCoordinates(flat, 0, flat.length, 2, false, false); expect(replay.coordinates).to.eql(flat); }); @@ -374,7 +374,7 @@ describe('ol.render.canvas.Builder', function () { // this could be changed, but to make the code simpler for properly // closing rings, we always add the first point const flat = [-110, 145]; - replay.appendFlatCoordinates(flat, 0, flat.length, 2, false, false); + replay.appendFlatLineCoordinates(flat, 0, flat.length, 2, false, false); expect(replay.coordinates).to.eql(flat); }); @@ -382,13 +382,13 @@ describe('ol.render.canvas.Builder', function () { // this could be changed, but to make the code simpler for properly // closing rings, we always add the first point const flat = [-110, 145, -110, 145]; - replay.appendFlatCoordinates(flat, 0, flat.length, 2, true, false); + replay.appendFlatLineCoordinates(flat, 0, flat.length, 2, true, false); expect(replay.coordinates).to.eql(flat); }); it('skips first polygon vertex upon request (also when outside)', function () { const flat = [-110, 145, -110, 145]; - replay.appendFlatCoordinates(flat, 0, flat.length, 2, true, true); + replay.appendFlatLineCoordinates(flat, 0, flat.length, 2, true, true); expect(replay.coordinates).to.eql([-110, 145]); }); @@ -396,13 +396,13 @@ describe('ol.render.canvas.Builder', function () { // this means we get a few extra points when coordinates are not // part of a linestring or ring, but only a few extra const flat = [0, 200, 0, -200]; - replay.appendFlatCoordinates(flat, 0, flat.length, 2, false, false); + replay.appendFlatLineCoordinates(flat, 0, flat.length, 2, false, false); expect(replay.coordinates).to.eql(flat); }); it('appends points when segments cross (top to inside)', function () { const flat = [0, 200, 0, 0]; - replay.appendFlatCoordinates(flat, 0, flat.length, 2, false, false); + replay.appendFlatLineCoordinates(flat, 0, flat.length, 2, false, false); expect(replay.coordinates).to.eql(flat); }); @@ -410,7 +410,7 @@ describe('ol.render.canvas.Builder', function () { // this could be changed, but to make the code simpler for properly // closing rings, we always add the first segment const flat = [-10, 200, 10, 200]; - replay.appendFlatCoordinates(flat, 0, flat.length, 2, false, false); + replay.appendFlatLineCoordinates(flat, 0, flat.length, 2, false, false); expect(replay.coordinates).to.eql(flat); }); @@ -418,67 +418,67 @@ describe('ol.render.canvas.Builder', function () { // this could be changed, but to make the code simpler for properly // closing rings, we always add the first segment const flat = [-10, 200, 10, 200, -10, 200]; - replay.appendFlatCoordinates(flat, 0, flat.length, 2, true, false); + replay.appendFlatLineCoordinates(flat, 0, flat.length, 2, true, false); expect(replay.coordinates).to.eql(flat); }); it('skips first polygon segment upon request (also when outside)', function () { const flat = [-10, 200, 10, 200, -10, 200]; - replay.appendFlatCoordinates(flat, 0, flat.length, 2, true, true); + replay.appendFlatLineCoordinates(flat, 0, flat.length, 2, true, true); expect(replay.coordinates).to.eql([10, 200, -10, 200]); }); it('eliminates segments outside (and not changing rel)', function () { const flat = [0, 0, 0, 200, 5, 200, 10, 200]; - replay.appendFlatCoordinates(flat, 0, flat.length, 2, false, false); + replay.appendFlatLineCoordinates(flat, 0, flat.length, 2, false, false); expect(replay.coordinates).to.eql([0, 0, 0, 200]); }); it('eliminates polygon segments outside (and not changing rel)', function () { const flat = [0, 0, 0, 200, 5, 200, 10, 200, 0, 0]; - replay.appendFlatCoordinates(flat, 0, flat.length, 2, true, false); + replay.appendFlatLineCoordinates(flat, 0, flat.length, 2, true, false); expect(replay.coordinates).to.eql([0, 0, 0, 200, 10, 200, 0, 0]); }); it('eliminates polygon segments outside (skipping first and not changing rel)', function () { const flat = [0, 0, 0, 10, 0, 200, 5, 200, 10, 200, 0, 0]; - replay.appendFlatCoordinates(flat, 0, flat.length, 2, true, true); + replay.appendFlatLineCoordinates(flat, 0, flat.length, 2, true, true); expect(replay.coordinates).to.eql([0, 10, 0, 200, 10, 200, 0, 0]); }); it('eliminates segments outside (and not changing rel)', function () { const flat = [0, 0, 0, 200, 10, 200]; - replay.appendFlatCoordinates(flat, 0, flat.length, 2, false, false); + replay.appendFlatLineCoordinates(flat, 0, flat.length, 2, false, false); expect(replay.coordinates).to.eql([0, 0, 0, 200]); }); it('includes polygon segments outside (and not changing rel) when on last segment', function () { const flat = [0, 0, 0, 200, 10, 200, 0, 0]; - replay.appendFlatCoordinates(flat, 0, flat.length, 2, true, false); + replay.appendFlatLineCoordinates(flat, 0, flat.length, 2, true, false); expect(replay.coordinates).to.eql(flat); }); it('includes polygon segments outside (skipping first and not changing rel) when on last segment', function () { const flat = [0, 0, 0, 200, 10, 200, 0, 0]; - replay.appendFlatCoordinates(flat, 0, flat.length, 2, true, true); + replay.appendFlatLineCoordinates(flat, 0, flat.length, 2, true, true); expect(replay.coordinates).to.eql([0, 200, 10, 200, 0, 0]); }); it('includes outside segments that change relationship', function () { const flat = [0, 0, 0, 200, 200, 200, 250, 200]; - replay.appendFlatCoordinates(flat, 0, flat.length, 2, false, false); + replay.appendFlatLineCoordinates(flat, 0, flat.length, 2, false, false); expect(replay.coordinates).to.eql([0, 0, 0, 200, 200, 200]); }); it('includes outside polygon segments that change relationship when on last segment', function () { const flat = [0, 0, 0, 200, 200, 200, 250, 200, 0, 0]; - replay.appendFlatCoordinates(flat, 0, flat.length, 2, true, false); + replay.appendFlatLineCoordinates(flat, 0, flat.length, 2, true, false); expect(replay.coordinates).to.eql(flat); }); it('includes outside polygon segments that change relationship when on last segment (when skipping first)', function () { const flat = [0, 0, 0, 200, 200, 200, 250, 200, 0, 0]; - replay.appendFlatCoordinates(flat, 0, flat.length, 2, true, true); + replay.appendFlatLineCoordinates(flat, 0, flat.length, 2, true, true); expect(replay.coordinates).to.eql([0, 200, 200, 200, 250, 200, 0, 0]); }); });