ol 10.4.1-dev.1738658260831 → 10.4.1-dev.1738698469111

package/geom/flat/segments.d.ts

@@ -15,4 +15,12 @@
  * @template T
  */
 export function forEach<T>(flatCoordinates: Array<number>, offset: number, end: number, stride: number, callback: (arg0: import("../../coordinate.js").Coordinate, arg1: import("../../coordinate.js").Coordinate) => T): T | boolean;
+/**
+ * Calculate the intersection point of two line segments.
+ * Reference: https://stackoverflow.com/a/72474223/2389327
+ * @param {Array<import("../../coordinate.js").Coordinate>} segment1 The first line segment as an array of two points.
+ * @param {Array<import("../../coordinate.js").Coordinate>} segment2 The second line segment as an array of two points.
+ * @return {import("../../coordinate.js").Coordinate|undefined} The intersection point or `undefined` if no intersection.
+ */
+export function getIntersectionPoint(segment1: Array<import("../../coordinate.js").Coordinate>, segment2: Array<import("../../coordinate.js").Coordinate>): import("../../coordinate.js").Coordinate | undefined;
 //# sourceMappingURL=segments.d.ts.map

package/geom/flat/segments.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"segments.d.ts","sourceRoot":"","sources":["segments.js"],"names":[],"mappings":"AAAA;;GAEG;AAEH;;;;;;;;;;;;GAYG;AACH,wBAFa,CAAC,mBAPH,KAAK,CAAC,MAAM,CAAC,UACb,MAAM,OACN,MAAM,UACN,MAAM,YACN,CAAS,IAAwC,EAAxC,OAAO,qBAAqB,EAAE,UAAU,EAAE,IAAwC,EAAxC,OAAO,qBAAqB,EAAE,UAAU,KAAG,CAAC,GAE9F,CAAC,GAAC,OAAO,CAgBpB"}
+{"version":3,"file":"segments.d.ts","sourceRoot":"","sources":["segments.js"],"names":[],"mappings":"AAAA;;GAEG;AAEH;;;;;;;;;;;;GAYG;AACH,wBAFa,CAAC,mBAPH,KAAK,CAAC,MAAM,CAAC,UACb,MAAM,OACN,MAAM,UACN,MAAM,YACN,CAAS,IAAwC,EAAxC,OAAO,qBAAqB,EAAE,UAAU,EAAE,IAAwC,EAAxC,OAAO,qBAAqB,EAAE,UAAU,KAAG,CAAC,GAE9F,CAAC,GAAC,OAAO,CAgBpB;AAED;;;;;;GAMG;AACH,+CAJW,KAAK,CAAC,OAAO,qBAAqB,EAAE,UAAU,CAAC,YAC/C,KAAK,CAAC,OAAO,qBAAqB,EAAE,UAAU,CAAC,GAC9C,OAAO,qBAAqB,EAAE,UAAU,GAAC,SAAS,CAiB7D"}

package/geom/flat/segments.js

@@ -29,3 +29,27 @@ export function forEach(flatCoordinates, offset, end, stride, callback) {
   }
   return false;
 }
+
+/**
+ * Calculate the intersection point of two line segments.
+ * Reference: https://stackoverflow.com/a/72474223/2389327
+ * @param {Array<import("../../coordinate.js").Coordinate>} segment1 The first line segment as an array of two points.
+ * @param {Array<import("../../coordinate.js").Coordinate>} segment2 The second line segment as an array of two points.
+ * @return {import("../../coordinate.js").Coordinate|undefined} The intersection point or `undefined` if no intersection.
+ */
+export function getIntersectionPoint(segment1, segment2) {
+  const [a, b] = segment1;
+  const [c, d] = segment2;
+  const t =
+    ((a[0] - c[0]) * (c[1] - d[1]) - (a[1] - c[1]) * (c[0] - d[0])) /
+    ((a[0] - b[0]) * (c[1] - d[1]) - (a[1] - b[1]) * (c[0] - d[0]));
+  const u =
+    ((a[0] - c[0]) * (a[1] - b[1]) - (a[1] - c[1]) * (a[0] - b[0])) /
+    ((a[0] - b[0]) * (c[1] - d[1]) - (a[1] - b[1]) * (c[0] - d[0]));
+
+  // Check if lines actually intersect
+  if (0 <= t && t <= 1 && 0 <= u && u <= 1) {
+    return [a[0] + t * (b[0] - a[0]), a[1] + t * (b[1] - a[1])];
+  }
+  return undefined;
+}

