diff --git a/src/ol/render/canvas/ImageReplay.js b/src/ol/render/canvas/ImageReplay.js index e7f921889e..e9d71797ad 100644 --- a/src/ol/render/canvas/ImageReplay.js +++ b/src/ol/render/canvas/ImageReplay.js @@ -2,9 +2,9 @@ * @module ol/render/canvas/ImageReplay */ import CanvasInstruction from './Instruction.js'; -import CanvasReplay from './Replay.js'; +import CanvasInstructionsBuilder from './InstructionsBuilder.js'; -class CanvasImageReplay extends CanvasReplay { +class CanvasImageReplay extends CanvasInstructionsBuilder { /** * @param {number} tolerance Tolerance. * @param {import("../../extent.js").Extent} maxExtent Maximum extent. diff --git a/src/ol/render/canvas/Replay.js b/src/ol/render/canvas/InstructionsBuilder.js similarity index 97% rename from src/ol/render/canvas/Replay.js rename to src/ol/render/canvas/InstructionsBuilder.js index f7938df948..162162077b 100644 --- a/src/ol/render/canvas/Replay.js +++ b/src/ol/render/canvas/InstructionsBuilder.js @@ -31,7 +31,7 @@ import { */ -class CanvasReplay extends VectorContext { +class CanvasInstructionsBuilder extends VectorContext { /** * @param {number} tolerance Tolerance. * @param {import("../../extent.js").Extent} maxExtent Maximum extent. @@ -501,7 +501,7 @@ class CanvasReplay extends VectorContext { /** * @param {import("../canvas.js").FillStrokeState} state State. - * @param {function(this:CanvasReplay, import("../canvas.js").FillStrokeState, (import("../../geom/Geometry.js").default|import("../Feature.js").default)):Array<*>} createFill Create fill. + * @param {function(this:CanvasInstructionsBuilder, import("../canvas.js").FillStrokeState, (import("../../geom/Geometry.js").default|import("../Feature.js").default)):Array<*>} createFill Create fill. * @param {import("../../geom/Geometry.js").default|import("../Feature.js").default} geometry Geometry. */ updateFillStyle(state, createFill, geometry) { @@ -516,7 +516,7 @@ class CanvasReplay extends VectorContext { /** * @param {import("../canvas.js").FillStrokeState} state State. - * @param {function(this:CanvasReplay, import("../canvas.js").FillStrokeState)} applyStroke Apply stroke. + * @param {function(this:CanvasInstructionsBuilder, import("../canvas.js").FillStrokeState)} applyStroke Apply stroke. */ updateStrokeStyle(state, applyStroke) { const strokeStyle = state.strokeStyle; @@ -580,4 +580,4 @@ class CanvasReplay extends VectorContext { } -export default CanvasReplay; +export default CanvasInstructionsBuilder; diff --git a/src/ol/render/canvas/InstructionsGroupExecutor.js b/src/ol/render/canvas/InstructionsGroupExecutor.js index 1bff6b0834..dd3145718d 100644 --- a/src/ol/render/canvas/InstructionsGroupExecutor.js +++ b/src/ol/render/canvas/InstructionsGroupExecutor.js @@ -135,7 +135,7 @@ class InstructionsGroupExectuor extends ReplayGroup { /** * Recreate replays and populate them using the provided instructions. - * @param {!Object>} allInstructions The serializable instructions + * @param {!Object>} allInstructions The serializable instructions */ replaceInstructions(allInstructions) { this.replaysByZIndex_ = {}; diff --git a/src/ol/render/canvas/LineStringReplay.js b/src/ol/render/canvas/LineStringReplay.js index 8aed895832..4a7e90b140 100644 --- a/src/ol/render/canvas/LineStringReplay.js +++ b/src/ol/render/canvas/LineStringReplay.js @@ -2,9 +2,9 @@ * @module ol/render/canvas/LineStringReplay */ import CanvasInstruction, {strokeInstruction, beginPathInstruction} from './Instruction.js'; -import CanvasReplay from './Replay.js'; +import CanvasInstructionsBuilder from './InstructionsBuilder.js'; -class CanvasLineStringReplay extends CanvasReplay { +class CanvasLineStringReplay extends CanvasInstructionsBuilder { /** * @param {number} tolerance Tolerance. * @param {import("../../extent.js").Extent} maxExtent Maximum extent. diff --git a/src/ol/render/canvas/PolygonReplay.js b/src/ol/render/canvas/PolygonReplay.js index 6d9c87b007..77bb2d71ff 100644 --- a/src/ol/render/canvas/PolygonReplay.js +++ b/src/ol/render/canvas/PolygonReplay.js @@ -7,10 +7,10 @@ import {defaultFillStyle} from '../canvas.js'; import CanvasInstruction, { fillInstruction, strokeInstruction, beginPathInstruction, closePathInstruction } from './Instruction.js'; -import CanvasReplay from './Replay.js'; +import CanvasInstructionsBuilder from './InstructionsBuilder.js'; -class CanvasPolygonReplay extends CanvasReplay { +class CanvasPolygonReplay extends CanvasInstructionsBuilder { /** * @param {number} tolerance Tolerance. * @param {import("../../extent.js").Extent} maxExtent Maximum extent. diff --git a/src/ol/render/canvas/ReplayGroup.js b/src/ol/render/canvas/ReplayGroup.js index 6e52ee59a8..873af34410 100644 --- a/src/ol/render/canvas/ReplayGroup.js +++ b/src/ol/render/canvas/ReplayGroup.js @@ -9,7 +9,7 @@ import {transform2D} from '../../geom/flat/transform.js'; import {isEmpty} from '../../obj.js'; import ReplayGroup from '../ReplayGroup.js'; import ReplayType from '../ReplayType.js'; -import CanvasReplay from './Replay.js'; +import CanvasInstructionsBuilder from './InstructionsBuilder.js'; import CanvasImageReplay from './ImageReplay.js'; import CanvasLineStringReplay from './LineStringReplay.js'; import CanvasPolygonReplay from './PolygonReplay.js'; @@ -19,11 +19,11 @@ import {create as createTransform, compose as composeTransform} from '../../tran /** - * @type {Object} + * @type {Object} */ const BATCH_CONSTRUCTORS = { 'Circle': CanvasPolygonReplay, - 'Default': CanvasReplay, + 'Default': CanvasInstructionsBuilder, 'Image': CanvasImageReplay, 'LineString': CanvasLineStringReplay, 'Polygon': CanvasPolygonReplay, @@ -102,7 +102,7 @@ class CanvasReplayGroup extends ReplayGroup { /** * @private - * @type {!Object>} + * @type {!Object>} */ this.replaysByZIndex_ = {}; @@ -152,7 +152,7 @@ class CanvasReplayGroup extends ReplayGroup { /** * Recreate replays and populate them using the provided instructions. - * @param {!Object>} allInstructions The serializable instructions + * @param {!Object>} allInstructions The serializable instructions */ replaceInstructions(allInstructions) { this.replaysByZIndex_ = {}; @@ -183,7 +183,7 @@ class CanvasReplayGroup extends ReplayGroup { } /** - * @return {!Object>} The serializable instructions + * @return {!Object>} The serializable instructions */ finish() { const replaysInstructions = {}; @@ -359,7 +359,7 @@ class CanvasReplayGroup extends ReplayGroup { } /** - * @return {Object>} Replays. + * @return {Object>} Replays. */ getReplays() { return this.replaysByZIndex_; diff --git a/src/ol/render/canvas/TextReplay.js b/src/ol/render/canvas/TextReplay.js index 16e138c913..694fac4511 100644 --- a/src/ol/render/canvas/TextReplay.js +++ b/src/ol/render/canvas/TextReplay.js @@ -10,11 +10,11 @@ import GeometryType from '../../geom/GeometryType.js'; import {CANVAS_LINE_DASH} from '../../has.js'; import {labelCache, measureTextWidth, defaultTextAlign, measureTextHeight, defaultPadding, defaultLineCap, defaultLineDashOffset, defaultLineDash, defaultLineJoin, defaultFillStyle, checkFont, defaultFont, defaultLineWidth, defaultMiterLimit, defaultStrokeStyle, defaultTextBaseline} from '../canvas.js'; import CanvasInstruction from './Instruction.js'; -import CanvasReplay from './Replay.js'; +import CanvasInstructionsBuilder from './InstructionsBuilder.js'; import {TEXT_ALIGN} from '../replay.js'; import TextPlacement from '../../style/TextPlacement.js'; -class CanvasTextReplay extends CanvasReplay { +class CanvasTextReplay extends CanvasInstructionsBuilder { /** * @param {number} tolerance Tolerance. * @param {import("../../extent.js").Extent} maxExtent Maximum extent.