ol 10.6.2-dev.1751550843419 → 10.6.2-dev.1751637866951

package/interaction/Select.d.ts

@@ -334,6 +334,12 @@ declare class Select extends Interaction {
      * @private
      */
     private removeFeature_;
+    /**
+     * @param {Feature} feature Feature of which to get the layer
+     * @return {VectorLayer} layer, if one was found.
+     * @private
+     */
+    private findLayerOfFeature_;
     /**
      * @return {import("../style/Style.js").StyleLike|null} Select style.
      */
@@ -353,6 +359,51 @@ declare class Select extends Interaction {
      * @private
      */
     private removeFeatureLayerAssociation_;
+    /**
+     * @param {import("../Feature.js").FeatureLike} feature The feature to select
+     * @param {import("../layer/Layer.js").default} layer Optional layer containing this feature
+     * @param {Array<Feature>} [selected] optional array to which selected features will be added
+     * @return {Feature|undefined} The feature, if it got selected.
+     * @private
+     */
+    private selectFeatureInternal_;
+    /**
+     * Try to select a feature as if it was clicked and `addCondition` evaluated to True.
+     * Unlike modifying `select.getFeatures()` directly, this respects the `filter` and `layers` options (except `multi`, which is ignored).
+     * The {@link module:ol/interaction/Select~SelectEvent} fired by this won't have a mapBrowserEvent property
+     * @param {Feature} feature The feature to select
+     * @return {boolean} True if the feature was selected
+     */
+    selectFeature(feature: Feature): boolean;
+    /**
+     * Deselects a feature if it was previously selected. Also removes layer association.
+     * @param {import("../Feature.js").FeatureLike} feature The feature to deselect
+     * @param {Array<Feature>} [deselected] optional array to which deselected features will be added
+     * @return {Feature|undefined} The feature, if it was previously selected.
+     * @private
+     */
+    private removeFeatureInternal_;
+    /**
+     * Try to deselect a feature as if it was clicked.
+     * Compared to `select.getFeatures().remove(feature)` this causes a SelectEvent.
+     * The {@link module:ol/interaction/Select~SelectEvent} fired by this won't have a mapBrowserEvent property
+     * @param {Feature} feature The feature to deselect
+     * @return {boolean} True if the feature was deselected
+     */
+    deselectFeature(feature: Feature): boolean;
+    /**
+     * Try to toggle a feature as if it was clicked and `toggleCondition` was True.
+     * Unlike modifying `select.getFeatures()` directly, this respects the `filter` and `layers` options (except `multi`, which is ignored).
+     * The {@link module:ol/interaction/Select~SelectEvent} fired by this won't have a mapBrowserEvent property
+     * @param {Feature} feature The feature to deselect
+     */
+    toggleFeature(feature: Feature): void;
+    /**
+     * Deselect all features as if a user deselected them.
+     * Compared to `select.getFeatures().clear()` this causes a SelectEvent.
+     * The {@link module:ol/interaction/Select~SelectEvent} fired by this won't have a mapBrowserEvent property
+     */
+    clearSelection(): void;
 }
 import Feature from '../Feature.js';
 import Collection from '../Collection.js';

package/interaction/Select.d.ts.map

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

package/interaction/Select.js

@@ -377,19 +377,7 @@ class Select extends Interaction {
       this.applySelectedStyle_(feature);
     }
     if (!this.getLayer(feature)) {
-      const layer = /** @type {VectorLayer} */ (
-        this.getMap()
-          .getAllLayers()
-          .find(function (layer) {
-            if (
-              layer instanceof VectorLayer &&
-              layer.getSource() &&
-              layer.getSource().hasFeature(feature)
-            ) {
-              return layer;
-            }
-          })
-      );
+      const layer = this.findLayerOfFeature_(feature);
       if (layer) {
         this.addFeatureLayerAssociation_(feature, layer);
       }
@@ -406,6 +394,28 @@ class Select extends Interaction {
     }
   }
 
+  /**
+   * @param {Feature} feature Feature of which to get the layer
+   * @return {VectorLayer} layer, if one was found.
+   * @private
+   */
+  findLayerOfFeature_(feature) {
+    const layer = /** @type {VectorLayer} */ (
+      this.getMap()
+        .getAllLayers()
+        .find(function (layer) {
+          if (
+            layer instanceof VectorLayer &&
+            layer.getSource() &&
+            layer.getSource().hasFeature(feature)
+          ) {
+            return layer;
+          }
+        })
+    );
+    return layer;
+  }
+
   /**
    * @return {import("../style/Style.js").StyleLike|null} Select style.
    */
@@ -457,6 +467,116 @@ class Select extends Interaction {
     delete this.featureLayerAssociation_[getUid(feature)];
   }
 
+  /**
+   * @param {import("../Feature.js").FeatureLike} feature The feature to select
+   * @param {import("../layer/Layer.js").default} layer Optional layer containing this feature
+   * @param {Array<Feature>} [selected] optional array to which selected features will be added
+   * @return {Feature|undefined} The feature, if it got selected.
+   * @private
+   */
+  selectFeatureInternal_(feature, layer, selected) {
+    if (!(feature instanceof Feature)) {
+      return;
+    }
+    if (!this.filter_(feature, layer)) {
+      return;
+    }
+    const features = this.getFeatures();
+    if (!features.getArray().includes(feature)) {
+      this.addFeatureLayerAssociation_(feature, layer);
+      features.push(feature);
+      selected?.push(feature);
+    }
+    return feature;
+  }
+
+  /**
+   * Try to select a feature as if it was clicked and `addCondition` evaluated to True.
+   * Unlike modifying `select.getFeatures()` directly, this respects the `filter` and `layers` options (except `multi`, which is ignored).
+   * The {@link module:ol/interaction/Select~SelectEvent} fired by this won't have a mapBrowserEvent property
+   * @param {Feature} feature The feature to select
+   * @return {boolean} True if the feature was selected
+   */
+  selectFeature(feature) {
+    const layer = this.findLayerOfFeature_(feature);
+    if (!this.layerFilter_(layer)) {
+      return false;
+    }
+    const selected = this.selectFeatureInternal_(feature, layer);
+    if (selected) {
+      this.dispatchEvent(
+        new SelectEvent(SelectEventType.SELECT, [selected], [], undefined),
+      );
+    }
+    return !!selected;
+  }
+
+  /**
+   * Deselects a feature if it was previously selected. Also removes layer association.
+   * @param {import("../Feature.js").FeatureLike} feature The feature to deselect
+   * @param {Array<Feature>} [deselected] optional array to which deselected features will be added
+   * @return {Feature|undefined} The feature, if it was previously selected.
+   * @private
+   */
+  removeFeatureInternal_(feature, deselected) {
+    const features = this.getFeatures();
+    if (
+      !(feature instanceof Feature) ||
+      !features.getArray().includes(feature)
+    ) {
+      return;
+    }
+    features.remove(feature);
+    this.removeFeatureLayerAssociation_(feature);
+    deselected?.push(feature);
+    return feature;
+  }
+
+  /**
+   * Try to deselect a feature as if it was clicked.
+   * Compared to `select.getFeatures().remove(feature)` this causes a SelectEvent.
+   * The {@link module:ol/interaction/Select~SelectEvent} fired by this won't have a mapBrowserEvent property
+   * @param {Feature} feature The feature to deselect
+   * @return {boolean} True if the feature was deselected
+   */
+  deselectFeature(feature) {
+    const deselected = this.removeFeatureInternal_(feature);
+    if (deselected) {
+      this.dispatchEvent(
+        new SelectEvent(SelectEventType.SELECT, [], [deselected], undefined),
+      );
+    }
+    return !!deselected;
+  }
+
+  /**
+   * Try to toggle a feature as if it was clicked and `toggleCondition` was True.
+   * Unlike modifying `select.getFeatures()` directly, this respects the `filter` and `layers` options (except `multi`, which is ignored).
+   * The {@link module:ol/interaction/Select~SelectEvent} fired by this won't have a mapBrowserEvent property
+   * @param {Feature} feature The feature to deselect
+   */
+  toggleFeature(feature) {
+    if (!this.deselectFeature(feature)) {
+      this.selectFeature(feature);
+    }
+  }
+  /**
+   * Deselect all features as if a user deselected them.
+   * Compared to `select.getFeatures().clear()` this causes a SelectEvent.
+   * The {@link module:ol/interaction/Select~SelectEvent} fired by this won't have a mapBrowserEvent property
+   */
+  clearSelection() {
+    clear(this.featureLayerAssociation_);
+    const features = this.getFeatures();
+    const deselected = features.getArray().slice(); // shallow copy
+    features.clear();
+    if (deselected.length !== 0) {
+      this.dispatchEvent(
+        new SelectEvent(SelectEventType.SELECT, [], deselected, undefined),
+      );
+    }
+  }
+
   /**
    * Handles the {@link module:ol/MapBrowserEvent~MapBrowserEvent map browser event} and may change the
    * selected state of features.
@@ -485,79 +605,67 @@ class Select extends Interaction {
      */
     const selected = [];
 
+    // TODO: technically the way i've restructured this logic means that
+    //       instead of first emptying the features list of all extra features and then adding the selected ones back,
+    //       the selected features get added and then the old ones get removed.
+    //       a grow then shrink, instead of a shrink then grow. I can't imagine anyone relying on this, but alas, its worth a mention.
     if (set) {
       // Replace the currently selected feature(s) with the feature(s) at the
       // pixel, or clear the selected feature(s) if there is no feature at
       // the pixel.
-      clear(this.featureLayerAssociation_);
+      let foundAtCursor = false;
       map.forEachFeatureAtPixel(
         mapBrowserEvent.pixel,
-        /**
-         * @param {import("../Feature.js").FeatureLike} feature Feature.
-         * @param {import("../layer/Layer.js").default} layer Layer.
-         * @return {boolean|undefined} Continue to iterate over the features.
-         */
         (feature, layer) => {
-          if (!(feature instanceof Feature) || !this.filter_(feature, layer)) {
-            return;
+          foundAtCursor = true;
+          if (!this.selectFeatureInternal_(feature, layer, selected)) {
+            return; // keep going, this one wasn't selected
           }
-          this.addFeatureLayerAssociation_(feature, layer);
-          selected.push(feature);
-          return !this.multi_;
+          return !this.multi_; // stop if not multi
         },
         {
           layerFilter: this.layerFilter_,
           hitTolerance: this.hitTolerance_,
         },
       );
+
       for (let i = features.getLength() - 1; i >= 0; --i) {
         const feature = features.item(i);
-        const index = selected.indexOf(feature);
-        if (index > -1) {
-          // feature is already selected
-          selected.splice(index, 1);
-        } else {
-          features.remove(feature);
-          deselected.push(feature);
+        if (
+          // remove all but selected, if there were any selected
+          (selected.length > 0 && !selected.includes(feature)) ||
+          // remove all, if click outside of layer
+          !foundAtCursor
+        ) {
+          this.removeFeatureInternal_(feature, deselected);
         }
       }
-      if (selected.length !== 0) {
-        features.extend(selected);
-      }
     } else {
       // Modify the currently selected feature(s).
       map.forEachFeatureAtPixel(
         mapBrowserEvent.pixel,
-        /**
-         * @param {import("../Feature.js").FeatureLike} feature Feature.
-         * @param {import("../layer/Layer.js").default} layer Layer.
-         * @return {boolean|undefined} Continue to iterate over the features.
-         */
         (feature, layer) => {
-          if (!(feature instanceof Feature) || !this.filter_(feature, layer)) {
-            return;
+          let modifiedFeature;
+          if (remove || toggle) {
+            modifiedFeature = this.removeFeatureInternal_(feature, deselected);
           }
-          if ((add || toggle) && !features.getArray().includes(feature)) {
-            this.addFeatureLayerAssociation_(feature, layer);
-            selected.push(feature);
-          } else if (
-            (remove || toggle) &&
-            features.getArray().includes(feature)
-          ) {
-            deselected.push(feature);
-            this.removeFeatureLayerAssociation_(feature);
+          if ((add || toggle) && !modifiedFeature) {
+            modifiedFeature = this.selectFeatureInternal_(
+              feature,
+              layer,
+              selected,
+            );
+          }
+          if (!modifiedFeature) {
+            return; // keep going, this one wasn't removed/selected
           }
-          return !this.multi_;
+          return !this.multi_; // stop if not multi
         },
         {
           layerFilter: this.layerFilter_,
           hitTolerance: this.hitTolerance_,
         },
       );
-      for (let j = deselected.length - 1; j >= 0; --j) {
-        features.remove(deselected[j]);
-      }
-      features.extend(selected);
     }
     if (selected.length > 0 || deselected.length > 0) {
       this.dispatchEvent(

package/package.json

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