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

Merge pull request #9869 from MoonE/master

Browse Source 
Only get squared tolerance once per render
This commit is contained in:
Tim Schaub
2019-08-17 07:23:22 -06:00
committed by GitHub
parent c0e5c4b7fe 99462d3b53
commit f839b34594
2 changed files with 11 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/ol/renderer/canvas/VectorLayer.js
+8 -9
View File
@@ -299,6 +299,8 @@ class CanvasVectorLayerRenderer extends CanvasLayerRenderer {
vectorSource.loadFeatures(extent, resolution, projection); vectorSource.loadFeatures(extent, resolution, projection);
const squaredTolerance = getSquaredRenderTolerance(resolution, pixelRatio);
/** /**
* @param {import("../../Feature.js").default} feature Feature. * @param {import("../../Feature.js").default} feature Feature.
* @this {CanvasVectorLayerRenderer} * @this {CanvasVectorLayerRenderer}
@@ -310,11 +312,11 @@ class CanvasVectorLayerRenderer extends CanvasLayerRenderer {
styles = styleFunction(feature, resolution); styles = styleFunction(feature, resolution);
} }
if (styles) { if (styles) {
const dirty = this.renderFeature( const dirty = this.renderFeature(feature, squaredTolerance, styles, replayGroup);
feature, resolution, pixelRatio, styles, replayGroup);
this.dirty_ = this.dirty_ || dirty; this.dirty_ = this.dirty_ || dirty;
} }
}.bind(this); }.bind(this);
if (vectorLayerRenderOrder) { if (vectorLayerRenderOrder) {
/** @type {Array<import("../../Feature.js").default>} */ /** @type {Array<import("../../Feature.js").default>} */
const features = []; const features = [];
@@ -350,13 +352,12 @@ class CanvasVectorLayerRenderer extends CanvasLayerRenderer {
/** /**
* @param {import("../../Feature.js").default} feature Feature. * @param {import("../../Feature.js").default} feature Feature.
* @param {number} resolution Resolution. * @param {number} squaredTolerance Squared render tolerance.
* @param {number} pixelRatio Pixel ratio.
* @param {import("../../style/Style.js").default|Array<import("../../style/Style.js").default>} styles The style or array of styles. * @param {import("../../style/Style.js").default|Array<import("../../style/Style.js").default>} styles The style or array of styles.
* @param {import("../../render/canvas/BuilderGroup.js").default} builderGroup Builder group. * @param {import("../../render/canvas/BuilderGroup.js").default} builderGroup Builder group.
* @return {boolean} `true` if an image is loading. * @return {boolean} `true` if an image is loading.
*/ */
renderFeature(feature, resolution, pixelRatio, styles, builderGroup) { renderFeature(feature, squaredTolerance, styles, builderGroup) {
if (!styles) { if (!styles) {
return false; return false;
} }
@@ -364,14 +365,12 @@ class CanvasVectorLayerRenderer extends CanvasLayerRenderer {
if (Array.isArray(styles)) { if (Array.isArray(styles)) {
for (let i = 0, ii = styles.length; i < ii; ++i) { for (let i = 0, ii = styles.length; i < ii; ++i) {
loading = renderFeature( loading = renderFeature(
builderGroup, feature, styles[i], builderGroup, feature, styles[i], squaredTolerance,
getSquaredRenderTolerance(resolution, pixelRatio),
this.handleStyleImageChange_, this) || loading; this.handleStyleImageChange_, this) || loading;
} }
} else { } else {
loading = renderFeature( loading = renderFeature(
builderGroup, feature, styles, builderGroup, feature, styles, squaredTolerance,
getSquaredRenderTolerance(resolution, pixelRatio),
this.handleStyleImageChange_, this); this.handleStyleImageChange_, this);
} }
return loading; return loading;
test/spec/ol/renderer/canvas/vectorlayer.test.js
+3 -4
View File
@@ -75,11 +75,10 @@ describe('ol.renderer.canvas.VectorLayer', function() {
style: layerStyle style: layerStyle
}); });
map.addLayer(layer); map.addLayer(layer);
const spy = sinon.spy(layer.getRenderer(), const spy = sinon.spy(layer.getRenderer(), 'renderFeature');
'renderFeature');
map.renderSync(); map.renderSync();
expect(spy.getCall(0).args[3]).to.be(layerStyle); expect(spy.getCall(0).args[2]).to.be(layerStyle);
expect(spy.getCall(1).args[3]).to.be(featureStyle); expect(spy.getCall(1).args[2]).to.be(featureStyle);
document.body.removeChild(target); document.body.removeChild(target);
}); });