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

re-enable image smoothing after rendering

Browse Source
This commit is contained in:
mike-000
2022-01-13 22:32:43 +00:00
parent 89f632fa7e
commit 1c81f60fec
5 changed files with 37 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -4,7 +4,7 @@
import CanvasLayerRenderer from './Layer.js'; import CanvasLayerRenderer from './Layer.js';
import ViewHint from '../../ViewHint.js'; import ViewHint from '../../ViewHint.js';
import {ENABLE_RASTER_REPROJECTION} from '../../reproj/common.js'; import {ENABLE_RASTER_REPROJECTION} from '../../reproj/common.js';
import {IMAGE_SMOOTHING_DISABLED} from './common.js'; import {IMAGE_SMOOTHING_DISABLED, IMAGE_SMOOTHING_ENABLED} from './common.js';
import {assign} from '../../obj.js'; import {assign} from '../../obj.js';
import {compose as composeTransform, makeInverse} from '../../transform.js'; import {compose as composeTransform, makeInverse} from '../../transform.js';
import {containsExtent, intersects as intersectsExtent} from '../../extent.js'; import {containsExtent, intersects as intersectsExtent} from '../../extent.js';
@@ -219,6 +219,7 @@ class CanvasImageLayerRenderer extends CanvasLayerRenderer {
if (clipped) { if (clipped) {
context.restore(); context.restore();
} }
assign(context, IMAGE_SMOOTHING_ENABLED);
if (canvasTransform !== canvas.style.transform) { if (canvasTransform !== canvas.style.transform) {
canvas.style.transform = canvasTransform; canvas.style.transform = canvasTransform;

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

@@ -4,7 +4,7 @@
import CanvasLayerRenderer from './Layer.js'; import CanvasLayerRenderer from './Layer.js';
import TileRange from '../../TileRange.js'; import TileRange from '../../TileRange.js';
import TileState from '../../TileState.js'; import TileState from '../../TileState.js';
import {IMAGE_SMOOTHING_DISABLED} from './common.js'; import {IMAGE_SMOOTHING_DISABLED, IMAGE_SMOOTHING_ENABLED} from './common.js';
import { import {
apply as applyTransform, apply as applyTransform,
compose as composeTransform, compose as composeTransform,
@@ -457,6 +457,7 @@ class CanvasTileLayerRenderer extends CanvasLayerRenderer {
if (layerState.extent) { if (layerState.extent) {
context.restore(); context.restore();
} }
assign(context, IMAGE_SMOOTHING_ENABLED);
if (canvasTransform !== canvas.style.transform) { if (canvasTransform !== canvas.style.transform) {
canvas.style.transform = canvasTransform; canvas.style.transform = canvasTransform;

9
src/ol/renderer/canvas/common.js
View File

@@ -10,3 +10,12 @@ export const IMAGE_SMOOTHING_DISABLED = {
imageSmoothingEnabled: false, imageSmoothingEnabled: false,
msImageSmoothingEnabled: false, msImageSmoothingEnabled: false,
}; };
/**
* Context options to enable image smoothing.
* @type {Object}
*/
export const IMAGE_SMOOTHING_ENABLED = {
imageSmoothingEnabled: true,
msImageSmoothingEnabled: true,
};

12
test/browser/spec/ol/renderer/canvas/imagelayer.test.js
View File

@@ -301,6 +301,18 @@ describe('ol.renderer.canvas.ImageLayer', function () {
done(); done();
}); });
}); });
it('image smoothing is re-enabled after rendering', function (done) {
let context;
layer.on('postrender', function (e) {
context = e.context;
context.imageSmoothingEnabled = false;
});
map.on('postrender', function () {
expect(context.imageSmoothingEnabled).to.be(true);
done();
});
});
}); });
describe('Vector image rendering', function () { describe('Vector image rendering', function () {

12
test/browser/spec/ol/renderer/canvas/tilelayer.test.js
View File

@@ -87,5 +87,17 @@ describe('ol.renderer.canvas.TileLayer', function () {
done(); done();
}); });
}); });
it('image smoothing is re-enabled after rendering', function (done) {
let context;
layer.on('postrender', function (e) {
context = e.context;
context.imageSmoothingEnabled = false;
});
map.on('postrender', function () {
expect(context.imageSmoothingEnabled).to.be(true);
done();
});
});
}); });
}); });