ol 10.2.2-dev.1731448023339 → 10.2.2-dev.1731745671443
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/BaseTile.d.ts +7 -0
- package/layer/BaseTile.d.ts.map +1 -1
- package/layer/BaseTile.js +2 -0
- package/package.json +1 -1
- package/renderer/canvas/TileLayer.d.ts.map +1 -1
- package/renderer/canvas/TileLayer.js +25 -16
- package/util.js +1 -1
package/layer/BaseTile.d.ts
CHANGED
|
@@ -64,6 +64,11 @@ export type Options<TileSourceType extends import("../source/Tile.js").default>
|
|
|
64
64
|
* use {@link import ("../Map.js").default#addLayer map.addLayer()}.
|
|
65
65
|
*/
|
|
66
66
|
map?: import("../Map.js").default | undefined;
|
|
67
|
+
/**
|
|
68
|
+
* Background color for the layer. If not specified, no background
|
|
69
|
+
* will be rendered.
|
|
70
|
+
*/
|
|
71
|
+
background?: import("./Base").BackgroundColor | undefined;
|
|
67
72
|
/**
|
|
68
73
|
* Deprecated. Use interim tiles on error.
|
|
69
74
|
*/
|
|
@@ -116,6 +121,8 @@ export type Options<TileSourceType extends import("../source/Tile.js").default>
|
|
|
116
121
|
* this layer in its layers collection, and the layer will be rendered on top. This is useful for
|
|
117
122
|
* temporary layers. The standard way to add a layer to a map and have it managed by the map is to
|
|
118
123
|
* use {@link import("../Map.js").default#addLayer map.addLayer()}.
|
|
124
|
+
* @property {import("./Base.js").BackgroundColor} [background] Background color for the layer. If not specified, no background
|
|
125
|
+
* will be rendered.
|
|
119
126
|
* @property {boolean} [useInterimTilesOnError=true] Deprecated. Use interim tiles on error.
|
|
120
127
|
* @property {Object<string, *>} [properties] Arbitrary observable properties. Can be accessed with `#get()` and `#set()`.
|
|
121
128
|
* @property {number} [cacheSize=512] The internal tile cache size. This needs to be large enough to render
|
package/layer/BaseTile.d.ts.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"BaseTile.d.ts","sourceRoot":"","sources":["BaseTile.js"],"names":[],"mappings":";;;;qCAOa,MAAM,IACN,OAAO,eAAe,EAAE,WAAW,CAAC,OAAO,eAAe,EAAE,UAAU,EAAE,OAAO,oBAAoB,EAAE,OAAO,EAAE,MAAM,CAAC,GACjI,OAAW,eAAe,EAAE,WAAW,CAAC,OAAO,QAAQ,EAAE,yBAAyB,GAClF,OAAa,YAAY,EAAE,cAAc,GAAC,gBAAgB,GAAC,+BAA+B,EAAE,OAAO,WAAW,EAAE,WAAW,EAAE,MAAM,CAAC,GACpI,OAAW,eAAe,EAAE,WAAW,CAAC,OAAO,qBAAqB,EAAE,qBAAqB,EAAE,OAAO,iBAAiB,EAAE,OAAO,EAAE,MAAM,CAAC,GACvI,OAAW,eAAe,EAAE,mBAAmB,CAAC,OAAO,eAAe,EAAE,UAAU,GAAC,OAAO,QAAQ,EAAE,yBAAyB,GAC7H,OAAW,YAAY,EAAE,cAAc,GAAC,gBAAgB,GAAC,+BAA+B,GAAC,OAAO,qBAAqB,EAAE,qBAAqB,EAAE,MAAM,CAAC;oBAInG,cAAc,SAApD,OAAQ,mBAAmB,EAAE,OAAQ
|
|
1
|
+
{"version":3,"file":"BaseTile.d.ts","sourceRoot":"","sources":["BaseTile.js"],"names":[],"mappings":";;;;qCAOa,MAAM,IACN,OAAO,eAAe,EAAE,WAAW,CAAC,OAAO,eAAe,EAAE,UAAU,EAAE,OAAO,oBAAoB,EAAE,OAAO,EAAE,MAAM,CAAC,GACjI,OAAW,eAAe,EAAE,WAAW,CAAC,OAAO,QAAQ,EAAE,yBAAyB,GAClF,OAAa,YAAY,EAAE,cAAc,GAAC,gBAAgB,GAAC,+BAA+B,EAAE,OAAO,WAAW,EAAE,WAAW,EAAE,MAAM,CAAC,GACpI,OAAW,eAAe,EAAE,WAAW,CAAC,OAAO,qBAAqB,EAAE,qBAAqB,EAAE,OAAO,iBAAiB,EAAE,OAAO,EAAE,MAAM,CAAC,GACvI,OAAW,eAAe,EAAE,mBAAmB,CAAC,OAAO,eAAe,EAAE,UAAU,GAAC,OAAO,QAAQ,EAAE,yBAAyB,GAC7H,OAAW,YAAY,EAAE,cAAc,GAAC,gBAAgB,GAAC,+BAA+B,GAAC,OAAO,qBAAqB,EAAE,qBAAqB,EAAE,MAAM,CAAC;oBAInG,cAAc,SAApD,OAAQ,mBAAmB,EAAE,OAAQ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAXlD;;;;;;;;GAQG;AAEH;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;GAiCG;AAEH;;;;;;;;;;;;GAYG;AACH,4BALmD,cAAc,SAApD,OAAQ,mBAAmB,EAAE,OAAQ,EACI,YAAY,SAArD,2CAAwC;IAKnD;;OAEG;IACH,2DAuCC;IA3BC;;OAEG;IACH,IAFU,wBAAwB,CAAC,OAAO,WAAW,EAAE,SAAS,CAAC,CAE1D;IAEP;;OAEG;IACH,MAFU,wBAAwB,CAAC,OAAO,WAAW,EAAE,SAAS,CAAC,CAExD;IAET;;OAEG;IACH,IAFU,wBAAwB,CAAC,IAAI,CAAC,CAEjC;IAEP;;;OAGG;IACH,mBAA2B;IAU7B;;;OAGG;IACH,0BAHY,MAAM,GAAC,SAAS,CAK3B;IAED;;;;;OAKG;IACH,cAJY,MAAM,CAMjB;IAED;;;;;OAKG;IACH,oBAJW,MAAM,QAMhB;IAED;;;;;OAKG;IACH,6BAJY,OAAO,CAQlB;IAED;;;;;OAKG;IACH,kDAJW,OAAO,QAMjB;CAsBF;kBAhLiB,YAAY"}
|
package/layer/BaseTile.js
CHANGED
|
@@ -41,6 +41,8 @@ import TileProperty from './TileProperty.js';
|
|
|
41
41
|
* this layer in its layers collection, and the layer will be rendered on top. This is useful for
|
|
42
42
|
* temporary layers. The standard way to add a layer to a map and have it managed by the map is to
|
|
43
43
|
* use {@link import("../Map.js").default#addLayer map.addLayer()}.
|
|
44
|
+
* @property {import("./Base.js").BackgroundColor} [background] Background color for the layer. If not specified, no background
|
|
45
|
+
* will be rendered.
|
|
44
46
|
* @property {boolean} [useInterimTilesOnError=true] Deprecated. Use interim tiles on error.
|
|
45
47
|
* @property {Object<string, *>} [properties] Arbitrary observable properties. Can be accessed with `#get()` and `#set()`.
|
|
46
48
|
* @property {number} [cacheSize=512] The internal tile cache size. This needs to be large enough to render
|
package/package.json
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"TileLayer.d.ts","sourceRoot":"","sources":["TileLayer.js"],"names":[],"mappings":";yBAyCa;QAAO,MAAM,GAAE,GAAG,CAAC,OAAO,eAAe,EAAE,OAAO,CAAC;CAAC;;;;;;;AAiEjE;;;GAGG;AAEH;;;;;;GAMG;AACH,sCAHkG,SAAS,SAA7F,OAAO,qBAAqB,EAAE,OAAO,GAAC,OAAO,2BAA2B,EAAE,OAAQ;IAI9F;;;OAGG;IACH,uBAHW,SAAS,iCAyFnB;IAjFC;;;OAGG;IACH,eAFU,OAAO,CAEQ;IAEzB;;;OAGG;IACH,gBAFU,OAAO,CAEU;IAE3B;;;OAGG;IACH,wBAA2B;IAE3B;;;OAGG;IACH,8BAFU,MAAM,CAEO;IAEvB;;;OAGG;IACH,8BAFU,OAAO,0BAA0B,EAAE,OAAO,GAAC,IAAI,CAE3B;IAE9B;;;OAGG;IACH,4BAFU,MAAM,CAEK;IAErB;;;OAGG;IACH,yBAFW,KAAK,CAAC,OAAO,eAAe,EAAE,OAAO,CAAC,CAE1B;IAEvB;;;OAGG;IACH,2BAAuB;IAEvB;;;OAGG;IACH,gCAA4B;IAE5B;;;OAGG;IACH,sBAFU,OAAO,iBAAiB,EAAE,MAAM,CAEX;IAE/B;;;OAGG;IACH,uBAA+C;IAE/C;;;OAGG;IACH,uBAA8C;IAI9C;;;OAGG;IACH,mBAAyC;IAK3C;;OAEG;IACH,8BAEC;IAED;;;;;;;;;OASG;IACH,6BAPW,MAAM,KACN,MAAM,KACN,MAAM,cACN,OAAO,cAAc,EAAE,UAAU,GAChC,OAAO,eAAe,EAAE,OAAO,GAAC,IAAI,CA4B/C;IAED;;;;;;;OAOG;IACH,qBAPW,MAAM,KACN,MAAM,KACN,MAAM,cACN,OAAO,cAAc,EAAE,UAAU,GAChC,OAAO,eAAe,EAAE,OAAO,GAAC,IAAI,CAS/C;IAED;;;;OAIG;IACH,wBAJW,OAAO,gBAAgB,EAAE,KAAK,GAC7B,iBAAiB,CA6E5B;IAsBG,uBAAuC;IAU3C;;;;;;OAMG;IACH,yBANW,OAAO,cAAc,EAAE,UAAU,UACjC,OAAO,iBAAiB,EAAE,MAAM,YAChC,MAAM,YACN,UAAU,WACV,MAAM,QAoEhB;IAED;;;;;;;OAOG;IACH,uBAkBC;IAED;;;;;;;;;OASG;IACH,sBAgCC;IAED;;;;;;;;;;;;;OAaG;IACH,iCALW,OAAO,cAAc,EAAE,UAAU,UACjC,WAAW,GACV,WAAW,
|
|
1
|
+
{"version":3,"file":"TileLayer.d.ts","sourceRoot":"","sources":["TileLayer.js"],"names":[],"mappings":";yBAyCa;QAAO,MAAM,GAAE,GAAG,CAAC,OAAO,eAAe,EAAE,OAAO,CAAC;CAAC;;;;;;;AAiEjE;;;GAGG;AAEH;;;;;;GAMG;AACH,sCAHkG,SAAS,SAA7F,OAAO,qBAAqB,EAAE,OAAO,GAAC,OAAO,2BAA2B,EAAE,OAAQ;IAI9F;;;OAGG;IACH,uBAHW,SAAS,iCAyFnB;IAjFC;;;OAGG;IACH,eAFU,OAAO,CAEQ;IAEzB;;;OAGG;IACH,gBAFU,OAAO,CAEU;IAE3B;;;OAGG;IACH,wBAA2B;IAE3B;;;OAGG;IACH,8BAFU,MAAM,CAEO;IAEvB;;;OAGG;IACH,8BAFU,OAAO,0BAA0B,EAAE,OAAO,GAAC,IAAI,CAE3B;IAE9B;;;OAGG;IACH,4BAFU,MAAM,CAEK;IAErB;;;OAGG;IACH,yBAFW,KAAK,CAAC,OAAO,eAAe,EAAE,OAAO,CAAC,CAE1B;IAEvB;;;OAGG;IACH,2BAAuB;IAEvB;;;OAGG;IACH,gCAA4B;IAE5B;;;OAGG;IACH,sBAFU,OAAO,iBAAiB,EAAE,MAAM,CAEX;IAE/B;;;OAGG;IACH,uBAA+C;IAE/C;;;OAGG;IACH,uBAA8C;IAI9C;;;OAGG;IACH,mBAAyC;IAK3C;;OAEG;IACH,8BAEC;IAED;;;;;;;;;OASG;IACH,6BAPW,MAAM,KACN,MAAM,KACN,MAAM,cACN,OAAO,cAAc,EAAE,UAAU,GAChC,OAAO,eAAe,EAAE,OAAO,GAAC,IAAI,CA4B/C;IAED;;;;;;;OAOG;IACH,qBAPW,MAAM,KACN,MAAM,KACN,MAAM,cACN,OAAO,cAAc,EAAE,UAAU,GAChC,OAAO,eAAe,EAAE,OAAO,GAAC,IAAI,CAS/C;IAED;;;;OAIG;IACH,wBAJW,OAAO,gBAAgB,EAAE,KAAK,GAC7B,iBAAiB,CA6E5B;IAsBG,uBAAuC;IAU3C;;;;;;OAMG;IACH,yBANW,OAAO,cAAc,EAAE,UAAU,UACjC,OAAO,iBAAiB,EAAE,MAAM,YAChC,MAAM,YACN,UAAU,WACV,MAAM,QAoEhB;IAED;;;;;;;OAOG;IACH,uBAkBC;IAED;;;;;;;;;OASG;IACH,sBAgCC;IAED;;;;;;;;;;;;;OAaG;IACH,iCALW,OAAO,cAAc,EAAE,UAAU,UACjC,WAAW,GACV,WAAW,CAyUtB;IAED;;;OAGG;IACH,2BAFW,MAAM,QAOhB;IAED;;;;;;;;;;OAUG;IACH,yBAVW,OAAO,eAAe,EAAE,OAAO,cAC/B,OAAO,cAAc,EAAE,UAAU,KACjC,MAAM,KACN,MAAM,KACN,MAAM,KACN,MAAM,UACN,MAAM,cACN,OAAO,QAiDjB;IAED;;OAEG;IACH,YAFY,iBAAiB,CAK5B;IAED;;;;;OAKG;IACH,6BAJW,OAAO,oBAAoB,EAAE,OAAO,GACnC,iBAAiB,GAAC,gBAAgB,GAAC,gBAAgB,CAK9D;IAED;;;;;OAKG;IACH,qCALW;YAAQ,MAAM,GAAE;gBAAQ,MAAM,GAAE,OAAO;SAAC;KAAC,cACzC,OAAO,sBAAsB,EAAE,OAAO,QACtC,OAAO,eAAe,EAAE,OAAO,QAUzC;CACF;gCA18B+B,YAAY;qBAGvB,2BAA2B"}
|
|
@@ -542,6 +542,7 @@ class CanvasTileLayerRenderer extends CanvasLayerRenderer {
|
|
|
542
542
|
* @override
|
|
543
543
|
*/
|
|
544
544
|
renderFrame(frameState, target) {
|
|
545
|
+
let allTilesIdle = true;
|
|
545
546
|
this.renderComplete = true;
|
|
546
547
|
|
|
547
548
|
/**
|
|
@@ -664,7 +665,12 @@ class CanvasTileLayerRenderer extends CanvasLayerRenderer {
|
|
|
664
665
|
continue;
|
|
665
666
|
}
|
|
666
667
|
}
|
|
667
|
-
|
|
668
|
+
if (tileState !== TileState.IDLE) {
|
|
669
|
+
allTilesIdle = false;
|
|
670
|
+
}
|
|
671
|
+
if (tileState !== TileState.ERROR) {
|
|
672
|
+
this.renderComplete = false;
|
|
673
|
+
}
|
|
668
674
|
|
|
669
675
|
const hasStaleTile = this.findStaleTile_(tileCoord, tilesByZ);
|
|
670
676
|
if (hasStaleTile) {
|
|
@@ -841,21 +847,24 @@ class CanvasTileLayerRenderer extends CanvasLayerRenderer {
|
|
|
841
847
|
}
|
|
842
848
|
context.imageSmoothingEnabled = true;
|
|
843
849
|
|
|
844
|
-
|
|
845
|
-
|
|
846
|
-
|
|
847
|
-
|
|
848
|
-
|
|
849
|
-
|
|
850
|
-
|
|
851
|
-
|
|
852
|
-
|
|
853
|
-
|
|
854
|
-
|
|
855
|
-
|
|
856
|
-
|
|
857
|
-
|
|
858
|
-
|
|
850
|
+
if (this.renderComplete) {
|
|
851
|
+
/**
|
|
852
|
+
* @param {import("../../Map.js").default} map Map.
|
|
853
|
+
* @param {import("../../Map.js").FrameState} frameState Frame state.
|
|
854
|
+
*/
|
|
855
|
+
const postRenderFunction = (map, frameState) => {
|
|
856
|
+
const tileSourceKey = getUid(tileSource);
|
|
857
|
+
const wantedTiles = frameState.wantedTiles[tileSourceKey];
|
|
858
|
+
const tilesCount = wantedTiles ? Object.keys(wantedTiles).length : 0;
|
|
859
|
+
this.updateCacheSize(tilesCount);
|
|
860
|
+
this.tileCache_.expireCache();
|
|
861
|
+
};
|
|
862
|
+
|
|
863
|
+
frameState.postRenderFunctions.push(postRenderFunction);
|
|
864
|
+
}
|
|
865
|
+
if (!this.renderComplete && !allTilesIdle) {
|
|
866
|
+
frameState.animate = true;
|
|
867
|
+
}
|
|
859
868
|
|
|
860
869
|
return this.container;
|
|
861
870
|
}
|
package/util.js
CHANGED