ol 10.3.2-dev.1733499492405 → 10.3.2-dev.1733614996166

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.
@@ -1 +1 @@
1
- {"version":3,"file":"Geometry.d.ts","sourceRoot":"","sources":["Geometry.js"],"names":[],"mappings":";;;;;6BAoBa,IAAI,GAAG,KAAK,GAAG,KAAK,GAAG,MAAM;;;;;;mBAM7B,OAAO,GAAG,YAAY,GAAG,YAAY,GAAG,SAAS,GAAG,YAAY,GAAG,iBAAiB,GAAG,cAAc,GAAG,oBAAoB,GAAG,QAAQ;AAWpJ;;;;;;;;;;;GAWG;AACH;IACE,cA6CC;IA1CC;;;OAGG;IACH,gBAA4B;IAE5B;;;OAGG;IACH,wBAAyB;IAEzB;;;OAGG;IACH,oDAFU,MAAM,CAEiC;IAEjD;;;OAGG;IACH,sCAFU,MAAM,CAEmB;IAEnC;;;;;;;OAOG;IACH,0DASC;IAGH;;;;;;OAMG;IACH,sCAJW,MAAM,cACN,OAAO,YAAY,EAAE,iBAAiB,GACrC,QAAQ,CAQnB;IAED;;;;OAIG;IACH,SAFa,QAAQ,CAIpB;IAED;;;;;;;OAOG;IACH,kBANW,MAAM,KACN,MAAM,gBACN,OAAO,kBAAkB,EAAE,UAAU,sBACrC,MAAM,GACL,MAAM,CAIjB;IAED;;;;OAIG;IACH,cAJW,MAAM,KACN,MAAM,GACL,OAAO,CAKlB;IAED;;;;;;;OAOG;IACH,uBALW,OAAO,kBAAkB,EAAE,UAAU,iBACrC,OAAO,kBAAkB,EAAE,UAAU,GACpC,OAAO,kBAAkB,EAAE,UAAU,CAOhD;IAED;;;;;;OAMG;IACH,iCAJW,OAAO,kBAAkB,EAAE,UAAU,GACpC,OAAO,CAKlB;IAED;;;;;OAKG;IACH,gCAJW,OAAO,cAAc,EAAE,MAAM,GAE5B,OAAO,cAAc,EAAE,MAAM,CAIxC;IAED;;;;;OAKG;IACH,mBAJW,OAAO,cAAc,EAAE,MAAM,GAC5B,OAAO,cAAc,EAAE,MAAM,CAYxC;IAED;;;;;;;OAOG;IACH,cAJW,MAAM,UACN,OAAO,kBAAkB,EAAE,UAAU,QAK/C;IAED;;;;;;;;;OASG;IACH,UANW,MAAM,OACN,MAAM,WACN,OAAO,kBAAkB,EAAE,UAAU,QAM/C;IAED;;;;;;;;OAQG;IACH,oBAJW,MAAM,GACL,QAAQ,CAKnB;IAED;;;;;;;OAOG;IACH,wCAHW,MAAM,GACL,QAAQ,CAInB;IAED;;;;OAIG;IACH,WAFY,IAAI,CAIf;IAED;;;;;;;;OAQG;IACH,4BAHW,OAAO,YAAY,EAAE,iBAAiB,QAKhD;IAED;;;;;OAKG;IACH,yBAHW,OAAO,cAAc,EAAE,MAAM,GAC5B,OAAO,CAIlB;IAED;;;;;;;OAOG;IACH,kBAJW,MAAM,UACN,MAAM,QAKhB;IAED;;;;;;;;;;;;;;OAcG;IACH,kBARW,OAAO,YAAY,EAAE,cAAc,eAEnC,OAAO,YAAY,EAAE,cAAc,GAElC,IAAI,CAwCf;CACF;uBAnVsB,cAAc"}
1
+ {"version":3,"file":"Geometry.d.ts","sourceRoot":"","sources":["Geometry.js"],"names":[],"mappings":";;;;;6BAoBa,IAAI,GAAG,KAAK,GAAG,KAAK,GAAG,MAAM;;;;;;mBAM7B,OAAO,GAAG,YAAY,GAAG,YAAY,GAAG,SAAS,GAAG,YAAY,GAAG,iBAAiB,GAAG,cAAc,GAAG,oBAAoB,GAAG,QAAQ;AAcpJ;;;;;;;;;;;GAWG;AACH;IACE,cA6CC;IA1CC;;;OAGG;IACH,gBAA4B;IAE5B;;;OAGG;IACH,wBAAyB;IAEzB;;;OAGG;IACH,oDAFU,MAAM,CAEiC;IAEjD;;;OAGG;IACH,sCAFU,MAAM,CAEmB;IAEnC;;;;;;;OAOG;IACH,0DASC;IAGH;;;;;;OAMG;IACH,sCAJW,MAAM,cACN,OAAO,YAAY,EAAE,iBAAiB,GACrC,QAAQ,CAQnB;IAED;;;;OAIG;IACH,SAFa,QAAQ,CAIpB;IAED;;;;;;;OAOG;IACH,kBANW,MAAM,KACN,MAAM,gBACN,OAAO,kBAAkB,EAAE,UAAU,sBACrC,MAAM,GACL,MAAM,CAIjB;IAED;;;;OAIG;IACH,cAJW,MAAM,KACN,MAAM,GACL,OAAO,CAIlB;IAED;;;;;;;OAOG;IACH,uBALW,OAAO,kBAAkB,EAAE,UAAU,iBACrC,OAAO,kBAAkB,EAAE,UAAU,GACpC,OAAO,kBAAkB,EAAE,UAAU,CAOhD;IAED;;;;;;OAMG;IACH,iCAJW,OAAO,kBAAkB,EAAE,UAAU,GACpC,OAAO,CAKlB;IAED;;;;;OAKG;IACH,gCAJW,OAAO,cAAc,EAAE,MAAM,GAE5B,OAAO,cAAc,EAAE,MAAM,CAIxC;IAED;;;;;OAKG;IACH,mBAJW,OAAO,cAAc,EAAE,MAAM,GAC5B,OAAO,cAAc,EAAE,MAAM,CAYxC;IAED;;;;;;;OAOG;IACH,cAJW,MAAM,UACN,OAAO,kBAAkB,EAAE,UAAU,QAK/C;IAED;;;;;;;;;OASG;IACH,UANW,MAAM,OACN,MAAM,WACN,OAAO,kBAAkB,EAAE,UAAU,QAM/C;IAED;;;;;;;;OAQG;IACH,oBAJW,MAAM,GACL,QAAQ,CAKnB;IAED;;;;;;;OAOG;IACH,wCAHW,MAAM,GACL,QAAQ,CAInB;IAED;;;;OAIG;IACH,WAFY,IAAI,CAIf;IAED;;;;;;;;OAQG;IACH,4BAHW,OAAO,YAAY,EAAE,iBAAiB,QAKhD;IAED;;;;;OAKG;IACH,yBAHW,OAAO,cAAc,EAAE,MAAM,GAC5B,OAAO,CAIlB;IAED;;;;;;;OAOG;IACH,kBAJW,MAAM,UACN,MAAM,QAKhB;IAED;;;;;;;;;;;;;;OAcG;IACH,kBARW,OAAO,YAAY,EAAE,cAAc,eAEnC,OAAO,YAAY,EAAE,cAAc,GAElC,IAAI,CAwCf;CACF;uBArVsB,cAAc"}
package/geom/Geometry.js CHANGED
@@ -35,6 +35,9 @@ import {transform2D} from './flat/transform.js';
35
35
  */
