From ec5e8bfa50bca46b614f6a0eb6dbd5838fdb500a Mon Sep 17 00:00:00 2001 From: Frederic Junod Date: Fri, 14 Jun 2019 14:52:26 +0200 Subject: [PATCH] Set pixelTransform and inversePixelTransform as protected The variables are used in child classes --- src/ol/renderer/canvas/ImageLayer.js | 8 ++++---- src/ol/renderer/canvas/Layer.js | 14 +++++++------- src/ol/renderer/canvas/TileLayer.js | 8 ++++---- src/ol/renderer/canvas/VectorLayer.js | 8 ++++---- 4 files changed, 19 insertions(+), 19 deletions(-) diff --git a/src/ol/renderer/canvas/ImageLayer.js b/src/ol/renderer/canvas/ImageLayer.js index 5d4c7b6cda..c6b78ef1c3 100644 --- a/src/ol/renderer/canvas/ImageLayer.js +++ b/src/ol/renderer/canvas/ImageLayer.js @@ -95,15 +95,15 @@ class CanvasImageLayerRenderer extends CanvasLayerRenderer { } // set forward and inverse pixel transforms - composeTransform(this.pixelTransform_, + composeTransform(this.pixelTransform, frameState.size[0] / 2, frameState.size[1] / 2, 1 / pixelRatio, 1 / pixelRatio, rotation, -width / 2, -height / 2 ); - makeInverse(this.inversePixelTransform_, this.pixelTransform_); + makeInverse(this.inversePixelTransform, this.pixelTransform); - this.useContainer(target, this.pixelTransform_, layerState.opacity); + this.useContainer(target, this.pixelTransform, layerState.opacity); const context = this.context; const canvas = context.canvas; @@ -160,7 +160,7 @@ class CanvasImageLayerRenderer extends CanvasLayerRenderer { context.restore(); } - const canvasTransform = transformToString(this.pixelTransform_); + const canvasTransform = transformToString(this.pixelTransform); if (canvasTransform !== canvas.style.transform) { canvas.style.transform = canvasTransform; } diff --git a/src/ol/renderer/canvas/Layer.js b/src/ol/renderer/canvas/Layer.js index 8fd413a508..1522c58e8f 100644 --- a/src/ol/renderer/canvas/Layer.js +++ b/src/ol/renderer/canvas/Layer.js @@ -44,18 +44,18 @@ class CanvasLayerRenderer extends LayerRenderer { /** * The transform for rendered pixels to viewport CSS pixels. This transform must * be set when rendering a frame and may be used by other functions after rendering. - * @private + * @protected * @type {import("../../transform.js").Transform} */ - this.pixelTransform_ = createTransform(); + this.pixelTransform = createTransform(); /** * The transform for viewport CSS pixels to rendered pixels. This transform must * be set when rendering a frame and may be used by other functions after rendering. - * @private + * @protected * @type {import("../../transform.js").Transform} */ - this.inversePixelTransform_ = createTransform(); + this.inversePixelTransform = createTransform(); /** * @protected @@ -163,7 +163,7 @@ class CanvasLayerRenderer extends LayerRenderer { applyTransform(frameState.coordinateToPixelTransform, bottomRight); applyTransform(frameState.coordinateToPixelTransform, bottomLeft); - const inverted = this.inversePixelTransform_; + const inverted = this.inversePixelTransform; applyTransform(inverted, topLeft); applyTransform(inverted, topRight); applyTransform(inverted, bottomRight); @@ -187,7 +187,7 @@ class CanvasLayerRenderer extends LayerRenderer { dispatchRenderEvent_(type, context, frameState) { const layer = this.getLayer(); if (layer.hasListener(type)) { - const event = new RenderEvent(type, this.inversePixelTransform_, frameState, context, null); + const event = new RenderEvent(type, this.inversePixelTransform, frameState, context, null); layer.dispatchEvent(event); } } @@ -240,7 +240,7 @@ class CanvasLayerRenderer extends LayerRenderer { * returned, and empty array will be returned. */ getDataAtPixel(pixel, frameState, hitTolerance) { - const renderPixel = applyTransform(this.inversePixelTransform_, pixel.slice()); + const renderPixel = applyTransform(this.inversePixelTransform, pixel.slice()); const context = this.context; let data; diff --git a/src/ol/renderer/canvas/TileLayer.js b/src/ol/renderer/canvas/TileLayer.js index f005c466e2..b2a5509804 100644 --- a/src/ol/renderer/canvas/TileLayer.js +++ b/src/ol/renderer/canvas/TileLayer.js @@ -227,18 +227,18 @@ class CanvasTileLayerRenderer extends CanvasLayerRenderer { const canvasScale = tileResolution / viewResolution; // set forward and inverse pixel transforms - composeTransform(this.pixelTransform_, + composeTransform(this.pixelTransform, frameState.size[0] / 2, frameState.size[1] / 2, 1 / tilePixelRatio, 1 / tilePixelRatio, rotation, -width / 2, -height / 2 ); - this.useContainer(target, this.pixelTransform_, layerState.opacity); + this.useContainer(target, this.pixelTransform, layerState.opacity); const context = this.context; const canvas = context.canvas; - makeInverse(this.inversePixelTransform_, this.pixelTransform_); + makeInverse(this.inversePixelTransform, this.pixelTransform); // set scale transform for calculating tile positions on the canvas composeTransform(this.tempTransform_, @@ -361,7 +361,7 @@ class CanvasTileLayerRenderer extends CanvasLayerRenderer { context.restore(); } - const canvasTransform = transformToString(this.pixelTransform_); + const canvasTransform = transformToString(this.pixelTransform); if (canvasTransform !== canvas.style.transform) { canvas.style.transform = canvasTransform; } diff --git a/src/ol/renderer/canvas/VectorLayer.js b/src/ol/renderer/canvas/VectorLayer.js index 538aa612b9..98801e1fc5 100644 --- a/src/ol/renderer/canvas/VectorLayer.js +++ b/src/ol/renderer/canvas/VectorLayer.js @@ -86,10 +86,10 @@ class CanvasVectorLayerRenderer extends CanvasLayerRenderer { const layerState = frameState.layerStatesArray[frameState.layerIndex]; // set forward and inverse pixel transforms - makeScale(this.pixelTransform_, 1 / pixelRatio, 1 / pixelRatio); - makeInverse(this.inversePixelTransform_, this.pixelTransform_); + makeScale(this.pixelTransform, 1 / pixelRatio, 1 / pixelRatio); + makeInverse(this.inversePixelTransform, this.pixelTransform); - this.useContainer(target, this.pixelTransform_, layerState.opacity); + this.useContainer(target, this.pixelTransform, layerState.opacity); const context = this.context; const canvas = context.canvas; @@ -107,7 +107,7 @@ class CanvasVectorLayerRenderer extends CanvasLayerRenderer { if (canvas.width != width || canvas.height != height) { canvas.width = width; canvas.height = height; - const canvasTransform = transformToString(this.pixelTransform_); + const canvasTransform = transformToString(this.pixelTransform); if (canvas.style.transform !== canvasTransform) { canvas.style.transform = canvasTransform; }