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

fix currentClip == null

Browse Source
This commit is contained in:
VLCEK Martin
2022-05-13 15:40:03 +02:00
parent c6de7701bb
commit bd223b4447
1 changed files with 33 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files

59
src/ol/renderer/canvas/VectorTileLayer.js
View File

@@ -688,36 +688,43 @@ class CanvasVectorTileLayerRenderer extends CanvasTileLayerRenderer {
let contextSaved = false; let contextSaved = false;
// Clip mask for regions in this tile that already filled by a higher z tile // Clip mask for regions in this tile that already filled by a higher z tile
const currentClip = executorGroups[0].getClipCoords(transform); const currentClip = executorGroups[0].getClipCoords(transform);
for (let j = 0, jj = clips.length; j < jj; ++j) { if (currentClip) {
if (z !== currentZ && currentZ < clipZs[j]) { for (let j = 0, jj = clips.length; j < jj; ++j) {
const clip = clips[j]; if (z !== currentZ && currentZ < clipZs[j]) {
if ( const clip = clips[j];
intersects( if (
[currentClip[0], currentClip[3], currentClip[4], currentClip[7]], intersects(
[clip[0], clip[3], clip[4], clip[7]] [
) currentClip[0],
) { currentClip[3],
if (!contextSaved) { currentClip[4],
context.save(); currentClip[7],
contextSaved = true; ],
[clip[0], clip[3], clip[4], clip[7]]
)
) {
if (!contextSaved) {
context.save();
contextSaved = true;
}
context.beginPath();
// counter-clockwise (outer ring) for current tile
context.moveTo(currentClip[0], currentClip[1]);
context.lineTo(currentClip[2], currentClip[3]);
context.lineTo(currentClip[4], currentClip[5]);
context.lineTo(currentClip[6], currentClip[7]);
// clockwise (inner ring) for higher z tile
context.moveTo(clip[6], clip[7]);
context.lineTo(clip[4], clip[5]);
context.lineTo(clip[2], clip[3]);
context.lineTo(clip[0], clip[1]);
context.clip();
} }
context.beginPath();
// counter-clockwise (outer ring) for current tile
context.moveTo(currentClip[0], currentClip[1]);
context.lineTo(currentClip[2], currentClip[3]);
context.lineTo(currentClip[4], currentClip[5]);
context.lineTo(currentClip[6], currentClip[7]);
// clockwise (inner ring) for higher z tile
context.moveTo(clip[6], clip[7]);
context.lineTo(clip[4], clip[5]);
context.lineTo(clip[2], clip[3]);
context.lineTo(clip[0], clip[1]);
context.clip();
} }
} }
clips.push(currentClip);
clipZs.push(currentZ);
} }
clips.push(currentClip);
clipZs.push(currentZ);
for (let t = 0, tt = executorGroups.length; t < tt; ++t) { for (let t = 0, tt = executorGroups.length; t < tt; ++t) {
const executorGroup = executorGroups[t]; const executorGroup = executorGroups[t];
executorGroup.execute( executorGroup.execute(