ol 10.6.2-dev.1758267478938 → 10.6.2-dev.1758488544346

package/events/SnapEvent.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"SnapEvent.d.ts","sourceRoot":"","sources":["SnapEvent.js"],"names":[],"mappings":"4BAMU,MAAM;;;;;AAYhB;;;GAGG;AACH;IACE;;;;;;;OAOG;IACH,kBAPW,aAAa,WAErB;QAAuD,MAAM,EAArD,OAAO,kBAAkB,EAAE,UAAU;QACU,WAAW,EAA1D,OAAO,kBAAkB,EAAE,UAAU;QACI,OAAO,EAAhD,OAAO,eAAe,EAAE,OAAO;QAC4B,OAAO,EAAlE,KAAK,CAAC,OAAO,kBAAkB,EAAE,UAAU,CAAC,GAAC,IAAI;KAC3D,EA2BA;IAxBC;;;;OAIG;IACH,QAHU,OAAO,kBAAkB,EAAE,UAAU,CAGnB;IAC5B;;;;OAIG;IACH,aAHU,KAAK,CAAC,MAAM,CAAC,GAAC,KAAK,CAAC,MAAM,CAAC,CAGC;IACtC;;;;OAIG;IACH,SAHU,OAAO,eAAe,EAAE,OAAO,CAAC,OAAO,qBAAqB,EAAE,OAAO,CAAC,CAGlD;IAC9B;;;;OAIG;IACH,SAHU,KAAK,CAAC,OAAO,kBAAkB,EAAE,UAAU,CAAC,GAAC,IAAI,CAG7B;CAEjC;kBAvDiB,YAAY"}
+{"version":3,"file":"SnapEvent.d.ts","sourceRoot":"","sources":["SnapEvent.js"],"names":[],"mappings":"4BAMU,MAAM;;;;;AAiBhB;;;GAGG;AACH;IACE;;;;;;;OAOG;IACH,kBAPW,aAAa,WAErB;QAAuD,MAAM,EAArD,OAAO,kBAAkB,EAAE,UAAU;QACU,WAAW,EAA1D,OAAO,kBAAkB,EAAE,UAAU;QACI,OAAO,EAAhD,OAAO,eAAe,EAAE,OAAO;QAC4B,OAAO,EAAlE,KAAK,CAAC,OAAO,kBAAkB,EAAE,UAAU,CAAC,GAAC,IAAI;KAC3D,EA2BA;IAxBC;;;;OAIG;IACH,QAHU,OAAO,kBAAkB,EAAE,UAAU,CAGnB;IAC5B;;;;OAIG;IACH,aAHU,KAAK,CAAC,MAAM,CAAC,GAAC,KAAK,CAAC,MAAM,CAAC,CAGC;IACtC;;;;OAIG;IACH,SAHU,OAAO,eAAe,EAAE,OAAO,CAAC,OAAO,qBAAqB,EAAE,OAAO,CAAC,CAGlD;IAC9B;;;;OAIG;IACH,SAHU,KAAK,CAAC,OAAO,kBAAkB,EAAE,UAAU,CAAC,GAAC,IAAI,CAG7B;CAEjC;kBA5DiB,YAAY"}

package/events/SnapEvent.js

@@ -13,6 +13,11 @@ export const SnapEventType = {
    * @api
    */
   SNAP: 'snap',
+  /**
+   * Triggered if no longer snapped
+   * @event SnapEvent#unsnap
+   * @api
+   */
   UNSNAP: 'unsnap',
 };
 

package/interaction/Snap.d.ts