package/interaction/Snap.d.ts

@@ -26,6 +26,10 @@ export type SegmentData = {
      * Segment.
      */
     segment: Array<import("../coordinate.js").Coordinate>;
+    /**
+     * Is intersection.
+     */
+    isIntersection?: boolean | undefined;
 };
 export type Options = {
     /**
@@ -40,6 +44,10 @@ export type Options = {
      * Snap to vertices.
      */
     vertex?: boolean | undefined;
+    /**
+     * Snap to intersections between segments.
+     */
+    intersection?: boolean | undefined;
     /**
      * Pixel tolerance for considering the pointer close enough to a segment or
      * vertex for snapping.
@@ -140,6 +148,11 @@ declare class Snap extends PointerInteraction {
      * @type {boolean}
      */
     private edge_;
+    /**
+     * @private
+     * @type {boolean}
+     */
+    private intersection_;
     /**
      * @type {import("../Collection.js").default<import("../Feature.js").default>|null}
      * @private

package/interaction/Snap.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"Snap.d.ts","sourceRoot":"","sources":["Snap.js"],"names":[],"mappings":"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"}
+{"version":3,"file":"Snap.d.ts","sourceRoot":"","sources":["Snap.js"],"names":[],"mappings":"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"}

package/interaction/Snap.js

@@ -10,9 +10,15 @@ import {
 import EventType from '../events/EventType.js';
 import {SnapEvent, SnapEventType} from '../events/SnapEvent.js';
 import {listen, unlistenByKey} from '../events.js';
-import {boundingExtent, buffer, createEmpty} from '../extent.js';
+import {
+  boundingExtent,
+  buffer,
+  createEmpty,
+  intersects as intersectsExtent,
+} from '../extent.js';
 import {FALSE, TRUE} from '../functions.js';
 import {fromCircle} from '../geom/Polygon.js';
+import {getIntersectionPoint} from '../geom/flat/segments.js';
 import {
   fromUserCoordinate,
   getUserProjection,
@@ -36,6 +42,7 @@ import PointerInteraction from './Pointer.js';
  * @typedef {Object} SegmentData
  * @property {import("../Feature.js").default} feature Feature.
  * @property {Array<import("../coordinate.js").Coordinate>} segment Segment.
+ * @property {boolean} [isIntersection] Is intersection.
  */
 
 /**
@@ -43,6 +50,7 @@ import PointerInteraction from './Pointer.js';
  * @property {import("../Collection.js").default<import("../Feature.js").default>} [features] Snap to these features. Either this option or source should be provided.
  * @property {boolean} [edge=true] Snap to edges.
  * @property {boolean} [vertex=true] Snap to vertices.
+ * @property {boolean} [intersection=false] Snap to intersections between segments.
  * @property {number} [pixelTolerance=10] Pixel tolerance for considering the pointer close enough to a segment or
  * vertex for snapping.
  * @property {import("../source/Vector.js").default} [source] Snap to features from this source. Either this option or features should be provided
@@ -81,6 +89,10 @@ function getFeatureFromEvent(evt) {
 }
 
 const tempSegment = [];
+/** @type {Array<import('../extent.js').Extent>} */
+const tempExtents = [];
+/** @type {Array<SegmentData>} */
+const tempSegmentData = [];
 
 /***
  * @template Return
@@ -170,6 +182,13 @@ class Snap extends PointerInteraction {
      */
     this.edge_ = options.edge !== undefined ? options.edge : true;
 
+    /**
+     * @private
+     * @type {boolean}
+     */
+    this.intersection_ =
+      options.intersection !== undefined ? options.intersection : false;
+
     /**
      * @type {import("../Collection.js").default<import("../Feature.js").default>|null}
      * @private
@@ -263,18 +282,72 @@ class Snap extends PointerInteraction {
         const segments =
           /** @type {Array<Array<import('../coordinate.js').Coordinate>>} */ ([]);
         segmenter(segments, geometry);
-        if (segments.length === 1) {
-          this.rBush_.insert(boundingExtent(segments[0]), {
-            feature: feature,
-            segment: segments[0],
-          });
-        } else if (segments.length > 1) {
-          const extents = segments.map((s) => boundingExtent(s));
-          const segmentsData = segments.map((segment) => ({
+        let segmentCount = segments.length;
+        for (let i = 0; i < segmentCount; ++i) {
+          const segment = segments[i];
+          tempExtents[i] = boundingExtent(segment);
+          tempSegmentData[i] = {
             feature: feature,
             segment: segment,
-          }));
-          this.rBush_.load(extents, segmentsData);
+          };
+        }
+        tempExtents.length = segmentCount;
+        tempSegmentData.length = segmentCount;
+
+        if (this.intersection_) {
+          for (let j = 0, jj = segments.length; j < jj; ++j) {
+            const segment = segments[j];
+            if (segment.length === 1) {
+              continue;
+            }
+            const extent = tempExtents[j];
+            // Calculate intersections with own segments
+            for (let k = 0, kk = segments.length; k < kk; ++k) {
+              if (j === k || j - 1 === k || j + 1 === k) {
+                // Exclude self and neighbours
+                continue;
+              }
+              const otherSegment = segments[k];
+              if (!intersectsExtent(extent, tempExtents[k])) {
+                continue;
+              }
+              const intersection = getIntersectionPoint(segment, otherSegment);
+              if (!intersection) {
+                continue;
+              }
+              const intersectionSegment = [intersection];
+              tempExtents[segmentCount] = boundingExtent(intersectionSegment);
+              tempSegmentData[segmentCount++] = {
+                feature,
+                segment: intersectionSegment,
+                isIntersection: true,
+              };
+            }
+            // Calculate intersections with existing segments
+            const otherSegments = this.rBush_.getInExtent(tempExtents[j]);
+            for (const {segment: otherSegment} of otherSegments) {
+              if (otherSegment.length === 1) {
+                continue;
+              }
+              const intersection = getIntersectionPoint(segment, otherSegment);
+              if (!intersection) {
+                continue;
+              }
+              const intersectionSegment = [intersection];
+              tempExtents[segmentCount] = boundingExtent(intersectionSegment);
+              tempSegmentData[segmentCount++] = {
+                feature,
+                segment: intersectionSegment,
+                isIntersection: true,
+              };
+            }
+          }
+        }
+
+        if (segmentCount === 1) {
+          this.rBush_.insert(tempExtents[0], tempSegmentData[0]);
+        } else {
+          this.rBush_.load(tempExtents, tempSegmentData);
         }
       }
     }
