Module renaming
This commit is contained in:
@@ -1,10 +1,10 @@
|
|||||||
/**
|
/**
|
||||||
* @module ol/render/canvas/ImageReplay
|
* @module ol/render/canvas/ImageBuilder
|
||||||
*/
|
*/
|
||||||
import CanvasInstruction from './Instruction.js';
|
import CanvasInstruction from './Instruction.js';
|
||||||
import CanvasInstructionsBuilder from './InstructionsBuilder.js';
|
import CanvasInstructionsBuilder from './InstructionsBuilder.js';
|
||||||
|
|
||||||
class CanvasImageReplay extends CanvasInstructionsBuilder {
|
class CanvasImageBuilder extends CanvasInstructionsBuilder {
|
||||||
/**
|
/**
|
||||||
* @param {number} tolerance Tolerance.
|
* @param {number} tolerance Tolerance.
|
||||||
* @param {import("../../extent.js").Extent} maxExtent Maximum extent.
|
* @param {import("../../extent.js").Extent} maxExtent Maximum extent.
|
||||||
@@ -214,4 +214,4 @@ class CanvasImageReplay extends CanvasInstructionsBuilder {
|
|||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
export default CanvasImageReplay;
|
export default CanvasImageBuilder;
|
||||||
|
|||||||
@@ -1,5 +1,5 @@
|
|||||||
/**
|
/**
|
||||||
* @module ol/render/canvas/Replay
|
* @module ol/render/canvas/InstructionsBuilder
|
||||||
*/
|
*/
|
||||||
import {equals, reverseSubArray} from '../../array.js';
|
import {equals, reverseSubArray} from '../../array.js';
|
||||||
import {asColorLike} from '../../colorlike.js';
|
import {asColorLike} from '../../colorlike.js';
|
||||||
|
|||||||
@@ -1,5 +1,5 @@
|
|||||||
/**
|
/**
|
||||||
* @module ol/render/canvas/Replay
|
* @module ol/render/canvas/InstructionsExecutor
|
||||||
*/
|
*/
|
||||||
import {getUid} from '../../util.js';
|
import {getUid} from '../../util.js';
|
||||||
import {equals, reverseSubArray} from '../../array.js';
|
import {equals, reverseSubArray} from '../../array.js';
|
||||||
@@ -52,7 +52,7 @@ const tmpExtent = createEmpty();
|
|||||||
const tmpTransform = createTransform();
|
const tmpTransform = createTransform();
|
||||||
|
|
||||||
|
|
||||||
class InstructionsExecutor {
|
class CanvasInstructionsExecutor {
|
||||||
/**
|
/**
|
||||||
* @param {number} tolerance Tolerance.
|
* @param {number} tolerance Tolerance.
|
||||||
* @param {import("../../extent.js").Extent} maxExtent Maximum extent.
|
* @param {import("../../extent.js").Extent} maxExtent Maximum extent.
|
||||||
@@ -1344,7 +1344,7 @@ class InstructionsExecutor {
|
|||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
export default InstructionsExecutor;
|
export default CanvasInstructionsExecutor;
|
||||||
|
|
||||||
|
|
||||||
/////////////// Below is code copied from TextReplay /////////////////
|
/////////////// Below is code copied from TextReplay /////////////////
|
||||||
|
|||||||
@@ -1,5 +1,5 @@
|
|||||||
/**
|
/**
|
||||||
* @module ol/render/canvas/ReplayGroup
|
* @module ol/render/canvas/InstructionsGroupBuilder
|
||||||
*/
|
*/
|
||||||
|
|
||||||
import {numberSafeCompareFunction} from '../../array.js';
|
import {numberSafeCompareFunction} from '../../array.js';
|
||||||
@@ -10,10 +10,10 @@ import {isEmpty} from '../../obj.js';
|
|||||||
import ReplayGroup from '../ReplayGroup.js';
|
import ReplayGroup from '../ReplayGroup.js';
|
||||||
import ReplayType from '../ReplayType.js';
|
import ReplayType from '../ReplayType.js';
|
||||||
import CanvasInstructionsBuilder from './InstructionsBuilder.js';
|
import CanvasInstructionsBuilder from './InstructionsBuilder.js';
|
||||||
import CanvasImageReplay from './ImageBuilder.js';
|
import CanvasImageBuilder from './ImageBuilder.js';
|
||||||
import CanvasLineStringReplay from './LineStringBuilder.js';
|
import CanvasLineStringBuilder from './LineStringBuilder.js';
|
||||||
import CanvasPolygonReplay from './PolygonBuilder.js';
|
import CanvasPolygonBuilder from './PolygonBuilder.js';
|
||||||
import CanvasTextReplay from './TextBuilder.js';
|
import CanvasTextBuilder from './TextBuilder.js';
|
||||||
import {ORDER} from '../replay.js';
|
import {ORDER} from '../replay.js';
|
||||||
import {create as createTransform, compose as composeTransform} from '../../transform.js';
|
import {create as createTransform, compose as composeTransform} from '../../transform.js';
|
||||||
|
|
||||||
@@ -22,16 +22,16 @@ import {create as createTransform, compose as composeTransform} from '../../tran
|
|||||||
* @type {Object<ReplayType, typeof CanvasInstructionsBuilder>}
|
* @type {Object<ReplayType, typeof CanvasInstructionsBuilder>}
|
||||||
*/
|
*/
|
||||||
const BATCH_CONSTRUCTORS = {
|
const BATCH_CONSTRUCTORS = {
|
||||||
'Circle': CanvasPolygonReplay,
|
'Circle': CanvasPolygonBuilder,
|
||||||
'Default': CanvasInstructionsBuilder,
|
'Default': CanvasInstructionsBuilder,
|
||||||
'Image': CanvasImageReplay,
|
'Image': CanvasImageBuilder,
|
||||||
'LineString': CanvasLineStringReplay,
|
'LineString': CanvasLineStringBuilder,
|
||||||
'Polygon': CanvasPolygonReplay,
|
'Polygon': CanvasPolygonBuilder,
|
||||||
'Text': CanvasTextReplay
|
'Text': CanvasTextBuilder
|
||||||
};
|
};
|
||||||
|
|
||||||
|
|
||||||
class CanvasReplayGroup extends ReplayGroup {
|
class CanvasInstructionsGroupBuilder extends ReplayGroup {
|
||||||
/**
|
/**
|
||||||
* @param {number} tolerance Tolerance.
|
* @param {number} tolerance Tolerance.
|
||||||
* @param {import("../../extent.js").Extent} maxExtent Max extent.
|
* @param {import("../../extent.js").Extent} maxExtent Max extent.
|
||||||
@@ -528,4 +528,4 @@ export function replayDeclutter(declutterReplays, context, rotation, snapToPixel
|
|||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
export default CanvasReplayGroup;
|
export default CanvasInstructionsGroupBuilder;
|
||||||
|
|||||||
@@ -1,5 +1,5 @@
|
|||||||
/**
|
/**
|
||||||
* @module ol/render/canvas/ReplayGroup
|
* @module ol/render/canvas/InstructionsGroupExecutor
|
||||||
*/
|
*/
|
||||||
|
|
||||||
import {numberSafeCompareFunction} from '../../array.js';
|
import {numberSafeCompareFunction} from '../../array.js';
|
||||||
@@ -11,7 +11,7 @@ import ReplayGroup from '../ReplayGroup.js';
|
|||||||
import ReplayType from '../ReplayType.js';
|
import ReplayType from '../ReplayType.js';
|
||||||
import {ORDER} from '../replay.js';
|
import {ORDER} from '../replay.js';
|
||||||
import {create as createTransform, compose as composeTransform} from '../../transform.js';
|
import {create as createTransform, compose as composeTransform} from '../../transform.js';
|
||||||
import InstructionsExecutor from './InstructionsExecutor.js';
|
import CanvasInstructionsExecutor from './InstructionsExecutor.js';
|
||||||
|
|
||||||
|
|
||||||
class InstructionsGroupExectuor extends ReplayGroup {
|
class InstructionsGroupExectuor extends ReplayGroup {
|
||||||
@@ -311,7 +311,7 @@ class InstructionsGroupExectuor extends ReplayGroup {
|
|||||||
}
|
}
|
||||||
let replay = replays[replayType];
|
let replay = replays[replayType];
|
||||||
if (replay === undefined) {
|
if (replay === undefined) {
|
||||||
replay = new InstructionsExecutor(this.tolerance_, this.maxExtent_,
|
replay = new CanvasInstructionsExecutor(this.tolerance_, this.maxExtent_,
|
||||||
this.resolution_, this.pixelRatio_, this.overlaps_, this.declutterTree_);
|
this.resolution_, this.pixelRatio_, this.overlaps_, this.declutterTree_);
|
||||||
replays[replayType] = replay;
|
replays[replayType] = replay;
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -1,10 +1,10 @@
|
|||||||
/**
|
/**
|
||||||
* @module ol/render/canvas/LineStringReplay
|
* @module ol/render/canvas/LineStringBuilder
|
||||||
*/
|
*/
|
||||||
import CanvasInstruction, {strokeInstruction, beginPathInstruction} from './Instruction.js';
|
import CanvasInstruction, {strokeInstruction, beginPathInstruction} from './Instruction.js';
|
||||||
import CanvasInstructionsBuilder from './InstructionsBuilder.js';
|
import CanvasInstructionsBuilder from './InstructionsBuilder.js';
|
||||||
|
|
||||||
class CanvasLineStringReplay extends CanvasInstructionsBuilder {
|
class CanvasLineStringBuilder extends CanvasInstructionsBuilder {
|
||||||
/**
|
/**
|
||||||
* @param {number} tolerance Tolerance.
|
* @param {number} tolerance Tolerance.
|
||||||
* @param {import("../../extent.js").Extent} maxExtent Maximum extent.
|
* @param {import("../../extent.js").Extent} maxExtent Maximum extent.
|
||||||
@@ -115,4 +115,4 @@ class CanvasLineStringReplay extends CanvasInstructionsBuilder {
|
|||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
export default CanvasLineStringReplay;
|
export default CanvasLineStringBuilder;
|
||||||
|
|||||||
@@ -1,5 +1,5 @@
|
|||||||
/**
|
/**
|
||||||
* @module ol/render/canvas/PolygonReplay
|
* @module ol/render/canvas/PolygonBuilder
|
||||||
*/
|
*/
|
||||||
import {asString} from '../../color.js';
|
import {asString} from '../../color.js';
|
||||||
import {snap} from '../../geom/flat/simplify.js';
|
import {snap} from '../../geom/flat/simplify.js';
|
||||||
@@ -10,7 +10,7 @@ import CanvasInstruction, {
|
|||||||
import CanvasInstructionsBuilder from './InstructionsBuilder.js';
|
import CanvasInstructionsBuilder from './InstructionsBuilder.js';
|
||||||
|
|
||||||
|
|
||||||
class CanvasPolygonReplay extends CanvasInstructionsBuilder {
|
class CanvasPolygonBuilder extends CanvasInstructionsBuilder {
|
||||||
/**
|
/**
|
||||||
* @param {number} tolerance Tolerance.
|
* @param {number} tolerance Tolerance.
|
||||||
* @param {import("../../extent.js").Extent} maxExtent Maximum extent.
|
* @param {import("../../extent.js").Extent} maxExtent Maximum extent.
|
||||||
@@ -212,4 +212,4 @@ class CanvasPolygonReplay extends CanvasInstructionsBuilder {
|
|||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
export default CanvasPolygonReplay;
|
export default CanvasPolygonBuilder;
|
||||||
|
|||||||
@@ -1,5 +1,5 @@
|
|||||||
/**
|
/**
|
||||||
* @module ol/render/canvas/TextReplay
|
* @module ol/render/canvas/TextBuilder
|
||||||
*/
|
*/
|
||||||
import {getUid} from '../../util.js';
|
import {getUid} from '../../util.js';
|
||||||
import {asColorLike} from '../../colorlike.js';
|
import {asColorLike} from '../../colorlike.js';
|
||||||
@@ -14,7 +14,7 @@ import CanvasInstructionsBuilder from './InstructionsBuilder.js';
|
|||||||
import {TEXT_ALIGN} from '../replay.js';
|
import {TEXT_ALIGN} from '../replay.js';
|
||||||
import TextPlacement from '../../style/TextPlacement.js';
|
import TextPlacement from '../../style/TextPlacement.js';
|
||||||
|
|
||||||
class CanvasTextReplay extends CanvasInstructionsBuilder {
|
class CanvasTextBuilder extends CanvasInstructionsBuilder {
|
||||||
/**
|
/**
|
||||||
* @param {number} tolerance Tolerance.
|
* @param {number} tolerance Tolerance.
|
||||||
* @param {import("../../extent.js").Extent} maxExtent Maximum extent.
|
* @param {import("../../extent.js").Extent} maxExtent Maximum extent.
|
||||||
@@ -547,4 +547,4 @@ export function measureTextWidths(font, lines, widths) {
|
|||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
export default CanvasTextReplay;
|
export default CanvasTextBuilder;
|
||||||
|
|||||||
@@ -10,7 +10,7 @@ import rbush from 'rbush';
|
|||||||
import {buffer, createEmpty, containsExtent, getWidth} from '../../extent.js';
|
import {buffer, createEmpty, containsExtent, getWidth} from '../../extent.js';
|
||||||
import RenderEventType from '../../render/EventType.js';
|
import RenderEventType from '../../render/EventType.js';
|
||||||
import {labelCache, rotateAtOffset} from '../../render/canvas.js';
|
import {labelCache, rotateAtOffset} from '../../render/canvas.js';
|
||||||
import CanvasReplayGroup from '../../render/canvas/InstructionsGroupBuilder.js';
|
import CanvasInstructionsGroupBuilder from '../../render/canvas/InstructionsGroupBuilder.js';
|
||||||
import InstructionsGroupExecutor from '../../render/canvas/InstructionsGroupExecutor.js';
|
import InstructionsGroupExecutor from '../../render/canvas/InstructionsGroupExecutor.js';
|
||||||
import CanvasLayerRenderer from './Layer.js';
|
import CanvasLayerRenderer from './Layer.js';
|
||||||
import {defaultOrder as defaultRenderOrder, getTolerance as getRenderTolerance, getSquaredTolerance as getSquaredRenderTolerance, renderFeature} from '../vector.js';
|
import {defaultOrder as defaultRenderOrder, getTolerance as getRenderTolerance, getSquaredTolerance as getSquaredRenderTolerance, renderFeature} from '../vector.js';
|
||||||
@@ -444,7 +444,7 @@ class CanvasVectorLayerRenderer extends CanvasLayerRenderer {
|
|||||||
|
|
||||||
this.dirty_ = false;
|
this.dirty_ = false;
|
||||||
|
|
||||||
const replayGroup = new CanvasReplayGroup(
|
const replayGroup = new CanvasInstructionsGroupBuilder(
|
||||||
getRenderTolerance(resolution, pixelRatio), extent, resolution,
|
getRenderTolerance(resolution, pixelRatio), extent, resolution,
|
||||||
pixelRatio, vectorSource.getOverlaps(), this.declutterTree_, vectorLayer.getRenderBuffer());
|
pixelRatio, vectorSource.getOverlaps(), this.declutterTree_, vectorLayer.getRenderBuffer());
|
||||||
vectorSource.loadFeatures(extent, resolution, projection);
|
vectorSource.loadFeatures(extent, resolution, projection);
|
||||||
|
|||||||
@@ -13,7 +13,7 @@ import {equivalent as equivalentProjection} from '../../proj.js';
|
|||||||
import Units from '../../proj/Units.js';
|
import Units from '../../proj/Units.js';
|
||||||
import ReplayType from '../../render/ReplayType.js';
|
import ReplayType from '../../render/ReplayType.js';
|
||||||
import {labelCache, rotateAtOffset} from '../../render/canvas.js';
|
import {labelCache, rotateAtOffset} from '../../render/canvas.js';
|
||||||
import CanvasReplayGroup, {replayDeclutter} from '../../render/canvas/InstructionsGroupBuilder.js';
|
import CanvasInstructionsGroupBuilder, {replayDeclutter} from '../../render/canvas/InstructionsGroupBuilder.js';
|
||||||
import {ORDER} from '../../render/replay.js';
|
import {ORDER} from '../../render/replay.js';
|
||||||
import CanvasTileLayerRenderer from './TileLayer.js';
|
import CanvasTileLayerRenderer from './TileLayer.js';
|
||||||
import {getSquaredTolerance as getSquaredRenderTolerance, renderFeature} from '../vector.js';
|
import {getSquaredTolerance as getSquaredRenderTolerance, renderFeature} from '../vector.js';
|
||||||
@@ -187,7 +187,7 @@ class CanvasVectorTileLayerRenderer extends CanvasTileLayerRenderer {
|
|||||||
sourceTile.setProjection(projection);
|
sourceTile.setProjection(projection);
|
||||||
}
|
}
|
||||||
replayState.dirty = false;
|
replayState.dirty = false;
|
||||||
const replayGroup = new CanvasReplayGroup(0, sharedExtent, resolution,
|
const replayGroup = new CanvasInstructionsGroupBuilder(0, sharedExtent, resolution,
|
||||||
pixelRatio, source.getOverlaps(), this.declutterTree_, layer.getRenderBuffer());
|
pixelRatio, source.getOverlaps(), this.declutterTree_, layer.getRenderBuffer());
|
||||||
const squaredTolerance = getSquaredRenderTolerance(resolution, pixelRatio);
|
const squaredTolerance = getSquaredRenderTolerance(resolution, pixelRatio);
|
||||||
|
|
||||||
@@ -263,7 +263,7 @@ class CanvasVectorTileLayerRenderer extends CanvasTileLayerRenderer {
|
|||||||
if (sourceTile.getState() != TileState.LOADED) {
|
if (sourceTile.getState() != TileState.LOADED) {
|
||||||
continue;
|
continue;
|
||||||
}
|
}
|
||||||
const replayGroup = /** @type {CanvasReplayGroup} */ (sourceTile.getReplayGroup(layer,
|
const replayGroup = /** @type {CanvasInstructionsGroupBuilder} */ (sourceTile.getReplayGroup(layer,
|
||||||
tile.tileCoord.toString()));
|
tile.tileCoord.toString()));
|
||||||
found = found || replayGroup.forEachFeatureAtCoordinate(coordinate, resolution, rotation, hitTolerance, {},
|
found = found || replayGroup.forEachFeatureAtCoordinate(coordinate, resolution, rotation, hitTolerance, {},
|
||||||
/**
|
/**
|
||||||
@@ -371,7 +371,7 @@ class CanvasVectorTileLayerRenderer extends CanvasTileLayerRenderer {
|
|||||||
if (sourceTile.getState() != TileState.LOADED) {
|
if (sourceTile.getState() != TileState.LOADED) {
|
||||||
continue;
|
continue;
|
||||||
}
|
}
|
||||||
const replayGroup = /** @type {CanvasReplayGroup} */ (sourceTile.getReplayGroup(layer, tileCoord.toString()));
|
const replayGroup = /** @type {CanvasInstructionsGroupBuilder} */ (sourceTile.getReplayGroup(layer, tileCoord.toString()));
|
||||||
if (!replayGroup || !replayGroup.hasReplays(replayTypes)) {
|
if (!replayGroup || !replayGroup.hasReplays(replayTypes)) {
|
||||||
// sourceTile was not yet loaded when this.createReplayGroup_() was
|
// sourceTile was not yet loaded when this.createReplayGroup_() was
|
||||||
// called, or it has no replays of the types we want to render
|
// called, or it has no replays of the types we want to render
|
||||||
@@ -478,7 +478,7 @@ class CanvasVectorTileLayerRenderer extends CanvasTileLayerRenderer {
|
|||||||
const transform = resetTransform(this.tmpTransform_);
|
const transform = resetTransform(this.tmpTransform_);
|
||||||
scaleTransform(transform, pixelScale, -pixelScale);
|
scaleTransform(transform, pixelScale, -pixelScale);
|
||||||
translateTransform(transform, -tileExtent[0], -tileExtent[3]);
|
translateTransform(transform, -tileExtent[0], -tileExtent[3]);
|
||||||
const replayGroup = /** @type {CanvasReplayGroup} */ (sourceTile.getReplayGroup(layer,
|
const replayGroup = /** @type {CanvasInstructionsGroupBuilder} */ (sourceTile.getReplayGroup(layer,
|
||||||
tile.tileCoord.toString()));
|
tile.tileCoord.toString()));
|
||||||
replayGroup.replay(context, transform, 0, {}, true, replays);
|
replayGroup.replay(context, transform, 0, {}, true, replays);
|
||||||
}
|
}
|
||||||
|
|||||||
Reference in New Issue
Block a user