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

Smaller canvas when rotating vector layers

Browse Source
This commit is contained in:
Tim Schaub
2018-11-15 11:37:45 +01:00
parent 26de43de0c
commit f90efac131
4 changed files with 7 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/ol/render/canvas/Executor.js
View File

@@ -700,8 +700,8 @@ class CanvasExecutor {
backgroundFill = backgroundStroke = false;
}
if (!rotateWithView) {
rotation -= viewRotation;
if (rotateWithView) {
rotation += viewRotation;
}
let widthIndex = 0;
for (; d < dd; d += 2) {

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

@@ -192,7 +192,7 @@ class CanvasLayerRenderer extends LayerRenderer {
const sy = -sx;
const dx2 = -viewState.center[0] + offsetX;
const dy2 = -viewState.center[1];
return composeTransform(this.transform_, dx1, dy1, sx, sy, 0, dx2, dy2);
return composeTransform(this.transform_, dx1, dy1, sx, sy, -viewState.rotation, dx2, dy2);
}
}

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

@@ -123,12 +123,8 @@ class CanvasVectorLayerRenderer extends CanvasLayerRenderer {
}
// resize and clear
let width = Math.round(frameState.size[0] * pixelRatio);
let height = Math.round(frameState.size[1] * pixelRatio);
if (rotation) {
const size = Math.round(Math.sqrt(width * width + height * height));
width = height = size;
}
const width = Math.round(frameState.size[0] * pixelRatio);
const height = Math.round(frameState.size[1] * pixelRatio);
if (canvas.width != width || canvas.height != height) {
canvas.width = width;
canvas.height = height;
@@ -193,12 +189,6 @@ class CanvasVectorLayerRenderer extends CanvasLayerRenderer {
canvas.style.opacity = opacity;
}
const rotation = frameState.viewState.rotation;
const transform = 'rotate(' + rotation + 'rad)';
if (transform !== canvas.style.transform) {
canvas.style.transform = transform;
}
return canvas;
}

13
src/ol/renderer/canvas/VectorTileLayer.js
View File

@@ -378,12 +378,8 @@ class CanvasVectorTileLayerRenderer extends CanvasTileLayerRenderer {
// resize and clear
const canvas = context.canvas;
let width = Math.round(size[0] * pixelRatio);
let height = Math.round(size[1] * pixelRatio);
if (rotation) {
const size = Math.round(Math.sqrt(width * width + height * height));
width = height = size;
}
const width = Math.round(size[0] * pixelRatio);
const height = Math.round(size[1] * pixelRatio);
if (canvas.width != width || canvas.height != height) {
canvas.width = width;
canvas.height = height;
@@ -462,11 +458,6 @@ class CanvasVectorTileLayerRenderer extends CanvasTileLayerRenderer {
canvas.style.opacity = opacity;
}
const canvasTransform = 'rotate(' + rotation + 'rad)';
if (canvasTransform !== canvas.style.transform) {
canvas.style.transform = canvasTransform;
}
return this.container_;
}