36
36
  const tmpTransform = createTransform();
37
37
 
38
+ /** @type {import('../coordinate.js').Coordinate} */
39
+ const tmpPoint = [NaN, NaN];
40
+
38
41
  /**
39
42
  * @classdesc
40
43
  * Abstract base class; normally only used for creating subclasses and not
@@ -137,8 +140,7 @@ class Geometry extends BaseObject {
137
140
  * @return {boolean} Contains (x, y).
138
141
  */
139
142
  containsXY(x, y) {
140
- const coord = this.getClosestPoint([x, y]);
141
- return coord[0] === x && coord[1] === y;
143
+ return this.closestPointXY(x, y, tmpPoint, Number.MIN_VALUE) === 0;
142
144
  }
143
145
 
144
146
  /**
@@ -1 +1 @@
1
- {"version":3,"file":"LineString.d.ts","sourceRoot":"","sources":["LineString.js"],"names":[],"mappings":";AAeA;;;;;GAKG;AACH;IACE;;;;OAIG;IACH,yBAJW,KAAK,CAAC,OAAO,kBAAkB,EAAE,UAAU,CAAC,GAAC,KAAK,CAAC,MAAM,CAAC,WAE1D,OAAO,eAAe,EAAE,cAAc,EA0ChD;IArCC;;;OAGG;IACH,sBAAyB;IAEzB;;;OAGG;IACH,8BAA+B;IAE/B;;;OAGG;IACH,kBAAmB;IAEnB;;;OAGG;IACH,0BAA2B;IAiB7B;;;;OAIG;IACH,6BAHW,OAAO,kBAAkB,EAAE,UAAU,QAM/C;IAED;;;;;OAKG;IACH,kBAJa,UAAU,CAWtB;IAwCD;;;;;;;;;;OAUG;IACH,eAHa,CAAC,EAAC,CAAC,YAHL,CAAS,IAAO,EAAD,CAAC,EAAE,IAAqC,EAArC,OAAO,kBAAkB,EAAE,UAAU,EAAE,IAAqC,EAArC,OAAO,kBAAkB,EAAE,UAAU,KAAG,CAAC,GAEjG,CAAC,GAAC,OAAO,CAYpB;IAED;;;;;;;;;;;;;OAaG;IACH,oBALW,MAAM,gBACN,OAAO,GACN,OAAO,kBAAkB,EAAE,UAAU,GAAC,IAAI,CAgBrD;IAED;;;;;OAKG;IACH,2BAJY,KAAK,CAAC,OAAO,kBAAkB,EAAE,UAAU,CAAC,CAWvD;IAED;;;;;;;;;OASG;IACH,0BANW,MAAM,SACN,OAAO,kBAAkB,EAAE,UAAU,GAEpC,OAAO,kBAAkB,EAAE,UAAU,CAahD;IAED;;;;OAIG;IACH,aAHY,MAAM,CAUjB;IAED;;OAEG;IACH,mBAFY,KAAK,CAAC,MAAM,CAAC,CAWxB;IAED;;;;;OAKG;IACH,mEALW,MAAM,GACL,UAAU,CAiBrB;IA6BD;;;;;;OAMG;IACH,qCALY,KAAK,CAAC,OAAO,kBAAkB,EAAE,UAAU,CAAC,WAC7C,OAAO,eAAe,EAAE,cAAc,QAgBhD;CACF;2BAxT0B,qBAAqB"}
1
+ {"version":3,"file":"LineString.d.ts","sourceRoot":"","sources":["LineString.js"],"names":[],"mappings":";AAeA;;;;;GAKG;AACH;IACE;;;;OAIG;IACH,yBAJW,KAAK,CAAC,OAAO,kBAAkB,EAAE,UAAU,CAAC,GAAC,KAAK,CAAC,MAAM,CAAC,WAE1D,OAAO,eAAe,EAAE,cAAc,EA0ChD;IArCC;;;OAGG;IACH,sBAAyB;IAEzB;;;OAGG;IACH,8BAA+B;IAE/B;;;OAGG;IACH,kBAAmB;IAEnB;;;OAGG;IACH,0BAA2B;IAiB7B;;;;OAIG;IACH,6BAHW,OAAO,kBAAkB,EAAE,UAAU,QAM/C;IAED;;;;;OAKG;IACH,kBAJa,UAAU,CAWtB;IAwCD;;;;;;;;;;OAUG;IACH,eAHa,CAAC,EAAC,CAAC,YAHL,CAAS,IAAO,EAAD,CAAC,EAAE,IAAqC,EAArC,OAAO,kBAAkB,EAAE,UAAU,EAAE,IAAqC,EAArC,OAAO,kBAAkB,EAAE,UAAU,KAAG,CAAC,GAEjG,CAAC,GAAC,OAAO,CAYpB;IAED;;;;;;;;;;;;;OAaG;IACH,oBALW,MAAM,gBACN,OAAO,GACN,OAAO,kBAAkB,EAAE,UAAU,GAAC,IAAI,CAgBrD;IAED;;;;;OAKG;IACH,2BAJY,KAAK,CAAC,OAAO,kBAAkB,EAAE,UAAU,CAAC,CAWvD;IAED;;;;;;;;;OASG;IACH,0BANW,MAAM,SACN,OAAO,kBAAkB,EAAE,UAAU,GAEpC,OAAO,kBAAkB,EAAE,UAAU,CAahD;IAED;;;;OAIG;IACH,aAHY,MAAM,CAUjB;IAED;;OAEG;IACH,mBAFY,KAAK,CAAC,MAAM,CAAC,CAWxB;IAED;;;;;OAKG;IACH,mEALW,MAAM,GACL,UAAU,CAiBrB;IA8BD;;;;;;OAMG;IACH,qCALY,KAAK,CAAC,OAAO,kBAAkB,EAAE,UAAU,CAAC,WAC7C,OAAO,eAAe,EAAE,cAAc,QAgBhD;CACF;2BAzT0B,qBAAqB"}
@@ -290,6 +290,7 @@ class LineString extends SimpleGeometry {
290
290
  this.flatCoordinates.length,
291
291
  this.stride,
292
292
  extent,
293
+ this.getExtent(),
293
294
  );
294
295
  }
295
296
 
@@ -4,9 +4,10 @@
4
4
  * @param {number} end End.
5
5
  * @param {number} stride Stride.
6
6
  * @param {import("../../extent.js").Extent} extent Extent.
7
+ * @param {import('../../extent.js').Extent} [coordinatesExtent] Coordinates extent
7
8
  * @return {boolean} True if the geometry and the extent intersect.
8
9
  */
