ol 10.7.1-dev.1763485375947 → 10.7.1-dev.1763628189598

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "ol",
-  "version": "10.7.1-dev.1763485375947",
+  "version": "10.7.1-dev.1763628189598",
   "description": "OpenLayers mapping library",
   "keywords": [
     "map",

package/render/canvas/style.js

@@ -823,7 +823,18 @@ function buildShape(flatStyle, context) {
   const pointsName = prefix + 'points';
   const radiusName = prefix + 'radius';
   const points = requireNumber(flatStyle[pointsName], pointsName);
-  const radius = requireNumber(flatStyle[radiusName], radiusName);
+  if (!(radiusName in flatStyle)) {
+    throw new Error(`Expected a number for ${radiusName}`);
+  }
+  const evaluateRadius = numberEvaluator(flatStyle, radiusName, context);
+  const initialRadius =
+    typeof flatStyle[radiusName] === 'number' ? flatStyle[radiusName] : 5;
+  const radius2Name = prefix + 'radius2';
+  const evaluateRadius2 = numberEvaluator(flatStyle, radius2Name, context);
+  const initialRadius2 =
+    typeof flatStyle[radius2Name] === 'number'
+      ? flatStyle[radius2Name]
+      : undefined;
 
   // settable properties
   const evaluateFill = buildFill(flatStyle, prefix, context);
@@ -846,7 +857,6 @@ function buildShape(flatStyle, context) {
   );
 
   // the remaining properties are not currently settable
-  const radius2 = optionalNumber(flatStyle, prefix + 'radius2');
   const angle = optionalNumber(flatStyle, prefix + 'angle');
   const declutterMode = optionalDeclutterMode(
     flatStyle,
@@ -855,13 +865,19 @@ function buildShape(flatStyle, context) {
 
   const shape = new RegularShape({
     points,
-    radius,
-    radius2,
+    radius: initialRadius,
+    radius2: initialRadius2,
     angle,
     declutterMode,
   });
 
   return function (context) {
+    if (evaluateRadius) {
+      shape.setRadius(evaluateRadius(context));
+    }
+    if (evaluateRadius2) {
+      shape.setRadius2(evaluateRadius2(context));
+    }
     if (evaluateFill) {
       shape.setFill(evaluateFill(context));
     }
@@ -952,6 +968,19 @@ function buildCircle(flatStyle, context) {
   };
 }
 
+/**
+ * @param {FlatStyle} flatStyle The flat style.
+ * @param {string} name The property name.
+ * @return {any|undefined} The encoded value, or undefined if not provided.
+ */
+function getExpressionValue(flatStyle, name) {
+  if (!(name in flatStyle)) {
+    return undefined;
+  }
+  const value = flatStyle[name];
+  return value === undefined ? undefined : value;
+}
+
 /**
  * @param {FlatStyle} flatStyle The flat style.
  * @param {string} name The property name.
@@ -959,10 +988,11 @@ function buildCircle(flatStyle, context) {
  * @return {import('../../expr/cpu.js').NumberEvaluator|undefined} The expression evaluator or undefined.
  */
 function numberEvaluator(flatStyle, name, context) {
-  if (!(name in flatStyle)) {
+  const encoded = getExpressionValue(flatStyle, name);
+  if (encoded === undefined) {
     return undefined;
   }
-  const evaluator = buildExpression(flatStyle[name], NumberType, context);
+  const evaluator = buildExpression(encoded, NumberType, context);
   return function (context) {
     return requireNumber(evaluator(context), name);
   };
@@ -975,10 +1005,11 @@ function numberEvaluator(flatStyle, name, context) {
  * @return {import('../../expr/cpu.js').StringEvaluator?} The expression evaluator.
  */
 function stringEvaluator(flatStyle, name, context) {
-  if (!(name in flatStyle)) {
+  const encoded = getExpressionValue(flatStyle, name);
+  if (encoded === undefined) {
     return null;
   }
-  const evaluator = buildExpression(flatStyle[name], StringType, context);
+  const evaluator = buildExpression(encoded, StringType, context);
   return function (context) {
     return requireString(evaluator(context), name);
   };
@@ -1022,10 +1053,11 @@ function patternEvaluator(flatStyle, prefix, context) {
  * @return {import('../../expr/cpu.js').BooleanEvaluator?} The expression evaluator.
  */
 function booleanEvaluator(flatStyle, name, context) {
-  if (!(name in flatStyle)) {
+  const encoded = getExpressionValue(flatStyle, name);
+  if (encoded === undefined) {
     return null;
   }
-  const evaluator = buildExpression(flatStyle[name], BooleanType, context);
+  const evaluator = buildExpression(encoded, BooleanType, context);
   return function (context) {
     const value = evaluator(context);
     if (typeof value !== 'boolean') {
@@ -1042,10 +1074,11 @@ function booleanEvaluator(flatStyle, name, context) {
  * @return {import('../../expr/cpu.js').ColorLikeEvaluator?} The expression evaluator.
  */
 function colorLikeEvaluator(flatStyle, name, context) {
-  if (!(name in flatStyle)) {
+  const encoded = getExpressionValue(flatStyle, name);
+  if (encoded === undefined) {
     return null;
   }
-  const evaluator = buildExpression(flatStyle[name], ColorType, context);
+  const evaluator = buildExpression(encoded, ColorType, context);
   return function (context) {
     return requireColorLike(evaluator(context), name);
   };
@@ -1058,10 +1091,33 @@ function colorLikeEvaluator(flatStyle, name, context) {
  * @return {import('../../expr/cpu.js').NumberArrayEvaluator?} The expression evaluator.
  */
 function numberArrayEvaluator(flatStyle, name, context) {
-  if (!(name in flatStyle)) {
+  const encoded = getExpressionValue(flatStyle, name);
+  if (encoded === undefined) {
     return null;
   }
-  const evaluator = buildExpression(flatStyle[name], NumberArrayType, context);
+  if (
+    Array.isArray(encoded) &&
+    (encoded.length === 0 || typeof encoded[0] !== 'string')
+  ) {
+    /** @type {Array<import('../../expr/cpu.js').NumberEvaluator>} */
+    const evaluators = encoded.map((value, index) => {
+      if (typeof value === 'number') {
+        return () => value;
+      }
+      const evaluator = buildExpression(value, NumberType, context);
+      return function (context) {
+        return requireNumber(evaluator(context), `${name}[${index}]`);
+      };
+    });
+    return function (context) {
+      const array = new Array(evaluators.length);
+      for (let i = 0; i < evaluators.length; ++i) {
+        array[i] = evaluators[i](context);
+      }
+      return array;
+    };
+  }
+  const evaluator = buildExpression(encoded, NumberArrayType, context);
   return function (context) {
     return requireNumberArray(evaluator(context), name);
   };
@@ -1074,10 +1130,11 @@ function numberArrayEvaluator(flatStyle, name, context) {
  * @return {import('../../expr/cpu.js').CoordinateEvaluator?} The expression evaluator.
  */
 function coordinateEvaluator(flatStyle, name, context) {
-  if (!(name in flatStyle)) {
+  const encoded = getExpressionValue(flatStyle, name);
+  if (encoded === undefined) {
     return null;
   }
-  const evaluator = buildExpression(flatStyle[name], NumberArrayType, context);
+  const evaluator = buildExpression(encoded, NumberArrayType, context);
   return function (context) {
     const array = requireNumberArray(evaluator(context), name);
     if (array.length !== 2) {
@@ -1094,10 +1151,11 @@ function coordinateEvaluator(flatStyle, name, context) {
  * @return {import('../../expr/cpu.js').SizeEvaluator?} The expression evaluator.
  */
 function sizeEvaluator(flatStyle, name, context) {
-  if (!(name in flatStyle)) {
+  const encoded = getExpressionValue(flatStyle, name);
+  if (encoded === undefined) {
     return null;
   }
-  const evaluator = buildExpression(flatStyle[name], NumberArrayType, context);
+  const evaluator = buildExpression(encoded, NumberArrayType, context);
   return function (context) {
     return requireSize(evaluator(context), name);
   };
@@ -1110,11 +1168,12 @@ function sizeEvaluator(flatStyle, name, context) {
  * @return {import('../../expr/cpu.js').SizeLikeEvaluator?} The expression evaluator.
  */
 function sizeLikeEvaluator(flatStyle, name, context) {
-  if (!(name in flatStyle)) {
+  const encoded = getExpressionValue(flatStyle, name);
+  if (encoded === undefined) {
     return null;
   }
   const evaluator = buildExpression(
-    flatStyle[name],
+    encoded,
     NumberArrayType | NumberType,
     context,
   );

package/style/Circle.d.ts

@@ -60,20 +60,6 @@ declare class CircleStyle extends RegularShape {
      * @param {Options} [options] Options.
      */
     constructor(options?: Options);
-    /**
-     * Clones the style.
-     * @return {CircleStyle} The cloned style.
-     * @api
-     * @override
-     */
-    override clone(): CircleStyle;
-    /**
-     * Set the circle radius.
-     *
-     * @param {number} radius Circle radius.
-     * @api
-     */
-    setRadius(radius: number): void;
 }
 import RegularShape from './RegularShape.js';
 //# sourceMappingURL=Circle.d.ts.map

package/style/Circle.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"Circle.d.ts","sourceRoot":"","sources":["Circle.js"],"names":[],"mappings":";;;;;;;;;YASc,MAAM;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAHpB;;;;;;;;;;;;;GAaG;AAEH;;;;GAIG;AACH;IACE;;OAEG;IACH,sBAFW,OAAO,EAkBjB;IAED;;;;;OAKG;IACH,kBAJY,WAAW,CAkBtB;IAED;;;;;OAKG;IACH,kBAHW,MAAM,QAMhB;CACF;yBA5EwB,mBAAmB"}
+{"version":3,"file":"Circle.d.ts","sourceRoot":"","sources":["Circle.js"],"names":[],"mappings":";;;;;;;;;YASc,MAAM;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAHpB;;;;;;;;;;;;;GAaG;AAEH;;;;GAIG;AACH;IACE;;OAEG;IACH,sBAFW,OAAO,EAkBjB;CAuBF;yBAjEwB,mBAAmB"}

package/style/Circle.js

@@ -67,17 +67,6 @@ class CircleStyle extends RegularShape {
     style.setOpacity(this.getOpacity());
     return style;
   }
-
-  /**
-   * Set the circle radius.
-   *
-   * @param {number} radius Circle radius.
-   * @api
-   */
-  setRadius(radius) {
-    this.radius = radius;
-    this.render();
-  }
 }
 
 export default CircleStyle;

package/style/RegularShape.d.ts

@@ -230,12 +230,24 @@ declare class RegularShape extends ImageStyle {
      * @api
      */
     getRadius(): number;
+    /**
+     * Set the (primary) radius for the shape.
+     * @param {number} radius Radius.
+     * @api
+     */
+    setRadius(radius: number): void;
     /**
      * Get the secondary radius for the shape.
      * @return {number|undefined} Radius2.
      * @api
      */
     getRadius2(): number | undefined;
+    /**
+     * Set the secondary radius for the shape.
+     * @param {number|undefined} radius2 Radius2.
+     * @api
+     */
+    setRadius2(radius2: number | undefined): void;
     /**
      * Get the stroke style for the shape.
      * @return {import("./Stroke.js").default|null} Stroke style.

package/style/RegularShape.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"RegularShape.d.ts","sourceRoot":"","sources":["RegularShape.js"],"names":[],"mappings":";;;;;;;;;;;;;YAwBc,MAAM;;;;YAEN,MAAM;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;iBAeN,OAAO,iBAAiB,EAAE,SAAS,GAAC,SAAS;;;;iBAC7C,MAAM;;;;UACN,MAAM;;;;aACN,aAAa;;;;cACb,KAAK,CAAC,MAAM,CAAC,GAAC,IAAI;;;;oBAClB,MAAM;;;;cACN,cAAc;;;;gBACd,MAAM;;AA5BpB;;;;;;;;;;;;;;;;;GAiBG;AAEH;;;;;;;;;;GAUG;AAEH;;;;;;GAMG;AACH;IACE;;OAEG;IACH,qBAFW,OAAO,EAqFjB;IAvEC;;;OAGG;IACH,4BAA+B;IAE/B;;;OAGG;IACH,cAA6D;IAE7D;;;OAGG;IACH,gBAAqB;IAErB;;;OAGG;IACH,gBAA6B;IAE7B;;;OAGG;IACH,kBAFU,MAAM,CAEY;IAE5B;;;OAGG;IACH,iBAA+B;IAE/B;;;OAGG;IACH,eAA6D;IAE7D;;;OAGG;IACH,gBAAmE;IAEnE;;;OAGG;IACH,cAAU;IAEV;;;OAGG;IACH,uBAAmB;IAEnB;;OAEG;IACH,oBAGuB;IAOzB;;;;;OAKG;IACH,kBAJY,YAAY,CAqBvB;IAqBD;;;;OAIG;IACH,YAHY,MAAM,CAKjB;IAED;;;;OAIG;IACH,WAHY,OAAO,WAAW,EAAE,OAAO,GAAC,IAAI,CAK3C;IAED;;;;OAIG;IACH,cAHW,OAAO,WAAW,EAAE,OAAO,GAAC,IAAI,QAM1C;IAED;;;OAGG;IACH,iCAHY,iBAAiB,GAAC,eAAe,CAU5C;IAED;;;;;;OAMG;IACH,8BALW,MAAM,GACL,iBAAiB,GAAC,eAAe,CA2B5C;IAsCD;;;;OAIG;IACH,aAHY,MAAM,CAKjB;IAED;;;;OAIG;IACH,aAHY,MAAM,CAKjB;IAED;;;;OAIG;IACH,cAHY,MAAM,GAAC,SAAS,CAK3B;IAYD;;;;OAIG;IACH,aAHY,OAAO,aAAa,EAAE,OAAO,GAAC,IAAI,CAK7C;IAED;;;;OAIG;IACH,kBAHW,OAAO,aAAa,EAAE,OAAO,GAAC,IAAI,QAM5C;IAoBD;;;;;;;OAOG;IACH,+BAgFC;IAED;;;OAGG;IACH,iCAHY,aAAa,CAoCxB;IAED;;OAEG;IACH,yBAKC;IAED;;;;;OAKG;IACH,cA2BC;IAED;;;;OAIG;IACH,kCAuBC;IAED;;;OAGG;IACH,oBAmBC;IAED;;;;OAIG;IACH,gCAmBC;CAQF;uBAzmBsB,YAAY"}
+{"version":3,"file":"RegularShape.d.ts","sourceRoot":"","sources":["RegularShape.js"],"names":[],"mappings":";;;;;;;;;;;;;YAwBc,MAAM;;;;YAEN,MAAM;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;iBAeN,OAAO,iBAAiB,EAAE,SAAS,GAAC,SAAS;;;;iBAC7C,MAAM;;;;UACN,MAAM;;;;aACN,aAAa;;;;cACb,KAAK,CAAC,MAAM,CAAC,GAAC,IAAI;;;;oBAClB,MAAM;;;;cACN,cAAc;;;;gBACd,MAAM;;AA5BpB;;;;;;;;;;;;;;;;;GAiBG;AAEH;;;;;;;;;;GAUG;AAEH;;;;;;GAMG;AACH;IACE;;OAEG;IACH,qBAFW,OAAO,EAqFjB;IAvEC;;;OAGG;IACH,4BAA+B;IAE/B;;;OAGG;IACH,cAA6D;IAE7D;;;OAGG;IACH,gBAAqB;IAErB;;;OAGG;IACH,gBAA6B;IAE7B;;;OAGG;IACH,kBAFU,MAAM,CAEY;IAE5B;;;OAGG;IACH,iBAA+B;IAE/B;;;OAGG;IACH,eAA6D;IAE7D;;;OAGG;IACH,gBAAmE;IAEnE;;;OAGG;IACH,cAAU;IAEV;;;OAGG;IACH,uBAAmB;IAEnB;;OAEG;IACH,oBAGuB;IAOzB;;;;;OAKG;IACH,kBAJY,YAAY,CAqBvB;IAqBD;;;;OAIG;IACH,YAHY,MAAM,CAKjB;IAED;;;;OAIG;IACH,WAHY,OAAO,WAAW,EAAE,OAAO,GAAC,IAAI,CAK3C;IAED;;;;OAIG;IACH,cAHW,OAAO,WAAW,EAAE,OAAO,GAAC,IAAI,QAM1C;IAED;;;OAGG;IACH,iCAHY,iBAAiB,GAAC,eAAe,CAU5C;IAED;;;;;;OAMG;IACH,8BALW,MAAM,GACL,iBAAiB,GAAC,eAAe,CA2B5C;IAsCD;;;;OAIG;IACH,aAHY,MAAM,CAKjB;IAED;;;;OAIG;IACH,aAHY,MAAM,CAKjB;IAED;;;;OAIG;IACH,kBAHW,MAAM,QAShB;IAED;;;;OAIG;IACH,cAHY,MAAM,GAAC,SAAS,CAK3B;IAED;;;;OAIG;IACH,oBAHW,MAAM,GAAC,SAAS,QAS1B;IAYD;;;;OAIG;IACH,aAHY,OAAO,aAAa,EAAE,OAAO,GAAC,IAAI,CAK7C;IAED;;;;OAIG;IACH,kBAHW,OAAO,aAAa,EAAE,OAAO,GAAC,IAAI,QAM5C;IAoBD;;;;;;;OAOG;IACH,+BAgFC;IAED;;;OAGG;IACH,iCAHY,aAAa,CAoCxB;IAED;;OAEG;IACH,yBAKC;IAED;;;;;OAKG;IACH,cA2BC;IAED;;;;OAIG;IACH,kCAuBC;IAED;;;OAGG;IACH,oBAmBC;IAED;;;;OAIG;IACH,gCAmBC;CAQF;uBAnoBsB,YAAY"}

package/style/RegularShape.js

@@ -316,6 +316,19 @@ class RegularShape extends ImageStyle {
     return this.radius;
   }
 
+  /**
+   * Set the (primary) radius for the shape.
+   * @param {number} radius Radius.
+   * @api
+   */
+  setRadius(radius) {
+    if (this.radius === radius) {
+      return;
+    }
+    this.radius = radius;
+    this.render();
+  }
+
   /**
    * Get the secondary radius for the shape.
    * @return {number|undefined} Radius2.
@@ -325,6 +338,19 @@ class RegularShape extends ImageStyle {
     return this.radius2_;
   }
 
+  /**
+   * Set the secondary radius for the shape.
+   * @param {number|undefined} radius2 Radius2.
+   * @api
+   */
+  setRadius2(radius2) {
+    if (this.radius2_ === radius2) {
+      return;
+    }
+    this.radius2_ = radius2;
+    this.render();
+  }
+
   /**
    * Get the size of the symbolizer (in pixels).
    * @return {import("../size.js").Size} Size.

package/util.js

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