Final renamings

src/ol/VectorTile.js

@@ -67,7 +67,7 @@ class VectorTile extends Tile {
      * @private
      * @type {Object<string, import("./render/ExecutorGroup.js").default>}
      */
-    this.replayGroups_ = {};
+    this.executorGroups_ = {};
 
     /**
      * @private
@@ -88,7 +88,7 @@ class VectorTile extends Tile {
    */
   disposeInternal() {
     this.features_ = null;
-    this.replayGroups_ = {};
+    this.executorGroups_ = {};
     this.state = TileState.ABORT;
     this.changed();
     super.disposeInternal();
@@ -142,10 +142,10 @@ class VectorTile extends Tile {
   /**
    * @param {import("./layer/Layer.js").default} layer Layer.
    * @param {string} key Key.
-   * @return {import("./render/ExecutorGroup.js").default} Replay group.
+   * @return {import("./render/ExecutorGroup.js").default} Executor group.
    */
   getExecutorGroup(layer, key) {
-    return this.replayGroups_[getUid(layer) + ',' + key];
+    return this.executorGroups_[getUid(layer) + ',' + key];
   }
 
   /**
@@ -153,17 +153,17 @@ class VectorTile extends Tile {
    * @param {import("./layer/Layer").default} layer Layer.
    * @param {number} zoom Zoom.
    * @param {import("./extent").Extent} extent Extent.
-   * @return {import("./render/ExecutorGroup.js").default} Replay groups.
+   * @return {import("./render/ExecutorGroup.js").default} Executor groups.
    */
   getLowResExecutorGroup(layer, zoom, extent) {
     const layerId = getUid(layer);
     let bestZoom = 0;
     let replayGroup = null;
-    for (const key in this.replayGroups_) {
+    for (const key in this.executorGroups_) {
       const keyData = key.split(',');
       const candidateZoom = Number(keyData[1]);
       if (keyData[0] === layerId && candidateZoom <= zoom) {
-        const candidate = this.replayGroups_[key];
+        const candidate = this.executorGroups_[key];
         if (containsExtent(candidate.getMaxExtent(), extent) && candidateZoom > bestZoom) {
           replayGroup = candidate;
           bestZoom = candidateZoom;
@@ -247,7 +247,7 @@ class VectorTile extends Tile {
    * @param {import("./render/ExecutorGroup.js").default} executorGroup Executor group.
    */
   setExecutorGroup(layer, key, executorGroup) {
-    this.replayGroups_[getUid(layer) + ',' + key] = executorGroup;
+    this.executorGroups_[getUid(layer) + ',' + key] = executorGroup;
   }
 
   /**

src/ol/render/ExecutorGroup.js

@@ -11,7 +11,7 @@ class ExecutorGroup {
    * @abstract
    * @param {number|undefined} zIndex Z index.
    * @param {import("./ReplayType.js").default} replayType Replay type.
-   * @return {import("./VectorContext.js").default} Replay.
+   * @return {import("./VectorContext.js").default} Executor.
    */
   getExecutor(zIndex, replayType) {
     return abstract();
@@ -25,9 +25,16 @@ class ExecutorGroup {
     return abstract();
   }
 
+  /**
+   * @return {import("../extent.js").Extent} The extent of the group.
+   */
+  getMaxExtent() {
+    return abstract();
+  }
+
   /**
    * @abstract
-   * @param {boolean} group Group with previous replay
+   * @param {boolean} group Group with previous executor
    * @return {Array<*>} The resulting instruction group
    */
   addDeclutter(group) {

src/ol/render/canvas/Builder.js

@@ -1,5 +1,5 @@
 /**
- * @module ol/render/canvas/InstructionsBuilder
+ * @module ol/render/canvas/Builder
  */
 import {equals, reverseSubArray} from '../../array.js';
 import {asColorLike} from '../../colorlike.js';
@@ -30,7 +30,7 @@ import {
  */
 
 
-class CanvasInstructionsBuilder extends VectorContext {
+class CanvasBuilder extends VectorContext {
   /**
    * @param {number} tolerance Tolerance.
    * @param {import("../../extent.js").Extent} maxExtent Maximum extent.
@@ -464,7 +464,7 @@ class CanvasInstructionsBuilder extends VectorContext {
 
   /**
    * @param {import("../canvas.js").FillStrokeState} state State.
-   * @param {function(this:CanvasInstructionsBuilder, import("../canvas.js").FillStrokeState, (import("../../geom/Geometry.js").default|import("../Feature.js").default)):Array<*>} createFill Create fill.
+   * @param {function(this:CanvasBuilder, 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) {
@@ -479,7 +479,7 @@ class CanvasInstructionsBuilder extends VectorContext {
 
   /**
    * @param {import("../canvas.js").FillStrokeState} state State.
-   * @param {function(this:CanvasInstructionsBuilder, import("../canvas.js").FillStrokeState)} applyStroke Apply stroke.
+   * @param {function(this:CanvasBuilder, import("../canvas.js").FillStrokeState)} applyStroke Apply stroke.
    */
   updateStrokeStyle(state, applyStroke) {
     const strokeStyle = state.strokeStyle;
@@ -543,4 +543,4 @@ class CanvasInstructionsBuilder extends VectorContext {
 }
 
 
-export default CanvasInstructionsBuilder;
+export default CanvasBuilder;

src/ol/render/canvas/BuilderGroup.js

@@ -1,5 +1,5 @@
 /**
- * @module ol/render/canvas/InstructionsGroupBuilder
+ * @module ol/render/canvas/BuilderGroup
  */
 
 import {numberSafeCompareFunction} from '../../array.js';
@@ -9,7 +9,7 @@ import {transform2D} from '../../geom/flat/transform.js';
 import {isEmpty} from '../../obj.js';
 import BuilderGroup from '../BuilderGroup.js';
 import ReplayType from '../ReplayType.js';
-import CanvasInstructionsBuilder from './InstructionsBuilder.js';
+import CanvasBuilder from './Builder.js';
 import CanvasImageBuilder from './ImageBuilder.js';
 import CanvasLineStringBuilder from './LineStringBuilder.js';
 import CanvasPolygonBuilder from './PolygonBuilder.js';
@@ -19,11 +19,11 @@ import {create as createTransform, compose as composeTransform} from '../../tran
 
 
 /**
- * @type {Object<ReplayType, typeof CanvasInstructionsBuilder>}
+ * @type {Object<ReplayType, typeof CanvasBuilder>}
  */
 const BATCH_CONSTRUCTORS = {
   'Circle': CanvasPolygonBuilder,
-  'Default': CanvasInstructionsBuilder,
+  'Default': CanvasBuilder,
   'Image': CanvasImageBuilder,
   'LineString': CanvasLineStringBuilder,
   'Polygon': CanvasPolygonBuilder,
@@ -102,7 +102,7 @@ class CanvasBuilderGroup extends BuilderGroup {
 
     /**
      * @private
-     * @type {!Object<string, !Object<ReplayType, CanvasInstructionsBuilder>>}
+     * @type {!Object<string, !Object<ReplayType, CanvasBuilder>>}
      */
     this.buildersByZIndex_ = {};
 
@@ -151,7 +151,7 @@ class CanvasBuilderGroup extends BuilderGroup {
   }
 
   /**
-   * @return {!Object<string, !Object<ReplayType, import("./InstructionsBuilder.js").SerializableInstructions>>} The serializable instructions
+   * @return {!Object<string, !Object<ReplayType, import("./Builder.js").SerializableInstructions>>} The serializable instructions
    */
   finish() {
     const builderInstructions = {};

src/ol/render/canvas/Executor.js

@@ -1,5 +1,5 @@
 /**
- * @module ol/render/canvas/InstructionsExecutor
+ * @module ol/render/canvas/Executor
  */
 import {getUid} from '../../util.js';
 import {equals, reverseSubArray} from '../../array.js';
@@ -47,7 +47,7 @@ const tmpExtent = createEmpty();
 const tmpTransform = createTransform();
 
 
-class CanvasInstructionsExecutor {
+class CanvasExecutor {
   /**
    * @param {number} tolerance Tolerance.
    * @param {import("../../extent.js").Extent} maxExtent Maximum extent.
@@ -1019,4 +1019,4 @@ class CanvasInstructionsExecutor {
 }
 
 
-export default CanvasInstructionsExecutor;
+export default CanvasExecutor;

src/ol/render/canvas/ExecutorGroup.js

@@ -11,7 +11,7 @@ import BaseExecutorGroup from '../ExecutorGroup.js';
 import ReplayType from '../ReplayType.js';
 import {ORDER} from '../replay.js';
 import {create as createTransform, compose as composeTransform} from '../../transform.js';
-import CanvasInstructionsExecutor from './InstructionsExecutor.js';
+import CanvasExecutor from './Executor.js';
 
 
 class ExecutorGroup extends BaseExecutorGroup {
@@ -85,7 +85,7 @@ class ExecutorGroup extends BaseExecutorGroup {
 
     /**
      * @private
-     * @type {!Object<string, !Object<ReplayType, import("./InstructionsExecutor").default>>}
+     * @type {!Object<string, !Object<ReplayType, import("./Executor").default>>}
      */
     this.executorsByZIndex_ = {};
 
@@ -118,7 +118,7 @@ class ExecutorGroup extends BaseExecutorGroup {
 
   /**
    * Create executors and populate them using the provided instructions.
-   * @param {!Object<string, !Object<ReplayType, import("./InstructionsBuilder.js").SerializableInstructions>>} allInstructions The serializable instructions
+   * @param {!Object<string, !Object<ReplayType, import("./Builder.js").SerializableInstructions>>} allInstructions The serializable instructions
    */
   replaceInstructions(allInstructions) {
     this.executorsByZIndex_ = {};
@@ -301,7 +301,7 @@ class ExecutorGroup extends BaseExecutorGroup {
     }
     let executor = executors[replayType];
     if (executor === undefined) {
-      executor = new CanvasInstructionsExecutor(this.tolerance_, this.maxExtent_,
+      executor = new CanvasExecutor(this.tolerance_, this.maxExtent_,
         this.resolution_, this.pixelRatio_, this.overlaps_, this.declutterTree_);
       executors[replayType] = executor;
     }

src/ol/render/canvas/ImageBuilder.js

@@ -2,9 +2,9 @@
  * @module ol/render/canvas/ImageBuilder
  */
 import CanvasInstruction from './Instruction.js';
-import CanvasInstructionsBuilder from './InstructionsBuilder.js';
+import CanvasBuilder from './Builder.js';
 
-class CanvasImageBuilder extends CanvasInstructionsBuilder {
+class CanvasImageBuilder extends CanvasBuilder {
   /**
    * @param {number} tolerance Tolerance.
    * @param {import("../../extent.js").Extent} maxExtent Maximum extent.

src/ol/render/canvas/LineStringBuilder.js

@@ -2,9 +2,9 @@
  * @module ol/render/canvas/LineStringBuilder
  */
 import CanvasInstruction, {strokeInstruction, beginPathInstruction} from './Instruction.js';
-import CanvasInstructionsBuilder from './InstructionsBuilder.js';
+import CanvasBuilder from './Builder.js';
 
-class CanvasLineStringBuilder extends CanvasInstructionsBuilder {
+class CanvasLineStringBuilder extends CanvasBuilder {
   /**
    * @param {number} tolerance Tolerance.
    * @param {import("../../extent.js").Extent} maxExtent Maximum extent.

src/ol/render/canvas/PolygonBuilder.js

@@ -7,10 +7,10 @@ import {defaultFillStyle} from '../canvas.js';
 import CanvasInstruction, {
   fillInstruction, strokeInstruction, beginPathInstruction, closePathInstruction
 } from './Instruction.js';
-import CanvasInstructionsBuilder from './InstructionsBuilder.js';
+import CanvasBuilder from './Builder.js';
 
 
-class CanvasPolygonBuilder extends CanvasInstructionsBuilder {
+class CanvasPolygonBuilder extends CanvasBuilder {
   /**
    * @param {number} tolerance Tolerance.
    * @param {import("../../extent.js").Extent} maxExtent Maximum extent.

src/ol/render/canvas/TextBuilder.js

@@ -8,11 +8,11 @@ import {matchingChunk} from '../../geom/flat/straightchunk.js';
 import GeometryType from '../../geom/GeometryType.js';
 import {labelCache, defaultTextAlign, defaultPadding, defaultLineCap, defaultLineDashOffset, defaultLineDash, defaultLineJoin, defaultFillStyle, checkFont, defaultFont, defaultLineWidth, defaultMiterLimit, defaultStrokeStyle, defaultTextBaseline} from '../canvas.js';
 import CanvasInstruction from './Instruction.js';
-import CanvasInstructionsBuilder from './InstructionsBuilder.js';
+import CanvasBuilder from './Builder.js';
 import {TEXT_ALIGN} from '../replay.js';
 import TextPlacement from '../../style/TextPlacement.js';
 
-class CanvasTextBuilder extends CanvasInstructionsBuilder {
+class CanvasTextBuilder extends CanvasBuilder {
   /**
    * @param {number} tolerance Tolerance.
    * @param {import("../../extent.js").Extent} maxExtent Maximum extent.

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 CanvasBuilderGroup from '../../render/canvas/InstructionsGroupBuilder.js';
+import CanvasBuilderGroup from '../../render/canvas/BuilderGroup.js';
 import InstructionsGroupExecutor from '../../render/canvas/ExecutorGroup.js';
 import CanvasLayerRenderer from './Layer.js';
 import {defaultOrder as defaultRenderOrder, getTolerance as getRenderTolerance, getSquaredTolerance as getSquaredRenderTolerance, renderFeature} from '../vector.js';
@@ -483,16 +483,16 @@ class CanvasVectorLayerRenderer extends CanvasLayerRenderer {
     }
 
     const replayGroupInstructions = replayGroup.finish();
-    const renderingReplayGroup = new InstructionsGroupExecutor(
+    const renderingExecutorGroup = new InstructionsGroupExecutor(
       getRenderTolerance(resolution, pixelRatio), extent, resolution,
       pixelRatio, vectorSource.getOverlaps(), this.declutterTree_, vectorLayer.getRenderBuffer());
-    renderingReplayGroup.replaceInstructions(replayGroupInstructions);
+    renderingExecutorGroup.replaceInstructions(replayGroupInstructions);
 
     this.renderedResolution_ = resolution;
     this.renderedRevision_ = vectorLayerRevision;
     this.renderedRenderOrder_ = vectorLayerRenderOrder;
     this.renderedExtent_ = extent;
-    this.replayGroup_ = renderingReplayGroup;
+    this.replayGroup_ = renderingExecutorGroup;
 
     this.replayGroupChanged = true;
     return true;
@@ -503,10 +503,10 @@ class CanvasVectorLayerRenderer extends CanvasLayerRenderer {
    * @param {number} resolution Resolution.
    * @param {number} pixelRatio Pixel ratio.
    * @param {import("../../style/Style.js").default|Array<import("../../style/Style.js").default>} styles The style or array of styles.
-   * @param {import("../../render/canvas/InstructionsGroupBuilder.js").default} replayGroup Replay group.
+   * @param {import("../../render/canvas/BuilderGroup.js").default} builderGroup Builder group.
    * @return {boolean} `true` if an image is loading.
    */
-  renderFeature(feature, resolution, pixelRatio, styles, replayGroup) {
+  renderFeature(feature, resolution, pixelRatio, styles, builderGroup) {
     if (!styles) {
       return false;
     }
@@ -514,13 +514,13 @@ class CanvasVectorLayerRenderer extends CanvasLayerRenderer {
     if (Array.isArray(styles)) {
       for (let i = 0, ii = styles.length; i < ii; ++i) {
         loading = renderFeature(
-          replayGroup, feature, styles[i],
+          builderGroup, feature, styles[i],
           getSquaredRenderTolerance(resolution, pixelRatio),
           this.handleStyleImageChange_, this) || loading;
       }
     } else {
       loading = renderFeature(
-        replayGroup, feature, styles,
+        builderGroup, feature, styles,
         getSquaredRenderTolerance(resolution, pixelRatio),
         this.handleStyleImageChange_, this);
     }

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 CanvasBuilderGroup from '../../render/canvas/InstructionsGroupBuilder.js';
+import CanvasBuilderGroup from '../../render/canvas/BuilderGroup.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<import("../../style/Style.js").default>} styles The style or array of styles.
-   * @param {import("../../render/canvas/InstructionsGroupBuilder.js").default} replayGroup Replay group.
+   * @param {import("../../render/canvas/BuilderGroup.js").default} replayGroup Replay group.
    * @return {boolean} `true` if an image is loading.
    */
   renderFeature(feature, squaredTolerance, styles, replayGroup) {

test/spec/ol/render/canvas/replaygroup.test.js

@@ -1,4 +1,4 @@
-import {getCircleArray} from '../../../../../src/ol/render/canvas/InstructionsGroupBuilder.js';
+import {getCircleArray} from '../../../../../src/ol/render/canvas/BuilderGroup.js';
 
 
 describe('ol.render.canvas.ReplayGroup', function() {

test/spec/ol/render/canvas/textreplay.test.js

@@ -2,7 +2,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/TextBuilder.js';
-import InstructionExecutor from '../../../../../src/ol/render/canvas/InstructionsExecutor.js';
+import InstructionExecutor from '../../../../../src/ol/render/canvas/Executor.js';
 import Text from '../../../../../src/ol/style/Text.js';
 import {create as createTransform} from '../../../../../src/ol/transform.js';
 

test/spec/ol/renderer/canvas/replay.test.js

@@ -9,8 +9,8 @@ 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/InstructionsBuilder.js';
-import CanvasInstructionsGroupBuilder from '../../../../../src/ol/render/canvas/InstructionsGroupBuilder.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 {renderFeature} from '../../../../../src/ol/renderer/vector.js';
 import Fill from '../../../../../src/ol/style/Fill.js';

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 CanvasBuilderGroup from '../../../../src/ol/render/canvas/InstructionsGroupBuilder.js';
+import CanvasBuilderGroup from '../../../../src/ol/render/canvas/BuilderGroup.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';