9
- export function intersectsLineString(flatCoordinates: Array<number>, offset: number, end: number, stride: number, extent: import("../../extent.js").Extent): boolean;
10
+ export function intersectsLineString(flatCoordinates: Array<number>, offset: number, end: number, stride: number, extent: import("../../extent.js").Extent, coordinatesExtent?: import("../../extent.js").Extent): boolean;
10
11
  /**
11
12
  * @param {Array<number>} flatCoordinates Flat coordinates.
12
13
  * @param {number} offset Offset.
@@ -1 +1 @@
1
- {"version":3,"file":"intersectsextent.d.ts","sourceRoot":"","sources":["intersectsextent.js"],"names":[],"mappings":"AAaA;;;;;;;GAOG;AACH,sDAPW,KAAK,CAAC,MAAM,CAAC,UACb,MAAM,OACN,MAAM,UACN,MAAM,UACN,OAAO,iBAAiB,EAAE,MAAM,GAC/B,OAAO,CA2ClB;AAED;;;;;;;GAOG;AACH,2DAPW,KAAK,CAAC,MAAM,CAAC,UACb,MAAM,QACN,KAAK,CAAC,MAAM,CAAC,UACb,MAAM,UACN,OAAO,iBAAiB,EAAE,MAAM,GAC/B,OAAO,CAkBlB;AAED;;;;;;;GAOG;AACH,sDAPW,KAAK,CAAC,MAAM,CAAC,UACb,MAAM,OACN,MAAM,UACN,MAAM,UACN,OAAO,iBAAiB,EAAE,MAAM,GAC/B,OAAO,CA6DlB;AAED;;;;;;;GAOG;AACH,2DAPW,KAAK,CAAC,MAAM,CAAC,UACb,MAAM,QACN,KAAK,CAAC,MAAM,CAAC,UACb,MAAM,UACN,OAAO,iBAAiB,EAAE,MAAM,GAC/B,OAAO,CAuClB;AAED;;;;;;;GAOG;AACH,gEAPW,KAAK,CAAC,MAAM,CAAC,UACb,MAAM,SACN,KAAK,CAAC,KAAK,CAAC,MAAM,CAAC,CAAC,UACpB,MAAM,UACN,OAAO,iBAAiB,EAAE,MAAM,GAC/B,OAAO,CAmBlB"}
1
+ {"version":3,"file":"intersectsextent.d.ts","sourceRoot":"","sources":["intersectsextent.js"],"names":[],"mappings":"AAYA;;;;;;;;GAQG;AACH,sDARW,KAAK,CAAC,MAAM,CAAC,UACb,MAAM,OACN,MAAM,UACN,MAAM,UACN,OAAO,iBAAiB,EAAE,MAAM,sBAChC,OAAO,iBAAiB,EAAE,MAAM,GAC/B,OAAO,CAqClB;AAED;;;;;;;GAOG;AACH,2DAPW,KAAK,CAAC,MAAM,CAAC,UACb,MAAM,QACN,KAAK,CAAC,MAAM,CAAC,UACb,MAAM,UACN,OAAO,iBAAiB,EAAE,MAAM,GAC/B,OAAO,CAkBlB;AAED;;;;;;;GAOG;AACH,sDAPW,KAAK,CAAC,MAAM,CAAC,UACb,MAAM,OACN,MAAM,UACN,MAAM,UACN,OAAO,iBAAiB,EAAE,MAAM,GAC/B,OAAO,CA6DlB;AAED;;;;;;;GAOG;AACH,2DAPW,KAAK,CAAC,MAAM,CAAC,UACb,MAAM,QACN,KAAK,CAAC,MAAM,CAAC,UACb,MAAM,UACN,OAAO,iBAAiB,EAAE,MAAM,GAC/B,OAAO,CAuClB;AAED;;;;;;;GAOG;AACH,gEAPW,KAAK,CAAC,MAAM,CAAC,UACb,MAAM,SACN,KAAK,CAAC,KAAK,CAAC,MAAM,CAAC,CAAC,UACpB,MAAM,UACN,OAAO,iBAAiB,EAAE,MAAM,GAC/B,OAAO,CAmBlB"}
@@ -2,7 +2,6 @@
2
2
  * @module ol/geom/flat/intersectsextent
3
3
  */
