From e2998631171db127e20f5b1a20d12e87ee9ae1c1 Mon Sep 17 00:00:00 2001 From: Guillaume Beraudo Date: Tue, 13 Nov 2018 16:57:03 +0100 Subject: [PATCH] More renaming --- src/ol/render/canvas/{ImageReplay.js => ImageBuilder.js} | 0 src/ol/render/canvas/InstructionsExecutor.js | 2 +- .../{ReplayGroup.js => InstructionsGroupBuilder.js} | 8 ++++---- .../canvas/{LineStringReplay.js => LineStringBuilder.js} | 0 .../render/canvas/{PolygonReplay.js => PolygonBuilder.js} | 0 src/ol/render/canvas/{TextReplay.js => TextBuilder.js} | 0 src/ol/renderer/canvas/VectorLayer.js | 4 ++-- src/ol/renderer/canvas/VectorTileLayer.js | 4 ++-- test/spec/ol/render/canvas/replaygroup.test.js | 2 +- test/spec/ol/render/canvas/textreplay.test.js | 2 +- test/spec/ol/renderer/canvas/replay.test.js | 8 ++++---- test/spec/ol/renderer/vector.test.js | 2 +- 12 files changed, 16 insertions(+), 16 deletions(-) rename src/ol/render/canvas/{ImageReplay.js => ImageBuilder.js} (100%) rename src/ol/render/canvas/{ReplayGroup.js => InstructionsGroupBuilder.js} (98%) rename src/ol/render/canvas/{LineStringReplay.js => LineStringBuilder.js} (100%) rename src/ol/render/canvas/{PolygonReplay.js => PolygonBuilder.js} (100%) rename src/ol/render/canvas/{TextReplay.js => TextBuilder.js} (100%) diff --git a/src/ol/render/canvas/ImageReplay.js b/src/ol/render/canvas/ImageBuilder.js similarity index 100% rename from src/ol/render/canvas/ImageReplay.js rename to src/ol/render/canvas/ImageBuilder.js diff --git a/src/ol/render/canvas/InstructionsExecutor.js b/src/ol/render/canvas/InstructionsExecutor.js index dbf169f44c..36168bfe12 100644 --- a/src/ol/render/canvas/InstructionsExecutor.js +++ b/src/ol/render/canvas/InstructionsExecutor.js @@ -1095,7 +1095,7 @@ class InstructionsExecutor { const pathLength = lineStringLength(pixelCoordinates, begin, end, 2); const textLength = measure(text); if (overflow || textLength <= pathLength) { - /** @type {import("./TextReplay.js").default} */ + /** @type {import("./TextBuilder.js").default} */ const textReplay = /** @type {?} */ (this); const textAlign = textReplay.textStates[textKey].textAlign; const startM = (pathLength - textLength) * TEXT_ALIGN[textAlign]; diff --git a/src/ol/render/canvas/ReplayGroup.js b/src/ol/render/canvas/InstructionsGroupBuilder.js similarity index 98% rename from src/ol/render/canvas/ReplayGroup.js rename to src/ol/render/canvas/InstructionsGroupBuilder.js index 873af34410..276db14ecd 100644 --- a/src/ol/render/canvas/ReplayGroup.js +++ b/src/ol/render/canvas/InstructionsGroupBuilder.js @@ -10,10 +10,10 @@ import {isEmpty} from '../../obj.js'; import ReplayGroup from '../ReplayGroup.js'; import ReplayType from '../ReplayType.js'; import CanvasInstructionsBuilder from './InstructionsBuilder.js'; -import CanvasImageReplay from './ImageReplay.js'; -import CanvasLineStringReplay from './LineStringReplay.js'; -import CanvasPolygonReplay from './PolygonReplay.js'; -import CanvasTextReplay from './TextReplay.js'; +import CanvasImageReplay from './ImageBuilder.js'; +import CanvasLineStringReplay from './LineStringBuilder.js'; +import CanvasPolygonReplay from './PolygonBuilder.js'; +import CanvasTextReplay from './TextBuilder.js'; import {ORDER} from '../replay.js'; import {create as createTransform, compose as composeTransform} from '../../transform.js'; diff --git a/src/ol/render/canvas/LineStringReplay.js b/src/ol/render/canvas/LineStringBuilder.js similarity index 100% rename from src/ol/render/canvas/LineStringReplay.js rename to src/ol/render/canvas/LineStringBuilder.js diff --git a/src/ol/render/canvas/PolygonReplay.js b/src/ol/render/canvas/PolygonBuilder.js similarity index 100% rename from src/ol/render/canvas/PolygonReplay.js rename to src/ol/render/canvas/PolygonBuilder.js diff --git a/src/ol/render/canvas/TextReplay.js b/src/ol/render/canvas/TextBuilder.js similarity index 100% rename from src/ol/render/canvas/TextReplay.js rename to src/ol/render/canvas/TextBuilder.js diff --git a/src/ol/renderer/canvas/VectorLayer.js b/src/ol/renderer/canvas/VectorLayer.js index f8d02528bd..4f2ebe9f1f 100644 --- a/src/ol/renderer/canvas/VectorLayer.js +++ b/src/ol/renderer/canvas/VectorLayer.js @@ -10,7 +10,7 @@ import rbush from 'rbush'; import {buffer, createEmpty, containsExtent, getWidth} from '../../extent.js'; import RenderEventType from '../../render/EventType.js'; import {labelCache, rotateAtOffset} from '../../render/canvas.js'; -import CanvasReplayGroup from '../../render/canvas/ReplayGroup.js'; +import CanvasReplayGroup from '../../render/canvas/InstructionsGroupBuilder.js'; import InstructionsGroupExecutor from '../../render/canvas/InstructionsGroupExecutor.js'; import CanvasLayerRenderer from './Layer.js'; import {defaultOrder as defaultRenderOrder, getTolerance as getRenderTolerance, getSquaredTolerance as getSquaredRenderTolerance, renderFeature} from '../vector.js'; @@ -503,7 +503,7 @@ class CanvasVectorLayerRenderer extends CanvasLayerRenderer { * @param {number} resolution Resolution. * @param {number} pixelRatio Pixel ratio. * @param {import("../../style/Style.js").default|Array} styles The style or array of styles. - * @param {import("../../render/canvas/ReplayGroup.js").default} replayGroup Replay group. + * @param {import("../../render/canvas/InstructionsGroupBuilder.js").default} replayGroup Replay group. * @return {boolean} `true` if an image is loading. */ renderFeature(feature, resolution, pixelRatio, styles, replayGroup) { diff --git a/src/ol/renderer/canvas/VectorTileLayer.js b/src/ol/renderer/canvas/VectorTileLayer.js index 35350f23a3..87ebc363f2 100644 --- a/src/ol/renderer/canvas/VectorTileLayer.js +++ b/src/ol/renderer/canvas/VectorTileLayer.js @@ -13,7 +13,7 @@ import {equivalent as equivalentProjection} from '../../proj.js'; import Units from '../../proj/Units.js'; import ReplayType from '../../render/ReplayType.js'; import {labelCache, rotateAtOffset} from '../../render/canvas.js'; -import CanvasReplayGroup, {replayDeclutter} from '../../render/canvas/ReplayGroup.js'; +import CanvasReplayGroup, {replayDeclutter} from '../../render/canvas/InstructionsGroupBuilder.js'; import {ORDER} from '../../render/replay.js'; import CanvasTileLayerRenderer from './TileLayer.js'; import {getSquaredTolerance as getSquaredRenderTolerance, renderFeature} from '../vector.js'; @@ -424,7 +424,7 @@ class CanvasVectorTileLayerRenderer extends CanvasTileLayerRenderer { * @param {import("../../Feature.js").FeatureLike} feature Feature. * @param {number} squaredTolerance Squared tolerance. * @param {import("../../style/Style.js").default|Array} styles The style or array of styles. - * @param {import("../../render/canvas/ReplayGroup.js").default} replayGroup Replay group. + * @param {import("../../render/canvas/InstructionsGroupBuilder.js").default} replayGroup Replay group. * @return {boolean} `true` if an image is loading. */ renderFeature(feature, squaredTolerance, styles, replayGroup) { diff --git a/test/spec/ol/render/canvas/replaygroup.test.js b/test/spec/ol/render/canvas/replaygroup.test.js index ac00a62a22..7313a596d3 100644 --- a/test/spec/ol/render/canvas/replaygroup.test.js +++ b/test/spec/ol/render/canvas/replaygroup.test.js @@ -1,4 +1,4 @@ -import {getCircleArray} from '../../../../../src/ol/render/canvas/ReplayGroup.js'; +import {getCircleArray} from '../../../../../src/ol/render/canvas/InstructionsGroupBuilder.js'; describe('ol.render.canvas.ReplayGroup', function() { diff --git a/test/spec/ol/render/canvas/textreplay.test.js b/test/spec/ol/render/canvas/textreplay.test.js index e9cce55171..e5e3804d2b 100644 --- a/test/spec/ol/render/canvas/textreplay.test.js +++ b/test/spec/ol/render/canvas/textreplay.test.js @@ -1,7 +1,7 @@ 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/TextReplay.js'; +import CanvasTextReplay from '../../../../../src/ol/render/canvas/TextBuilder.js'; import Text from '../../../../../src/ol/style/Text.js'; describe('ol.render.canvas.TextReplay', function() { diff --git a/test/spec/ol/renderer/canvas/replay.test.js b/test/spec/ol/renderer/canvas/replay.test.js index f449190ec3..9090ab5d56 100644 --- a/test/spec/ol/renderer/canvas/replay.test.js +++ b/test/spec/ol/renderer/canvas/replay.test.js @@ -7,10 +7,10 @@ import MultiPoint from '../../../../../src/ol/geom/MultiPoint.js'; import MultiPolygon from '../../../../../src/ol/geom/MultiPolygon.js'; import Point from '../../../../../src/ol/geom/Point.js'; import Polygon from '../../../../../src/ol/geom/Polygon.js'; -import CanvasLineStringReplay from '../../../../../src/ol/render/canvas/LineStringReplay.js'; -import CanvasPolygonReplay from '../../../../../src/ol/render/canvas/PolygonReplay.js'; -import CanvasReplay from '../../../../../src/ol/render/canvas/Replay.js'; -import CanvasReplayGroup from '../../../../../src/ol/render/canvas/ReplayGroup.js'; +import CanvasLineStringReplay from '../../../../../src/ol/render/canvas/LineStringBuilder.js'; +import CanvasPolygonReplay from '../../../../../src/ol/render/canvas/PolygonBuilder.js'; +import CanvasReplay from '../../../../../src/ol/render/canvas/InstructionsBuilder.js'; +import CanvasReplayGroup from '../../../../../src/ol/render/canvas/InstructionsGroupBuilder.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'; diff --git a/test/spec/ol/renderer/vector.test.js b/test/spec/ol/renderer/vector.test.js index 7d354b34e9..62e7050779 100644 --- a/test/spec/ol/renderer/vector.test.js +++ b/test/spec/ol/renderer/vector.test.js @@ -6,7 +6,7 @@ import Polygon from '../../../../src/ol/geom/Polygon.js'; import MultiLineString from '../../../../src/ol/geom/MultiLineString.js'; import MultiPoint from '../../../../src/ol/geom/MultiPoint.js'; import MultiPolygon from '../../../../src/ol/geom/MultiPolygon.js'; -import CanvasReplayGroup from '../../../../src/ol/render/canvas/ReplayGroup.js'; +import CanvasReplayGroup from '../../../../src/ol/render/canvas/InstructionsGroupBuilder.js'; import {renderFeature} from '../../../../src/ol/renderer/vector.js'; import Fill from '../../../../src/ol/style/Fill.js'; import Icon from '../../../../src/ol/style/Icon.js';