Skip to content

Commit 5c48c12

Browse files
committed
Website updates
1 parent 617d8e4 commit 5c48c12

File tree

8 files changed

+29
-16
lines changed

8 files changed

+29
-16
lines changed

dist/en/main/examples/common.js

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

dist/en/main/examples/common.js.map

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

dist/en/main/ol/dist/ol.js

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

dist/en/main/ol/dist/ol.js.map

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

dist/en/main/ol/renderer/canvas/VectorLayer.d.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -23,9 +23,9 @@ declare class CanvasVectorLayerRenderer extends CanvasLayerRenderer<any> {
2323
private hitDetectionImageData_;
2424
/**
2525
* @private
26-
* @type {boolean}
26+
* @type {import("../../extent.js").Extent}
2727
*/
28-
private clipped_;
28+
private clipExtent_;
2929
/**
3030
* Do we need to extend the rendered area on the x-axis to handle
3131
* features that cross the antimeridian?

dist/en/main/ol/renderer/canvas/VectorLayer.d.ts.map

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

dist/en/main/ol/renderer/canvas/VectorLayer.js

Lines changed: 21 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -72,9 +72,9 @@ class CanvasVectorLayerRenderer extends CanvasLayerRenderer {
7272

7373
/**
7474
* @private
75-
* @type {boolean}
75+
* @type {import("../../extent.js").Extent}
7676
*/
77-
this.clipped_ = false;
77+
this.clipExtent_ = null;
7878

7979
/**
8080
* Do we need to extend the rendered area on the x-axis to handle
@@ -297,9 +297,13 @@ class CanvasVectorLayerRenderer extends CanvasLayerRenderer {
297297
if (!this.replayGroup_) {
298298
return;
299299
}
300+
if (this.clipExtent_) {
301+
this.clipUnrotated(this.context, frameState, this.clipExtent_);
302+
}
300303
this.replayGroup_.renderDeferred();
301-
if (this.clipped_) {
304+
if (this.clipExtent_) {
302305
this.context.restore();
306+
this.clipExtent_ = null;
303307
}
304308
this.resetDrawContext_();
305309
}
@@ -337,13 +341,22 @@ class CanvasVectorLayerRenderer extends CanvasLayerRenderer {
337341
const projection = viewState.projection;
338342

339343
// clipped rendering if layer extent is set
340-
this.clipped_ = false;
344+
this.clipExtent_ = null;
345+
let clipped = false;
341346
if (render && layerState.extent && this.clipping) {
342347
const layerExtent = fromUserExtent(layerState.extent, projection);
343348
render = intersectsExtent(layerExtent, frameState.extent);
344-
this.clipped_ = render && !containsExtent(layerExtent, frameState.extent);
345-
if (this.clipped_) {
346-
this.clipUnrotated(context, frameState, layerExtent);
349+
const needsClip =
350+
render && !containsExtent(layerExtent, frameState.extent);
351+
if (needsClip) {
352+
if (frameState.declutter) {
353+
// Store extent for deferred clipping
354+
this.clipExtent_ = layerExtent;
355+
} else {
356+
// Apply clipping immediately for non-declutter rendering
357+
this.clipUnrotated(context, frameState, layerExtent);
358+
clipped = true;
359+
}
347360
}
348361
}
349362

@@ -355,7 +368,7 @@ class CanvasVectorLayerRenderer extends CanvasLayerRenderer {
355368
);
356369
}
357370

358-
if (!frameState.declutter && this.clipped_) {
371+
if (clipped) {
359372
context.restore();
360373
}
361374

dist/main.js

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)