Fix layer renderer scope issues

This commit is contained in:
Andreas Hocevar
2020-04-14 20:55:55 +02:00
parent 6426cd10dc
commit bcc94baf22
6 changed files with 6 additions and 10 deletions

View File

@@ -25,7 +25,6 @@ class ImageLayer extends BaseImageLayer {
/** /**
* Create a renderer for this layer. * Create a renderer for this layer.
* @return {import("../renderer/Layer.js").default} A layer renderer. * @return {import("../renderer/Layer.js").default} A layer renderer.
* @protected
*/ */
createRenderer() { createRenderer() {
return new CanvasImageLayerRenderer(this); return new CanvasImageLayerRenderer(this);

View File

@@ -25,7 +25,6 @@ class VectorLayer extends BaseVectorLayer {
/** /**
* Create a renderer for this layer. * Create a renderer for this layer.
* @return {import("../renderer/Layer.js").default} A layer renderer. * @return {import("../renderer/Layer.js").default} A layer renderer.
* @protected
*/ */
createRenderer() { createRenderer() {
return new CanvasVectorLayerRenderer(this); return new CanvasVectorLayerRenderer(this);

View File

@@ -88,7 +88,6 @@ class VectorImageLayer extends BaseVectorLayer {
/** /**
* Create a renderer for this layer. * Create a renderer for this layer.
* @return {import("../renderer/Layer.js").default} A layer renderer. * @return {import("../renderer/Layer.js").default} A layer renderer.
* @protected
*/ */
createRenderer() { createRenderer() {
return new CanvasVectorImageLayerRenderer(this); return new CanvasVectorImageLayerRenderer(this);

View File

@@ -163,7 +163,7 @@ class CanvasImageLayerRenderer extends CanvasLayerRenderer {
const img = image.getImage(); const img = image.getImage();
const transform = composeTransform( const transform = composeTransform(
this.tempTransform_, this.tempTransform,
width / 2, width / 2,
height / 2, height / 2,
scale, scale,

View File

@@ -44,10 +44,10 @@ class CanvasLayerRenderer extends LayerRenderer {
/** /**
* A temporary transform. The values in this transform should only be used in a * A temporary transform. The values in this transform should only be used in a
* function that sets the values. * function that sets the values.
* @private * @protected
* @type {import("../../transform.js").Transform} * @type {import("../../transform.js").Transform}
*/ */
this.tempTransform_ = createTransform(); this.tempTransform = createTransform();
/** /**
* The transform for rendered pixels to viewport CSS pixels. This transform must * The transform for rendered pixels to viewport CSS pixels. This transform must
@@ -66,7 +66,6 @@ class CanvasLayerRenderer extends LayerRenderer {
this.inversePixelTransform = createTransform(); this.inversePixelTransform = createTransform();
/** /**
* @protected
* @type {CanvasRenderingContext2D} * @type {CanvasRenderingContext2D}
*/ */
this.context = null; this.context = null;
@@ -255,7 +254,7 @@ class CanvasLayerRenderer extends LayerRenderer {
const dx2 = -center[0] + offsetX; const dx2 = -center[0] + offsetX;
const dy2 = -center[1]; const dy2 = -center[1];
return composeTransform( return composeTransform(
this.tempTransform_, this.tempTransform,
dx1, dx1,
dy1, dy1,
sx, sx,

View File

@@ -290,7 +290,7 @@ class CanvasTileLayerRenderer extends CanvasLayerRenderer {
// set scale transform for calculating tile positions on the canvas // set scale transform for calculating tile positions on the canvas
composeTransform( composeTransform(
this.tempTransform_, this.tempTransform,
width / 2, width / 2,
height / 2, height / 2,
canvasScale, canvasScale,
@@ -346,7 +346,7 @@ class CanvasTileLayerRenderer extends CanvasLayerRenderer {
currentZ currentZ
); );
const originTileExtent = tileGrid.getTileCoordExtent(originTileCoord); const originTileExtent = tileGrid.getTileCoordExtent(originTileCoord);
const origin = applyTransform(this.tempTransform_, [ const origin = applyTransform(this.tempTransform, [
(tilePixelRatio * (originTileExtent[0] - canvasExtent[0])) / (tilePixelRatio * (originTileExtent[0] - canvasExtent[0])) /
tileResolution, tileResolution,
(tilePixelRatio * (canvasExtent[3] - originTileExtent[3])) / (tilePixelRatio * (canvasExtent[3] - originTileExtent[3])) /