ol 10.3.2-dev.1733613524786 → 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.
- package/dist/ol.js +1 -1
- package/dist/ol.js.map +1 -1
- package/geom/Geometry.d.ts.map +1 -1
- package/geom/Geometry.js +4 -2
- package/geom/LineString.d.ts.map +1 -1
- package/geom/LineString.js +1 -0
- package/geom/flat/intersectsextent.d.ts +2 -1
- package/geom/flat/intersectsextent.d.ts.map +1 -1
- package/geom/flat/intersectsextent.js +9 -15
- package/package.json +1 -1
- package/util.js +1 -1
package/geom/Geometry.d.ts.map
CHANGED
|
@@ -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;
|
|
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
|
-
|
|
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
|
/**
|
package/geom/LineString.d.ts.map
CHANGED
|
@@ -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;
|
|
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"}
|
package/geom/LineString.js
CHANGED
|
@@ -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":"
|
|
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
|
-
|
|
30
|
-
|
|
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 (
|
|
40
|
-
|
|
41
|
-
|
|
42
|
-
|
|
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
package/util.js
CHANGED