4
4
  import {
5
- containsExtent,
6
5
  createEmpty,
7
6
  extendFlatCoordinates,
8
7
  intersects,
@@ -17,6 +16,7 @@ import {linearRingContainsExtent, linearRingContainsXY} from './contains.js';
17
16
  * @param {number} end End.
18
17
  * @param {number} stride Stride.
19
18
  * @param {import("../../extent.js").Extent} extent Extent.
19
+ * @param {import('../../extent.js').Extent} [coordinatesExtent] Coordinates extent
20
20
  * @return {boolean} True if the geometry and the extent intersect.
21
21
  */
22
22
  export function intersectsLineString(
@@ -25,24 +25,18 @@ export function intersectsLineString(
25
25
  end,
26
26
  stride,
27
27
  extent,
28
+ coordinatesExtent,
28
29
  ) {
29
- const coordinatesExtent = extendFlatCoordinates(
30
- createEmpty(),
31
- flatCoordinates,
32
- offset,
33
- end,
34
- stride,
35
- );
30
+ coordinatesExtent =
31
+ coordinatesExtent ??
32
+ extendFlatCoordinates(createEmpty(), flatCoordinates, offset, end, stride);
36
33
  if (!intersects(extent, coordinatesExtent)) {
37
34
  return false;
38
35
  }
39
- if (containsExtent(extent, coordinatesExtent)) {
40
- return true;
41
- }
42
- if (coordinatesExtent[0] >= extent[0] && coordinatesExtent[2] <= extent[2]) {
43
- return true;
44
- }
45
- if (coordinatesExtent[1] >= extent[1] && coordinatesExtent[3] <= extent[3]) {
36
+ if (
37
+ (coordinatesExtent[0] >= extent[0] && coordinatesExtent[2] <= extent[2]) ||
38
+ (coordinatesExtent[1] >= extent[1] && coordinatesExtent[3] <= extent[3])
39
+ ) {
46
40
  return true;
47
41
  }
48
42
  return forEachSegment(
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "ol",
3
- "version": "10.3.2-dev.1733499492405",
3
+ "version": "10.3.2-dev.1733614996166",
4
4
  "description": "OpenLayers mapping library",
5
5
  "keywords": [
6
6
  "map",
@@ -1 +1 @@
1
- {"version":3,"file":"TileLayer.d.ts","sourceRoot":"","sources":["TileLayer.js"],"names":[],"mappings":";;;;;;;;;;AA0GA;;;GAGG;AAEH;;;;;;GAMG;AACH,sCAHkG,SAAS,SAA7F,OAAO,qBAAqB,EAAE,OAAO,GAAC,OAAO,2BAA2B,EAAE,OAAQ;IAI9F;;;OAGG;IACH,uBAHW,SAAS,YACT,OAAO,EAwFjB;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"}
1
+ {"version":3,"file":"TileLayer.d.ts","sourceRoot":"","sources":["TileLayer.js"],"names":[],"mappings":";;;;;;;;;;AA2GA;;;GAGG;AAEH;;;;;;GAMG;AACH,sCAHkG,SAAS,SAA7F,OAAO,qBAAqB,EAAE,OAAO,GAAC,OAAO,2BAA2B,EAAE,OAAQ;IAI9F;;;OAGG;IACH,uBAHW,SAAS,YACT,OAAO,EAwFjB;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,QAmFhB;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;gCA19B+B,YAAY;qBAGvB,2BAA2B"}
@@ -19,6 +19,7 @@ import {
19
19
  createEmpty,
20
20
  equals,
21
21
  getIntersection,
22
+ getRotatedViewport,
22
23
  getTopLeft,
23
24
  intersects,
24
25
  } from '../../extent.js';
@@ -416,6 +417,15 @@ class CanvasTileLayerRenderer extends CanvasLayerRenderer {
416
417
  tileSource.zDirection,
417
418
  ),
418
419
  );
420
+ const rotation = viewState.rotation;
421
+ const viewport = rotation
422
+ ? getRotatedViewport(
423
+ viewState.center,
424
+ viewState.resolution,
425
+ rotation,
426
+ frameState.size,
427
+ )
428
+ : undefined;
419
429
  for (let z = initialZ; z >= minZ; --z) {
420
430
  const tileRange = tileGrid.getTileRangeForExtentAndZ(
421
431
  extent,
@@ -427,6 +437,12 @@ class CanvasTileLayerRenderer extends CanvasLayerRenderer {
427
437
 
428
438
  for (let x = tileRange.minX; x <= tileRange.maxX; ++x) {
429
439
  for (let y = tileRange.minY; y <= tileRange.maxY; ++y) {
440
+ if (
441
+ rotation &&
442
+ !tileGrid.tileCoordIntersectsViewport([z, x, y], viewport)
443
+ ) {
444
+ continue;
445
+ }
430
446
  const tile = this.getTile(z, x, y, frameState);
431
447
  if (!tile) {
432
448
  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,CA4MtB;IAED;;;OAGG;IACH,qCAHW,OAAO,cAAc,EAAE,UAAU,QAK3C;IAED;;;;;;;;;;OAUG;IACH,sBAsCC;CAkCF;+BAzyB8B,YAAY"}
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,QAoIhB;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;+BAxzB8B,YAAY"}
@@ -22,7 +22,7 @@ import {
22
22
  } from '../../transform.js';
23
23
  import {descending} from '../../array.js';
24
24
  import {fromUserExtent} from '../../proj.js';
25
- import {getIntersection, isEmpty} from '../../extent.js';
25
+ import {getIntersection, getRotatedViewport, isEmpty} from '../../extent.js';
26
26
  import {toSize} from '../../size.js';
27
27
 
28
28
  export const Uniforms = {
@@ -307,6 +307,15 @@ class WebGLBaseTileLayerRenderer extends WebGLLayerRenderer {
307
307
  tileSource.zDirection,
308
308
  ),
309
309
  );
310
+ const rotation = viewState.rotation;
311
+ const viewport = rotation
312
+ ? getRotatedViewport(
313
+ viewState.center,
314
+ viewState.resolution,
315
+ rotation,
316
+ frameState.size,
317
+ )
318
+ : undefined;
310
319
  for (let z = initialZ; z >= minZ; --z) {
311
320
  const tileRange = tileGrid.getTileRangeForExtentAndZ(
312
321
  extent,
@@ -318,6 +327,12 @@ class WebGLBaseTileLayerRenderer extends WebGLLayerRenderer {
318
327
 
319
328
  for (let x = tileRange.minX; x <= tileRange.maxX; ++x) {
320
329
  for (let y = tileRange.minY; y <= tileRange.maxY; ++y) {
330
+ if (
331
+ rotation &&
332
+ !tileGrid.tileCoordIntersectsViewport([z, x, y], viewport)
333
+ ) {
334
+ continue;
335
+ }
321
336
  const tileCoord = createTileCoord(z, x, y, this.tempTileCoord_);
322
337
  const cacheKey = getCacheKey(tileSource, tileCoord);
323
338
 
package/util.js CHANGED
@@ -33,4 +33,4 @@ export function getUid(obj) {
33
33
  * OpenLayers version.
34
34
  * @type {string}
35
35
  */
36
- export const VERSION = '10.3.2-dev.1733499492405';
36
+ export const VERSION = '10.3.2-dev.1733614996166';