From 4ce19530cea2bf350a7e49f1a5ad95b2ccd028d6 Mon Sep 17 00:00:00 2001 From: ahocevar Date: Tue, 13 Nov 2018 18:01:42 +0100 Subject: [PATCH] Remove unused methods --- src/ol/render/canvas/InstructionsExecutor.js | 198 ------------------- 1 file changed, 198 deletions(-) diff --git a/src/ol/render/canvas/InstructionsExecutor.js b/src/ol/render/canvas/InstructionsExecutor.js index de128a06c2..2836a8d874 100644 --- a/src/ol/render/canvas/InstructionsExecutor.js +++ b/src/ol/render/canvas/InstructionsExecutor.js @@ -344,204 +344,6 @@ class CanvasInstructionsExecutor { return labelCache.get(key); } - /** - * @private - * @param {HTMLCanvasElement} label Label. - * @param {number} begin Begin. - * @param {number} end End. - */ - drawTextImage_(label, begin, end) { - const textState = this.textState_; - const strokeState = this.textStrokeState_; - const pixelRatio = this.pixelRatio; - const align = TEXT_ALIGN[textState.textAlign || defaultTextAlign]; - const baseline = TEXT_ALIGN[textState.textBaseline]; - const strokeWidth = strokeState && strokeState.lineWidth ? strokeState.lineWidth : 0; - - const anchorX = align * label.width / pixelRatio + 2 * (0.5 - align) * strokeWidth; - const anchorY = baseline * label.height / pixelRatio + 2 * (0.5 - baseline) * strokeWidth; - this.instructions.push([CanvasInstruction.DRAW_IMAGE, begin, end, - label, (anchorX - this.textOffsetX_) * pixelRatio, (anchorY - this.textOffsetY_) * pixelRatio, - this.declutterGroup_, label.height, 1, 0, 0, this.textRotateWithView_, this.textRotation_, - 1, label.width, - textState.padding == defaultPadding ? - defaultPadding : textState.padding.map(function(p) { - return p * pixelRatio; - }), - !!textState.backgroundFill, !!textState.backgroundStroke - ]); - this.hitDetectionInstructions.push([CanvasInstruction.DRAW_IMAGE, begin, end, - label, (anchorX - this.textOffsetX_) * pixelRatio, (anchorY - this.textOffsetY_) * pixelRatio, - this.declutterGroup_, label.height, 1, 0, 0, this.textRotateWithView_, this.textRotation_, - 1 / pixelRatio, label.width, textState.padding, - !!textState.backgroundFill, !!textState.backgroundStroke - ]); - } - - /** - * @private - * @param {number} begin Begin. - * @param {number} end End. - * @param {import("../canvas.js").DeclutterGroup} declutterGroup Declutter group. - */ - drawChars_(begin, end, declutterGroup) { - const strokeState = this.textStrokeState_; - const textState = this.textState_; - const fillState = this.textFillState_; - - const strokeKey = this.strokeKey_; - if (strokeState) { - if (!(strokeKey in this.strokeStates)) { - this.strokeStates[strokeKey] = /** @type {import("../canvas.js").StrokeState} */ ({ - strokeStyle: strokeState.strokeStyle, - lineCap: strokeState.lineCap, - lineDashOffset: strokeState.lineDashOffset, - lineWidth: strokeState.lineWidth, - lineJoin: strokeState.lineJoin, - miterLimit: strokeState.miterLimit, - lineDash: strokeState.lineDash - }); - } - } - const textKey = this.textKey_; - if (!(this.textKey_ in this.textStates)) { - this.textStates[this.textKey_] = /** @type {import("../canvas.js").TextState} */ ({ - font: textState.font, - textAlign: textState.textAlign || defaultTextAlign, - scale: textState.scale - }); - } - const fillKey = this.fillKey_; - if (fillState) { - if (!(fillKey in this.fillStates)) { - this.fillStates[fillKey] = /** @type {import("../canvas.js").FillState} */ ({ - fillStyle: fillState.fillStyle - }); - } - } - - const pixelRatio = this.pixelRatio; - const baseline = TEXT_ALIGN[textState.textBaseline]; - - const offsetY = this.textOffsetY_ * pixelRatio; - const text = this.text_; - const font = textState.font; - const textScale = textState.scale; - const strokeWidth = strokeState ? strokeState.lineWidth * textScale / 2 : 0; - let widths = this.widths_[font]; - if (!widths) { - this.widths_[font] = widths = {}; - } - this.instructions.push([CanvasInstruction.DRAW_CHARS, - begin, end, baseline, declutterGroup, - textState.overflow, fillKey, textState.maxAngle, - function(text) { - let width = widths[text]; - if (!width) { - width = widths[text] = measureTextWidth(font, text); - } - return width * textScale * pixelRatio; - }, - offsetY, strokeKey, strokeWidth * pixelRatio, text, textKey, 1 - ]); - this.hitDetectionInstructions.push([CanvasInstruction.DRAW_CHARS, - begin, end, baseline, declutterGroup, - textState.overflow, fillKey, textState.maxAngle, - function(text) { - let width = widths[text]; - if (!width) { - width = widths[text] = measureTextWidth(font, text); - } - return width * textScale; - }, - offsetY, strokeKey, strokeWidth, text, textKey, 1 / pixelRatio - ]); - } - - /** - * @inheritDoc - */ - setTextStyle(textStyle, declutterGroup) { - let textState, fillState, strokeState; - if (!textStyle) { - this.text_ = ''; - } else { - this.declutterGroup_ = /** @type {import("../canvas.js").DeclutterGroup} */ (declutterGroup); - - const textFillStyle = textStyle.getFill(); - if (!textFillStyle) { - fillState = this.textFillState_ = null; - } else { - fillState = this.textFillState_; - if (!fillState) { - fillState = this.textFillState_ = /** @type {import("../canvas.js").FillState} */ ({}); - } - fillState.fillStyle = asColorLike( - textFillStyle.getColor() || defaultFillStyle); - } - - const textStrokeStyle = textStyle.getStroke(); - if (!textStrokeStyle) { - strokeState = this.textStrokeState_ = null; - } else { - strokeState = this.textStrokeState_; - if (!strokeState) { - strokeState = this.textStrokeState_ = /** @type {import("../canvas.js").StrokeState} */ ({}); - } - const lineDash = textStrokeStyle.getLineDash(); - const lineDashOffset = textStrokeStyle.getLineDashOffset(); - const lineWidth = textStrokeStyle.getWidth(); - const miterLimit = textStrokeStyle.getMiterLimit(); - strokeState.lineCap = textStrokeStyle.getLineCap() || defaultLineCap; - strokeState.lineDash = lineDash ? lineDash.slice() : defaultLineDash; - strokeState.lineDashOffset = - lineDashOffset === undefined ? defaultLineDashOffset : lineDashOffset; - strokeState.lineJoin = textStrokeStyle.getLineJoin() || defaultLineJoin; - strokeState.lineWidth = - lineWidth === undefined ? defaultLineWidth : lineWidth; - strokeState.miterLimit = - miterLimit === undefined ? defaultMiterLimit : miterLimit; - strokeState.strokeStyle = asColorLike( - textStrokeStyle.getColor() || defaultStrokeStyle); - } - - textState = this.textState_; - const font = textStyle.getFont() || defaultFont; - checkFont(font); - const textScale = textStyle.getScale(); - textState.overflow = textStyle.getOverflow(); - textState.font = font; - textState.maxAngle = textStyle.getMaxAngle(); - textState.placement = textStyle.getPlacement(); - textState.textAlign = textStyle.getTextAlign(); - textState.textBaseline = textStyle.getTextBaseline() || defaultTextBaseline; - textState.backgroundFill = textStyle.getBackgroundFill(); - textState.backgroundStroke = textStyle.getBackgroundStroke(); - textState.padding = textStyle.getPadding() || defaultPadding; - textState.scale = textScale === undefined ? 1 : textScale; - - const textOffsetX = textStyle.getOffsetX(); - const textOffsetY = textStyle.getOffsetY(); - const textRotateWithView = textStyle.getRotateWithView(); - const textRotation = textStyle.getRotation(); - this.text_ = textStyle.getText() || ''; - this.textOffsetX_ = textOffsetX === undefined ? 0 : textOffsetX; - this.textOffsetY_ = textOffsetY === undefined ? 0 : textOffsetY; - this.textRotateWithView_ = textRotateWithView === undefined ? false : textRotateWithView; - this.textRotation_ = textRotation === undefined ? 0 : textRotation; - - this.strokeKey_ = strokeState ? - (typeof strokeState.strokeStyle == 'string' ? strokeState.strokeStyle : getUid(strokeState.strokeStyle)) + - strokeState.lineCap + strokeState.lineDashOffset + '|' + strokeState.lineWidth + - strokeState.lineJoin + strokeState.miterLimit + '[' + strokeState.lineDash.join() + ']' : - ''; - this.textKey_ = textState.font + textState.scale + (textState.textAlign || '?'); - this.fillKey_ = fillState ? - (typeof fillState.fillStyle == 'string' ? fillState.fillStyle : ('|' + getUid(fillState.fillStyle))) : - ''; - } - } - ////////////// Above is code from TextReplay ////////////////// /**