ol 9.0.1-dev.1709105228771 → 9.0.1-dev.1709147539193

package/expr/cpu.js

@@ -148,6 +148,8 @@ function compileExpression(expression, context) {
     }
     case Ops.Any:
     case Ops.All:
+    case Ops.Between:
+    case Ops.In:
     case Ops.Not: {
       return compileLogicalExpression(expression, context);
     }
@@ -194,8 +196,6 @@ function compileExpression(expression, context) {
     // TODO: unimplemented
     // Ops.Zoom
     // Ops.Time
-    // Ops.Between
-    // Ops.In
     // Ops.Array
     // Ops.Color
     // Ops.Band
@@ -335,6 +335,25 @@ function compileLogicalExpression(expression, context) {
         return true;
       };
     }
+    case Ops.Between: {
+      return (context) => {
+        const value = args[0](context);
+        const min = args[1](context);
+        const max = args[2](context);
+        return value >= min && value <= max;
+      };
+    }
+    case Ops.In: {
+      return (context) => {
+        const value = args[0](context);
+        for (let i = 1; i < length; ++i) {
+          if (value === args[i](context)) {
+            return true;
+          }
+        }
+        return false;
+      };
+    }
     case Ops.Not: {
       return (context) => !args[0](context);
     }

package/expr/expression.d.ts

@@ -193,9 +193,9 @@ export type ArgValidator = (arg0: Array<EncodedExpression>, arg1: ParsingContext
  *   * `['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.
  *   * `['between', value1, value2, value3]` returns `true` if `value1` is contained between `value2` and `value3`
- *     (inclusively), or `false` otherwise (WebGL only).
+ *     (inclusively), or `false` otherwise.
  *   * `['in', needle, haystack]` returns `true` if `needle` is found in `haystack`, and
- *     `false` otherwise (WebGL only).
+ *     `false` otherwise.
  *     This operator has the following limitations:
  *     * `haystack` has to be an array of numbers or strings (searching for a substring in a string is not supported yet)
  *     * Only literal arrays are supported as `haystack` for now; this means that `haystack` cannot be the result of an

package/expr/expression.js

@@ -84,9 +84,9 @@ import {isStringColor} from '../color.js';
  *   * `['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.
  *   * `['between', value1, value2, value3]` returns `true` if `value1` is contained between `value2` and `value3`
- *     (inclusively), or `false` otherwise (WebGL only).
+ *     (inclusively), or `false` otherwise.
  *   * `['in', needle, haystack]` returns `true` if `needle` is found in `haystack`, and
- *     `false` otherwise (WebGL only).
+ *     `false` otherwise.
  *     This operator has the following limitations:
  *     * `haystack` has to be an array of numbers or strings (searching for a substring in a string is not supported yet)
  *     * Only literal arrays are supported as `haystack` for now; this means that `haystack` cannot be the result of an

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "ol",
-  "version": "9.0.1-dev.1709105228771",
+  "version": "9.0.1-dev.1709147539193",
   "description": "OpenLayers mapping library",
   "keywords": [
     "map",

package/source/StadiaMaps.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"StadiaMaps.d.ts","sourceRoot":"","sources":["StadiaMaps.js"],"names":[],"mappings":";;;;;;;;;;;;;;WAoHc,MAAM;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AALpB;;;;;;;;;;;;;;;;;;;;;;;;;;GA0BG;AAEH;;;;GAIG;AACH;IACE;;OAEG;IACH,qBAFW,OAAO,EAsDjB;CACF;gBArMe,UAAU"}
+{"version":3,"file":"StadiaMaps.d.ts","sourceRoot":"","sources":["StadiaMaps.js"],"names":[],"mappings":";;;;;;;;;;;;;;WAwHc,MAAM;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AALpB;;;;;;;;;;;;;;;;;;;;;;;;;;GA0BG;AAEH;;;;GAIG;AACH;IACE;;OAEG;IACH,qBAFW,OAAO,EAsDjB;CACF;gBAzMe,UAAU"}

package/source/StadiaMaps.js

@@ -78,6 +78,10 @@ const LayerConfig = {
     extension: 'png',
     opaque: true,
   },
+  'alidade_satellite': {
+    extension: 'png',
+    opaque: true,
+  },
   'outdoors': {
     extension: 'png',
     opaque: true,

package/util.js

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