ol 10.3.1-dev.1733186938963 → 10.3.1-dev.1733335966071
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 +1 -1
- package/dist/ol.js.map +1 -1
- package/layer.d.ts +1 -0
- package/layer.js +1 -0
- package/package.json +1 -1
- package/render/canvas/ExecutorGroup.d.ts.map +1 -1
- package/render/canvas/ExecutorGroup.js +7 -13
- package/render/webgl/MixedGeometryBatch.d.ts.map +1 -1
- package/render/webgl/MixedGeometryBatch.js +9 -6
- package/renderer/canvas/VectorLayer.d.ts.map +1 -1
- package/renderer/canvas/VectorLayer.js +10 -16
- package/renderer/canvas/VectorTileLayer.d.ts +6 -1
- package/renderer/canvas/VectorTileLayer.d.ts.map +1 -1
- package/renderer/canvas/VectorTileLayer.js +79 -71
- package/renderer/webgl/TileLayerBase.d.ts.map +1 -1
- package/renderer/webgl/TileLayerBase.js +2 -3
- package/util.js +1 -1
package/layer.d.ts
CHANGED
|
@@ -9,4 +9,5 @@ export { default as VectorImage } from "./layer/VectorImage.js";
|
|
|
9
9
|
export { default as VectorTile } from "./layer/VectorTile.js";
|
|
10
10
|
export { default as WebGLPoints } from "./layer/WebGLPoints.js";
|
|
11
11
|
export { default as WebGLTile } from "./layer/WebGLTile.js";
|
|
12
|
+
export { default as WebGLVector } from "./layer/WebGLVector.js";
|
|
12
13
|
//# sourceMappingURL=layer.d.ts.map
|
package/layer.js
CHANGED
|
@@ -13,3 +13,4 @@ export {default as VectorImage} from './layer/VectorImage.js';
|
|
|
13
13
|
export {default as VectorTile} from './layer/VectorTile.js';
|
|
14
14
|
export {default as WebGLPoints} from './layer/WebGLPoints.js';
|
|
15
15
|
export {default as WebGLTile} from './layer/WebGLTile.js';
|
|
16
|
+
export {default as WebGLVector} from './layer/WebGLVector.js';
|
package/package.json
CHANGED
|
@@ -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":"AA8cA;;;;;;GAMG;AACH,2CAHW,MAAM,GACL,KAAK,CAAC,MAAM,CAAC,CA2CxB;AA/eD;;;GAGG;AACH,kBAFU,KAAK,CAAC,OAAO,cAAc,EAAE,WAAW,CAAC,CASjD;AAEF;;;GAGG;AACH,wBAFU,KAAK,CAAC,OAAO,cAAc,EAAE,WAAW,CAAC,CAER;AAE3C;;;GAGG;AACH,4BAFU,KAAK,CAAC,OAAO,cAAc,EAAE,WAAW,CAAC,CAIjD;;AAEF;IACE;;;;;;;;;;;;OAYG;IACH,uBAZW,OAAO,iBAAiB,EAAE,MAAM,cAIhC,MAAM,cACN,MAAM,YACN,OAAO,mBACP;YAAQ,MAAM,GAAE,GAA4F;KAAC,iBAE7G,MAAM,sBACN,OAAO,EAwEjB;IA7DC;;;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;;;OAGG;IACH,gCAAiC;IAKnC;;;OAGG;IACH,cAHW,wBAAwB,aACxB,OAAO,oBAAoB,EAAE,SAAS,QAUhD;IAED;;;;;OAKG;IACH,yBAmBC;IAED;;;OAGG;IACH,wBAHW,KAAK,CAAC,OAAO,cAAc,EAAE,WAAW,CAAC,GACxC,OAAO,CAYlB;IAED;;;;;;;;;OASG;IACH,2BAFa,CAAC,cAPH,OAAO,qBAAqB,EAAE,UAAU,cACxC,MAAM,YACN,MAAM,gBACN,MAAM,YACN,CAAS,IAAsC,EAAtC,OAAO,kBAAkB,EAAE,WAAW,EAAE,IAA8C,EAA9C,OAAO,8BAA8B,EAAE,OAAO,EAAE,IAAM,EAAN,MAAM,KAAG,CAAC,uBAC3G,KAAK,CAAC,OAAO,kBAAkB,EAAE,WAAW,CAAC,GAC5C,CAAC,GAAC,SAAS,CA4HtB;IAED;;;OAGG;IACH,yBAHW,OAAO,oBAAoB,EAAE,SAAS,GACrC,KAAK,CAAC,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,iBACP,KAAK,CAAC,OAAO,cAAc,EAAE,WAAW,CAAC,kBAEzC,OAAO,OAAO,EAAE,OAAO,CAAC,OAAO,eAAe,EAAE,cAAc,CAAC,GAAC,IAAI,QAgF9E;IAED;;MAEC;IAED,+CAEC;IAED,uBAUC;CACF"}
|
|
@@ -3,7 +3,7 @@
|
|
|
3
3
|
*/
|
|
4
4
|
|
|
5
5
|
import Executor from './Executor.js';
|
|
6
|
-
import {ascending} from '../../array.js';
|
|
6
|
+
import {ascending, descending} from '../../array.js';
|
|
7
7
|
import {buffer, createEmpty, extendCoordinate} from '../../extent.js';
|
|
8
8
|
import {
|
|
9
9
|
compose as composeTransform,
|
|
@@ -235,9 +235,7 @@ class ExecutorGroup {
|
|
|
235
235
|
context.clearRect(0, 0, contextSize, contextSize);
|
|
236
236
|
}
|
|
237
237
|
|
|
238
|
-
/**
|
|
239
|
-
* @type {import("../../extent.js").Extent}
|
|
240
|
-
*/
|
|
238
|
+
/** @type {import("../../extent.js").Extent|undefined} */
|
|
241
239
|
let hitExtent;
|
|
242
240
|
if (this.renderBuffer_ !== undefined) {
|
|
243
241
|
hitExtent = createEmpty();
|
|
@@ -251,6 +249,7 @@ class ExecutorGroup {
|
|
|
251
249
|
|
|
252
250
|
const indexes = getPixelIndexArray(hitTolerance);
|
|
253
251
|
|
|
252
|
+
/** @type {import("../canvas.js").BuilderType} */
|
|
254
253
|
let builderType;
|
|
255
254
|
|
|
256
255
|
/**
|
|
@@ -362,20 +361,15 @@ class ExecutorGroup {
|
|
|
362
361
|
builderTypes,
|
|
363
362
|
declutterTree,
|
|
364
363
|
) {
|
|
365
|
-
/** @type {Array<number>} */
|
|
366
364
|
const zs = Object.keys(this.executorsByZIndex_).map(Number);
|
|
367
|
-
zs.sort(ascending);
|
|
365
|
+
zs.sort(declutterTree ? descending : ascending);
|
|
368
366
|
|
|
369
367
|
builderTypes = builderTypes ? builderTypes : ALL;
|
|
370
368
|
const maxBuilderTypes = ALL.length;
|
|
371
|
-
let i, ii
|
|
372
|
-
if (declutterTree) {
|
|
373
|
-
zs.reverse();
|
|
374
|
-
}
|
|
375
|
-
for (i = 0, ii = zs.length; i < ii; ++i) {
|
|
369
|
+
for (let i = 0, ii = zs.length; i < ii; ++i) {
|
|
376
370
|
const zIndexKey = zs[i].toString();
|
|
377
|
-
replays = this.executorsByZIndex_[zIndexKey];
|
|
378
|
-
for (j = 0, jj = builderTypes.length; j < jj; ++j) {
|
|
371
|
+
const replays = this.executorsByZIndex_[zIndexKey];
|
|
372
|
+
for (let j = 0, jj = builderTypes.length; j < jj; ++j) {
|
|
379
373
|
const builderType = builderTypes[j];
|
|
380
374
|
const replay = replays[builderType];
|
|
381
375
|
if (replay !== undefined) {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"MixedGeometryBatch.d.ts","sourceRoot":"","sources":["MixedGeometryBatch.js"],"names":[],"mappings":";sBAQa,OAAO,kBAAkB,EAAE,OAAO;2BAGlC,OAAO,wBAAwB,EAAE,IAAI;;;;;;;;aAKpC,OAAO,GAAC,aAAa;;;;iBACrB,KAAK,CAAC,KAAK,CAAC,MAAM,CAAC,CAAC;;;;;;;;;;;;;;;;;;4BAQrB,kBAAkB,GAAC,uBAAuB,GAAC,oBAAoB;;;;;;;;;;;;;;;qBAO9D,MAAM;;;;mBACN,MAAM;;;;gBACN,MAAM;;;;;;;;;;;;;;;;qBAON,MAAM;;;;mBACN,MAAM;;;;;;;;;;;;;;;;qBAON,MAAM;;AA1CpB;;GAEG;AACH;;GAEG;AAEH;;;;;;;;GAQG;AAEH;;GAEG;AAEH;;;;;;;GAOG;AAEH;;;;;;GAMG;AAEH;;;;;GAKG;AAEH;;;;;;;;;;;;;;;;;;GAkBG;AACH;IAEI;;OAEG;IACH,uBAAuB;IAEvB;;;;OAIG;IACH,sBAA8B;IAE9B;;;;OAIG;IACH,kBAA0B;IAE1B;;;;;OAKG;IACH,uBAAwB;IAExB;;OAEG;IACH,cAFU,oBAAoB,CAO7B;IAED;;OAEG;IACH,YAFU,kBAAkB,CAK3B;IAED;;OAEG;IACH,iBAFU,uBAAuB,CAMhC;IAGH;;;OAGG;IACH,sBAHW,KAAK,CAAC,OAAO,GAAC,aAAa,CAAC,wBAC5B,OAAO,eAAe,EAAE,iBAAiB,QAMnD;IAED;;;OAGG;IACH,oBAHW,OAAO,GAAC,aAAa,wBACrB,OAAO,eAAe,EAAE,iBAAiB,QAYnD;IAED;;;;OAIG;IACH,
|
|
1
|
+
{"version":3,"file":"MixedGeometryBatch.d.ts","sourceRoot":"","sources":["MixedGeometryBatch.js"],"names":[],"mappings":";sBAQa,OAAO,kBAAkB,EAAE,OAAO;2BAGlC,OAAO,wBAAwB,EAAE,IAAI;;;;;;;;aAKpC,OAAO,GAAC,aAAa;;;;iBACrB,KAAK,CAAC,KAAK,CAAC,MAAM,CAAC,CAAC;;;;;;;;;;;;;;;;;;4BAQrB,kBAAkB,GAAC,uBAAuB,GAAC,oBAAoB;;;;;;;;;;;;;;;qBAO9D,MAAM;;;;mBACN,MAAM;;;;gBACN,MAAM;;;;;;;;;;;;;;;;qBAON,MAAM;;;;mBACN,MAAM;;;;;;;;;;;;;;;;qBAON,MAAM;;AA1CpB;;GAEG;AACH;;GAEG;AAEH;;;;;;;;GAQG;AAEH;;GAEG;AAEH;;;;;;;GAOG;AAEH;;;;;;GAMG;AAEH;;;;;GAKG;AAEH;;;;;;;;;;;;;;;;;;GAkBG;AACH;IAEI;;OAEG;IACH,uBAAuB;IAEvB;;;;OAIG;IACH,sBAA8B;IAE9B;;;;OAIG;IACH,kBAA0B;IAE1B;;;;;OAKG;IACH,uBAAwB;IAExB;;OAEG;IACH,cAFU,oBAAoB,CAO7B;IAED;;OAEG;IACH,YAFU,kBAAkB,CAK3B;IAED;;OAEG;IACH,iBAFU,uBAAuB,CAMhC;IAGH;;;OAGG;IACH,sBAHW,KAAK,CAAC,OAAO,GAAC,aAAa,CAAC,wBAC5B,OAAO,eAAe,EAAE,iBAAiB,QAMnD;IAED;;;OAGG;IACH,oBAHW,OAAO,GAAC,aAAa,wBACrB,OAAO,eAAe,EAAE,iBAAiB,QAYnD;IAED;;;;OAIG;IACH,uCASC;IAED;;;;OAIG;IACH,4CAUC;IAED;;;;OAIG;IACH,yCAWC;IAED;;;;OAIG;IACH,qBA2GC;IAED;;;;;;;;;OASG;IACH,wBAyJC;IAED;;;;;OAKG;IACH,uBAYC;IAED;;;;;OAKG;IACH,mBAOC;IAED;;OAEG;IACH,uBAFW,OAAO,GAAC,aAAa,QAS/B;IAED;;OAEG;IACH,uBAFW,OAAO,GAAC,aAAa,QAU/B;IAED,cAcC;IAED;;;;OAIG;IACH,uBAHW,MAAM,GACL,OAAO,GAAC,aAAa,CAIhC;CACF;0BArjByB,yBAAyB"}
|
|
@@ -158,12 +158,13 @@ class MixedGeometryBatch {
|
|
|
158
158
|
* @private
|
|
159
159
|
*/
|
|
160
160
|
clearFeatureEntryInPointBatch_(feature) {
|
|
161
|
-
const
|
|
161
|
+
const featureUid = getUid(feature);
|
|
162
|
+
const entry = this.pointBatch.entries[featureUid];
|
|
162
163
|
if (!entry) {
|
|
163
164
|
return;
|
|
164
165
|
}
|
|
165
166
|
this.pointBatch.geometriesCount -= entry.flatCoordss.length;
|
|
166
|
-
delete this.pointBatch.entries[
|
|
167
|
+
delete this.pointBatch.entries[featureUid];
|
|
167
168
|
return entry;
|
|
168
169
|
}
|
|
169
170
|
|
|
@@ -173,13 +174,14 @@ class MixedGeometryBatch {
|
|
|
173
174
|
* @private
|
|
174
175
|
*/
|
|
175
176
|
clearFeatureEntryInLineStringBatch_(feature) {
|
|
176
|
-
const
|
|
177
|
+
const featureUid = getUid(feature);
|
|
178
|
+
const entry = this.lineStringBatch.entries[featureUid];
|
|
177
179
|
if (!entry) {
|
|
178
180
|
return;
|
|
179
181
|
}
|
|
180
182
|
this.lineStringBatch.verticesCount -= entry.verticesCount;
|
|
181
183
|
this.lineStringBatch.geometriesCount -= entry.flatCoordss.length;
|
|
182
|
-
delete this.lineStringBatch.entries[
|
|
184
|
+
delete this.lineStringBatch.entries[featureUid];
|
|
183
185
|
return entry;
|
|
184
186
|
}
|
|
185
187
|
|
|
@@ -189,14 +191,15 @@ class MixedGeometryBatch {
|
|
|
189
191
|
* @private
|
|
190
192
|
*/
|
|
191
193
|
clearFeatureEntryInPolygonBatch_(feature) {
|
|
192
|
-
const
|
|
194
|
+
const featureUid = getUid(feature);
|
|
195
|
+
const entry = this.polygonBatch.entries[featureUid];
|
|
193
196
|
if (!entry) {
|
|
194
197
|
return;
|
|
195
198
|
}
|
|
196
199
|
this.polygonBatch.verticesCount -= entry.verticesCount;
|
|
197
200
|
this.polygonBatch.ringsCount -= entry.ringsCount;
|
|
198
201
|
this.polygonBatch.geometriesCount -= entry.flatCoordss.length;
|
|
199
|
-
delete this.polygonBatch.entries[
|
|
202
|
+
delete this.polygonBatch.entries[featureUid];
|
|
200
203
|
return entry;
|
|
201
204
|
}
|
|
202
205
|
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"VectorLayer.d.ts","sourceRoot":"","sources":["VectorLayer.js"],"names":[],"mappings":";AA4CA;;;;GAIG;AACH;IACE;;OAEG;IACH,qFAuHC;IApHC,eAAe;IACf,qCAA2E;IAE3E;;;OAGG;IACH,gCAA4B;IAE5B;;;OAGG;IACH,+BAAkC;IAElC;;;OAGG;IACH,iBAAqB;IAErB;;;OAGG;IACH,0BAA6B;IAE7B;;;OAGG;IACH,0BAA2B;IAE3B;;;OAGG;IACH,4BAA8B;IAE9B;;;OAGG;IACH,wBAAoC;IAEpC;;;OAGG;IACH,+BAA2C;IAE3C;;;OAGG;IACH,0BAAsB;IAEtB;;;OAGG;IACH,wBAA2B;IAE3B;;;OAGG;IACH,4BAA+B;IAE/B;;;OAGG;IACH,4BAA4B;IAE5B;;;OAGG;IACH,6BAAgC;IAEhC;;;OAGG;IACH,gCAA4B;IAE5B;;;OAGG;IACH,qBAAwB;IAExB;;;OAGG;IACH,oBAFU,OAAO,CAEa;IAE9B;;;OAGG;IACH,UAFU,OAAO,CAEG;IAEpB;;;OAGG;IACH,uBAA0B;IAE1B;;;OAGG;IACH,iBAAiB;IAGnB;;;;;OAKG;IACH,4BALW,aAAa,cACb,OAAO,cAAc,EAAE,UAAU,kBACjC,OAAO,QA2DjB;IAED;;OAEG;IACH,wBASC;IAED;;OAEG;IACH,0BAWC;IAED;;;OAGG;IACH,4BAFW,OAAO,cAAc,EAAE,UAAU,QAO3C;IAqFD;;;;;;OAMG;IACH,4BALW,OAAO,gBAAgB,EAAE,KAAK,GAC7B,OAAO,CAAC,KAAK,CAAC,OAAO,eAAe,EAAE,OAAO,CAAC,CAAC,CA+F1D;
|
|
1
|
+
{"version":3,"file":"VectorLayer.d.ts","sourceRoot":"","sources":["VectorLayer.js"],"names":[],"mappings":";AA4CA;;;;GAIG;AACH;IACE;;OAEG;IACH,qFAuHC;IApHC,eAAe;IACf,qCAA2E;IAE3E;;;OAGG;IACH,gCAA4B;IAE5B;;;OAGG;IACH,+BAAkC;IAElC;;;OAGG;IACH,iBAAqB;IAErB;;;OAGG;IACH,0BAA6B;IAE7B;;;OAGG;IACH,0BAA2B;IAE3B;;;OAGG;IACH,4BAA8B;IAE9B;;;OAGG;IACH,wBAAoC;IAEpC;;;OAGG;IACH,+BAA2C;IAE3C;;;OAGG;IACH,0BAAsB;IAEtB;;;OAGG;IACH,wBAA2B;IAE3B;;;OAGG;IACH,4BAA+B;IAE/B;;;OAGG;IACH,4BAA4B;IAE5B;;;OAGG;IACH,6BAAgC;IAEhC;;;OAGG;IACH,gCAA4B;IAE5B;;;OAGG;IACH,qBAAwB;IAExB;;;OAGG;IACH,oBAFU,OAAO,CAEa;IAE9B;;;OAGG;IACH,UAFU,OAAO,CAEG;IAEpB;;;OAGG;IACH,uBAA0B;IAE1B;;;OAGG;IACH,iBAAiB;IAGnB;;;;;OAKG;IACH,4BALW,aAAa,cACb,OAAO,cAAc,EAAE,UAAU,kBACjC,OAAO,QA2DjB;IAED;;OAEG;IACH,wBASC;IAED;;OAEG;IACH,0BAWC;IAED;;;OAGG;IACH,4BAFW,OAAO,cAAc,EAAE,UAAU,QAO3C;IAqFD;;;;;;OAMG;IACH,4BALW,OAAO,gBAAgB,EAAE,KAAK,GAC7B,OAAO,CAAC,KAAK,CAAC,OAAO,eAAe,EAAE,OAAO,CAAC,CAAC,CA+F1D;IAwFD;;;;OAIG;IACH,gCAEC;IA2MD;;;;;;;;;OASG;IACH,uBATW,OAAO,kBAAkB,EAAE,OAAO,oBAClC,MAAM,UACN,OAAO,sBAAsB,EAAE,OAAO,GAAC,KAAK,CAAC,OAAO,sBAAsB,EAAE,OAAO,CAAC,gBACpF,OAAO,qCAAqC,EAAE,OAAO,cACrD,OAAO,eAAe,EAAE,iBAAiB,cACzC,OAAO,UACP,MAAM,GACL,OAAO,CA0ClB;CACF;gCAryB6C,YAAY;0BAKnD,sCAAsC"}
|
|
@@ -522,23 +522,17 @@ class CanvasVectorLayerRenderer extends CanvasLayerRenderer {
|
|
|
522
522
|
return undefined;
|
|
523
523
|
};
|
|
524
524
|
|
|
525
|
-
let result;
|
|
526
|
-
const executorGroups = [this.replayGroup_];
|
|
527
525
|
const declutter = this.getLayer().getDeclutter();
|
|
528
|
-
|
|
529
|
-
|
|
530
|
-
|
|
531
|
-
|
|
532
|
-
|
|
533
|
-
|
|
534
|
-
|
|
535
|
-
|
|
536
|
-
|
|
537
|
-
|
|
538
|
-
));
|
|
539
|
-
});
|
|
540
|
-
|
|
541
|
-
return result;
|
|
526
|
+
return this.replayGroup_.forEachFeatureAtCoordinate(
|
|
527
|
+
coordinate,
|
|
528
|
+
resolution,
|
|
529
|
+
rotation,
|
|
530
|
+
hitTolerance,
|
|
531
|
+
featureCallback,
|
|
532
|
+
declutter
|
|
533
|
+
? frameState.declutter[declutter].all().map((item) => item.value)
|
|
534
|
+
: null,
|
|
535
|
+
);
|
|
542
536
|
}
|
|
543
537
|
|
|
544
538
|
/**
|
|
@@ -79,7 +79,12 @@ declare class CanvasVectorTileLayerRenderer extends CanvasTileLayerRenderer<impo
|
|
|
79
79
|
* @param {import("../../layer/Layer.js").State} layerState Layer state.
|
|
80
80
|
*/
|
|
81
81
|
renderDeclutter(frameState: import("../../Map.js").FrameState, layerState: import("../../layer/Layer.js").State): void;
|
|
82
|
-
|
|
82
|
+
/**
|
|
83
|
+
* @param {import("../../VectorRenderTile.js").default} tile The tile
|
|
84
|
+
* @param {import('../../Map.js').FrameState} frameState Current frame state
|
|
85
|
+
* @return {import('../../transform.js').Transform} Transform to use to render this tile
|
|
86
|
+
*/
|
|
87
|
+
getTileRenderTransform(tile: import("../../VectorRenderTile.js").default, frameState: import("../../Map.js").FrameState): import("../../transform.js").Transform;
|
|
83
88
|
/**
|
|
84
89
|
* @param {import("../../Feature.js").FeatureLike} feature Feature.
|
|
85
90
|
* @param {number} squaredTolerance Squared tolerance.
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"VectorTileLayer.d.ts","sourceRoot":"","sources":["VectorTileLayer.js"],"names":[],"mappings":";AA4DA;;;;;GAKG;AACH;IACE;;;OAGG;IACH,mBAHW,OAAO,2BAA2B,EAAE,OAAO,WAC3C,OAAO,gBAAgB,EAAE,OAAO,EA2C1C;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;;;;;;;;;;OAUG;IACH,wBAVW,OAAO,2BAA2B,EAAE,OAAO,cAC3C,OAAO,cAAc,EAAE,UAAU,KACjC,MAAM,KACN,MAAM,KACN,MAAM,KACN,MAAM,UACN,MAAM,cACN,OAAO,QAajB;IA6CD;;;;;OAKG;IACH,6BAqHC;
|
|
1
|
+
{"version":3,"file":"VectorTileLayer.d.ts","sourceRoot":"","sources":["VectorTileLayer.js"],"names":[],"mappings":";AA4DA;;;;;GAKG;AACH;IACE;;;OAGG;IACH,mBAHW,OAAO,2BAA2B,EAAE,OAAO,WAC3C,OAAO,gBAAgB,EAAE,OAAO,EA2C1C;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;;;;;;;;;;OAUG;IACH,wBAVW,OAAO,2BAA2B,EAAE,OAAO,cAC3C,OAAO,cAAc,EAAE,UAAU,KACjC,MAAM,KACN,MAAM,KACN,MAAM,KACN,MAAM,UACN,MAAM,cACN,OAAO,QAajB;IA6CD;;;;;OAKG;IACH,6BAqHC;IAyMD;;;OAGG;IACH,4BAHW,OAAO,iBAAiB,EAAE,MAAM,GAC/B,KAAK,CAAC,OAAO,kBAAkB,EAAE,WAAW,CAAC,CA4CxD;IAaD;;;;OAIG;IACH,gCAEC;IAED;;;;OAIG;IACH,4BAHW,OAAO,cAAc,EAAE,UAAU,cACjC,OAAO,sBAAsB,EAAE,KAAK,QAyC9C;IA6DD;;;;OAIG;IACH,6BAJW,OAAO,2BAA2B,EAAE,OAAO,cAC3C,OAAO,cAAc,EAAE,UAAU,GAChC,OAAO,oBAAoB,EAAE,SAAS,CAkCjD;IAqID;;;;;;;;OAQG;IACH,uBARW,OAAO,kBAAkB,EAAE,WAAW,oBACtC,MAAM,UACN,OAAO,sBAAsB,EAAE,OAAO,GAAC,KAAK,CAAC,OAAO,sBAAsB,EAAE,OAAO,CAAC,gBACpF,OAAO,qCAAqC,EAAE,OAAO,cACrD,OAAO,UACP,MAAM,GACL,OAAO,CAyClB;IAED;;;;OAIG;IACH,8BAcC;IAED;;;;OAIG;IACH,yBAwDC;CACF;oCA78BmC,gBAAgB"}
|
|
@@ -377,37 +377,33 @@ class CanvasVectorTileLayerRenderer extends CanvasTileLayerRenderer {
|
|
|
377
377
|
/** @type {Array<import("../../VectorRenderTile.js").default>} */ (
|
|
378
378
|
this.renderedTiles
|
|
379
379
|
);
|
|
380
|
-
|
|
380
|
+
const layerUid = getUid(layer);
|
|
381
|
+
const declutter = layer.getDeclutter();
|
|
382
|
+
const declutteredFeatures = declutter
|
|
383
|
+
? frameState.declutter[declutter].all().map((item) => item.value)
|
|
384
|
+
: null;
|
|
381
385
|
let found;
|
|
382
|
-
for (let i = 0, ii = renderedTiles.length;
|
|
386
|
+
foundFeature: for (let i = 0, ii = renderedTiles.length; i < ii; ++i) {
|
|
383
387
|
const tile = renderedTiles[i];
|
|
384
388
|
const tileExtent = tileGrid.getTileCoordExtent(tile.wrappedTileCoord);
|
|
385
389
|
if (!intersects(tileExtent, hitExtent)) {
|
|
386
390
|
continue;
|
|
387
391
|
}
|
|
388
392
|
|
|
389
|
-
const
|
|
390
|
-
|
|
391
|
-
|
|
392
|
-
|
|
393
|
-
|
|
394
|
-
|
|
395
|
-
|
|
396
|
-
|
|
397
|
-
|
|
398
|
-
|
|
399
|
-
|
|
400
|
-
|
|
401
|
-
rotation,
|
|
402
|
-
hitTolerance,
|
|
403
|
-
featureCallback,
|
|
404
|
-
declutteredFeatures,
|
|
405
|
-
);
|
|
406
|
-
if (found) {
|
|
407
|
-
return true;
|
|
408
|
-
}
|
|
393
|
+
const executorGroups = tile.executorGroups[layerUid];
|
|
394
|
+
for (let t = 0, tt = executorGroups.length; t < tt; ++t) {
|
|
395
|
+
found = executorGroups[t].forEachFeatureAtCoordinate(
|
|
396
|
+
coordinate,
|
|
397
|
+
resolution,
|
|
398
|
+
rotation,
|
|
399
|
+
hitTolerance,
|
|
400
|
+
featureCallback,
|
|
401
|
+
declutteredFeatures,
|
|
402
|
+
);
|
|
403
|
+
if (found) {
|
|
404
|
+
break foundFeature;
|
|
409
405
|
}
|
|
410
|
-
}
|
|
406
|
+
}
|
|
411
407
|
}
|
|
412
408
|
return found;
|
|
413
409
|
}
|
|
@@ -424,7 +420,6 @@ class CanvasVectorTileLayerRenderer extends CanvasTileLayerRenderer {
|
|
|
424
420
|
}
|
|
425
421
|
return new Promise((resolve, reject) => {
|
|
426
422
|
const layer = this.getLayer();
|
|
427
|
-
const layerUid = getUid(layer);
|
|
428
423
|
const source = layer.getSource();
|
|
429
424
|
const projection = this.renderedProjection;
|
|
430
425
|
const projectionExtent = projection.getExtent();
|
|
@@ -434,51 +429,45 @@ class CanvasVectorTileLayerRenderer extends CanvasTileLayerRenderer {
|
|
|
434
429
|
this.renderedPixelToCoordinateTransform_,
|
|
435
430
|
pixel.slice(),
|
|
436
431
|
);
|
|
437
|
-
const
|
|
438
|
-
coordinate,
|
|
439
|
-
|
|
440
|
-
|
|
441
|
-
|
|
442
|
-
|
|
443
|
-
|
|
444
|
-
|
|
445
|
-
|
|
446
|
-
|
|
447
|
-
|
|
448
|
-
this.renderedTiles[i]
|
|
449
|
-
);
|
|
450
|
-
if (tile.getState() === TileState.LOADED) {
|
|
451
|
-
const extent = tileGrid.getTileCoordExtent(tile.tileCoord);
|
|
452
|
-
if (
|
|
453
|
-
source.getWrapX() &&
|
|
454
|
-
projection.canWrapX() &&
|
|
455
|
-
!containsExtent(projectionExtent, extent)
|
|
456
|
-
) {
|
|
457
|
-
wrapX(coordinate, projection);
|
|
458
|
-
}
|
|
459
|
-
break;
|
|
460
|
-
}
|
|
461
|
-
tile = undefined;
|
|
462
|
-
}
|
|
463
|
-
}
|
|
432
|
+
const tileCoordString = tileGrid
|
|
433
|
+
.getTileCoordForCoordAndResolution(coordinate, resolution)
|
|
434
|
+
.toString();
|
|
435
|
+
const tile =
|
|
436
|
+
/** @type {Array<import("../../VectorRenderTile.js").default>} */ (
|
|
437
|
+
this.renderedTiles
|
|
438
|
+
).find(
|
|
439
|
+
(tile) =>
|
|
440
|
+
tile.tileCoord.toString() === tileCoordString &&
|
|
441
|
+
tile.getState() === TileState.LOADED,
|
|
442
|
+
);
|
|
464
443
|
if (!tile || tile.loadingSourceTiles > 0) {
|
|
465
444
|
resolve([]);
|
|
466
445
|
return;
|
|
467
446
|
}
|
|
447
|
+
if (
|
|
448
|
+
source.getWrapX() &&
|
|
449
|
+
projection.canWrapX() &&
|
|
450
|
+
!containsExtent(
|
|
451
|
+
projectionExtent,
|
|
452
|
+
tileGrid.getTileCoordExtent(tile.tileCoord),
|
|
453
|
+
)
|
|
454
|
+
) {
|
|
455
|
+
wrapX(coordinate, projection);
|
|
456
|
+
}
|
|
457
|
+
const layerUid = getUid(layer);
|
|
468
458
|
const extent = tileGrid.getTileCoordExtent(tile.wrappedTileCoord);
|
|
469
459
|
const corner = getTopLeft(extent);
|
|
470
460
|
const tilePixel = [
|
|
471
461
|
(coordinate[0] - corner[0]) / resolution,
|
|
472
462
|
(corner[1] - coordinate[1]) / resolution,
|
|
473
463
|
];
|
|
474
|
-
|
|
475
|
-
|
|
476
|
-
|
|
477
|
-
|
|
478
|
-
|
|
479
|
-
|
|
480
|
-
|
|
481
|
-
/** @type {ImageData|undefined} */
|
|
464
|
+
const features = tile
|
|
465
|
+
.getSourceTiles()
|
|
466
|
+
.reduce(
|
|
467
|
+
(accumulator, sourceTile) =>
|
|
468
|
+
accumulator.concat(sourceTile.getFeatures()),
|
|
469
|
+
/** @type {Array<import("../../Feature.js").FeatureLike>} */ ([]),
|
|
470
|
+
);
|
|
482
471
|
let hitDetectionImageData = tile.hitDetectionImageData[layerUid];
|
|
483
472
|
if (!hitDetectionImageData) {
|
|
484
473
|
const tileSize = toSize(
|
|
@@ -518,6 +507,7 @@ class CanvasVectorTileLayerRenderer extends CanvasTileLayerRenderer {
|
|
|
518
507
|
* @return {Array<import('../../Feature.js').FeatureLike>} Features.
|
|
519
508
|
*/
|
|
520
509
|
getFeaturesInExtent(extent) {
|
|
510
|
+
/** @type {Array<import('../../Feature.js').FeatureLike>} */
|
|
521
511
|
const features = [];
|
|
522
512
|
const tileCache = this.getTileCache();
|
|
523
513
|
if (tileCache.getCount() === 0) {
|
|
@@ -528,6 +518,7 @@ class CanvasVectorTileLayerRenderer extends CanvasTileLayerRenderer {
|
|
|
528
518
|
this.frameState.viewState.projection,
|
|
529
519
|
);
|
|
530
520
|
const z = tileGrid.getZForResolution(this.renderedResolution);
|
|
521
|
+
/** @type {Object<string, true>} */
|
|
531
522
|
const visitedSourceTiles = {};
|
|
532
523
|
tileCache.forEach((tile) => {
|
|
533
524
|
if (tile.tileCoord[0] !== z || tile.getState() !== TileState.LOADED) {
|
|
@@ -592,24 +583,32 @@ class CanvasVectorTileLayerRenderer extends CanvasTileLayerRenderer {
|
|
|
592
583
|
const hifi = !(
|
|
593
584
|
viewHints[ViewHint.ANIMATING] || viewHints[ViewHint.INTERACTING]
|
|
594
585
|
);
|
|
586
|
+
const scaledCanvasSize = [
|
|
587
|
+
this.context.canvas.width,
|
|
588
|
+
this.context.canvas.height,
|
|
589
|
+
];
|
|
590
|
+
const declutter = this.getLayer().getDeclutter();
|
|
591
|
+
const declutterTree = declutter
|
|
592
|
+
? frameState.declutter[declutter]
|
|
593
|
+
: undefined;
|
|
594
|
+
const layerUid = getUid(this.getLayer());
|
|
595
595
|
const tiles =
|
|
596
596
|
/** @type {Array<import("../../VectorRenderTile.js").default>} */ (
|
|
597
597
|
this.renderedTiles
|
|
598
598
|
);
|
|
599
599
|
for (let i = 0, ii = tiles.length; i < ii; ++i) {
|
|
600
600
|
const tile = tiles[i];
|
|
601
|
-
const executorGroups = tile.executorGroups[
|
|
602
|
-
const declutter = this.getLayer().getDeclutter();
|
|
601
|
+
const executorGroups = tile.executorGroups[layerUid];
|
|
603
602
|
if (executorGroups) {
|
|
604
603
|
for (let j = executorGroups.length - 1; j >= 0; --j) {
|
|
605
604
|
executorGroups[j].execute(
|
|
606
605
|
this.context,
|
|
607
|
-
|
|
606
|
+
scaledCanvasSize,
|
|
608
607
|
this.getTileRenderTransform(tile, frameState),
|
|
609
608
|
frameState.viewState.rotation,
|
|
610
609
|
hifi,
|
|
611
610
|
DECLUTTER,
|
|
612
|
-
|
|
611
|
+
declutterTree,
|
|
613
612
|
);
|
|
614
613
|
}
|
|
615
614
|
}
|
|
@@ -626,19 +625,21 @@ class CanvasVectorTileLayerRenderer extends CanvasTileLayerRenderer {
|
|
|
626
625
|
/** @type {Array<import("../../VectorRenderTile.js").default>} */ (
|
|
627
626
|
this.renderedTiles
|
|
628
627
|
);
|
|
628
|
+
const layerUid = getUid(this.getLayer());
|
|
629
629
|
const executorGroups = tiles.reduce((acc, tile, index) => {
|
|
630
|
-
tile.executorGroups[
|
|
630
|
+
tile.executorGroups[layerUid].forEach((executorGroup) =>
|
|
631
631
|
acc.push({
|
|
632
632
|
executorGroup,
|
|
633
633
|
index,
|
|
634
634
|
}),
|
|
635
635
|
);
|
|
636
636
|
return acc;
|
|
637
|
-
}, []);
|
|
637
|
+
}, /** @type {Array<{executorGroup: CanvasExecutorGroup, index: number}>} */ ([]));
|
|
638
638
|
|
|
639
639
|
const executorGroupZIndexContexts = executorGroups.map(({executorGroup}) =>
|
|
640
640
|
executorGroup.getDeferredZIndexContexts(),
|
|
641
641
|
);
|
|
642
|
+
/** @type {Object<number, true>} */
|
|
642
643
|
const usedZIndices = {};
|
|
643
644
|
for (let i = 0, ii = executorGroups.length; i < ii; ++i) {
|
|
644
645
|
const executorGroupZindexContext =
|
|
@@ -674,6 +675,11 @@ class CanvasVectorTileLayerRenderer extends CanvasTileLayerRenderer {
|
|
|
674
675
|
});
|
|
675
676
|
}
|
|
676
677
|
|
|
678
|
+
/**
|
|
679
|
+
* @param {import("../../VectorRenderTile.js").default} tile The tile
|
|
680
|
+
* @param {import('../../Map.js').FrameState} frameState Current frame state
|
|
681
|
+
* @return {import('../../transform.js').Transform} Transform to use to render this tile
|
|
682
|
+
*/
|
|
677
683
|
getTileRenderTransform(tile, frameState) {
|
|
678
684
|
const pixelRatio = frameState.pixelRatio;
|
|
679
685
|
const viewState = frameState.viewState;
|
|
@@ -745,18 +751,20 @@ class CanvasVectorTileLayerRenderer extends CanvasTileLayerRenderer {
|
|
|
745
751
|
tileSource.zDirection,
|
|
746
752
|
);
|
|
747
753
|
|
|
748
|
-
const tiles =
|
|
754
|
+
const tiles =
|
|
755
|
+
/** @type {Array<import("../../VectorRenderTile.js").default>} */ (
|
|
756
|
+
this.renderedTiles
|
|
757
|
+
);
|
|
749
758
|
const clips = [];
|
|
750
759
|
const clipZs = [];
|
|
751
760
|
const tileClipContexts = [];
|
|
761
|
+
const layerUid = getUid(layer);
|
|
752
762
|
let ready = true;
|
|
753
763
|
for (let i = tiles.length - 1; i >= 0; --i) {
|
|
754
|
-
const tile =
|
|
755
|
-
tiles[i]
|
|
756
|
-
);
|
|
764
|
+
const tile = tiles[i];
|
|
757
765
|
ready = ready && !tile.getReplayState(layer).dirty;
|
|
758
|
-
const executorGroups = tile.executorGroups[
|
|
759
|
-
|
|
766
|
+
const executorGroups = tile.executorGroups[layerUid].filter((group) =>
|
|
767
|
+
group.hasExecutors(replayTypes),
|
|
760
768
|
);
|
|
761
769
|
if (executorGroups.length === 0) {
|
|
762
770
|
continue;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"TileLayerBase.d.ts","sourceRoot":"","sources":["TileLayerBase.js"],"names":[],"mappings":"AAkDA;;GAEG;AACH;;;;GAIG;AAEH;;GAEG;AACH,+CAFY,wBAAwB,CAInC;AA0DD;;;;GAIG;AACH,oCAJW,OAAO,sBAAsB,EAAE,OAAO,aACtC,OAAO,oBAAoB,EAAE,SAAS,GACrC,MAAM,CAIjB;;;;;;;;;;;;;;yCA9EY,OAAO,uCAAuC,EAAE,OAAO,CAAC,OAAO,eAAe,EAAE,OAAO,CAAC;;;;;aAIvF,GAAG,CAAC,MAAM,CAAC;;;;;;;;;;;;;;;;;;;;;;;;;;AA4EzB;;;;;;GAMG;AAEH;;GAEG;AAEH;;;;;;;GAOG;AACH,yCAL6B,SAAS,SAAxB,aAAc,EACmB,QAAQ,SAA1C,OAAQ,eAAe,EAAE,OAAQ,EACmC,kBAAkB,SAAtF,OAAQ,uCAAuC,EAAE,OAAO,CAAC,QAAQ,CAAE;IAI9E;;;OAGG;IACH,uBAHW,SAAS,WACT,OAAO,EA+DjB;IAvDC;;;OAGG;IACH,gBAFU,OAAO,CAEU;IAE3B;;;;OAIG;IACH,uBAAuC;IAEvC;;;OAGG;IACH,oBAHU,KAAK,CAAC,MAAM,CAAC,CAGK;IAE5B;;;OAGG;IACH,uBAA+C;IAE/C;;;OAGG;IACH,uBAA8C;IAE9C;;;OAGG;IACH,kBAAuB;IAGvB;;;OAGG;IACH,mCAHU,OAAO,2BAA2B,EAAE,OAAO,CAAC,kBAAkB,CAAC,CAGnB;IAEtD;;;OAGG;IACH,sBAFU,OAAO,cAAc,EAAE,UAAU,GAAC,IAAI,CAE1B;IAEtB;;;OAGG;IACH,4BAAoC;IAGtC;;;OAGG;IACH,wBAHW,OAAO,QAOjB;IA4BD;;;;;OAKG;IACH,4CAJW,OAAO,uCAAuC,EAAE,yBAAyB,CAAC,QAAQ,CAAC,GAClF,kBAAkB,CAK7B;IAED;;;;;;OAMG;IACH,yBANW,OAAO,cAAc,EAAE,UAAU,UACjC,OAAO,iBAAiB,EAAE,MAAM,YAChC,MAAM,4BACN,wBAAwB,WACxB,MAAM,QAqHhB;IAED;;;;OAIG;IACH,wCAJW,OAAO,cAAc,EAAE,UAAU,kBACjC,OAAO,QAKjB;IAED;;;;OAIG;IACH,4CAJW,OAAO,cAAc,EAAE,UAAU,GAChC,OAAO,CAKlB;IAED;;;;;;;;;;;;;OAaG;IACH,yCAbW,kBAAkB,iBAClB,OAAO,oBAAoB,EAAE,SAAS,cACtC,OAAO,cAAc,EAAE,UAAU,gBACjC,OAAO,iBAAiB,EAAE,MAAM,kBAChC,MAAM,YACN,OAAO,eAAe,EAAE,IAAI,cAC5B,OAAO,qBAAqB,EAAE,UAAU,cACxC,OAAO,iBAAiB,EAAE,MAAM,SAChC,MAAM,UACN,MAAM,SACN,MAAM,QAeb;IAEJ;;;;;;OAMG;IACH,6CANW,kBAAkB,SAClB,MAAM,UACN,OAAO,iBAAiB,EAAE,MAAM,SAChC,MAAM,QAG0C;IAE3D,iIAuEC;IAED;;;;;OAKG;IACH,iCAJW,OAAO,cAAc,EAAE,UAAU,GAChC,WAAW,
|
|
1
|
+
{"version":3,"file":"TileLayerBase.d.ts","sourceRoot":"","sources":["TileLayerBase.js"],"names":[],"mappings":"AAkDA;;GAEG;AACH;;;;GAIG;AAEH;;GAEG;AACH,+CAFY,wBAAwB,CAInC;AA0DD;;;;GAIG;AACH,oCAJW,OAAO,sBAAsB,EAAE,OAAO,aACtC,OAAO,oBAAoB,EAAE,SAAS,GACrC,MAAM,CAIjB;;;;;;;;;;;;;;yCA9EY,OAAO,uCAAuC,EAAE,OAAO,CAAC,OAAO,eAAe,EAAE,OAAO,CAAC;;;;;aAIvF,GAAG,CAAC,MAAM,CAAC;;;;;;;;;;;;;;;;;;;;;;;;;;AA4EzB;;;;;;GAMG;AAEH;;GAEG;AAEH;;;;;;;GAOG;AACH,yCAL6B,SAAS,SAAxB,aAAc,EACmB,QAAQ,SAA1C,OAAQ,eAAe,EAAE,OAAQ,EACmC,kBAAkB,SAAtF,OAAQ,uCAAuC,EAAE,OAAO,CAAC,QAAQ,CAAE;IAI9E;;;OAGG;IACH,uBAHW,SAAS,WACT,OAAO,EA+DjB;IAvDC;;;OAGG;IACH,gBAFU,OAAO,CAEU;IAE3B;;;;OAIG;IACH,uBAAuC;IAEvC;;;OAGG;IACH,oBAHU,KAAK,CAAC,MAAM,CAAC,CAGK;IAE5B;;;OAGG;IACH,uBAA+C;IAE/C;;;OAGG;IACH,uBAA8C;IAE9C;;;OAGG;IACH,kBAAuB;IAGvB;;;OAGG;IACH,mCAHU,OAAO,2BAA2B,EAAE,OAAO,CAAC,kBAAkB,CAAC,CAGnB;IAEtD;;;OAGG;IACH,sBAFU,OAAO,cAAc,EAAE,UAAU,GAAC,IAAI,CAE1B;IAEtB;;;OAGG;IACH,4BAAoC;IAGtC;;;OAGG;IACH,wBAHW,OAAO,QAOjB;IA4BD;;;;;OAKG;IACH,4CAJW,OAAO,uCAAuC,EAAE,yBAAyB,CAAC,QAAQ,CAAC,GAClF,kBAAkB,CAK7B;IAED;;;;;;OAMG;IACH,yBANW,OAAO,cAAc,EAAE,UAAU,UACjC,OAAO,iBAAiB,EAAE,MAAM,YAChC,MAAM,4BACN,wBAAwB,WACxB,MAAM,QAqHhB;IAED;;;;OAIG;IACH,wCAJW,OAAO,cAAc,EAAE,UAAU,kBACjC,OAAO,QAKjB;IAED;;;;OAIG;IACH,4CAJW,OAAO,cAAc,EAAE,UAAU,GAChC,OAAO,CAKlB;IAED;;;;;;;;;;;;;OAaG;IACH,yCAbW,kBAAkB,iBAClB,OAAO,oBAAoB,EAAE,SAAS,cACtC,OAAO,cAAc,EAAE,UAAU,gBACjC,OAAO,iBAAiB,EAAE,MAAM,kBAChC,MAAM,YACN,OAAO,eAAe,EAAE,IAAI,cAC5B,OAAO,qBAAqB,EAAE,UAAU,cACxC,OAAO,iBAAiB,EAAE,MAAM,SAChC,MAAM,UACN,MAAM,SACN,MAAM,QAeb;IAEJ;;;;;;OAMG;IACH,6CANW,kBAAkB,SAClB,MAAM,UACN,OAAO,iBAAiB,EAAE,MAAM,SAChC,MAAM,QAG0C;IAE3D,iIAuEC;IAED;;;;;OAKG;IACH,iCAJW,OAAO,cAAc,EAAE,UAAU,GAChC,WAAW,CA4MtB;IAED;;;OAGG;IACH,qCAHW,OAAO,cAAc,EAAE,UAAU,QAK3C;IAED;;;;;;;;;;OAUG;IACH,sBAsCC;CAkCF;+BAzyB8B,YAAY"}
|
|
@@ -580,14 +580,13 @@ class WebGLBaseTileLayerRenderer extends WebGLLayerRenderer {
|
|
|
580
580
|
*/
|
|
581
581
|
const alphaLookup = {};
|
|
582
582
|
|
|
583
|
-
const uid = getUid(this);
|
|
584
|
-
const time = frameState.time;
|
|
585
583
|
let blend = false;
|
|
586
|
-
|
|
587
584
|
const representationsByZ = tileRepresentationLookup.representationsByZ;
|
|
588
585
|
|
|
589
586
|
// look for cached tiles to use if a target tile is not ready
|
|
590
587
|
if (z in representationsByZ) {
|
|
588
|
+
const uid = getUid(this);
|
|
589
|
+
const time = frameState.time;
|
|
591
590
|
for (const tileRepresentation of representationsByZ[z]) {
|
|
592
591
|
const tile = tileRepresentation.tile;
|
|
593
592
|
if (
|
package/util.js
CHANGED