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

Use Object.assign

Browse Source
This commit is contained in:
Tim Schaub
2022-07-27 14:22:04 -06:00
parent 9f6ccdfb2d
commit 25d47ed752
46 changed files with 108 additions and 212 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/ol/renderer/canvas/ImageLayer.js
+2 -3
View File
@@ -12,7 +12,6 @@ import {
makeInverse,
toString as toTransformString,
} from '../../transform.js';
import {assign} from '../../obj.js';
import {
containsCoordinate,
containsExtent,
@@ -239,7 +238,7 @@ class CanvasImageLayerRenderer extends CanvasLayerRenderer {
const dh = img.height * transform[3];
if (!this.getLayer().getSource().getInterpolate()) {
assign(context, IMAGE_SMOOTHING_DISABLED);
Object.assign(context, IMAGE_SMOOTHING_DISABLED);
}
this.preRender(context, frameState);
@@ -262,7 +261,7 @@ class CanvasImageLayerRenderer extends CanvasLayerRenderer {
if (clipped) {
context.restore();
}
assign(context, IMAGE_SMOOTHING_ENABLED);
Object.assign(context, IMAGE_SMOOTHING_ENABLED);
if (canvasTransform !== canvas.style.transform) {
canvas.style.transform = canvasTransform;
src/ol/renderer/canvas/TileLayer.js
+2 -3
View File
@@ -13,7 +13,6 @@ import {
makeInverse,
toString as toTransformString,
} from '../../transform.js';
import {assign} from '../../obj.js';
import {
containsCoordinate,
createEmpty,
@@ -411,7 +410,7 @@ class CanvasTileLayerRenderer extends CanvasLayerRenderer {
}
if (!tileSource.getInterpolate()) {
assign(context, IMAGE_SMOOTHING_DISABLED);
Object.assign(context, IMAGE_SMOOTHING_DISABLED);
}
this.preRender(context, frameState);
@@ -562,7 +561,7 @@ class CanvasTileLayerRenderer extends CanvasLayerRenderer {
if (layerState.extent) {
context.restore();
}
assign(context, IMAGE_SMOOTHING_ENABLED);
Object.assign(context, IMAGE_SMOOTHING_ENABLED);
if (canvasTransform !== canvas.style.transform) {
canvas.style.transform = canvasTransform;
src/ol/renderer/canvas/VectorImageLayer.js
+3 -4
View File
@@ -9,7 +9,6 @@ import ImageState from '../../ImageState.js';
import RBush from 'rbush';
import ViewHint from '../../ViewHint.js';
import {apply, compose, create} from '../../transform.js';
import {assign} from '../../obj.js';
import {getHeight, getWidth, isEmpty, scaleFromCenter} from '../../extent.js';
/**
@@ -109,15 +108,15 @@ class CanvasVectorImageLayerRenderer extends CanvasImageLayerRenderer {
const context = vectorRenderer.context;
const layerState = frameState.layerStatesArray[frameState.layerIndex];
context.globalAlpha = layerState.opacity;
const imageLayerState = assign({}, layerState, {opacity: 1});
const imageLayerState = Object.assign({}, layerState, {opacity: 1});
const imageFrameState =
/** @type {import("../../PluggableMap.js").FrameState} */ (
assign({}, frameState, {
Object.assign({}, frameState, {
declutterTree: new RBush(9),
extent: renderedExtent,
size: [width, height],
viewState: /** @type {import("../../View.js").State} */ (
assign({}, frameState.viewState, {
Object.assign({}, frameState.viewState, {
rotation: 0,
})
),