From 0ece0fb002a47e03754620dc0d7b63a2af7c509a Mon Sep 17 00:00:00 2001 From: Guillaume Beraudo Date: Tue, 13 Nov 2018 19:20:26 +0100 Subject: [PATCH] Cleanup unused text replay code --- src/ol/render/canvas/InstructionsExecutor.js | 68 +------------------- 1 file changed, 1 insertion(+), 67 deletions(-) diff --git a/src/ol/render/canvas/InstructionsExecutor.js b/src/ol/render/canvas/InstructionsExecutor.js index 2836a8d874..471e4a254a 100644 --- a/src/ol/render/canvas/InstructionsExecutor.js +++ b/src/ol/render/canvas/InstructionsExecutor.js @@ -21,10 +21,8 @@ import { } from '../../transform.js'; -/// Imports copied from TextReplay -import {asColorLike} from '../../colorlike.js'; import {createCanvasContext2D} from '../../dom.js'; -import {labelCache, measureTextWidth, measureTextWidths, defaultTextAlign, measureTextHeight, defaultLineCap, defaultLineDashOffset, defaultLineDash, defaultLineJoin, defaultFillStyle, checkFont, defaultFont, defaultLineWidth, defaultMiterLimit, defaultStrokeStyle, defaultTextBaseline} from '../canvas.js'; +import {labelCache, defaultTextAlign, measureTextHeight, measureTextWidths} from '../canvas.js'; /** @@ -176,44 +174,6 @@ class CanvasInstructionsExecutor { this.viewRotation_ = 0; ////////////// Below is code copied from TextReplay //////////// - - - /** - * @private - * @type {Array} - */ - this.labels_ = null; - - /** - * @private - * @type {string} - */ - this.text_ = ''; - - /** - * @private - * @type {number} - */ - this.textOffsetX_ = 0; - - /** - * @private - * @type {number} - */ - this.textOffsetY_ = 0; - - /** - * @private - * @type {boolean|undefined} - */ - this.textRotateWithView_ = undefined; - - /** - * @private - * @type {number} - */ - this.textRotation_ = 0; - /** * @private * @type {?import("../canvas.js").FillState} @@ -246,32 +206,6 @@ class CanvasInstructionsExecutor { * @type {!Object} */ this.textStates = {}; - - /** - * @private - * @type {string} - */ - this.textKey_ = ''; - - /** - * @private - * @type {string} - */ - this.fillKey_ = ''; - - /** - * @private - * @type {string} - */ - this.strokeKey_ = ''; - - /** - * @private - * @type {Object>} - */ - this.widths_ = {}; - - labelCache.prune(); }