ashatora/openlayers
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Remove unused Builder/Executor functions and members

Browse Source
This commit is contained in:
ahocevar
2018-11-25 20:06:37 +01:00
parent b71a8aa006
commit f4aec3fd01
18 changed files with 160 additions and 769 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
src/ol/renderer/canvas/VectorLayer.js
View File

@@ -296,7 +296,7 @@ class CanvasVectorLayerRenderer extends CanvasLayerRenderer {
const replayGroup = new CanvasBuilderGroup(
getRenderTolerance(resolution, pixelRatio), extent, resolution,
pixelRatio, vectorSource.getOverlaps(), this.declutterTree_, vectorLayer.getRenderBuffer());
pixelRatio, !!this.declutterTree_);
vectorSource.loadFeatures(extent, resolution, projection);
@@ -335,8 +335,7 @@ class CanvasVectorLayerRenderer extends CanvasLayerRenderer {
}
const replayGroupInstructions = replayGroup.finish();
const renderingExecutorGroup = new InstructionsGroupExecutor(
getRenderTolerance(resolution, pixelRatio), extent, resolution,
const renderingExecutorGroup = new InstructionsGroupExecutor(extent, resolution,
pixelRatio, vectorSource.getOverlaps(), this.declutterTree_,
replayGroupInstructions, vectorLayer.getRenderBuffer());

10
src/ol/renderer/canvas/VectorTileLayer.js
View File

@@ -12,7 +12,7 @@ import {buffer, containsCoordinate, equals, getIntersection, getTopLeft, interse
import VectorTileRenderType from '../../layer/VectorTileRenderType.js';
import {equivalent as equivalentProjection} from '../../proj.js';
import Units from '../../proj/Units.js';
import ReplayType from '../../render/ReplayType.js';
import ReplayType from '../../render/canvas/BuilderType.js';
import {labelCache} from '../../render/canvas.js';
import CanvasBuilderGroup from '../../render/canvas/BuilderGroup.js';
import CanvasTileLayerRenderer from './TileLayer.js';
@@ -32,7 +32,7 @@ import CanvasExecutorGroup, {replayDeclutter} from '../../render/canvas/Executor
/**
* @type {!Object<string, Array<import("../../render/ReplayType.js").default>>}
* @type {!Object<string, Array<import("../../render/canvas/BuilderType.js").default>>}
*/
const IMAGE_REPLAYS = {
'image': [ReplayType.POLYGON, ReplayType.CIRCLE,
@@ -42,7 +42,7 @@ const IMAGE_REPLAYS = {
/**
* @type {!Object<string, Array<import("../../render/ReplayType.js").default>>}
* @type {!Object<string, Array<import("../../render/canvas/BuilderType.js").default>>}
*/
const VECTOR_REPLAYS = {
'image': [ReplayType.DEFAULT],
@@ -229,7 +229,7 @@ class CanvasVectorTileLayerRenderer extends CanvasTileLayerRenderer {
}
builderState.dirty = false;
const builderGroup = new CanvasBuilderGroup(0, sharedExtent, resolution,
pixelRatio, source.getOverlaps(), this.declutterTree_, layer.getRenderBuffer());
pixelRatio, !!this.declutterTree_);
const squaredTolerance = getSquaredRenderTolerance(resolution, pixelRatio);
/**
@@ -269,7 +269,7 @@ class CanvasVectorTileLayerRenderer extends CanvasTileLayerRenderer {
}
}
const executorGroupInstructions = builderGroup.finish();
const renderingReplayGroup = new CanvasExecutorGroup(0, sharedExtent, resolution,
const renderingReplayGroup = new CanvasExecutorGroup(sharedExtent, resolution,
pixelRatio, source.getOverlaps(), this.declutterTree_, executorGroupInstructions, layer.getRenderBuffer());
sourceTile.setExecutorGroup(layer, tile.tileCoord.toString(), renderingReplayGroup);
}

26
src/ol/renderer/vector.js
View File

@@ -4,7 +4,7 @@
import {getUid} from '../util.js';
import ImageState from '../ImageState.js';
import GeometryType from '../geom/GeometryType.js';
import BuilderType from '../render/ReplayType.js';
import BuilderType from '../render/canvas/BuilderType.js';
/**
@@ -17,7 +17,7 @@ const SIMPLIFY_TOLERANCE = 0.5;
/**
* @const
* @type {Object<import("../geom/GeometryType.js").default,
* function(import("../render/BuilderGroup.js").default, import("../geom/Geometry.js").default,
* function(import("../render/canvas/BuilderGroup.js").default, import("../geom/Geometry.js").default,
* import("../style/Style.js").default, Object)>}
*/
const GEOMETRY_RENDERERS = {
@@ -64,7 +64,7 @@ export function getTolerance(resolution, pixelRatio) {
/**
* @param {import("../render/BuilderGroup.js").default} builderGroup Builder group.
* @param {import("../render/canvas/BuilderGroup.js").default} builderGroup Builder group.
* @param {import("../geom/Circle.js").default} geometry Geometry.
* @param {import("../style/Style.js").default} style Style.
* @param {import("../Feature.js").default} feature Feature.
@@ -87,7 +87,7 @@ function renderCircleGeometry(builderGroup, geometry, style, feature) {
/**
* @param {import("../render/BuilderGroup.js").default} replayGroup Replay group.
* @param {import("../render/canvas/BuilderGroup.js").default} replayGroup Replay group.
* @param {import("../Feature.js").FeatureLike} feature Feature.
* @param {import("../style/Style.js").default} style Style.
* @param {number} squaredTolerance Squared tolerance.
@@ -119,7 +119,7 @@ export function renderFeature(replayGroup, feature, style, squaredTolerance, lis
/**
* @param {import("../render/BuilderGroup.js").default} replayGroup Replay group.
* @param {import("../render/canvas/BuilderGroup.js").default} replayGroup Replay group.
* @param {import("../Feature.js").FeatureLike} feature Feature.
* @param {import("../style/Style.js").default} style Style.
* @param {number} squaredTolerance Squared tolerance.
@@ -141,7 +141,7 @@ function renderFeatureInternal(replayGroup, feature, style, squaredTolerance) {
/**
* @param {import("../render/BuilderGroup.js").default} replayGroup Replay group.
* @param {import("../render/canvas/BuilderGroup.js").default} replayGroup Replay group.
* @param {import("../geom/Geometry.js").default|import("../render/Feature.js").default} geometry Geometry.
* @param {import("../style/Style.js").default} style Style.
* @param {import("../Feature.js").FeatureLike} feature Feature.
@@ -160,7 +160,7 @@ function renderGeometry(replayGroup, geometry, style, feature) {
/**
* @param {import("../render/BuilderGroup.js").default} replayGroup Replay group.
* @param {import("../render/canvas/BuilderGroup.js").default} replayGroup Replay group.
* @param {import("../geom/GeometryCollection.js").default} geometry Geometry.
* @param {import("../style/Style.js").default} style Style.
* @param {import("../Feature.js").default} feature Feature.
@@ -177,7 +177,7 @@ function renderGeometryCollectionGeometry(replayGroup, geometry, style, feature)
/**
* @param {import("../render/BuilderGroup.js").default} builderGroup Replay group.
* @param {import("../render/canvas/BuilderGroup.js").default} builderGroup Replay group.
* @param {import("../geom/LineString.js").default|import("../render/Feature.js").default} geometry Geometry.
* @param {import("../style/Style.js").default} style Style.
* @param {import("../Feature.js").FeatureLike} feature Feature.
@@ -199,7 +199,7 @@ function renderLineStringGeometry(builderGroup, geometry, style, feature) {
/**
* @param {import("../render/BuilderGroup.js").default} builderGroup Replay group.
* @param {import("../render/canvas/BuilderGroup.js").default} builderGroup Replay group.
* @param {import("../geom/MultiLineString.js").default|import("../render/Feature.js").default} geometry Geometry.
* @param {import("../style/Style.js").default} style Style.
* @param {import("../Feature.js").FeatureLike} feature Feature.
@@ -221,7 +221,7 @@ function renderMultiLineStringGeometry(builderGroup, geometry, style, feature) {
/**
* @param {import("../render/BuilderGroup.js").default} builderGroup Replay group.
* @param {import("../render/canvas/BuilderGroup.js").default} builderGroup Replay group.
* @param {import("../geom/MultiPolygon.js").default} geometry Geometry.
* @param {import("../style/Style.js").default} style Style.
* @param {import("../Feature.js").default} feature Feature.
@@ -244,7 +244,7 @@ function renderMultiPolygonGeometry(builderGroup, geometry, style, feature) {
/**
* @param {import("../render/BuilderGroup.js").default} builderGroup Replay group.
* @param {import("../render/canvas/BuilderGroup.js").default} builderGroup Replay group.
* @param {import("../geom/Point.js").default|import("../render/Feature.js").default} geometry Geometry.
* @param {import("../style/Style.js").default} style Style.
* @param {import("../Feature.js").FeatureLike} feature Feature.
@@ -269,7 +269,7 @@ function renderPointGeometry(builderGroup, geometry, style, feature) {
/**
* @param {import("../render/BuilderGroup.js").default} builderGroup Replay group.
* @param {import("../render/canvas/BuilderGroup.js").default} builderGroup Replay group.
* @param {import("../geom/MultiPoint.js").default|import("../render/Feature.js").default} geometry Geometry.
* @param {import("../style/Style.js").default} style Style.
* @param {import("../Feature.js").FeatureLike} feature Feature.
@@ -294,7 +294,7 @@ function renderMultiPointGeometry(builderGroup, geometry, style, feature) {
/**
* @param {import("../render/BuilderGroup.js").default} builderGroup Replay group.
* @param {import("../render/canvas/BuilderGroup.js").default} builderGroup Replay group.
* @param {import("../geom/Polygon.js").default|import("../render/Feature.js").default} geometry Geometry.
* @param {import("../style/Style.js").default} style Style.
* @param {import("../Feature.js").FeatureLike} feature Feature.