@@ -10,13 +10,13 @@ export type SegmentData = {
      */
     feature: import("../Feature.js").default;
     /**
-     * Segment.
+     * Feature which intersects.
      */
-    segment: Segment;
+    intersectionFeature?: import("../Feature.js").default<import("../geom/Geometry.js").default> | undefined;
     /**
-     * Is intersection.
+     * Segment.
      */
-    isIntersection?: boolean | undefined;
+    segment: Segment;
 };
 /**
  * A function taking a {@link module :ol/geom/Geometry~Geometry} as argument and returning an array of {@link Segment}s.

package/interaction/Snap.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"Snap.d.ts","sourceRoot":"","sources":["Snap.js"],"names":[],"mappings":";;;;;sBAiCa,KAAK,CAAC,OAAO,kBAAkB,EAAE,UAAU,CAAC;;;;;aAO3C,OAAO,eAAe,EAAE,OAAO;;;;aAC/B,OAAO;;;;;;;;;sBAKiC,YAAY,SAArD,OAAQ,qBAAqB,EAAE,OAAQ,4CACvC,CAAC,QAAQ,EAAE,YAAY,EAAE,UAAU,CAAC,EAAE,OAAO,uBAAuB,EAAE,OAAO,KAAK,KAAK,CAAC,OAAO,CAAC;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;YA2C/F,OAAO,kBAAkB,EAAE,UAAU,GAAC,IAAI;;;;iBAC1C,OAAO,aAAa,EAAE,KAAK,GAAC,IAAI;;;;aAChC,OAAO,eAAe,EAAE,OAAO,GAAC,IAAI;;;;aACpC,OAAO,GAAC,IAAI;;;;;4BAgMb,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,oBAAoB,EAAE,KAAK,GAC1E,eAAqB,EAAE,OAAO,WAAW,EAAE,WAAW,EAAE,MAAM,CAAC,GAC/D,OAAW,eAAe,EAAE,WAAW,CAAC,MAAM,GAAC,QAAQ,EAAE,SAAS,EAAE,MAAM,CAAC,GAC3E,OAAW,eAAe,EAAE,mBAAmB,CAAC,OAAO,eAAe,EAAE,UAAU,GAAC,OAAO,oBAAoB,EAAE,KAAK,GACrH,eAAqB,GAAC,MAAM,GAAC,QAAQ,EAAE,MAAM,CAAC;AAP/C;;;;;;;;GAQG;AAEH;;;;;;;;;;;;;;;;;;;;;;;GAuBG;AACH;IACE;;OAEG;IACH,sBAFW,OAAO,EA4HjB;IAzGC;;OAEG;IACH,IAFU,eAAe,CAAC,OAAO,WAAW,EAAE,SAAS,CAAC,CAEjD;IAEP;;OAEG;IACH,MAFU,eAAe,CAAC,OAAO,WAAW,EAAE,SAAS,CAAC,CAE/C;IAET;;OAEG;IACH,IAFU,eAAe,CAAC,IAAI,CAAC,CAExB;IAEP;;;OAGG;IACH,gBAAqD;IAErD;;;OAGG;IACH,gBAAmE;IAEnE;;;OAGG;IACH,cAA6D;IAE7D;;;OAGG;IACH,sBACmE;IAEnE;;;OAGG;IACH,kBAA2D;IAE3D;;;OAGG;IACH,8BAA+B;IAE/B;;;OAGG;IACH,mCAAoC;IAEpC;;;;;OAKG;IACH,gCAAiC;IAEjC;;;;;;OAMG;IACH,yBAA0B;IAE1B;;;OAGG;IACH,wBACoE;IAEpE;;;;OAIG;IACH,eAAyB;IAEzB;;;;OAIG;IACH,iBAAoB;IAEpB;;;OAGG;IACH,oBAIC;IAGH;;;;;;OAMG;IACH,oBALW,OAAO,eAAe,EAAE,OAAO,aAC/B,OAAO,QAkGjB;IAED;;;OAGG;IACH,qBASC;IAED;;;;;;;;OAQG;IACH,0BAEC;IAoCD;;;OAGG;IACH,0BAKC;IAED;;;OAGG;IACH,6BAKC;IAED;;;OAGG;IACH,6BAUC;IAkBD;;;;;;OAMG;IACH,uBALW,OAAO,eAAe,EAAE,OAAO,aAC/B,OAAO,QAyBjB;IAED;;;;;;OAMG;IACH,qBAHW,OAAO,WAAW,EAAE,OAAO,QAwDrC;IAED;;;;;OAKG;IACH,cALW,OAAO,aAAa,EAAE,KAAK,mBAC3B,OAAO,kBAAkB,EAAE,UAAU,OACrC,OAAO,WAAW,EAAE,OAAO,GAC1B,WAAW,GAAC,IAAI,CAsH3B;IAED;;;OAGG;IACH,uBAGC;CACF;0BA/2BsC,wBAAwB;+BAoBhC,cAAc"}
+{"version":3,"file":"Snap.d.ts","sourceRoot":"","sources":["Snap.js"],"names":[],"mappings":";;;;;sBAkCa,KAAK,CAAC,OAAO,kBAAkB,EAAE,UAAU,CAAC;;;;;aAO3C,OAAO,eAAe,EAAE,OAAO;;;;;;;;aAE/B,OAAO;;;;;sBAIiC,YAAY,SAArD,OAAQ,qBAAqB,EAAE,OAAQ,4CACvC,CAAC,QAAQ,EAAE,YAAY,EAAE,UAAU,CAAC,EAAE,OAAO,uBAAuB,EAAE,OAAO,KAAK,KAAK,CAAC,OAAO,CAAC;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;YA2C/F,OAAO,kBAAkB,EAAE,UAAU,GAAC,IAAI;;;;iBAC1C,OAAO,aAAa,EAAE,KAAK,GAAC,IAAI;;;;aAChC,OAAO,eAAe,EAAE,OAAO,GAAC,IAAI;;;;aACpC,OAAO,GAAC,IAAI;;;;;4BAgMb,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,oBAAoB,EAAE,KAAK,GAC1E,eAAqB,EAAE,OAAO,WAAW,EAAE,WAAW,EAAE,MAAM,CAAC,GAC/D,OAAW,eAAe,EAAE,WAAW,CAAC,MAAM,GAAC,QAAQ,EAAE,SAAS,EAAE,MAAM,CAAC,GAC3E,OAAW,eAAe,EAAE,mBAAmB,CAAC,OAAO,eAAe,EAAE,UAAU,GAAC,OAAO,oBAAoB,EAAE,KAAK,GACrH,eAAqB,GAAC,MAAM,GAAC,QAAQ,EAAE,MAAM,CAAC;AAP/C;;;;;;;;GAQG;AAEH;;;;;;;;;;;;;;;;;;;;;;;GAuBG;AACH;IACE;;OAEG;IACH,sBAFW,OAAO,EAmHjB;IAzGC;;OAEG;IACH,IAFU,eAAe,CAAC,OAAO,WAAW,EAAE,SAAS,CAAC,CAEjD;IAEP;;OAEG;IACH,MAFU,eAAe,CAAC,OAAO,WAAW,EAAE,SAAS,CAAC,CAE/C;IAET;;OAEG;IACH,IAFU,eAAe,CAAC,IAAI,CAAC,CAExB;IAEP;;;OAGG;IACH,gBAAqD;IAErD;;;OAGG;IACH,gBAAmE;IAEnE;;;OAGG;IACH,cAA6D;IAE7D;;;OAGG;IACH,sBACmE;IAEnE;;;OAGG;IACH,kBAA2D;IAE3D;;;OAGG;IACH,8BAA+B;IAE/B;;;OAGG;IACH,mCAAoC;IAEpC;;;;;OAKG;IACH,gCAAiC;IAEjC;;;;;;OAMG;IACH,yBAA0B;IAE1B;;;OAGG;IACH,wBACoE;IAEpE;;;;OAIG;IACH,eAAyB;IAEzB;;;;OAIG;IACH,iBAAoB;IAEpB;;;OAGG;IACH,oBAIC;IAGH;;;;;;OAMG;IACH,oBALW,OAAO,eAAe,EAAE,OAAO,aAC/B,OAAO,QAiGjB;IAED;;;OAGG;IACH,qBASC;IAED;;;;;;;;OAQG;IACH,0BAEC;IAoCD;;;OAGG;IACH,0BAKC;IAED;;;OAGG;IACH,6BAMC;IAED;;;OAGG;IACH,6BAOC;IAmBD;;;;;;OAMG;IACH,uBALW,OAAO,eAAe,EAAE,OAAO,aAC/B,OAAO,QAqBjB;IAED;;;;;;OAMG;IACH,qBAHW,OAAO,WAAW,EAAE,OAAO,QAwDrC;IAED;;;;;OAKG;IACH,cALW,OAAO,aAAa,EAAE,KAAK,mBAC3B,OAAO,kBAAkB,EAAE,UAAU,OACrC,OAAO,WAAW,EAAE,OAAO,GAC1B,WAAW,GAAC,IAAI,CAkH3B;IAED;;;OAGG;IACH,uBAGC;CACF;0BA71BsC,wBAAwB;+BAqBhC,cAAc"}

package/interaction/Snap.js

@@ -19,6 +19,7 @@ import {
 import {FALSE, TRUE} from '../functions.js';
 import {fromCircle} from '../geom/Polygon.js';
 import {getIntersectionPoint} from '../geom/flat/segments.js';
+import {clear} from '../obj.js';
 import {
   fromUserCoordinate,
   getUserProjection,
@@ -39,8 +40,8 @@ import PointerInteraction from './Pointer.js';
 /**
  * @typedef {Object} SegmentData
  * @property {import("../Feature.js").default} feature Feature.
+ * @property {import("../Feature.js").default} [intersectionFeature] Feature which intersects.
  * @property {Segment} segment Segment.
- * @property {boolean} [isIntersection] Is intersection.
  */
 
 /**
@@ -128,7 +129,7 @@ const GEOMETRY_SEGMENTERS = {
     const segments = [];
     const geometries = geometry.getGeometriesArray();
     for (let i = 0; i < geometries.length; ++i) {
-      const segmenter = GEOMETRY_SEGMENTERS[geometries[i].getType()];
+      const segmenter = this[geometries[i].getType()];
       if (segmenter) {
         segments.push(segmenter(geometries[i], projection));
       }
@@ -323,19 +324,10 @@ class Snap extends PointerInteraction {
   constructor(options) {
     options = options ? options : {};
 
-    const pointerOptions = /** @type {import("./Pointer.js").Options} */ (
-      options
-    );
-
-    if (!pointerOptions.handleDownEvent) {
-      pointerOptions.handleDownEvent = TRUE;
-    }
-
-    if (!pointerOptions.stopDown) {
-      pointerOptions.stopDown = FALSE;
-    }
-
-    super(pointerOptions);
+    super({
+      handleDownEvent: TRUE,
+      stopDown: FALSE,
+    });
 
     /***
      * @type {SnapOnSignature<import("../events").EventsKey>}
@@ -460,7 +452,8 @@ class Snap extends PointerInteraction {
       if (segmenter) {
         this.indexedFeaturesExtents_[feature_uid] =
           geometry.getExtent(createEmpty());
-        const segments = segmenter(
+        const segments = segmenter.call(
+          this.segmenters_,
           geometry,
           this.getMap().getView().getProjection(),
         );
@@ -473,8 +466,6 @@ class Snap extends PointerInteraction {
             segment: segment,
           };
         }
-        tempExtents.length = segmentCount;
-        tempSegmentData.length = segmentCount;
 
         if (this.intersection_) {
           for (let j = 0, jj = segments.length; j < jj; ++j) {
@@ -483,12 +474,9 @@ class Snap extends PointerInteraction {
               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;
-              }
+            // Calculate intersections with own segments excluding self and
+            // neighbors
+            for (let k = 0, kk = j - 1; k < kk; ++k) {
               const otherSegment = segments[k];
               if (!intersectsExtent(extent, tempExtents[k])) {
                 continue;
@@ -501,13 +489,14 @@ class Snap extends PointerInteraction {
               tempExtents[segmentCount] = boundingExtent(intersectionSegment);
               tempSegmentData[segmentCount++] = {
                 feature,
+                intersectionFeature: feature,
                 segment: intersectionSegment,
-                isIntersection: true,
               };
             }
             // Calculate intersections with existing segments
             const otherSegments = this.rBush_.getInExtent(tempExtents[j]);
-            for (const {segment: otherSegment} of otherSegments) {
+            for (let k = 0, kk = otherSegments.length; k < kk; ++k) {
+              const otherSegment = otherSegments[k].segment;
               if (otherSegment.length === 1) {
                 continue;
               }
@@ -519,8 +508,8 @@ class Snap extends PointerInteraction {
               tempExtents[segmentCount] = boundingExtent(intersectionSegment);
               tempSegmentData[segmentCount++] = {
                 feature,
+                intersectionFeature: otherSegments[k].feature,
                 segment: intersectionSegment,
-                isIntersection: true,
               };
             }
           }
@@ -529,6 +518,8 @@ class Snap extends PointerInteraction {
         if (segmentCount === 1) {
           this.rBush_.insert(tempExtents[0], tempSegmentData[0]);
         } else {
+          tempExtents.length = segmentCount;
+          tempSegmentData.length = segmentCount;
           this.rBush_.load(tempExtents, tempSegmentData);
         }
       }
@@ -628,6 +619,7 @@ class Snap extends PointerInteraction {
     const feature = getFeatureFromEvent(evt);
     if (feature) {
       this.removeFeature(feature);
+      delete this.pendingFeatures_[getUid(feature)];
     }
   }
 
@@ -638,10 +630,7 @@ class Snap extends PointerInteraction {
   handleFeatureChange_(evt) {
     const feature = /** @type {import("../Feature.js").default} */ (evt.target);
     if (this.handlingDownUpSequence) {
-      const uid = getUid(feature);
-      if (!(uid in this.pendingFeatures_)) {
-        this.pendingFeatures_[uid] = feature;
-      }
+      this.pendingFeatures_[getUid(feature)] = feature;
     } else {
       this.updateFeature_(feature);
     }
