ol 10.8.1-dev.1775310976144 → 10.8.1-dev.1775729245452
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/package.json +1 -1
- package/renderer/canvas/TileLayer.d.ts +5 -0
- package/renderer/canvas/TileLayer.d.ts.map +1 -1
- package/renderer/canvas/TileLayer.js +14 -10
- package/renderer/canvas/VectorTileLayer.d.ts.map +1 -1
- package/renderer/canvas/VectorTileLayer.js +13 -0
- package/util.js +1 -1
package/package.json
CHANGED
|
@@ -90,6 +90,11 @@ declare class CanvasTileLayerRenderer<LayerType extends import("../../layer/Tile
|
|
|
90
90
|
* @private
|
|
91
91
|
*/
|
|
92
92
|
private sourceTileCache_;
|
|
93
|
+
/**
|
|
94
|
+
* @protected
|
|
95
|
+
* @type {import("../../extent.js").Extent|null}
|
|
96
|
+
*/
|
|
97
|
+
protected layerExtent: import("../../extent.js").Extent | null;
|
|
93
98
|
/**
|
|
94
99
|
* @return {LRUCache} Tile cache.
|
|
95
100
|
*/
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"TileLayer.d.ts","sourceRoot":"","sources":["TileLayer.js"],"names":[],"mappings":";;;;;;;;;;AAkGA;;;GAGG;AAEH;;;;;;GAMG;AACH,sCAHkG,SAAS,SAA7F,OAAO,qBAAqB,EAAE,OAAO,GAAC,OAAO,2BAA2B,EAAE,OAAQ;IAI9F;;;OAGG;IACH,uBAHW,SAAS,YACT,OAAO,
|
|
1
|
+
{"version":3,"file":"TileLayer.d.ts","sourceRoot":"","sources":["TileLayer.js"],"names":[],"mappings":";;;;;;;;;;AAkGA;;;GAGG;AAEH;;;;;;GAMG;AACH,sCAHkG,SAAS,SAA7F,OAAO,qBAAqB,EAAE,OAAO,GAAC,OAAO,2BAA2B,EAAE,OAAQ;IAI9F;;;OAGG;IACH,uBAHW,SAAS,YACT,OAAO,EA8FjB;IAvFC;;;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,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;IAEzC;;;OAGG;IACH,yBAA4B;IAE5B;;;OAGG;IACH,uBAFU,OAAO,iBAAiB,EAAE,MAAM,GAAC,IAAI,CAExB;IAKzB;;OAEG;IACH,8BAEC;IAED;;OAEG;IACH,oCAKC;IAED;;;;;;;;;OASG;IACH,6BAPW,MAAM,KACN,MAAM,KACN,MAAM,cACN,OAAO,cAAc,EAAE,UAAU,GAChC,OAAO,eAAe,EAAE,OAAO,GAAC,IAAI,CAiC/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;IAiCD;;;;OAIG;IACH,uCAHY,OAAO,CAKlB;IAED;;;;;;OAMG;IACH,yBANW,OAAO,cAAc,EAAE,UAAU,UACjC,OAAO,iBAAiB,EAAE,MAAM,YAChC,MAAM,YACN,UAAU,WACV,MAAM,QAmFhB;IAED;;;;;;;OAOG;IACH,uBAwBC;IAED;;;;;;;;;OASG;IACH,sBAgCC;IAED;;;;;;;;;;;;;OAaG;IACH,iCALW,OAAO,cAAc,EAAE,UAAU,UACjC,WAAW,GACV,WAAW,CA4TtB;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,QAkDjB;IAED;;OAEG;IACH,YAFY,iBAAiB,GAAC,eAAe,CAK5C;IAED;;;;;OAKG;IACH,6BAJW,OAAO,oBAAoB,EAAE,OAAO,GACnC,iBAAiB,GAAC,eAAe,GAAC,gBAAgB,GAAC,gBAAgB,CAK9E;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;gCA/8B+B,YAAY;qBAVvB,2BAA2B"}
|
|
@@ -198,6 +198,12 @@ class CanvasTileLayerRenderer extends CanvasLayerRenderer {
|
|
|
198
198
|
*/
|
|
199
199
|
this.sourceTileCache_ = null;
|
|
200
200
|
|
|
201
|
+
/**
|
|
202
|
+
* @protected
|
|
203
|
+
* @type {import("../../extent.js").Extent|null}
|
|
204
|
+
*/
|
|
205
|
+
this.layerExtent = null;
|
|
206
|
+
|
|
201
207
|
this.maxStaleKeys = cacheSize * 0.5;
|
|
202
208
|
}
|
|
203
209
|
|
|
@@ -617,13 +623,11 @@ class CanvasTileLayerRenderer extends CanvasLayerRenderer {
|
|
|
617
623
|
const width = this.context.canvas.width;
|
|
618
624
|
const height = this.context.canvas.height;
|
|
619
625
|
|
|
620
|
-
|
|
621
|
-
|
|
622
|
-
|
|
623
|
-
|
|
624
|
-
|
|
625
|
-
fromUserExtent(layerState.extent, projection),
|
|
626
|
-
);
|
|
626
|
+
this.layerExtent = layerState.extent
|
|
627
|
+
? fromUserExtent(layerState.extent, projection)
|
|
628
|
+
: null;
|
|
629
|
+
if (this.layerExtent) {
|
|
630
|
+
frameExtent = getIntersection(frameExtent, this.layerExtent);
|
|
627
631
|
}
|
|
628
632
|
|
|
629
633
|
const dx = (tileResolution * width) / 2 / tilePixelRatio;
|
|
@@ -758,8 +762,8 @@ class CanvasTileLayerRenderer extends CanvasLayerRenderer {
|
|
|
758
762
|
-height / 2,
|
|
759
763
|
);
|
|
760
764
|
|
|
761
|
-
if (
|
|
762
|
-
this.clipUnrotated(context, frameState, layerExtent);
|
|
765
|
+
if (this.layerExtent) {
|
|
766
|
+
this.clipUnrotated(context, frameState, this.layerExtent);
|
|
763
767
|
}
|
|
764
768
|
|
|
765
769
|
if (!tileSource.getInterpolate()) {
|
|
@@ -870,7 +874,7 @@ class CanvasTileLayerRenderer extends CanvasLayerRenderer {
|
|
|
870
874
|
|
|
871
875
|
this.postRender(this.context, frameState);
|
|
872
876
|
|
|
873
|
-
if (
|
|
877
|
+
if (this.layerExtent) {
|
|
874
878
|
context.restore();
|
|
875
879
|
}
|
|
876
880
|
context.imageSmoothingEnabled = true;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"VectorTileLayer.d.ts","sourceRoot":"","sources":["VectorTileLayer.js"],"names":[],"mappings":";AA6DA;;;;;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;IAY/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;IAoDD;;;;;OAKG;IACH,6BA8IC;IA0MD;;;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;
|
|
1
|
+
{"version":3,"file":"VectorTileLayer.d.ts","sourceRoot":"","sources":["VectorTileLayer.js"],"names":[],"mappings":";AA6DA;;;;;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;IAY/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;IAoDD;;;;;OAKG;IACH,6BA8IC;IA0MD;;;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;IAmED;;;;OAIG;IACH,6BAJW,OAAO,2BAA2B,EAAE,OAAO,cAC3C,OAAO,cAAc,EAAE,UAAU,GAChC,OAAO,oBAAoB,EAAE,SAAS,CAkCjD;IA4ID;;;;;;;;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;oCAl+BmC,gBAAgB"}
|
|
@@ -692,6 +692,9 @@ class CanvasVectorTileLayerRenderer extends CanvasTileLayerRenderer {
|
|
|
692
692
|
}
|
|
693
693
|
}
|
|
694
694
|
const zIndexKeys = Object.keys(usedZIndices).map(Number).sort(ascending);
|
|
695
|
+
if (this.layerExtent) {
|
|
696
|
+
this.clipUnrotated(this.context, frameState, this.layerExtent);
|
|
697
|
+
}
|
|
695
698
|
zIndexKeys.forEach((zIndex) => {
|
|
696
699
|
executorGroupZIndexContexts.forEach((zIndexContexts, i) => {
|
|
697
700
|
if (!zIndexContexts[zIndex]) {
|
|
@@ -716,6 +719,9 @@ class CanvasVectorTileLayerRenderer extends CanvasTileLayerRenderer {
|
|
|
716
719
|
zIndexContexts[zIndex].length = 0;
|
|
717
720
|
});
|
|
718
721
|
});
|
|
722
|
+
if (this.layerExtent) {
|
|
723
|
+
this.context.restore();
|
|
724
|
+
}
|
|
719
725
|
}
|
|
720
726
|
|
|
721
727
|
/**
|
|
@@ -787,6 +793,10 @@ class CanvasVectorTileLayerRenderer extends CanvasTileLayerRenderer {
|
|
|
787
793
|
: VECTOR_REPLAYS[renderMode];
|
|
788
794
|
const viewState = frameState.viewState;
|
|
789
795
|
const rotation = viewState.rotation;
|
|
796
|
+
// clipped rendering if layer extent is set
|
|
797
|
+
if (this.layerExtent) {
|
|
798
|
+
this.clipUnrotated(context, frameState, this.layerExtent);
|
|
799
|
+
}
|
|
790
800
|
const tileSource = layer.getSource();
|
|
791
801
|
const tileGrid = tileSource.getTileGridForProjection(viewState.projection);
|
|
792
802
|
const z = tileGrid.getZForResolution(
|
|
@@ -878,6 +888,9 @@ class CanvasVectorTileLayerRenderer extends CanvasTileLayerRenderer {
|
|
|
878
888
|
}
|
|
879
889
|
}
|
|
880
890
|
}
|
|
891
|
+
if (this.layerExtent) {
|
|
892
|
+
context.restore();
|
|
893
|
+
}
|
|
881
894
|
context.globalAlpha = alpha;
|
|
882
895
|
this.ready = ready;
|
|
883
896
|
this.tileClipContexts_ = tileClipContexts;
|
package/util.js
CHANGED