From bcc94baf224d1f774222281ed62f22a5daa46480 Mon Sep 17 00:00:00 2001
From: Andreas Hocevar <andreas.hocevar@gmail.com>
Date: Tue, 14 Apr 2020 20:55:55 +0200
Subject: [PATCH] Fix layer renderer scope issues

---
 src/ol/layer/Image.js                | 1 -
 src/ol/layer/Vector.js               | 1 -
 src/ol/layer/VectorImage.js          | 1 -
 src/ol/renderer/canvas/ImageLayer.js | 2 +-
 src/ol/renderer/canvas/Layer.js      | 7 +++----
 src/ol/renderer/canvas/TileLayer.js  | 4 ++--
 6 files changed, 6 insertions(+), 10 deletions(-)

diff --git a/src/ol/layer/Image.js b/src/ol/layer/Image.js
index 459da3b160..dae27d2a55 100644
--- a/src/ol/layer/Image.js
+++ b/src/ol/layer/Image.js
@@ -25,7 +25,6 @@ class ImageLayer extends BaseImageLayer {
   /**
    * Create a renderer for this layer.
    * @return {import("../renderer/Layer.js").default} A layer renderer.
-   * @protected
    */
   createRenderer() {
     return new CanvasImageLayerRenderer(this);
diff --git a/src/ol/layer/Vector.js b/src/ol/layer/Vector.js
index b52acf5267..6092ac9b63 100644
--- a/src/ol/layer/Vector.js
+++ b/src/ol/layer/Vector.js
@@ -25,7 +25,6 @@ class VectorLayer extends BaseVectorLayer {
   /**
    * Create a renderer for this layer.
    * @return {import("../renderer/Layer.js").default} A layer renderer.
-   * @protected
    */
   createRenderer() {
     return new CanvasVectorLayerRenderer(this);
diff --git a/src/ol/layer/VectorImage.js b/src/ol/layer/VectorImage.js
index aa4757d216..feaf9a5552 100644
--- a/src/ol/layer/VectorImage.js
+++ b/src/ol/layer/VectorImage.js
@@ -88,7 +88,6 @@ class VectorImageLayer extends BaseVectorLayer {
   /**
    * Create a renderer for this layer.
    * @return {import("../renderer/Layer.js").default} A layer renderer.
-   * @protected
    */
   createRenderer() {
     return new CanvasVectorImageLayerRenderer(this);
diff --git a/src/ol/renderer/canvas/ImageLayer.js b/src/ol/renderer/canvas/ImageLayer.js
index ae6e896152..7cf79ca989 100644
--- a/src/ol/renderer/canvas/ImageLayer.js
+++ b/src/ol/renderer/canvas/ImageLayer.js
@@ -163,7 +163,7 @@ class CanvasImageLayerRenderer extends CanvasLayerRenderer {
     const img = image.getImage();
 
     const transform = composeTransform(
-      this.tempTransform_,
+      this.tempTransform,
       width / 2,
       height / 2,
       scale,
diff --git a/src/ol/renderer/canvas/Layer.js b/src/ol/renderer/canvas/Layer.js
index cc1c1f1e64..e3e8f5c698 100644
--- a/src/ol/renderer/canvas/Layer.js
+++ b/src/ol/renderer/canvas/Layer.js
@@ -44,10 +44,10 @@ class CanvasLayerRenderer extends LayerRenderer {
     /**
      * A temporary transform.  The values in this transform should only be used in a
      * function that sets the values.
-     * @private
+     * @protected
      * @type {import("../../transform.js").Transform}
      */
-    this.tempTransform_ = createTransform();
+    this.tempTransform = createTransform();
 
     /**
      * The transform for rendered pixels to viewport CSS pixels.  This transform must
@@ -66,7 +66,6 @@ class CanvasLayerRenderer extends LayerRenderer {
     this.inversePixelTransform = createTransform();
 
     /**
-     * @protected
      * @type {CanvasRenderingContext2D}
      */
     this.context = null;
@@ -255,7 +254,7 @@ class CanvasLayerRenderer extends LayerRenderer {
     const dx2 = -center[0] + offsetX;
     const dy2 = -center[1];
     return composeTransform(
-      this.tempTransform_,
+      this.tempTransform,
       dx1,
       dy1,
       sx,
diff --git a/src/ol/renderer/canvas/TileLayer.js b/src/ol/renderer/canvas/TileLayer.js
index cf1d1b3544..b49bd78b7f 100644
--- a/src/ol/renderer/canvas/TileLayer.js
+++ b/src/ol/renderer/canvas/TileLayer.js
@@ -290,7 +290,7 @@ class CanvasTileLayerRenderer extends CanvasLayerRenderer {
 
     // set scale transform for calculating tile positions on the canvas
     composeTransform(
-      this.tempTransform_,
+      this.tempTransform,
       width / 2,
       height / 2,
       canvasScale,
@@ -346,7 +346,7 @@ class CanvasTileLayerRenderer extends CanvasLayerRenderer {
         currentZ
       );
       const originTileExtent = tileGrid.getTileCoordExtent(originTileCoord);
-      const origin = applyTransform(this.tempTransform_, [
+      const origin = applyTransform(this.tempTransform, [
         (tilePixelRatio * (originTileExtent[0] - canvasExtent[0])) /
           tileResolution,
         (tilePixelRatio * (canvasExtent[3] - originTileExtent[3])) /