@@ -659,6 +648,7 @@ class Snap extends PointerInteraction {
       for (const feature of featuresToUpdate) {
         this.updateFeature_(feature);
       }
+      clear(this.pendingFeatures_);
     }
     return false;
   }
@@ -676,15 +666,11 @@ class Snap extends PointerInteraction {
     const extent = this.indexedFeaturesExtents_[feature_uid];
     if (extent) {
       const rBush = this.rBush_;
-      const nodesToRemove = [];
-      rBush.forEachInExtent(extent, function (node) {
-        if (feature === node.feature) {
-          nodesToRemove.push(node);
+      rBush.getInExtent(extent).forEach((node) => {
+        if (feature === node.feature || feature === node.intersectionFeature) {
+          rBush.remove(node);
         }
       });
-      for (let i = nodesToRemove.length - 1; i >= 0; --i) {
-        rBush.remove(nodesToRemove[i]);
-      }
     }
 
     if (unregister) {
@@ -783,30 +769,23 @@ 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 &&
-          ((isIntersection && this.intersection_) ||
-            (!isIntersection && (this.vertex_ || this.edge_)))
-        ) {
-          return {
-            vertex: closestVertex,
-            vertexPixel: [
-              Math.round(vertexPixel[0]),
-              Math.round(vertexPixel[1]),
-            ],
-            feature: closestFeature,
-            segment: closestSegment,
-          };
-        }
+      if (!closestVertex) {
+        return null;
       }
-      return null;
+      const vertexPixel = map.getPixelFromCoordinate(closestVertex);
+      const squaredPixelDistance = squaredDistance(pixel, vertexPixel);
+      if (squaredPixelDistance > squaredPixelTolerance) {
+        return null;
+      }
+      return {
+        vertex: closestVertex,
+        vertexPixel: [Math.round(vertexPixel[0]), Math.round(vertexPixel[1])],
+        feature: closestFeature,
+        segment: closestSegment,
+      };
     };
 
     if (this.vertex_ || this.intersection_) {
@@ -816,11 +795,14 @@ class Snap extends PointerInteraction {
           for (const vertex of segmentData.segment) {
             const tempVertexCoord = fromUserCoordinate(vertex, projection);
             const delta = squaredDistance(projectedCoordinate, tempVertexCoord);
-            if (delta < minSquaredDistance) {
+            if (
+              delta < minSquaredDistance &&
+              ((this.intersection_ && segmentData.intersectionFeature) ||
+                (this.vertex_ && !segmentData.intersectionFeature))
+            ) {
               closestVertex = vertex;
               minSquaredDistance = delta;
               closestFeature = segmentData.feature;
-              isIntersection = segmentData.isIntersection;
             }
           }
         }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "ol",
-  "version": "10.6.2-dev.1758267478938",
+  "version": "10.6.2-dev.1758488544346",
   "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.6.2-dev.1758267478938';
+export const VERSION = '10.6.2-dev.1758488544346';