diff --git a/src/ol/render/canvas/Builder.js b/src/ol/render/canvas/Builder.js index 6734e40a41..f5f9faf675 100644 --- a/src/ol/render/canvas/Builder.js +++ b/src/ol/render/canvas/Builder.js @@ -352,10 +352,9 @@ class CanvasBuilder extends VectorContext { /** * @param {import("../canvas.js").FillStrokeState} state State. - * @param {import("../../geom/Geometry.js").default|import("../Feature.js").default} geometry Geometry. * @return {Array<*>} Fill instruction. */ - createFill(state, geometry) { + createFill(state) { const fillStyle = state.fillStyle; /** @type {Array<*>} */ const fillInstruction = [CanvasInstruction.SET_FILL_STYLE, fillStyle]; @@ -388,14 +387,13 @@ class CanvasBuilder extends VectorContext { /** * @param {import("../canvas.js").FillStrokeState} state State. - * @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. + * @param {function(this:CanvasBuilder, import("../canvas.js").FillStrokeState):Array<*>} createFill Create fill. */ - updateFillStyle(state, createFill, geometry) { + updateFillStyle(state, createFill) { const fillStyle = state.fillStyle; if (typeof fillStyle !== 'string' || state.currentFillStyle != fillStyle) { if (fillStyle !== undefined) { - this.instructions.push(createFill.call(this, state, geometry)); + this.instructions.push(createFill.call(this, state)); } state.currentFillStyle = fillStyle; } diff --git a/src/ol/render/canvas/PolygonBuilder.js b/src/ol/render/canvas/PolygonBuilder.js index 686ccb26bd..46f1a2a298 100644 --- a/src/ol/render/canvas/PolygonBuilder.js +++ b/src/ol/render/canvas/PolygonBuilder.js @@ -72,7 +72,7 @@ class CanvasPolygonBuilder extends CanvasBuilder { if (fillStyle === undefined && strokeStyle === undefined) { return; } - this.setFillStrokeStyles_(circleGeometry); + this.setFillStrokeStyles_(); this.beginGeometry(feature); if (state.fillStyle !== undefined) { this.hitDetectionInstructions.push([ @@ -116,7 +116,7 @@ class CanvasPolygonBuilder extends CanvasBuilder { if (fillStyle === undefined && strokeStyle === undefined) { return; } - this.setFillStrokeStyles_(polygonGeometry); + this.setFillStrokeStyles_(); this.beginGeometry(feature); if (state.fillStyle !== undefined) { this.hitDetectionInstructions.push([ @@ -148,7 +148,7 @@ class CanvasPolygonBuilder extends CanvasBuilder { if (fillStyle === undefined && strokeStyle === undefined) { return; } - this.setFillStrokeStyles_(multiPolygonGeometry); + this.setFillStrokeStyles_(); this.beginGeometry(feature); if (state.fillStyle !== undefined) { this.hitDetectionInstructions.push([ @@ -195,13 +195,12 @@ class CanvasPolygonBuilder extends CanvasBuilder { /** * @private - * @param {import("../../geom/Geometry.js").default|import("../Feature.js").default} geometry Geometry. */ - setFillStrokeStyles_(geometry) { + setFillStrokeStyles_() { const state = this.state; const fillStyle = state.fillStyle; if (fillStyle !== undefined) { - this.updateFillStyle(state, this.createFill, geometry); + this.updateFillStyle(state, this.createFill); } if (state.strokeStyle !== undefined) { this.updateStrokeStyle(state, this.applyStroke); diff --git a/src/ol/render/canvas/TextBuilder.js b/src/ol/render/canvas/TextBuilder.js index c3d446612a..ab9cfc14c8 100644 --- a/src/ol/render/canvas/TextBuilder.js +++ b/src/ol/render/canvas/TextBuilder.js @@ -258,8 +258,8 @@ class CanvasTextBuilder extends CanvasBuilder { if (textState.backgroundFill || textState.backgroundStroke) { this.setFillStrokeStyle(textState.backgroundFill, textState.backgroundStroke); if (textState.backgroundFill) { - this.updateFillStyle(this.state, this.createFill, geometry); - this.hitDetectionInstructions.push(this.createFill(this.state, geometry)); + this.updateFillStyle(this.state, this.createFill); + this.hitDetectionInstructions.push(this.createFill(this.state)); } if (textState.backgroundStroke) { this.updateStrokeStyle(this.state, this.applyStroke);