ol 10.0.1-dev.1723061166717 → 10.0.1-dev.1723457010002

package/expr/cpu.js

@@ -115,7 +115,8 @@ function compileExpression(expression, context) {
       return compileAssertionExpression(expression, context);
     }
     case Ops.Get:
-    case Ops.Var: {
+    case Ops.Var:
+    case Ops.Has: {
       return compileAccessorExpression(expression, context);
     }
     case Ops.Id: {
@@ -256,6 +257,24 @@ function compileAccessorExpression(expression, context) {
     case Ops.Var: {
       return (context) => context.variables[name];
     }
+    case Ops.Has: {
+      return (context) => {
+        const args = expression.args;
+        if (!(name in context.properties)) {
+          return false;
+        }
+        let value = context.properties[name];
+        for (let i = 1, ii = args.length; i < ii; ++i) {
+          const keyExpression = /** @type {LiteralExpression} */ (args[i]);
+          const key = /** @type {string|number} */ (keyExpression.value);
+          if (!value || !Object.hasOwn(value, key)) {
+            return false;
+          }
+          value = value[key];
+        }
+        return true;
+      };
+    }
     default: {
       throw new Error(`Unsupported accessor operator ${expression.operator}`);
     }

package/expr/expression.d.ts

@@ -193,6 +193,8 @@ export type ArgValidator = (arg0: Array<EncodedExpression>, arg1: number, arg2:
  *   * `['!', value1]` returns `false` if `value1` is `true` or greater than `0`, or `true` otherwise.
  *   * `['all', value1, value2, ...]` returns `true` if all the inputs are `true`, `false` otherwise.
  *   * `['any', value1, value2, ...]` returns `true` if any of the inputs are `true`, `false` otherwise.
+ *   * `['has', attributeName, keyOrArrayIndex, ...]` returns `true` if feature properties include the (nested) key `attributeName`,
+ *     `false` otherwise.
  *   * `['between', value1, value2, value3]` returns `true` if `value1` is contained between `value2` and `value3`
  *     (inclusively), or `false` otherwise.
  *   * `['in', needle, haystack]` returns `true` if `needle` is found in `haystack`, and

package/expr/expression.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"expression.d.ts","sourceRoot":"","sources":["expression.js"],"names":[],"mappings":"AA+JA;;;;GAIG;AACH,+BAHW,MAAM,GACL,MAAM,CAgBjB;AAED;;;;GAIG;AACH,oCAJW,MAAM,YACN,MAAM,GACL,OAAO,CAIlB;AAED;;;;GAIG;AACH,sCAJW,MAAM,aACN,MAAM,GACL,OAAO,CAIlB;AAED;;;;GAIG;AACH,6BAJW,MAAM,YACN,MAAM,GACL,OAAO,CAIlB;AAmCD;;GAEG;AAEH;;;;;;GAMG;AAEH;;GAEG;AACH,qCAFY,cAAc,CASzB;AAED;;GAEG;AAEH;;;;;GAKG;AACH,+BALW,iBAAiB,gBACjB,MAAM,WACN,cAAc,GACb,UAAU,CA6FrB;AAmoBD;;;;GAIG;AACH,8CAHW,OAAO,qBAAqB,EAAE,OAAO,GAAC,OAAO,sBAAsB,EAAE,OAAO,GAC3E,OAAO,GAAC,YAAY,GAAC,SAAS,GAAC,EAAE,CA2B5C;AA34BD,yBAA0B;AAC1B,iCAA2C;AAC3C,gCAA0C;AAC1C,gCAA0C;AAC1C,+BAAyC;AACzC,qCAA+C;AAC/C,8BAAwC;AACxC,6BAAiD;AAqEjD;;GAEG;AAEH;IACE;;;OAGG;IACH,kBAHW,MAAM,SACN,YAAY,EAUtB;IAFC,aAAgB;IAChB,oBAAkB;CAErB;AAED;IACE;;;;OAIG;IACH,kBAJW,MAAM,YACN,MAAM,WACH,UAAU,EAAA,EAMvB;IAHC,aAAgB;IAChB,iBAAwB;IACxB,mBAAgB;CAEnB;AAiID;;GAEG;AACH,kBAFU;QAAO,MAAM,GAAE,MAAM;CAAC,CAgD9B;yBA/KW,iBAAiB,GAAC,cAAc;;;;;eAK/B,GAAG,CAAC,MAAM,CAAC;;;;gBACX,GAAG,CAAC,MAAM,CAAC;;;;eACX,OAAO;;;;kBACP,OAAO;;gCAgBR,YAAY,QAAM;;;;;2BAqUlB,CAAS,IAAwB,EAAxB,KAAK,CAAC,iBAAiB,CAAC,EAAE,IAAM,EAAN,MAAM,EAAE,IAAc,EAAd,cAAc,KAAE,KAAK,CAAC,UAAU,CAAC,GAAC,IAAI;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;8BAhdjF,KAAK,CAAC,GAAC,CAAC,GAAC,OAAO,aAAa,EAAE,KAAK,GAAC,MAAM,GAAC,MAAM,GAAC,OAAO;2BAkF1D,OAAO,GAAC,MAAM,GAAC,MAAM,GAAC,KAAK,CAAC,MAAM,CAAC;;;;qBAmNnC,CAAS,IAAK,SAAE,IAAM,EAAN,MAAM,EAAE,IAAc,EAAd,cAAc,KAAE,UAAU"}
+{"version":3,"file":"expression.d.ts","sourceRoot":"","sources":["expression.js"],"names":[],"mappings":"AAiKA;;;;GAIG;AACH,+BAHW,MAAM,GACL,MAAM,CAgBjB;AAED;;;;GAIG;AACH,oCAJW,MAAM,YACN,MAAM,GACL,OAAO,CAIlB;AAED;;;;GAIG;AACH,sCAJW,MAAM,aACN,MAAM,GACL,OAAO,CAIlB;AAED;;;;GAIG;AACH,6BAJW,MAAM,YACN,MAAM,GACL,OAAO,CAIlB;AAmCD;;GAEG;AAEH;;;;;;GAMG;AAEH;;GAEG;AACH,qCAFY,cAAc,CASzB;AAED;;GAEG;AAEH;;;;;GAKG;AACH,+BALW,iBAAiB,gBACjB,MAAM,WACN,cAAc,GACb,UAAU,CA6FrB;AAqoBD;;;;GAIG;AACH,8CAHW,OAAO,qBAAqB,EAAE,OAAO,GAAC,OAAO,sBAAsB,EAAE,OAAO,GAC3E,OAAO,GAAC,YAAY,GAAC,SAAS,GAAC,EAAE,CA2B5C;AA74BD,yBAA0B;AAC1B,iCAA2C;AAC3C,gCAA0C;AAC1C,gCAA0C;AAC1C,+BAAyC;AACzC,qCAA+C;AAC/C,8BAAwC;AACxC,6BAAiD;AAqEjD;;GAEG;AAEH;IACE;;;OAGG;IACH,kBAHW,MAAM,SACN,YAAY,EAUtB;IAFC,aAAgB;IAChB,oBAAkB;CAErB;AAED;IACE;;;;OAIG;IACH,kBAJW,MAAM,YACN,MAAM,WACH,UAAU,EAAA,EAMvB;IAHC,aAAgB;IAChB,iBAAwB;IACxB,mBAAgB;CAEnB;AAiID;;GAEG;AACH,kBAFU;QAAO,MAAM,GAAE,MAAM;CAAC,CAiD9B;yBAhLW,iBAAiB,GAAC,cAAc;;;;;eAK/B,GAAG,CAAC,MAAM,CAAC;;;;gBACX,GAAG,CAAC,MAAM,CAAC;;;;eACX,OAAO;;;;kBACP,OAAO;;gCAgBR,YAAY,QAAM;;;;;2BAuUlB,CAAS,IAAwB,EAAxB,KAAK,CAAC,iBAAiB,CAAC,EAAE,IAAM,EAAN,MAAM,EAAE,IAAc,EAAd,cAAc,KAAE,KAAK,CAAC,UAAU,CAAC,GAAC,IAAI;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;8BAldjF,KAAK,CAAC,GAAC,CAAC,GAAC,OAAO,aAAa,EAAE,KAAK,GAAC,MAAM,GAAC,MAAM,GAAC,OAAO;2BAkF1D,OAAO,GAAC,MAAM,GAAC,MAAM,GAAC,KAAK,CAAC,MAAM,CAAC;;;;qBAoNnC,CAAS,IAAK,SAAE,IAAM,EAAN,MAAM,EAAE,IAAc,EAAd,cAAc,KAAE,UAAU"}

package/expr/expression.js

@@ -91,6 +91,8 @@ import {toSize} from '../size.js';
  *   * `['!', value1]` returns `false` if `value1` is `true` or greater than `0`, or `true` otherwise.
  *   * `['all', value1, value2, ...]` returns `true` if all the inputs are `true`, `false` otherwise.
  *   * `['any', value1, value2, ...]` returns `true` if any of the inputs are `true`, `false` otherwise.
+ *   * `['has', attributeName, keyOrArrayIndex, ...]` returns `true` if feature properties include the (nested) key `attributeName`,
+ *     `false` otherwise.
  *   * `['between', value1, value2, value3]` returns `true` if `value1` is contained between `value2` and `value3`
  *     (inclusively), or `false` otherwise.
  *   * `['in', needle, haystack]` returns `true` if `needle` is found in `haystack`, and
@@ -414,6 +416,7 @@ export const Ops = {
   Band: 'band',
   Palette: 'palette',
   ToString: 'to-string',
+  Has: 'has',
 };
 
 /**
@@ -428,6 +431,7 @@ export const Ops = {
 const parsers = {
   [Ops.Get]: createCallExpressionParser(hasArgsCount(1, Infinity), withGetArgs),
   [Ops.Var]: createCallExpressionParser(hasArgsCount(1, 1), withVarArgs),
+  [Ops.Has]: createCallExpressionParser(hasArgsCount(1, Infinity), withGetArgs),
   [Ops.Id]: createCallExpressionParser(usesFeatureId, withNoArgs),
   [Ops.Concat]: createCallExpressionParser(
     hasArgsCount(2, Infinity),

package/interaction/DragBox.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"DragBox.d.ts","sourceRoot":"","sources":["DragBox.js"],"names":[],"mappings":"AAgEA;;;;GAIG;AACH;IACE;;;;OAIG;IACH,kBAJW,MAAM,cACN,OAAO,kBAAkB,EAAE,UAAU,mBACrC,4CAAuC,EAmBjD;IAdC;;;;;OAKG;IACH,YAHU,OAAO,kBAAkB,EAAE,UAAU,CAGnB;IAE5B;;;;OAIG;IACH,iBAHU,4CAAuC,CAGX;CAEzC;;;;;;;2BAhFY,CAAS,IAAO,EAAD,OAAC,EAAE,IAAuC,EAAvC,4CAAuC,EAAE,IAA2B,EAA3B,OAAO,aAAa,EAAE,KAAK,EAAE,IAA2B,EAA3B,OAAO,aAAa,EAAE,KAAK,KAAE,OAAO;;;;;;;;;;;;;;;;;;;;;;;;;;;uBAc7G,OAAO,QAAE,4CAAuC,KAAE,IAAI;;;;;+BAqErE,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,WAAW,GAAC,SAAS,GAAC,QAAQ,GAAC,UAAU,EAAE,YAAY,EAAE,MAAM,CAAC,GACxG,OAAW,eAAe,EAAE,mBAAmB,CAAC,OAAO,eAAe,EAAE,UAAU,GAAC,OAAO,oBAAoB,EAAE,KAAK,GACrH,eAAqB,GAAC,WAAW,GAAC,SAAS,GAAC,QAAQ,EAAE,MAAM,CAAC;kBAlG5C,oBAAoB;AA2FtC;;;;;;;;GAQG;AAEH;;;;;;;;;;;GAWG;AACH;IACE;;OAEG;IACH,2CAuDC;IApDC;;OAEG;IACH,IAFU,kBAAkB,CAAC,OAAO,WAAW,EAAE,SAAS,CAAC,CAEpD;IAEP;;OAEG;IACH,MAFU,kBAAkB,CAAC,OAAO,WAAW,EAAE,SAAS,CAAC,CAElD;IAET;;OAEG;IACH,IAFU,kBAAkB,CAAC,IAAI,CAAC,CAE3B;IAIP;;;OAGG;IACH,aAA4D;IAE5D;;;OAGG;IACH,iBAAoE;IA8HtE;;;OAGG;IACH,gBAFW,4CAAuC,QAEhC;IA5HhB;;;OAGG;IACH,oBAAuB;IAEvB;;;OAGG;IACH,mBAA2E;IAE3E;;;OAGG;IACH,yBAE+B;IAGjC;;;;;;;;OAQG;IACH,wCANW,4CAAuC,cAEvC,OAAO,aAAa,EAAE,KAAK,YAC3B,OAAO,aAAa,EAAE,KAAK,GAC1B,OAAO,CAMlB;IAED;;;;OAIG;IACH,eAHY,OAAO,oBAAoB,EAAE,OAAO,CAK/C;CAuGF;+BA1S8B,cAAc"}
+{"version":3,"file":"DragBox.d.ts","sourceRoot":"","sources":["DragBox.js"],"names":[],"mappings":"AAgEA;;;;GAIG;AACH;IACE;;;;OAIG;IACH,kBAJW,MAAM,cACN,OAAO,kBAAkB,EAAE,UAAU,mBACrC,4CAAuC,EAmBjD;IAdC;;;;;OAKG;IACH,YAHU,OAAO,kBAAkB,EAAE,UAAU,CAGnB;IAE5B;;;;OAIG;IACH,iBAHU,4CAAuC,CAGX;CAEzC;;;;;;;2BAhFY,CAAS,IAAO,EAAD,OAAC,EAAE,IAAuC,EAAvC,4CAAuC,EAAE,IAA2B,EAA3B,OAAO,aAAa,EAAE,KAAK,EAAE,IAA2B,EAA3B,OAAO,aAAa,EAAE,KAAK,KAAE,OAAO;;;;;;;;;;;;;;;;;;;;;;;;;;;uBAc7G,OAAO,QAAE,4CAAuC,KAAE,IAAI;;;;;+BAqErE,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,WAAW,GAAC,SAAS,GAAC,QAAQ,GAAC,UAAU,EAAE,YAAY,EAAE,MAAM,CAAC,GACxG,OAAW,eAAe,EAAE,mBAAmB,CAAC,OAAO,eAAe,EAAE,UAAU,GAAC,OAAO,oBAAoB,EAAE,KAAK,GACrH,eAAqB,GAAC,WAAW,GAAC,SAAS,GAAC,QAAQ,EAAE,MAAM,CAAC;kBAlG5C,oBAAoB;AA2FtC;;;;;;;;GAQG;AAEH;;;;;;;;;;;GAWG;AACH;IACE;;OAEG;IACH,2CAsDC;IAnDC;;OAEG;IACH,IAFU,kBAAkB,CAAC,OAAO,WAAW,EAAE,SAAS,CAAC,CAEpD;IAEP;;OAEG;IACH,MAFU,kBAAkB,CAAC,OAAO,WAAW,EAAE,SAAS,CAAC,CAElD;IAET;;OAEG;IACH,IAFU,kBAAkB,CAAC,IAAI,CAAC,CAE3B;IAIP;;;OAGG;IACH,aAA4D;IAE5D;;;OAGG;IACH,iBAAqC;IA+HvC;;;OAGG;IACH,gBAFW,4CAAuC,QAEhC;IA7HhB;;;OAGG;IACH,oBAAuB;IAEvB;;;OAGG;IACH,mBAAwD;IAExD;;;OAGG;IACH,yBACwD;IAG1D;;;;;;;;OAQG;IACH,wCANW,4CAAuC,cAEvC,OAAO,aAAa,EAAE,KAAK,YAC3B,OAAO,aAAa,EAAE,KAAK,GAC1B,OAAO,CAMlB;IAED;;;;OAIG;IACH,eAHY,OAAO,oBAAoB,EAAE,OAAO,CAK/C;CA8HF;+BAhU8B,cAAc"}

package/interaction/DragBox.js

@@ -137,7 +137,7 @@ class DragBox extends PointerInteraction {
      */
     this.un;
 
-    options = options ? options : {};
+    options = options ?? {};
 
     /**
      * @type {import("../render/Box.js").default}
@@ -149,7 +149,7 @@ class DragBox extends PointerInteraction {
      * @type {number}
      * @private
      */
-    this.minArea_ = options.minArea !== undefined ? options.minArea : 64;
+    this.minArea_ = options.minArea ?? 64;
 
     if (options.onBoxEnd) {
       this.onBoxEnd = options.onBoxEnd;
@@ -165,15 +165,14 @@ class DragBox extends PointerInteraction {
      * @private
      * @type {import("../events/condition.js").Condition}
      */
-    this.condition_ = options.condition ? options.condition : mouseActionButton;
+    this.condition_ = options.condition ?? mouseActionButton;
 
     /**
      * @private
      * @type {EndCondition}
      */
-    this.boxEndCondition_ = options.boxEndCondition
-      ? options.boxEndCondition
-      : this.defaultBoxEndCondition;
+    this.boxEndCondition_ =
+      options.boxEndCondition ?? this.defaultBoxEndCondition;
   }
 
   /**
@@ -232,8 +231,6 @@ class DragBox extends PointerInteraction {
       return false;
     }
 
-    this.box_.setMap(null);
-
     const completeBox = this.boxEndCondition_(
       mapBrowserEvent,
       this.startPixel_,
@@ -249,6 +246,10 @@ class DragBox extends PointerInteraction {
         mapBrowserEvent,
       ),
     );
+
+    this.box_.setMap(null);
+    this.startPixel_ = null;
+
     return false;
   }
 
@@ -301,6 +302,27 @@ class DragBox extends PointerInteraction {
 
     super.setActive(active);
   }
+
+  /**
+   * @param {import("../Map.js").default|null} map Map.
+   * @override
+   */
+  setMap(map) {
+    const oldMap = this.getMap();
+
+    if (oldMap) {
+      this.box_.setMap(null);
+
+      if (this.startPixel_) {
+        this.dispatchEvent(
+          new DragBoxEvent(DragBoxEventType.BOXCANCEL, this.startPixel_, null),
+        );
+        this.startPixel_ = null;
+      }
+    }
+
+    super.setMap(map);
+  }
 }
 
 export default DragBox;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "ol",
-  "version": "10.0.1-dev.1723061166717",
+  "version": "10.0.1-dev.1723457010002",
   "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.0.1-dev.1723061166717';
+export const VERSION = '10.0.1-dev.1723457010002';