diff --git a/src/ol/render/canvas.js b/src/ol/render/canvas.js index cabd683f88..bbc8f40d9d 100644 --- a/src/ol/render/canvas.js +++ b/src/ol/render/canvas.js @@ -18,7 +18,7 @@ import LabelCache from './canvas/LabelCache.js'; * @typedef {Object} FillStrokeState * @property {import("../colorlike.js").ColorLike} [currentFillStyle] * @property {import("../colorlike.js").ColorLike} [currentStrokeStyle] - * @property {string} [currentLineCap] + * @property {CanvasLineCap} [currentLineCap] * @property {Array} currentLineDash * @property {number} [currentLineDashOffset] * @property {CanvasLineJoin} [currentLineJoin] @@ -27,7 +27,7 @@ import LabelCache from './canvas/LabelCache.js'; * @property {number} [lastStroke] * @property {import("../colorlike.js").ColorLike} [fillStyle] * @property {import("../colorlike.js").ColorLike} [strokeStyle] - * @property {string} [lineCap] + * @property {CanvasLineCap} [lineCap] * @property {Array} lineDash * @property {number} [lineDashOffset] * @property {CanvasLineJoin} [lineJoin] @@ -38,7 +38,7 @@ import LabelCache from './canvas/LabelCache.js'; /** * @typedef {Object} StrokeState - * @property {string} lineCap + * @property {CanvasLineCap} lineCap * @property {Array} lineDash * @property {number} lineDashOffset * @property {CanvasLineJoin} lineJoin @@ -92,7 +92,7 @@ export const defaultFillStyle = '#000'; /** * @const - * @type {string} + * @type {CanvasLineCap} */ export const defaultLineCap = 'round'; diff --git a/src/ol/render/canvas/Executor.js b/src/ol/render/canvas/Executor.js index 174fce8cd0..8c911a89db 100644 --- a/src/ol/render/canvas/Executor.js +++ b/src/ol/render/canvas/Executor.js @@ -207,7 +207,7 @@ class Executor extends Disposable { if (strokeKey) { context.strokeStyle = strokeState.strokeStyle; context.lineWidth = strokeWidth; - context.lineCap = /** @type {CanvasLineCap} */ (strokeState.lineCap); + context.lineCap = strokeState.lineCap; context.lineJoin = strokeState.lineJoin; context.miterLimit = strokeState.miterLimit; if (context.setLineDash && strokeState.lineDash.length) { diff --git a/src/ol/render/canvas/Immediate.js b/src/ol/render/canvas/Immediate.js index 16d01f7724..871b41adb6 100644 --- a/src/ol/render/canvas/Immediate.js +++ b/src/ol/render/canvas/Immediate.js @@ -692,7 +692,7 @@ class CanvasImmediateRenderer extends VectorContext { const context = this.context_; const contextStrokeState = this.contextStrokeState_; if (!contextStrokeState) { - context.lineCap = /** @type {CanvasLineCap} */ (strokeState.lineCap); + context.lineCap = strokeState.lineCap; if (context.setLineDash) { context.setLineDash(strokeState.lineDash); context.lineDashOffset = strokeState.lineDashOffset; @@ -712,7 +712,7 @@ class CanvasImmediateRenderer extends VectorContext { }; } else { if (contextStrokeState.lineCap != strokeState.lineCap) { - contextStrokeState.lineCap = context.lineCap = /** @type {CanvasLineCap} */ (strokeState.lineCap); + contextStrokeState.lineCap = context.lineCap = strokeState.lineCap; } if (context.setLineDash) { if (!equals(contextStrokeState.lineDash, strokeState.lineDash)) { diff --git a/src/ol/style/RegularShape.js b/src/ol/style/RegularShape.js index 0af81de92c..d30999e044 100644 --- a/src/ol/style/RegularShape.js +++ b/src/ol/style/RegularShape.js @@ -30,7 +30,7 @@ import ImageStyle from './Image.js'; * @property {import("../colorlike.js").ColorLike} [strokeStyle] * @property {number} strokeWidth * @property {number} size - * @property {string} lineCap + * @property {CanvasLineCap} lineCap * @property {Array} lineDash * @property {number} lineDashOffset * @property {CanvasLineJoin} lineJoin @@ -302,7 +302,7 @@ class RegularShape extends ImageStyle { * @protected */ render() { - let lineCap = ''; + let lineCap = defaultLineCap; let lineJoin = defaultLineJoin; let miterLimit = 0; let lineDash = null; @@ -417,7 +417,7 @@ class RegularShape extends ImageStyle { context.setLineDash(renderOptions.lineDash); context.lineDashOffset = renderOptions.lineDashOffset; } - context.lineCap = /** @type {CanvasLineCap} */ (renderOptions.lineCap); + context.lineCap = renderOptions.lineCap; context.lineJoin = renderOptions.lineJoin; context.miterLimit = renderOptions.miterLimit; context.stroke(); diff --git a/src/ol/style/Stroke.js b/src/ol/style/Stroke.js index 05f4926135..bee5ba1279 100644 --- a/src/ol/style/Stroke.js +++ b/src/ol/style/Stroke.js @@ -8,7 +8,7 @@ * @property {import("../color.js").Color|import("../colorlike.js").ColorLike} [color] A color, gradient or pattern. * See {@link module:ol/color~Color} and {@link module:ol/colorlike~ColorLike} for possible formats. * Default null; if null, the Canvas/renderer default black will be used. - * @property {string} [lineCap='round'] Line cap style: `butt`, `round`, or `square`. + * @property {CanvasLineCap} [lineCap='round'] Line cap style: `butt`, `round`, or `square`. * @property {CanvasLineJoin} [lineJoin='round'] Line join style: `bevel`, `round`, or `miter`. * @property {Array} [lineDash] Line dash pattern. Default is `undefined` (no dash). * Please note that Internet Explorer 10 and lower do not support the `setLineDash` method on @@ -43,7 +43,7 @@ class Stroke { /** * @private - * @type {string|undefined} + * @type {CanvasLineCap|undefined} */ this.lineCap_ = options.lineCap; @@ -107,7 +107,7 @@ class Stroke { /** * Get the line cap type for the stroke. - * @return {string|undefined} Line cap. + * @return {CanvasLineCap|undefined} Line cap. * @api */ getLineCap() { @@ -172,7 +172,7 @@ class Stroke { /** * Set the line cap. * - * @param {string|undefined} lineCap Line cap. + * @param {CanvasLineCap|undefined} lineCap Line cap. * @api */ setLineCap(lineCap) {