ol 9.2.5-dev.1716833846254 → 9.2.5-dev.1717010067861

package/expr/expression.js

@@ -834,7 +834,7 @@ function parseMatchArgs(encoded, context, parsedArgs, typeHint) {
 
   const input = parse(encoded[1], context);
   let inputType = input.type;
-  const fallback = parse(encoded[encoded.length - 1], context);
+  const fallback = parse(encoded[encoded.length - 1], context, typeHint);
   let outputType =
     typeHint !== undefined ? typeHint & fallback.type : fallback.type;
 
@@ -842,7 +842,7 @@ function parseMatchArgs(encoded, context, parsedArgs, typeHint) {
   const args = new Array(argsCount - 2);
   for (let i = 0; i < argsCount - 2; i += 2) {
     const match = parse(encoded[i + 2], context);
-    const output = parse(encoded[i + 3], context);
+    const output = parse(encoded[i + 3], context, typeHint);
     inputType &= match.type;
     outputType &= output.type;
     args[i] = match;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "ol",
-  "version": "9.2.5-dev.1716833846254",
+  "version": "9.2.5-dev.1717010067861",
   "description": "OpenLayers mapping library",
   "keywords": [
     "map",

package/source/Vector.d.ts

@@ -627,16 +627,14 @@ declare class VectorSource<FeatureType extends import("../Feature.js").FeatureLi
     /**
      * Remove feature without firing a `change` event.
      * @param {FeatureType} feature Feature.
-     * @return {FeatureType|undefined} The removed feature
-     *     (or undefined if the feature was not found).
+     * @return {boolean} True if the feature was removed, false if it was not found.
      * @protected
      */
-    protected removeFeatureInternal(feature: FeatureType): FeatureType | undefined;
+    protected removeFeatureInternal(feature: FeatureType): boolean;
     /**
      * Remove a feature from the id index.  Called internally when the feature id
      * may have changed.
      * @param {FeatureType} feature The feature.
-     * @return {boolean} Removed the feature from the index.
      * @private
      */
     private removeFromIdIndex_;

package/source/Vector.d.ts.map

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

package/source/Vector.js

@@ -1074,15 +1074,11 @@ class VectorSource extends Source {
    * @api
    */
   removeFeatures(features) {
-    const removedFeatures = [];
+    let removed = false;
     for (let i = 0, ii = features.length; i < ii; ++i) {
-      const feature = features[i];
-      const removedFeature = this.removeFeatureInternal(feature);
-      if (removedFeature) {
-        removedFeatures.push(removedFeature);
-      }
+      removed = this.removeFeatureInternal(features[i]) || removed;
     }
-    if (removedFeatures.length > 0) {
+    if (removed) {
       this.changed();
     }
   }
@@ -1098,8 +1094,8 @@ class VectorSource extends Source {
     if (!feature) {
       return;
     }
-    const result = this.removeFeatureInternal(feature);
-    if (result) {
+    const removed = this.removeFeatureInternal(feature);
+    if (removed) {
       this.changed();
     }
   }
@@ -1107,14 +1103,13 @@ class VectorSource extends Source {
   /**
    * Remove feature without firing a `change` event.
    * @param {FeatureType} feature Feature.
-   * @return {FeatureType|undefined} The removed feature
-   *     (or undefined if the feature was not found).
+   * @return {boolean} True if the feature was removed, false if it was not found.
    * @protected
    */
   removeFeatureInternal(feature) {
     const featureKey = getUid(feature);
     if (!(featureKey in this.uidIndex_)) {
-      return;
+      return false;
     }
 
     if (featureKey in this.nullGeometryFeatures_) {
@@ -1148,33 +1143,22 @@ class VectorSource extends Source {
         new VectorSourceEvent(VectorEventType.REMOVEFEATURE, feature),
       );
     }
-    return feature;
+    return true;
   }
 
   /**
    * Remove a feature from the id index.  Called internally when the feature id
    * may have changed.
    * @param {FeatureType} feature The feature.
-   * @return {boolean} Removed the feature from the index.
    * @private
    */
   removeFromIdIndex_(feature) {
-    let removed = false;
     for (const id in this.idIndex_) {
-      const indexedFeature = this.idIndex_[id];
-      if (
-        feature instanceof RenderFeature &&
-        Array.isArray(indexedFeature) &&
-        indexedFeature.includes(feature)
-      ) {
-        indexedFeature.splice(indexedFeature.indexOf(feature), 1);
-      } else if (this.idIndex_[id] === feature) {
+      if (this.idIndex_[id] === feature) {
         delete this.idIndex_[id];
-        removed = true;
         break;
       }
     }
-    return removed;
   }
 
   /**

package/util.js

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