ashatora/openlayers
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Set pixelTransform and inversePixelTransform as protected

Browse Source 
The variables are used in child classes
This commit is contained in:
Frederic Junod
2019-06-14 14:52:26 +02:00
parent 92c16ecdf5
commit ec5e8bfa50
4 changed files with 19 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/ol/renderer/canvas/ImageLayer.js
View File

@@ -95,15 +95,15 @@ class CanvasImageLayerRenderer extends CanvasLayerRenderer {
} }
// set forward and inverse pixel transforms // set forward and inverse pixel transforms
composeTransform(this.pixelTransform_, composeTransform(this.pixelTransform,
frameState.size[0] / 2, frameState.size[1] / 2, frameState.size[0] / 2, frameState.size[1] / 2,
1 / pixelRatio, 1 / pixelRatio, 1 / pixelRatio, 1 / pixelRatio,
rotation, rotation,
-width / 2, -height / 2 -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 context = this.context;
const canvas = context.canvas; const canvas = context.canvas;
@@ -160,7 +160,7 @@ class CanvasImageLayerRenderer extends CanvasLayerRenderer {
context.restore(); context.restore();
} }
const canvasTransform = transformToString(this.pixelTransform_); const canvasTransform = transformToString(this.pixelTransform);
if (canvasTransform !== canvas.style.transform) { if (canvasTransform !== canvas.style.transform) {
canvas.style.transform = canvasTransform; canvas.style.transform = canvasTransform;
} }

14
src/ol/renderer/canvas/Layer.js
View File

@@ -44,18 +44,18 @@ class CanvasLayerRenderer extends LayerRenderer {
/** /**
* The transform for rendered pixels to viewport CSS pixels. This transform must * 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. * be set when rendering a frame and may be used by other functions after rendering.
* @private * @protected
* @type {import("../../transform.js").Transform} * @type {import("../../transform.js").Transform}
*/ */
this.pixelTransform_ = createTransform(); this.pixelTransform = createTransform();
/** /**
* The transform for viewport CSS pixels to rendered pixels. This transform must * 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. * be set when rendering a frame and may be used by other functions after rendering.
* @private * @protected
* @type {import("../../transform.js").Transform} * @type {import("../../transform.js").Transform}
*/ */
this.inversePixelTransform_ = createTransform(); this.inversePixelTransform = createTransform();
/** /**
* @protected * @protected
@@ -163,7 +163,7 @@ class CanvasLayerRenderer extends LayerRenderer {
applyTransform(frameState.coordinateToPixelTransform, bottomRight); applyTransform(frameState.coordinateToPixelTransform, bottomRight);
applyTransform(frameState.coordinateToPixelTransform, bottomLeft); applyTransform(frameState.coordinateToPixelTransform, bottomLeft);
const inverted = this.inversePixelTransform_; const inverted = this.inversePixelTransform;
applyTransform(inverted, topLeft); applyTransform(inverted, topLeft);
applyTransform(inverted, topRight); applyTransform(inverted, topRight);
applyTransform(inverted, bottomRight); applyTransform(inverted, bottomRight);
@@ -187,7 +187,7 @@ class CanvasLayerRenderer extends LayerRenderer {
dispatchRenderEvent_(type, context, frameState) { dispatchRenderEvent_(type, context, frameState) {
const layer = this.getLayer(); const layer = this.getLayer();
if (layer.hasListener(type)) { 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); layer.dispatchEvent(event);
} }
} }
@@ -240,7 +240,7 @@ class CanvasLayerRenderer extends LayerRenderer {
* returned, and empty array will be returned. * returned, and empty array will be returned.
*/ */
getDataAtPixel(pixel, frameState, hitTolerance) { getDataAtPixel(pixel, frameState, hitTolerance) {
const renderPixel = applyTransform(this.inversePixelTransform_, pixel.slice()); const renderPixel = applyTransform(this.inversePixelTransform, pixel.slice());
const context = this.context; const context = this.context;
let data; let data;

8
src/ol/renderer/canvas/TileLayer.js
View File

@@ -227,18 +227,18 @@ class CanvasTileLayerRenderer extends CanvasLayerRenderer {
const canvasScale = tileResolution / viewResolution; const canvasScale = tileResolution / viewResolution;
// set forward and inverse pixel transforms // set forward and inverse pixel transforms
composeTransform(this.pixelTransform_, composeTransform(this.pixelTransform,
frameState.size[0] / 2, frameState.size[1] / 2, frameState.size[0] / 2, frameState.size[1] / 2,
1 / tilePixelRatio, 1 / tilePixelRatio, 1 / tilePixelRatio, 1 / tilePixelRatio,
rotation, rotation,
-width / 2, -height / 2 -width / 2, -height / 2
); );
this.useContainer(target, this.pixelTransform_, layerState.opacity); this.useContainer(target, this.pixelTransform, layerState.opacity);
const context = this.context; const context = this.context;
const canvas = context.canvas; const canvas = context.canvas;
makeInverse(this.inversePixelTransform_, this.pixelTransform_); makeInverse(this.inversePixelTransform, this.pixelTransform);
// set scale transform for calculating tile positions on the canvas // set scale transform for calculating tile positions on the canvas
composeTransform(this.tempTransform_, composeTransform(this.tempTransform_,
@@ -361,7 +361,7 @@ class CanvasTileLayerRenderer extends CanvasLayerRenderer {
context.restore(); context.restore();
} }
const canvasTransform = transformToString(this.pixelTransform_); const canvasTransform = transformToString(this.pixelTransform);
if (canvasTransform !== canvas.style.transform) { if (canvasTransform !== canvas.style.transform) {
canvas.style.transform = canvasTransform; canvas.style.transform = canvasTransform;
} }

8
src/ol/renderer/canvas/VectorLayer.js
View File

@@ -86,10 +86,10 @@ class CanvasVectorLayerRenderer extends CanvasLayerRenderer {
const layerState = frameState.layerStatesArray[frameState.layerIndex]; const layerState = frameState.layerStatesArray[frameState.layerIndex];
// set forward and inverse pixel transforms // set forward and inverse pixel transforms
makeScale(this.pixelTransform_, 1 / pixelRatio, 1 / pixelRatio); makeScale(this.pixelTransform, 1 / pixelRatio, 1 / pixelRatio);
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 context = this.context;
const canvas = context.canvas; const canvas = context.canvas;
@@ -107,7 +107,7 @@ class CanvasVectorLayerRenderer extends CanvasLayerRenderer {
if (canvas.width != width || canvas.height != height) { if (canvas.width != width || canvas.height != height) {
canvas.width = width; canvas.width = width;
canvas.height = height; canvas.height = height;
const canvasTransform = transformToString(this.pixelTransform_); const canvasTransform = transformToString(this.pixelTransform);
if (canvas.style.transform !== canvasTransform) { if (canvas.style.transform !== canvasTransform) {
canvas.style.transform = canvasTransform; canvas.style.transform = canvasTransform;
} }