ol 9.1.1-dev.1714566334338 → 9.1.1-dev.1714573976514
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/dist/ol.js +2 -2
- package/dist/ol.js.map +1 -1
- package/package.json +1 -1
- package/render/canvas/Executor.d.ts.map +1 -1
- package/render/canvas/Executor.js +3 -7
- package/render/canvas/ExecutorGroup.d.ts.map +1 -1
- package/render/canvas/ExecutorGroup.js +28 -10
- package/render/canvas/ZIndexContext.d.ts +5 -0
- package/render/canvas/ZIndexContext.d.ts.map +1 -1
- package/render/canvas/ZIndexContext.js +14 -2
- package/renderer/canvas/VectorTileLayer.d.ts.map +1 -1
- package/renderer/canvas/VectorTileLayer.js +10 -4
- package/util.js +1 -1
package/package.json
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"Executor.d.ts","sourceRoot":"","sources":["Executor.js"],"names":[],"mappings":";;;;;UA4Bc,MAAM;;;;UACN,MAAM;;;;UACN,MAAM;;;;UACN,MAAM;;;;;;;;;;gBAMN,MAAM;;;;gBACN,MAAM;;;;gBACN,MAAM;;;;gBACN,MAAM;;;;aACN,MAAM;;;;aACN,MAAM;;;;WACN,MAAM,MAAM,CAAC;;;;kBACb,IAAI;;;;qBACJ,OAAO,oBAAoB,EAAE,SAAS;;qCAIvC;IAAC,CAAC,EAAE,wBAAwB,CAAC;IAAC,CAAC,EAAE,OAAO,eAAe,EAAE,IAAI,CAAC;IAAC,CAAC,EAAE,OAAO,cAAc,EAAE,KAAK,GAAC,gBAAgB,GAAC,iBAAiB,GAAC,gBAAgB,CAAC;IAAC,CAAC,EAAE,sBAAsB,CAAC;IAAC,CAAC,EAAE,MAAM,CAAC;IAAC,CAAC,EAAE,UAAQ,CAAC;IAAC,CAAC,EAAE,UAAQ,CAAA;CAAC;wCAK1M,OAAO,kBAAkB,EAAE,WAAW,QAAE,OAAO,8BAA8B,EAAE,OAAO,KAAG,CAAC;AAiEhH;IACE;;;;;;OAMG;IACH,wBANW,MAAM,cACN,MAAM,YACN,OAAO,gBACP,OAAO,cAAc,EAAE,wBAAwB,2CA6GzD;IAnGC;;;OAGG;IACH,oBAFU,OAAO,CAEO;IAExB;;;OAGG;IACH,sBAFU,MAAM,CAEY;IAE5B;;;;OAIG;IACH,sBAFU,MAAM,CAEY;IAE5B;;;OAGG;IACH,2BAAuB;IAEvB;;;OAGG;IACH,wBAFU,UAAQ,CAE2B;IAE7C;;;OAGG;IACH,uBAFU,MAAM,MAAM,CAAC,CAEoB;IAE3C;;;OAGG;IACH,yBAA0B;IAE1B;;;OAGG;IACH,2BAA2C;IAE3C;;;OAGG;IACH,oCAFU,UAAQ,CAEmD;IAErE;;;OAGG;IACH,0BAA6B;IAE7B;;;OAGG;IACH,sBAAsB;IAEtB;;OAEG;IACH;YAFkB,MAAM,GAAE,OAAO,cAAc,EAAE,SAAS;MAEX;IAE/C;;OAEG;IACH;YAFkB,MAAM,GAAE,OAAO,cAAc,EAAE,WAAW;MAET;IAEnD;;OAEG;IACH;YAFkB,MAAM,GAAE,OAAO,cAAc,EAAE,SAAS;MAEX;IAE/C;;;OAGG;IACH,gBAAiB;IAEjB;;;OAGG;IACH,gBAAiB;IAEjB;;;OAGG;IACH,uBAAoE;IAGtE;;OAEG;IACH,oBAFY,aAAa,CAIxB;IAED;;;;;;OAMG;IACH,kBANW,MAAM,GAAC,MAAM,MAAM,CAAC,WACpB,MAAM,WACN,MAAM,aACN,MAAM,GACL,OAAO,cAAc,EAAE,KAAK,CA8GvC;IAED;;;;;;;;OAQG;IACH,+BARW,wBAAwB,MACxB,OAAO,qBAAqB,EAAE,UAAU,MACxC,OAAO,qBAAqB,EAAE,UAAU,MACxC,OAAO,qBAAqB,EAAE,UAAU,MACxC,OAAO,qBAAqB,EAAE,UAAU,mBACxC,UAAQ,qBACR,UAAQ,QA4BlB;IAED;;;;;;;;;;;;;;;;;;;OAmBG;IACH,yCA+FC;IAED;;;;;;;;;;OAUG;IACH,4BAgDC;IAED;;;OAGG;IACH,cAgBC;IAED;;;;OAIG;IACH,wBASC;IAED;;;;;;;OAOG;IACH,qCA2BC;IAED;;;;;;;;;;;;;OAaG;IACH,
|
|
1
|
+
{"version":3,"file":"Executor.d.ts","sourceRoot":"","sources":["Executor.js"],"names":[],"mappings":";;;;;UA4Bc,MAAM;;;;UACN,MAAM;;;;UACN,MAAM;;;;UACN,MAAM;;;;;;;;;;gBAMN,MAAM;;;;gBACN,MAAM;;;;gBACN,MAAM;;;;gBACN,MAAM;;;;aACN,MAAM;;;;aACN,MAAM;;;;WACN,MAAM,MAAM,CAAC;;;;kBACb,IAAI;;;;qBACJ,OAAO,oBAAoB,EAAE,SAAS;;qCAIvC;IAAC,CAAC,EAAE,wBAAwB,CAAC;IAAC,CAAC,EAAE,OAAO,eAAe,EAAE,IAAI,CAAC;IAAC,CAAC,EAAE,OAAO,cAAc,EAAE,KAAK,GAAC,gBAAgB,GAAC,iBAAiB,GAAC,gBAAgB,CAAC;IAAC,CAAC,EAAE,sBAAsB,CAAC;IAAC,CAAC,EAAE,MAAM,CAAC;IAAC,CAAC,EAAE,UAAQ,CAAC;IAAC,CAAC,EAAE,UAAQ,CAAA;CAAC;wCAK1M,OAAO,kBAAkB,EAAE,WAAW,QAAE,OAAO,8BAA8B,EAAE,OAAO,KAAG,CAAC;AAiEhH;IACE;;;;;;OAMG;IACH,wBANW,MAAM,cACN,MAAM,YACN,OAAO,gBACP,OAAO,cAAc,EAAE,wBAAwB,2CA6GzD;IAnGC;;;OAGG;IACH,oBAFU,OAAO,CAEO;IAExB;;;OAGG;IACH,sBAFU,MAAM,CAEY;IAE5B;;;;OAIG;IACH,sBAFU,MAAM,CAEY;IAE5B;;;OAGG;IACH,2BAAuB;IAEvB;;;OAGG;IACH,wBAFU,UAAQ,CAE2B;IAE7C;;;OAGG;IACH,uBAFU,MAAM,MAAM,CAAC,CAEoB;IAE3C;;;OAGG;IACH,yBAA0B;IAE1B;;;OAGG;IACH,2BAA2C;IAE3C;;;OAGG;IACH,oCAFU,UAAQ,CAEmD;IAErE;;;OAGG;IACH,0BAA6B;IAE7B;;;OAGG;IACH,sBAAsB;IAEtB;;OAEG;IACH;YAFkB,MAAM,GAAE,OAAO,cAAc,EAAE,SAAS;MAEX;IAE/C;;OAEG;IACH;YAFkB,MAAM,GAAE,OAAO,cAAc,EAAE,WAAW;MAET;IAEnD;;OAEG;IACH;YAFkB,MAAM,GAAE,OAAO,cAAc,EAAE,SAAS;MAEX;IAE/C;;;OAGG;IACH,gBAAiB;IAEjB;;;OAGG;IACH,gBAAiB;IAEjB;;;OAGG;IACH,uBAAoE;IAGtE;;OAEG;IACH,oBAFY,aAAa,CAIxB;IAED;;;;;;OAMG;IACH,kBANW,MAAM,GAAC,MAAM,MAAM,CAAC,WACpB,MAAM,WACN,MAAM,aACN,MAAM,GACL,OAAO,cAAc,EAAE,KAAK,CA8GvC;IAED;;;;;;;;OAQG;IACH,+BARW,wBAAwB,MACxB,OAAO,qBAAqB,EAAE,UAAU,MACxC,OAAO,qBAAqB,EAAE,UAAU,MACxC,OAAO,qBAAqB,EAAE,UAAU,MACxC,OAAO,qBAAqB,EAAE,UAAU,mBACxC,UAAQ,qBACR,UAAQ,QA4BlB;IAED;;;;;;;;;;;;;;;;;;;OAmBG;IACH,yCA+FC;IAED;;;;;;;;;;OAUG;IACH,4BAgDC;IAED;;;OAGG;IACH,cAgBC;IAED;;;;OAIG;IACH,wBASC;IAED;;;;;;;OAOG;IACH,qCA2BC;IAED;;;;;;;;;;;;;OAaG;IACH,iBAgkBC;IAED;;;;;;;OAOG;IACH,iBAPW,wBAAwB,oBACxB,OAAO,eAAe,EAAE,IAAI,aAC5B,OAAO,oBAAoB,EAAE,SAAS,gBACtC,MAAM,eACN,OAAO,6BAsBjB;IAED;;;;;;;;;OASG;IACH,gCATW,wBAAwB,aACxB,OAAO,oBAAoB,EAAE,SAAS,gBACtC,MAAM,6HAwBhB;CACF;0BA9wCyB,4BAA4B"}
|
|
@@ -1175,13 +1175,9 @@ class Executor {
|
|
|
1175
1175
|
dd = /** @type {number} */ (instruction[2]);
|
|
1176
1176
|
x = pixelCoordinates[d];
|
|
1177
1177
|
y = pixelCoordinates[d + 1];
|
|
1178
|
-
|
|
1179
|
-
|
|
1180
|
-
|
|
1181
|
-
context.moveTo(x, y);
|
|
1182
|
-
prevX = roundX;
|
|
1183
|
-
prevY = roundY;
|
|
1184
|
-
}
|
|
1178
|
+
context.moveTo(x, y);
|
|
1179
|
+
prevX = (x + 0.5) | 0;
|
|
1180
|
+
prevY = (y + 0.5) | 0;
|
|
1185
1181
|
for (d += 2; d < dd; d += 2) {
|
|
1186
1182
|
x = pixelCoordinates[d];
|
|
1187
1183
|
y = pixelCoordinates[d + 1];
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"ExecutorGroup.d.ts","sourceRoot":"","sources":["ExecutorGroup.js"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"ExecutorGroup.d.ts","sourceRoot":"","sources":["ExecutorGroup.js"],"names":[],"mappings":"AAidA;;;;;;GAMG;AACH,2CAHW,MAAM,GACL,MAAM,MAAM,CAAC,CA2CxB;AAlfD;;;GAGG;AACH,kBAFU,MAAM,OAAO,cAAc,EAAE,WAAW,CAAC,CASjD;AAEF;;;GAGG;AACH,wBAFU,MAAM,OAAO,cAAc,EAAE,WAAW,CAAC,CAER;AAE3C;;;GAGG;AACH,4BAFU,MAAM,OAAO,cAAc,EAAE,WAAW,CAAC,CAIjD;;AAEF;IACE;;;;;;;;;;;;OAYG;IACH,uBAZW,OAAO,iBAAiB,EAAE,MAAM,cAIhC,MAAM,cACN,MAAM,YACN,OAAO;YACC,MAAM;mFA0ExB;IA5DC;;;OAGG;IACH,mBAA2B;IAE3B;;;OAGG;IACH,kBAAyB;IAEzB;;;OAGG;IACH,oBAA6B;IAE7B;;;OAGG;IACH,oBAA6B;IAE7B;;;OAGG;IACH,sBAAiC;IAEjC;;;OAGG;IACH,2BAA4B;IAE5B;;;OAGG;IACH,6BAAgC;IAEhC;;;OAGG;IACH,+BAA+C;IAE/C;;;OAGG;IACH,yBAA4B;IAE5B;;OAEG;IACH;YAFiB,MAAM,GAAE,MAAM,OAAO,oBAAoB,EAAE,OAAO,CAAC;MAEnC;IAKnC;;;OAGG;IACH,cAHW,wBAAwB,aACxB,OAAO,oBAAoB,EAAE,SAAS,QAUhD;IAED;;;;;OAKG;IACH,yBAmBC;IAED;;;OAGG;IACH,wBAHW,MAAM,OAAO,cAAc,EAAE,WAAW,CAAC,GACxC,OAAO,CAYlB;IAED;;;;;;;;;OASG;IACH,0CATW,OAAO,qBAAqB,EAAE,UAAU,cACxC,MAAM,YACN,MAAM,gBACN,MAAM,mBACG,OAAO,kBAAkB,EAAE,WAAW,QAAE,OAAO,8BAA8B,EAAE,OAAO,QAAE,MAAM,6BACvG,MAAM,OAAO,kBAAkB,EAAE,WAAW,CAAC,iBA4HvD;IAED;;;OAGG;IACH,yBAHW,OAAO,oBAAoB,EAAE,SAAS,GACrC,MAAM,MAAM,CAAC,GAAC,IAAI,CAc7B;IAED;;OAEG;IACH,WAFY,OAAO,CAIlB;IAED;;;;;;;;;;OAUG;IACH,uBAVW,wBAAwB,oBACxB,OAAO,eAAe,EAAE,IAAI,aAC5B,OAAO,oBAAoB,EAAE,SAAS,gBACtC,MAAM,eACN,OAAO,mFAGP,MAAwB,IAAI,QAqFtC;IAED;;MAEC;IAED,+CAEC;IAED,uBAUC;CACF"}
|
|
@@ -365,7 +365,7 @@ class ExecutorGroup {
|
|
|
365
365
|
|
|
366
366
|
builderTypes = builderTypes ? builderTypes : ALL;
|
|
367
367
|
const maxBuilderTypes = ALL.length;
|
|
368
|
-
let i, ii, j, jj, replays
|
|
368
|
+
let i, ii, j, jj, replays;
|
|
369
369
|
if (declutterTree) {
|
|
370
370
|
zs.reverse();
|
|
371
371
|
}
|
|
@@ -374,7 +374,7 @@ class ExecutorGroup {
|
|
|
374
374
|
replays = this.executorsByZIndex_[zIndexKey];
|
|
375
375
|
for (j = 0, jj = builderTypes.length; j < jj; ++j) {
|
|
376
376
|
const builderType = builderTypes[j];
|
|
377
|
-
replay = replays[builderType];
|
|
377
|
+
const replay = replays[builderType];
|
|
378
378
|
if (replay !== undefined) {
|
|
379
379
|
const zIndexContext =
|
|
380
380
|
declutterTree === null ? undefined : replay.getZIndexContext();
|
|
@@ -391,14 +391,31 @@ class ExecutorGroup {
|
|
|
391
391
|
// visible outside the current extent when panning
|
|
392
392
|
this.clip(context, transform);
|
|
393
393
|
}
|
|
394
|
-
|
|
395
|
-
|
|
396
|
-
|
|
397
|
-
|
|
398
|
-
|
|
399
|
-
|
|
400
|
-
|
|
401
|
-
|
|
394
|
+
if (
|
|
395
|
+
!zIndexContext ||
|
|
396
|
+
builderType === 'Text' ||
|
|
397
|
+
builderType === 'Image'
|
|
398
|
+
) {
|
|
399
|
+
replay.execute(
|
|
400
|
+
context,
|
|
401
|
+
scaledCanvasSize,
|
|
402
|
+
transform,
|
|
403
|
+
viewRotation,
|
|
404
|
+
snapToPixel,
|
|
405
|
+
declutterTree,
|
|
406
|
+
);
|
|
407
|
+
} else {
|
|
408
|
+
zIndexContext.pushFunction((context) =>
|
|
409
|
+
replay.execute(
|
|
410
|
+
context,
|
|
411
|
+
scaledCanvasSize,
|
|
412
|
+
transform,
|
|
413
|
+
viewRotation,
|
|
414
|
+
snapToPixel,
|
|
415
|
+
declutterTree,
|
|
416
|
+
),
|
|
417
|
+
);
|
|
418
|
+
}
|
|
402
419
|
if (requireClip) {
|
|
403
420
|
context.restore();
|
|
404
421
|
}
|
|
@@ -433,6 +450,7 @@ class ExecutorGroup {
|
|
|
433
450
|
zIndexContext.draw(this.renderedContext_); // FIXME Pass clip to replay for temporarily enabling clip
|
|
434
451
|
zIndexContext.clear();
|
|
435
452
|
});
|
|
453
|
+
deferredZIndexContexts[zs[i]].length = 0;
|
|
436
454
|
}
|
|
437
455
|
}
|
|
438
456
|
}
|
|
@@ -31,6 +31,11 @@ declare class ZIndexContext {
|
|
|
31
31
|
* @return {ZIndexContext} This.
|
|
32
32
|
*/
|
|
33
33
|
private pushMethodArgs_;
|
|
34
|
+
/**
|
|
35
|
+
* Push a function that renders to the context directly.
|
|
36
|
+
* @param {function(CanvasRenderingContext2D): void} render Function.
|
|
37
|
+
*/
|
|
38
|
+
pushFunction(render: (arg0: CanvasRenderingContext2D) => void): void;
|
|
34
39
|
/**
|
|
35
40
|
* Get a proxy for CanvasRenderingContext2D which does not support getting state
|
|
36
41
|
* (e.g. `context.globalAlpha`, which will return `undefined`). To set state, if it relies on a
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"ZIndexContext.d.ts","sourceRoot":"","sources":["ZIndexContext.js"],"names":[],"mappings":";iCAMc,wBAAwB,GAAG;IAAC,WAAW,EAAE,GAAG,CAAA;CAAC;AAA3D,kFAAkF;AAElF;;GAEG;AACH;IAEI;;;OAGG;IACH,sBAAuB;IACvB;;OAEG;IACH,QAFU,MAAM,CAED;IACf;;;OAGG;IACH,gBAAgB;IAEhB;;OAEG;IACH,UAFU,kBAAkB,CA0B3B;IAGH;;;;OAIG;IACH,wBAGE;IAEF;;;;;;OAMG;IACH,cAFY,kBAAkB,CAI7B;IAED;;OAEG;IACH,cAFW,wBAAwB,
|
|
1
|
+
{"version":3,"file":"ZIndexContext.d.ts","sourceRoot":"","sources":["ZIndexContext.js"],"names":[],"mappings":";iCAMc,wBAAwB,GAAG;IAAC,WAAW,EAAE,GAAG,CAAA;CAAC;AAA3D,kFAAkF;AAElF;;GAEG;AACH;IAEI;;;OAGG;IACH,sBAAuB;IACvB;;OAEG;IACH,QAFU,MAAM,CAED;IACf;;;OAGG;IACH,gBAAgB;IAEhB;;OAEG;IACH,UAFU,kBAAkB,CA0B3B;IAGH;;;;OAIG;IACH,wBAGE;IAEF;;;OAGG;IACH,4BAFoB,wBAAwB,KAAG,IAAI,QAIlD;IAED;;;;;;OAMG;IACH,cAFY,kBAAkB,CAI7B;IAED;;OAEG;IACH,cAFW,wBAAwB,QAsBlC;IAED,cAIC;IAED;;;OAGG;IACH,eAGC;CACF"}
|
|
@@ -66,6 +66,14 @@ class ZIndexContext {
|
|
|
66
66
|
return this;
|
|
67
67
|
};
|
|
68
68
|
|
|
69
|
+
/**
|
|
70
|
+
* Push a function that renders to the context directly.
|
|
71
|
+
* @param {function(CanvasRenderingContext2D): void} render Function.
|
|
72
|
+
*/
|
|
73
|
+
pushFunction(render) {
|
|
74
|
+
this.instructions_[this.zIndex + this.offset_].push(render);
|
|
75
|
+
}
|
|
76
|
+
|
|
69
77
|
/**
|
|
70
78
|
* Get a proxy for CanvasRenderingContext2D which does not support getting state
|
|
71
79
|
* (e.g. `context.globalAlpha`, which will return `undefined`). To set state, if it relies on a
|
|
@@ -82,9 +90,13 @@ class ZIndexContext {
|
|
|
82
90
|
*/
|
|
83
91
|
draw(context) {
|
|
84
92
|
this.instructions_.forEach((instructionsAtIndex) => {
|
|
85
|
-
for (let i = 0, ii = instructionsAtIndex.length; i < ii; i
|
|
93
|
+
for (let i = 0, ii = instructionsAtIndex.length; i < ii; ++i) {
|
|
86
94
|
const property = instructionsAtIndex[i];
|
|
87
|
-
|
|
95
|
+
if (typeof property === 'function') {
|
|
96
|
+
property(context);
|
|
97
|
+
continue;
|
|
98
|
+
}
|
|
99
|
+
const instructionAtIndex = instructionsAtIndex[++i];
|
|
88
100
|
if (typeof (/** @type {*} */ (context)[property]) === 'function') {
|
|
89
101
|
/** @type {*} */ (context)[property](...instructionAtIndex);
|
|
90
102
|
} else {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"VectorTileLayer.d.ts","sourceRoot":"","sources":["VectorTileLayer.js"],"names":[],"mappings":";AA4DA;;;;;GAKG;AACH;IACE;;OAEG;IACH,qEAyCC;IAtCC,eAAe;IACf,qCAA2E;IAE3E;;;OAGG;IACH,+BAA2B;IAE3B;;;OAGG;IACH,4CAA+C;IAE/C;;;OAGG;IACH,0BAAsB;IAEtB;;;OAGG;IACH,yBAAyB;IAEzB;;;OAGG;IACH,sBAAsC;IAEtC;;;OAGG;IACH,0BAA6B;IAG/B;;;;;OAKG;IACH,kBALW,OAAO,2BAA2B,EAAE,OAAO,cAC3C,MAAM,cACN,OAAO,uBAAuB,EAAE,OAAO,GACtC,OAAO,GAAC,SAAS,CAY5B;IAkCD;;;OAGG;IACH,qBAHW,OAAO,2BAA2B,EAAE,OAAO,GAC1C,OAAO,CAUlB;IAED;;OAEG;IACH,6BAEC;IAgBD;;;;;OAKG;IACH,6BAqHC;IAyND;;;;OAIG;IACH,gCAEC;IAED;;;;OAIG;IACH,4BAHW,OAAO,cAAc,EAAE,UAAU,cACjC,OAAO,sBAAsB,EAAE,KAAK,QAiC9C;
|
|
1
|
+
{"version":3,"file":"VectorTileLayer.d.ts","sourceRoot":"","sources":["VectorTileLayer.js"],"names":[],"mappings":";AA4DA;;;;;GAKG;AACH;IACE;;OAEG;IACH,qEAyCC;IAtCC,eAAe;IACf,qCAA2E;IAE3E;;;OAGG;IACH,+BAA2B;IAE3B;;;OAGG;IACH,4CAA+C;IAE/C;;;OAGG;IACH,0BAAsB;IAEtB;;;OAGG;IACH,yBAAyB;IAEzB;;;OAGG;IACH,sBAAsC;IAEtC;;;OAGG;IACH,0BAA6B;IAG/B;;;;;OAKG;IACH,kBALW,OAAO,2BAA2B,EAAE,OAAO,cAC3C,MAAM,cACN,OAAO,uBAAuB,EAAE,OAAO,GACtC,OAAO,GAAC,SAAS,CAY5B;IAkCD;;;OAGG;IACH,qBAHW,OAAO,2BAA2B,EAAE,OAAO,GAC1C,OAAO,CAUlB;IAED;;OAEG;IACH,6BAEC;IAgBD;;;;;OAKG;IACH,6BAqHC;IAyND;;;;OAIG;IACH,gCAEC;IAED;;;;OAIG;IACH,4BAHW,OAAO,cAAc,EAAE,UAAU,cACjC,OAAO,sBAAsB,EAAE,KAAK,QAiC9C;IA0DD,6DA+BC;IAkID;;;;;;;;OAQG;IACH,uBARW,OAAO,kBAAkB,EAAE,WAAW,oBACtC,MAAM,UACN,OAAO,sBAAsB,EAAE,OAAO,GAAC,MAAM,OAAO,sBAAsB,EAAE,OAAO,CAAC,gBACpF,OAAO,qCAAqC,EAAE,OAAO,gEAGpD,OAAO,CAyClB;IAED;;;;OAIG;IACH,8BAcC;IAED;;;;OAIG;IACH,yBAwDC;CACF;oCAh6BmC,gBAAgB"}
|
|
@@ -604,10 +604,15 @@ class CanvasVectorTileLayerRenderer extends CanvasTileLayerRenderer {
|
|
|
604
604
|
const executorGroupZIndexContexts = executorGroups.map(({executorGroup}) =>
|
|
605
605
|
executorGroup.getDeferredZIndexContexts(),
|
|
606
606
|
);
|
|
607
|
-
const
|
|
608
|
-
|
|
609
|
-
|
|
610
|
-
|
|
607
|
+
const usedZIndices = {};
|
|
608
|
+
for (let i = 0, ii = executorGroups.length; i < ii; ++i) {
|
|
609
|
+
const executorGroupZindexContext =
|
|
610
|
+
executorGroups[i].executorGroup.getDeferredZIndexContexts();
|
|
611
|
+
for (const key in executorGroupZindexContext) {
|
|
612
|
+
usedZIndices[key] = true;
|
|
613
|
+
}
|
|
614
|
+
}
|
|
615
|
+
const zIndexKeys = Object.keys(usedZIndices).sort(ascending);
|
|
611
616
|
zIndexKeys.map(Number).forEach((zIndex) => {
|
|
612
617
|
executorGroupZIndexContexts.forEach((zIndexContexts, i) => {
|
|
613
618
|
if (!zIndexContexts[zIndex]) {
|
|
@@ -629,6 +634,7 @@ class CanvasVectorTileLayerRenderer extends CanvasTileLayerRenderer {
|
|
|
629
634
|
context.globalAlpha = alpha;
|
|
630
635
|
zIndexContext.clear();
|
|
631
636
|
});
|
|
637
|
+
zIndexContexts[zIndex].length = 0;
|
|
632
638
|
});
|
|
633
639
|
});
|
|
634
640
|
}
|
package/util.js
CHANGED