diff --git a/src/ol/renderer/canvas/VectorLayer.js b/src/ol/renderer/canvas/VectorLayer.js index 98801e1fc5..966dc18bbf 100644 --- a/src/ol/renderer/canvas/VectorLayer.js +++ b/src/ol/renderer/canvas/VectorLayer.js @@ -299,6 +299,8 @@ class CanvasVectorLayerRenderer extends CanvasLayerRenderer { vectorSource.loadFeatures(extent, resolution, projection); + const squaredTolerance = getSquaredRenderTolerance(resolution, pixelRatio); + /** * @param {import("../../Feature.js").default} feature Feature. * @this {CanvasVectorLayerRenderer} @@ -310,11 +312,11 @@ class CanvasVectorLayerRenderer extends CanvasLayerRenderer { styles = styleFunction(feature, resolution); } if (styles) { - const dirty = this.renderFeature( - feature, resolution, pixelRatio, styles, replayGroup); + const dirty = this.renderFeature(feature, squaredTolerance, styles, replayGroup); this.dirty_ = this.dirty_ || dirty; } }.bind(this); + if (vectorLayerRenderOrder) { /** @type {Array} */ const features = []; @@ -350,13 +352,12 @@ class CanvasVectorLayerRenderer extends CanvasLayerRenderer { /** * @param {import("../../Feature.js").default} feature Feature. - * @param {number} resolution Resolution. - * @param {number} pixelRatio Pixel ratio. + * @param {number} squaredTolerance Squared render tolerance. * @param {import("../../style/Style.js").default|Array} styles The style or array of styles. * @param {import("../../render/canvas/BuilderGroup.js").default} builderGroup Builder group. * @return {boolean} `true` if an image is loading. */ - renderFeature(feature, resolution, pixelRatio, styles, builderGroup) { + renderFeature(feature, squaredTolerance, styles, builderGroup) { if (!styles) { return false; } @@ -364,14 +365,12 @@ class CanvasVectorLayerRenderer extends CanvasLayerRenderer { if (Array.isArray(styles)) { for (let i = 0, ii = styles.length; i < ii; ++i) { loading = renderFeature( - builderGroup, feature, styles[i], - getSquaredRenderTolerance(resolution, pixelRatio), + builderGroup, feature, styles[i], squaredTolerance, this.handleStyleImageChange_, this) || loading; } } else { loading = renderFeature( - builderGroup, feature, styles, - getSquaredRenderTolerance(resolution, pixelRatio), + builderGroup, feature, styles, squaredTolerance, this.handleStyleImageChange_, this); } return loading; diff --git a/test/spec/ol/renderer/canvas/vectorlayer.test.js b/test/spec/ol/renderer/canvas/vectorlayer.test.js index a3921a8539..d6221ff07d 100644 --- a/test/spec/ol/renderer/canvas/vectorlayer.test.js +++ b/test/spec/ol/renderer/canvas/vectorlayer.test.js @@ -75,11 +75,10 @@ describe('ol.renderer.canvas.VectorLayer', function() { style: layerStyle }); map.addLayer(layer); - const spy = sinon.spy(layer.getRenderer(), - 'renderFeature'); + const spy = sinon.spy(layer.getRenderer(), 'renderFeature'); map.renderSync(); - expect(spy.getCall(0).args[3]).to.be(layerStyle); - expect(spy.getCall(1).args[3]).to.be(featureStyle); + expect(spy.getCall(0).args[2]).to.be(layerStyle); + expect(spy.getCall(1).args[2]).to.be(featureStyle); document.body.removeChild(target); });