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

Remove opt_ prefix

Browse Source
This commit is contained in:
Tim Schaub
2022-08-11 17:46:31 -06:00
committed by Tim Schaub
parent dd1edc37ca
commit 99612e7f9a
183 changed files with 1918 additions and 2079 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/ol/renderer/canvas/Layer.js
+6 -6
View File
@@ -147,20 +147,20 @@ class CanvasLayerRenderer extends LayerRenderer {
* Get a rendering container from an existing target, if compatible.
* @param {HTMLElement} target Potential render target.
* @param {string} transform CSS Transform.
* @param {string} [opt_backgroundColor] Background color.
* @param {string} [backgroundColor] Background color.
*/
useContainer(target, transform, opt_backgroundColor) {
useContainer(target, transform, backgroundColor) {
const layerClassName = this.getLayer().getClassName();
let container, context;
if (
target &&
target.className === layerClassName &&
(!opt_backgroundColor ||
(!backgroundColor ||
(target &&
target.style.backgroundColor &&
equals(
asArray(target.style.backgroundColor),
asArray(opt_backgroundColor)
asArray(backgroundColor)
)))
) {
const canvas = target.firstElementChild;
@@ -198,10 +198,10 @@ class CanvasLayerRenderer extends LayerRenderer {
}
if (
!this.containerReused &&
opt_backgroundColor &&
backgroundColor &&
!this.container.style.backgroundColor
) {
this.container.style.backgroundColor = opt_backgroundColor;
this.container.style.backgroundColor = backgroundColor;
}
}
src/ol/renderer/canvas/TileLayer.js
+4 -4
View File
@@ -694,7 +694,7 @@ class CanvasTileLayerRenderer extends CanvasLayerRenderer {
* @param {import("../../extent.js").Extent} extent Extent.
* @param {number} currentZ Current Z.
* @param {number} preload Load low resolution tiles up to `preload` levels.
* @param {function(import("../../Tile.js").default):void} [opt_tileCallback] Tile callback.
* @param {function(import("../../Tile.js").default):void} [tileCallback] Tile callback.
* @protected
*/
manageTilePyramid(
@@ -706,7 +706,7 @@ class CanvasTileLayerRenderer extends CanvasLayerRenderer {
extent,
currentZ,
preload,
opt_tileCallback
tileCallback
) {
const tileSourceKey = getUid(tileSource);
if (!(tileSourceKey in frameState.wantedTiles)) {
@@ -751,8 +751,8 @@ class CanvasTileLayerRenderer extends CanvasLayerRenderer {
]);
}
}
if (opt_tileCallback !== undefined) {
opt_tileCallback(tile);
if (tileCallback !== undefined) {
tileCallback(tile);
}
} else {
tileSource.useTile(z, x, y, projection);
src/ol/renderer/canvas/VectorLayer.js
+11 -11
View File
@@ -159,9 +159,9 @@ class CanvasVectorLayerRenderer extends CanvasLayerRenderer {
/**
* @param {ExecutorGroup} executorGroup Executor group.
* @param {import("../../Map.js").FrameState} frameState Frame state.
* @param {import("rbush").default} [opt_declutterTree] Declutter tree.
* @param {import("rbush").default} [declutterTree] Declutter tree.
*/
renderWorlds(executorGroup, frameState, opt_declutterTree) {
renderWorlds(executorGroup, frameState, declutterTree) {
const extent = frameState.extent;
const viewState = frameState.viewState;
const center = viewState.center;
@@ -204,7 +204,7 @@ class CanvasVectorLayerRenderer extends CanvasLayerRenderer {
rotation,
snapToPixel,
undefined,
opt_declutterTree
declutterTree
);
} while (++world < endWorld);
}
@@ -753,8 +753,8 @@ class CanvasVectorLayerRenderer extends CanvasLayerRenderer {
* @param {number} squaredTolerance Squared render tolerance.
* @param {import("../../style/Style.js").default|Array<import("../../style/Style.js").default>} styles The style or array of styles.
* @param {import("../../render/canvas/BuilderGroup.js").default} builderGroup Builder group.
* @param {import("../../proj.js").TransformFunction} [opt_transform] Transform from user to view projection.
* @param {import("../../render/canvas/BuilderGroup.js").default} [opt_declutterBuilderGroup] Builder for decluttering.
* @param {import("../../proj.js").TransformFunction} [transform] Transform from user to view projection.
* @param {import("../../render/canvas/BuilderGroup.js").default} [declutterBuilderGroup] Builder for decluttering.
* @return {boolean} `true` if an image is loading.
*/
renderFeature(
@@ -762,8 +762,8 @@ class CanvasVectorLayerRenderer extends CanvasLayerRenderer {
squaredTolerance,
styles,
builderGroup,
opt_transform,
opt_declutterBuilderGroup
transform,
declutterBuilderGroup
) {
if (!styles) {
return false;
@@ -778,8 +778,8 @@ class CanvasVectorLayerRenderer extends CanvasLayerRenderer {
styles[i],
squaredTolerance,
this.boundHandleStyleImageChange_,
opt_transform,
opt_declutterBuilderGroup
transform,
declutterBuilderGroup
) || loading;
}
} else {
@@ -789,8 +789,8 @@ class CanvasVectorLayerRenderer extends CanvasLayerRenderer {
styles,
squaredTolerance,
this.boundHandleStyleImageChange_,
opt_transform,
opt_declutterBuilderGroup
transform,
declutterBuilderGroup
);
}
return loading;
src/ol/renderer/canvas/VectorTileLayer.js
+4 -4
View File
@@ -730,7 +730,7 @@ class CanvasVectorTileLayerRenderer extends CanvasTileLayerRenderer {
* @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/BuilderGroup.js").default} builderGroup Replay group.
* @param {import("../../render/canvas/BuilderGroup.js").default} [opt_declutterBuilderGroup] Builder group for decluttering.
* @param {import("../../render/canvas/BuilderGroup.js").default} [declutterBuilderGroup] Builder group for decluttering.
* @return {boolean} `true` if an image is loading.
*/
renderFeature(
@@ -738,7 +738,7 @@ class CanvasVectorTileLayerRenderer extends CanvasTileLayerRenderer {
squaredTolerance,
styles,
builderGroup,
opt_declutterBuilderGroup
declutterBuilderGroup
) {
if (!styles) {
return false;
@@ -754,7 +754,7 @@ class CanvasVectorTileLayerRenderer extends CanvasTileLayerRenderer {
squaredTolerance,
this.boundHandleStyleImageChange_,
undefined,
opt_declutterBuilderGroup
declutterBuilderGroup
) || loading;
}
} else {
@@ -765,7 +765,7 @@ class CanvasVectorTileLayerRenderer extends CanvasTileLayerRenderer {
squaredTolerance,
this.boundHandleStyleImageChange_,
undefined,
opt_declutterBuilderGroup
declutterBuilderGroup
);
}
return loading;
src/ol/renderer/vector.js
+42 -42
View File
@@ -70,14 +70,14 @@ export function getTolerance(resolution, pixelRatio) {
* @param {import("../geom/Circle.js").default} geometry Geometry.
* @param {import("../style/Style.js").default} style Style.
* @param {import("../Feature.js").default} feature Feature.
* @param {import("../render/canvas/BuilderGroup.js").default} [opt_declutterBuilderGroup] Builder for decluttering.
* @param {import("../render/canvas/BuilderGroup.js").default} [declutterBuilderGroup] Builder for decluttering.
*/
function renderCircleGeometry(
builderGroup,
geometry,
style,
feature,
opt_declutterBuilderGroup
declutterBuilderGroup
) {
const fillStyle = style.getFill();
const strokeStyle = style.getStroke();
@@ -88,7 +88,7 @@ function renderCircleGeometry(
}
const textStyle = style.getText();
if (textStyle && textStyle.getText()) {
const textReplay = (opt_declutterBuilderGroup || builderGroup).getBuilder(
const textReplay = (declutterBuilderGroup || builderGroup).getBuilder(
style.getZIndex(),
'Text'
);
@@ -103,8 +103,8 @@ function renderCircleGeometry(
* @param {import("../style/Style.js").default} style Style.
* @param {number} squaredTolerance Squared tolerance.
* @param {function(import("../events/Event.js").default): void} listener Listener function.
* @param {import("../proj.js").TransformFunction} [opt_transform] Transform from user to view projection.
* @param {import("../render/canvas/BuilderGroup.js").default} [opt_declutterBuilderGroup] Builder for decluttering.
* @param {import("../proj.js").TransformFunction} [transform] Transform from user to view projection.
* @param {import("../render/canvas/BuilderGroup.js").default} [declutterBuilderGroup] Builder for decluttering.
* @return {boolean} `true` if style is loading.
*/
export function renderFeature(
@@ -113,8 +113,8 @@ export function renderFeature(
style,
squaredTolerance,
listener,
opt_transform,
opt_declutterBuilderGroup
transform,
declutterBuilderGroup
) {
let loading = false;
const imageStyle = style.getImage();
@@ -135,8 +135,8 @@ export function renderFeature(
feature,
style,
squaredTolerance,
opt_transform,
opt_declutterBuilderGroup
transform,
declutterBuilderGroup
);
return loading;
@@ -147,16 +147,16 @@ export function renderFeature(
* @param {import("../Feature.js").FeatureLike} feature Feature.
* @param {import("../style/Style.js").default} style Style.
* @param {number} squaredTolerance Squared tolerance.
* @param {import("../proj.js").TransformFunction} [opt_transform] Optional transform function.
* @param {import("../render/canvas/BuilderGroup.js").default} [opt_declutterBuilderGroup] Builder for decluttering.
* @param {import("../proj.js").TransformFunction} [transform] Optional transform function.
* @param {import("../render/canvas/BuilderGroup.js").default} [declutterBuilderGroup] Builder for decluttering.
*/
function renderFeatureInternal(
replayGroup,
feature,
style,
squaredTolerance,
opt_transform,
opt_declutterBuilderGroup
transform,
declutterBuilderGroup
) {
const geometry = style.getGeometryFunction()(feature);
if (!geometry) {
@@ -164,7 +164,7 @@ function renderFeatureInternal(
}
const simplifiedGeometry = geometry.simplifyTransformed(
squaredTolerance,
opt_transform
transform
);
const renderer = style.getRenderer();
if (renderer) {
@@ -176,7 +176,7 @@ function renderFeatureInternal(
simplifiedGeometry,
style,
feature,
opt_declutterBuilderGroup
declutterBuilderGroup
);
}
}
@@ -212,14 +212,14 @@ function renderGeometry(replayGroup, geometry, style, feature) {
* @param {import("../geom/GeometryCollection.js").default} geometry Geometry.
* @param {import("../style/Style.js").default} style Style.
* @param {import("../Feature.js").default} feature Feature.
* @param {import("../render/canvas/BuilderGroup.js").default} [opt_declutterBuilderGroup] Builder for decluttering.
* @param {import("../render/canvas/BuilderGroup.js").default} [declutterBuilderGroup] Builder for decluttering.
*/
function renderGeometryCollectionGeometry(
replayGroup,
geometry,
style,
feature,
opt_declutterBuilderGroup
declutterBuilderGroup
) {
const geometries = geometry.getGeometriesArray();
let i, ii;
@@ -230,7 +230,7 @@ function renderGeometryCollectionGeometry(
geometries[i],
style,
feature,
opt_declutterBuilderGroup
declutterBuilderGroup
);
}
}
@@ -240,14 +240,14 @@ function renderGeometryCollectionGeometry(
* @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.
* @param {import("../render/canvas/BuilderGroup.js").default} [opt_declutterBuilderGroup] Builder for decluttering.
* @param {import("../render/canvas/BuilderGroup.js").default} [declutterBuilderGroup] Builder for decluttering.
*/
function renderLineStringGeometry(
builderGroup,
geometry,
style,
feature,
opt_declutterBuilderGroup
declutterBuilderGroup
) {
const strokeStyle = style.getStroke();
if (strokeStyle) {
@@ -260,7 +260,7 @@ function renderLineStringGeometry(
}
const textStyle = style.getText();
if (textStyle && textStyle.getText()) {
const textReplay = (opt_declutterBuilderGroup || builderGroup).getBuilder(
const textReplay = (declutterBuilderGroup || builderGroup).getBuilder(
style.getZIndex(),
'Text'
);
@@ -274,14 +274,14 @@ function renderLineStringGeometry(
* @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.
* @param {import("../render/canvas/BuilderGroup.js").default} [opt_declutterBuilderGroup] Builder for decluttering.
* @param {import("../render/canvas/BuilderGroup.js").default} [declutterBuilderGroup] Builder for decluttering.
*/
function renderMultiLineStringGeometry(
builderGroup,
geometry,
style,
feature,
opt_declutterBuilderGroup
declutterBuilderGroup
) {
const strokeStyle = style.getStroke();
if (strokeStyle) {
@@ -294,7 +294,7 @@ function renderMultiLineStringGeometry(
}
const textStyle = style.getText();
if (textStyle && textStyle.getText()) {
const textReplay = (opt_declutterBuilderGroup || builderGroup).getBuilder(
const textReplay = (declutterBuilderGroup || builderGroup).getBuilder(
style.getZIndex(),
'Text'
);
@@ -308,14 +308,14 @@ function renderMultiLineStringGeometry(
* @param {import("../geom/MultiPolygon.js").default} geometry Geometry.
* @param {import("../style/Style.js").default} style Style.
* @param {import("../Feature.js").default} feature Feature.
* @param {import("../render/canvas/BuilderGroup.js").default} [opt_declutterBuilderGroup] Builder for decluttering.
* @param {import("../render/canvas/BuilderGroup.js").default} [declutterBuilderGroup] Builder for decluttering.
*/
function renderMultiPolygonGeometry(
builderGroup,
geometry,
style,
feature,
opt_declutterBuilderGroup
declutterBuilderGroup
) {
const fillStyle = style.getFill();
const strokeStyle = style.getStroke();
@@ -326,7 +326,7 @@ function renderMultiPolygonGeometry(
}
const textStyle = style.getText();
if (textStyle && textStyle.getText()) {
const textReplay = (opt_declutterBuilderGroup || builderGroup).getBuilder(
const textReplay = (declutterBuilderGroup || builderGroup).getBuilder(
style.getZIndex(),
'Text'
);
@@ -340,14 +340,14 @@ function renderMultiPolygonGeometry(
* @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.
* @param {import("../render/canvas/BuilderGroup.js").default} [opt_declutterBuilderGroup] Builder for decluttering.
* @param {import("../render/canvas/BuilderGroup.js").default} [declutterBuilderGroup] Builder for decluttering.
*/
function renderPointGeometry(
builderGroup,
geometry,
style,
feature,
opt_declutterBuilderGroup
declutterBuilderGroup
) {
const imageStyle = style.getImage();
const textStyle = style.getText();
@@ -358,10 +358,10 @@ function renderPointGeometry(
return;
}
let imageBuilderGroup = builderGroup;
if (opt_declutterBuilderGroup) {
if (declutterBuilderGroup) {
const declutterMode = imageStyle.getDeclutterMode();
if (declutterMode !== 'none') {
imageBuilderGroup = opt_declutterBuilderGroup;
imageBuilderGroup = declutterBuilderGroup;
if (declutterMode === 'obstacle') {
// draw in non-declutter group:
const imageReplay = builderGroup.getBuilder(
@@ -384,8 +384,8 @@ function renderPointGeometry(
}
if (textStyle && textStyle.getText()) {
let textBuilderGroup = builderGroup;
if (opt_declutterBuilderGroup) {
textBuilderGroup = opt_declutterBuilderGroup;
if (declutterBuilderGroup) {
textBuilderGroup = declutterBuilderGroup;
}
const textReplay = textBuilderGroup.getBuilder(style.getZIndex(), 'Text');
textReplay.setTextStyle(textStyle, declutterImageWithText);
@@ -398,14 +398,14 @@ function renderPointGeometry(
* @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.
* @param {import("../render/canvas/BuilderGroup.js").default} [opt_declutterBuilderGroup] Builder for decluttering.
* @param {import("../render/canvas/BuilderGroup.js").default} [declutterBuilderGroup] Builder for decluttering.
*/
function renderMultiPointGeometry(
builderGroup,
geometry,
style,
feature,
opt_declutterBuilderGroup
declutterBuilderGroup
) {
const imageStyle = style.getImage();
const textStyle = style.getText();
@@ -416,10 +416,10 @@ function renderMultiPointGeometry(
return;
}
let imageBuilderGroup = builderGroup;
if (opt_declutterBuilderGroup) {
if (declutterBuilderGroup) {
const declutterMode = imageStyle.getDeclutterMode();
if (declutterMode !== 'none') {
imageBuilderGroup = opt_declutterBuilderGroup;
imageBuilderGroup = declutterBuilderGroup;
if (declutterMode === 'obstacle') {
// draw in non-declutter group:
const imageReplay = builderGroup.getBuilder(
@@ -442,8 +442,8 @@ function renderMultiPointGeometry(
}
if (textStyle && textStyle.getText()) {
let textBuilderGroup = builderGroup;
if (opt_declutterBuilderGroup) {
textBuilderGroup = opt_declutterBuilderGroup;
if (declutterBuilderGroup) {
textBuilderGroup = declutterBuilderGroup;
}
const textReplay = textBuilderGroup.getBuilder(style.getZIndex(), 'Text');
textReplay.setTextStyle(textStyle, declutterImageWithText);
@@ -456,14 +456,14 @@ function renderMultiPointGeometry(
* @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.
* @param {import("../render/canvas/BuilderGroup.js").default} [opt_declutterBuilderGroup] Builder for decluttering.
* @param {import("../render/canvas/BuilderGroup.js").default} [declutterBuilderGroup] Builder for decluttering.
*/
function renderPolygonGeometry(
builderGroup,
geometry,
style,
feature,
opt_declutterBuilderGroup
declutterBuilderGroup
) {
const fillStyle = style.getFill();
const strokeStyle = style.getStroke();
@@ -474,7 +474,7 @@ function renderPolygonGeometry(
}
const textStyle = style.getText();
if (textStyle && textStyle.getText()) {
const textReplay = (opt_declutterBuilderGroup || builderGroup).getBuilder(
const textReplay = (declutterBuilderGroup || builderGroup).getBuilder(
style.getZIndex(),
'Text'
);
src/ol/renderer/webgl/Layer.js
+3 -3
View File
@@ -36,12 +36,12 @@ import {
class WebGLLayerRenderer extends LayerRenderer {
/**
* @param {LayerType} layer Layer.
* @param {Options} [opt_options] Options.
* @param {Options} [options] Options.
*/
constructor(layer, opt_options) {
constructor(layer, options) {
super(layer);
const options = opt_options || {};
options = options || {};
/**
* The transform for viewport CSS pixels to rendered pixels. This transform is only