diff --git a/src/ol/renderer/canvas/ImageLayer.js b/src/ol/renderer/canvas/ImageLayer.js index 328244c0db..b6e38e6ec5 100644 --- a/src/ol/renderer/canvas/ImageLayer.js +++ b/src/ol/renderer/canvas/ImageLayer.js @@ -6,7 +6,7 @@ import ViewHint from '../../ViewHint.js'; import {containsExtent, intersects} from '../../extent.js'; import {getIntersection, isEmpty} from '../../extent.js'; import CanvasLayerRenderer from './Layer.js'; -import {create as createTransform, compose as composeTransform, toString as transformToString} from '../../transform.js'; +import {compose as composeTransform, toString as transformToString} from '../../transform.js'; /** * @classdesc @@ -21,12 +21,6 @@ class CanvasImageLayerRenderer extends CanvasLayerRenderer { constructor(imageLayer) { super(imageLayer); - /** - * @protected - * @type {import("../../transform.js").Transform} - */ - this.coordinateToCanvasPixelTransform = createTransform(); - /** * @protected * @type {?import("../../ImageBase.js").default} diff --git a/src/ol/renderer/canvas/TileLayer.js b/src/ol/renderer/canvas/TileLayer.js index aa4adc3917..9f03aafd86 100644 --- a/src/ol/renderer/canvas/TileLayer.js +++ b/src/ol/renderer/canvas/TileLayer.js @@ -6,7 +6,7 @@ import TileRange from '../../TileRange.js'; import TileState from '../../TileState.js'; import {createEmpty, getIntersection, getTopLeft} from '../../extent.js'; import CanvasLayerRenderer from './Layer.js'; -import {create as createTransform, compose as composeTransform, toString as transformToString} from '../../transform.js'; +import {compose as composeTransform, toString as transformToString} from '../../transform.js'; /** * @classdesc @@ -21,12 +21,6 @@ class CanvasTileLayerRenderer extends CanvasLayerRenderer { constructor(tileLayer) { super(tileLayer); - /** - * @protected - * @type {import("../../transform.js").Transform} - */ - this.coordinateToCanvasPixelTransform = createTransform(); - /** * @private * @type {number} diff --git a/src/ol/renderer/canvas/VectorImageLayer.js b/src/ol/renderer/canvas/VectorImageLayer.js index 91ca356ace..0fb933b564 100644 --- a/src/ol/renderer/canvas/VectorImageLayer.js +++ b/src/ol/renderer/canvas/VectorImageLayer.js @@ -7,7 +7,6 @@ import {equals} from '../../array.js'; import {getHeight, getWidth, isEmpty} from '../../extent.js'; import {assign} from '../../obj.js'; import CanvasImageLayerRenderer from './ImageLayer.js'; -import {compose as composeTransform} from '../../transform.js'; import CanvasVectorLayerRenderer from './VectorLayer.js'; /** @@ -49,9 +48,7 @@ class CanvasVectorImageLayerRenderer extends CanvasImageLayerRenderer { */ prepareFrame(frameState, layerState) { const pixelRatio = frameState.pixelRatio; - const size = frameState.size; const viewState = frameState.viewState; - const viewCenter = viewState.center; const viewResolution = viewState.resolution; const hints = frameState.viewHints; @@ -90,25 +87,8 @@ class CanvasVectorImageLayerRenderer extends CanvasImageLayerRenderer { if (this.image_) { const image = this.image_; - const imageExtent = image.getExtent(); const imageResolution = image.getResolution(); const imagePixelRatio = image.getPixelRatio(); - const scale = pixelRatio * imageResolution / - (viewResolution * imagePixelRatio); - - const transform = composeTransform(this.transform_, - pixelRatio * size[0] / 2, pixelRatio * size[1] / 2, - scale, scale, - 0, - imagePixelRatio * (imageExtent[0] - viewCenter[0]) / imageResolution, - imagePixelRatio * (viewCenter[1] - imageExtent[3]) / imageResolution); - - composeTransform(this.coordinateToCanvasPixelTransform, - pixelRatio * size[0] / 2 - transform[4], pixelRatio * size[1] / 2 - transform[5], - pixelRatio / viewResolution, -pixelRatio / viewResolution, - 0, - -viewCenter[0], -viewCenter[1]); - this.renderedResolution = imageResolution * pixelRatio / imagePixelRatio; }