@@ -521,13 +594,18 @@ class Snap extends PointerInteraction {
     let minSquaredDistance = Infinity;
     let closestFeature;
     let closestSegment = null;
+    let isIntersection;
 
     const squaredPixelTolerance = this.pixelTolerance_ * this.pixelTolerance_;
     const getResult = () => {
       if (closestVertex) {
         const vertexPixel = map.getPixelFromCoordinate(closestVertex);
         const squaredPixelDistance = squaredDistance(pixel, vertexPixel);
-        if (squaredPixelDistance <= squaredPixelTolerance) {
+        if (
+          squaredPixelDistance <= squaredPixelTolerance &&
+          ((isIntersection && this.intersection_) ||
+            (!isIntersection && (this.vertex_ || this.edge_)))
+        ) {
           return {
             vertex: closestVertex,
             vertexPixel: [
@@ -542,7 +620,7 @@ class Snap extends PointerInteraction {
       return null;
     };
 
-    if (this.vertex_) {
+    if (this.vertex_ || this.intersection_) {
       for (let i = 0; i < segmentsLength; ++i) {
         const segmentData = segments[i];
         if (segmentData.feature.getGeometry().getType() !== 'Circle') {
@@ -553,6 +631,7 @@ class Snap extends PointerInteraction {
               closestVertex = vertex;
               minSquaredDistance = delta;
               closestFeature = segmentData.feature;
+              isIntersection = segmentData.isIntersection;
             }
           });
         }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "ol",
-  "version": "10.4.1-dev.1738658260831",
+  "version": "10.4.1-dev.1738698469111",
   "description": "OpenLayers mapping library",
   "keywords": [
     "map",

package/util.js

@@ -33,4 +33,4 @@ export function getUid(obj) {
  * OpenLayers version.
  * @type {string}
  */
-export const VERSION = '10.4.1-dev.1738658260831';
+export const VERSION = '10.4.1-dev.1738698469111';