ol 10.7.1 → 10.7.2

package/render/canvas/LineStringBuilder.d.ts

@@ -5,7 +5,6 @@ declare class CanvasLineStringBuilder extends CanvasBuilder {
      * @param {number} offset Offset.
      * @param {number} end End.
      * @param {number} stride Stride.
-     * @param {number} [strokeOffset] Stroke Offset in pixels.
      * @private
      * @return {number} end.
      */

package/render/canvas/LineStringBuilder.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"LineStringBuilder.d.ts","sourceRoot":"","sources":["LineStringBuilder.js"],"names":[],"mappings":";AAUA;IAWE;;;;;;;;OAQG;IACH,6BAuBC;CA2HF;0BA5KyB,cAAc"}
+{"version":3,"file":"LineStringBuilder.d.ts","sourceRoot":"","sources":["LineStringBuilder.js"],"names":[],"mappings":";AAUA;IAWE;;;;;;;OAOG;IACH,6BAkBC;CAuHF;0BAlKyB,cAAc"}

package/render/canvas/LineStringBuilder.js

@@ -24,11 +24,10 @@ class CanvasLineStringBuilder extends CanvasBuilder {
    * @param {number} offset Offset.
    * @param {number} end End.
    * @param {number} stride Stride.
-   * @param {number} [strokeOffset] Stroke Offset in pixels.
    * @private
    * @return {number} end.
    */
-  drawFlatCoordinates_(flatCoordinates, offset, end, stride, strokeOffset) {
+  drawFlatCoordinates_(flatCoordinates, offset, end, stride) {
     const myBegin = this.coordinates.length;
     const myEnd = this.appendFlatLineCoordinates(
       flatCoordinates,
@@ -38,18 +37,13 @@ class CanvasLineStringBuilder extends CanvasBuilder {
       false,
       false,
     );
-    this.instructions.push([
+    const moveToLineToInstruction = [
       CanvasInstruction.MOVE_TO_LINE_TO,
       myBegin,
       myEnd,
-      strokeOffset * this.pixelRatio,
-    ]);
-    this.hitDetectionInstructions.push([
-      CanvasInstruction.MOVE_TO_LINE_TO,
-      myBegin,
-      myEnd,
-      strokeOffset,
-    ]);
+    ];
+    this.instructions.push(moveToLineToInstruction);
+    this.hitDetectionInstructions.push(moveToLineToInstruction);
     return end;
   }
 
@@ -63,7 +57,6 @@ class CanvasLineStringBuilder extends CanvasBuilder {
     const state = this.state;
     const strokeStyle = state.strokeStyle;
     const lineWidth = state.lineWidth;
-    const strokeOffset = state.strokeOffset;
     if (strokeStyle === undefined || lineWidth === undefined) {
       return;
     }
@@ -89,7 +82,6 @@ class CanvasLineStringBuilder extends CanvasBuilder {
       0,
       flatCoordinates.length,
       stride,
-      strokeOffset,
     );
     this.hitDetectionInstructions.push(strokeInstruction);
     this.endGeometry(feature);
@@ -105,7 +97,6 @@ class CanvasLineStringBuilder extends CanvasBuilder {
     const state = this.state;
     const strokeStyle = state.strokeStyle;
     const lineWidth = state.lineWidth;
-    const strokeOffset = state.strokeOffset;
     if (strokeStyle === undefined || lineWidth === undefined) {
       return;
     }
@@ -134,7 +125,6 @@ class CanvasLineStringBuilder extends CanvasBuilder {
         offset,
         /** @type {number} */ (ends[i]),
         stride,
-        strokeOffset,
       );
     }
     this.hitDetectionInstructions.push(strokeInstruction);

package/render/canvas/PolygonBuilder.d.ts

@@ -5,7 +5,6 @@ declare class CanvasPolygonBuilder extends CanvasBuilder {
      * @param {number} offset Offset.
      * @param {Array<number>} ends Ends.
      * @param {number} stride Stride.
-     * @param {number} [strokeOffset] Stroke Offset in pixels.
      * @private
      * @return {number} End.
      */
@@ -14,7 +13,6 @@ declare class CanvasPolygonBuilder extends CanvasBuilder {
      * @private
      */
     private setFillStrokeStyles_;
-    handleStrokeOffset_(drawGeometryCallback: any): boolean;
 }
 import CanvasBuilder from './Builder.js';
 //# sourceMappingURL=PolygonBuilder.d.ts.map

package/render/canvas/PolygonBuilder.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"PolygonBuilder.d.ts","sourceRoot":"","sources":["PolygonBuilder.js"],"names":[],"mappings":";AAiBA;IAWE;;;;;;;;OAQG;IACH,8BAiDC;IA0MD;;OAEG;IACH,6BAIC;IAED,wDA4BC;CACF;0BA7TyB,cAAc"}
+{"version":3,"file":"PolygonBuilder.d.ts","sourceRoot":"","sources":["PolygonBuilder.js"],"names":[],"mappings":";AAiBA;IAWE;;;;;;;OAOG;IACH,8BA0CC;IA8KD;;OAEG;IACH,6BAIC;CACF;0BA3PyB,cAAc"}

package/render/canvas/PolygonBuilder.js

@@ -31,11 +31,10 @@ class CanvasPolygonBuilder extends CanvasBuilder {
    * @param {number} offset Offset.
    * @param {Array<number>} ends Ends.
    * @param {number} stride Stride.
-   * @param {number} [strokeOffset] Stroke Offset in pixels.
    * @private
    * @return {number} End.
    */
-  drawFlatCoordinatess_(flatCoordinates, offset, ends, stride, strokeOffset) {
+  drawFlatCoordinatess_(flatCoordinates, offset, ends, stride) {
     const state = this.state;
     const fill = state.fillStyle !== undefined;
     const stroke = state.strokeStyle !== undefined;
@@ -53,20 +52,13 @@ class CanvasPolygonBuilder extends CanvasBuilder {
         true,
         !stroke,
       );
-      this.instructions.push([
+      const moveToLineToInstruction = [
         CanvasInstruction.MOVE_TO_LINE_TO,
         myBegin,
         myEnd,
-        strokeOffset * this.pixelRatio,
-        true,
-      ]);
-      this.hitDetectionInstructions.push([
-        CanvasInstruction.MOVE_TO_LINE_TO,
-        myBegin,
-        myEnd,
-        strokeOffset,
-        true,
-      ]);
+      ];
+      this.instructions.push(moveToLineToInstruction);
+      this.hitDetectionInstructions.push(moveToLineToInstruction);
       if (stroke) {
         // Performance optimization: only call closePath() when we have a stroke.
         // Otherwise the ring is closed already (see appendFlatLineCoordinates above).
@@ -96,18 +88,9 @@ class CanvasPolygonBuilder extends CanvasBuilder {
     const state = this.state;
     const fillStyle = state.fillStyle;
     const strokeStyle = state.strokeStyle;
-    const strokeOffset = state.strokeOffset;
     if (fillStyle === undefined && strokeStyle === undefined) {
       return;
     }
-
-    if (
-      this.handleStrokeOffset_(() =>
-        this.drawCircle(circleGeometry, feature, index),
-      )
-    ) {
-      return;
-    }
     this.setFillStrokeStyles_();
     this.beginGeometry(circleGeometry, feature, index);
     if (state.fillStyle !== undefined) {
@@ -139,7 +122,7 @@ class CanvasPolygonBuilder extends CanvasBuilder {
       false,
       false,
     );
-    const circleInstruction = [CanvasInstruction.CIRCLE, myBegin, strokeOffset];
+    const circleInstruction = [CanvasInstruction.CIRCLE, myBegin];
     this.instructions.push(beginPathInstruction, circleInstruction);
     this.hitDetectionInstructions.push(beginPathInstruction, circleInstruction);
     if (state.fillStyle !== undefined) {
@@ -163,18 +146,9 @@ class CanvasPolygonBuilder extends CanvasBuilder {
     const state = this.state;
     const fillStyle = state.fillStyle;
     const strokeStyle = state.strokeStyle;
-    const strokeOffset = state.strokeOffset;
     if (fillStyle === undefined && strokeStyle === undefined) {
       return;
     }
-    if (
-      this.handleStrokeOffset_(() =>
-        this.drawPolygon(polygonGeometry, feature, index),
-      )
-    ) {
-      return;
-    }
-
     this.setFillStrokeStyles_();
     this.beginGeometry(polygonGeometry, feature, index);
     if (state.fillStyle !== undefined) {
@@ -203,7 +177,6 @@ class CanvasPolygonBuilder extends CanvasBuilder {
       0,
       /** @type {Array<number>} */ (ends),
       stride,
-      strokeOffset,
     );
     this.endGeometry(feature);
   }
@@ -218,17 +191,9 @@ class CanvasPolygonBuilder extends CanvasBuilder {
     const state = this.state;
     const fillStyle = state.fillStyle;
     const strokeStyle = state.strokeStyle;
-    const strokeOffset = state.strokeOffset;
     if (fillStyle === undefined && strokeStyle === undefined) {
       return;
     }
-    if (
-      this.handleStrokeOffset_(() =>
-        this.drawMultiPolygon(multiPolygonGeometry, feature, index),
-      )
-    ) {
-      return;
-    }
     this.setFillStrokeStyles_();
     this.beginGeometry(multiPolygonGeometry, feature, index);
     if (state.fillStyle !== undefined) {
@@ -259,7 +224,6 @@ class CanvasPolygonBuilder extends CanvasBuilder {
         offset,
         endss[i],
         stride,
-        strokeOffset,
       );
     }
     this.endGeometry(feature);
@@ -294,36 +258,6 @@ class CanvasPolygonBuilder extends CanvasBuilder {
     this.updateFillStyle(state, this.createFill);
     this.updateStrokeStyle(state, this.applyStroke);
   }
-
-  handleStrokeOffset_(drawGeometryCallback) {
-    const state = this.state;
-    const fillStyle = state.fillStyle;
-    const strokeStyle = state.strokeStyle;
-    const strokeOffset = state.strokeOffset;
-
-    // In case both fill style and stroke style are defined and the stroke style has an offset,
-    // the stroke and fill should be done in separate steps, because offset stroke shape will
-    // be different from the original shape used for the fill.
-    if (
-      Math.abs(strokeOffset) > 0 &&
-      fillStyle !== undefined &&
-      strokeStyle !== undefined
-    ) {
-      // First do only fill
-      state.strokeStyle = undefined;
-      state.strokeOffset = 0;
-      drawGeometryCallback();
-      // Now separately do the stroke
-      state.fillStyle = undefined;
-      state.strokeStyle = strokeStyle;
-      state.strokeOffset = strokeOffset;
-      drawGeometryCallback();
-      // Reset the state to the original
-      state.fillStyle = fillStyle;
-      return true;
-    }
-    return false;
-  }
 }
 
 export default CanvasPolygonBuilder;

package/render/canvas/style.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"style.d.ts","sourceRoot":"","sources":["style.js"],"names":[],"mappings":"AAiEA;;;;;;;GAOG;AACH,4CAHW,KAAK,CAAC,OAAO,qBAAqB,EAAE,IAAI,CAAC,GACxC,OAAO,sBAAsB,EAAE,aAAa,CAwBvD;AAED;;;;;;;GAOG;AACH,sDAHW,KAAK,CAAC,OAAO,qBAAqB,EAAE,SAAS,CAAC,GAC7C,OAAO,sBAAsB,EAAE,aAAa,CA0CvD;AAED;;GAEG;AAEH;;;;GAIG;AAEH;;;;GAIG;AACH,oCAJW,KAAK,CAAC,OAAO,qBAAqB,EAAE,IAAI,CAAC,WACzC,cAAc,GACb,gBAAgB,CA6D3B;AAED;;GAEG;AAEH;;;;;GAKG;AACH,sCALW,SAAS,WACT,cAAc,GACb,cAAc,CAgEzB;wBApQY,OAAO,qBAAqB,EAAE,SAAS;gCAIvC,OAAO,0BAA0B,EAAE,iBAAiB;6BAIpD,OAAO,0BAA0B,EAAE,cAAc;6BAIjD,OAAO,0BAA0B,EAAE,cAAc;gCAIjD,OAAO,mBAAmB,EAAE,iBAAiB;kCAI7C,OAAO,mBAAmB,EAAE,mBAAmB;+BA8F/C,CAAS,IAAiB,EAAjB,iBAAiB,KAAE,KAAK,CAAC,KAAK,CAAC;;;;;YAKvC,mBAAmB;;;;YACnB,KAAK,CAAC,cAAc,CAAC;;6BAsEtB,CAAS,IAAiB,EAAjB,iBAAiB,KAAE,KAAK,GAAC,IAAI;4BAyEtC,CAAS,IAAiB,EAAjB,iBAAiB,KAAE,IAAI,GAAC,IAAI;8BAyCrC,CAAS,IAAiB,EAAjB,iBAAiB,KAAE,MAAM,GAAC,IAAI;4BAqHvC,CAAS,IAAiB,EAAjB,iBAAiB,KAAE,IAAI;6BA0OhC,CAAS,IAAiB,EAAjB,iBAAiB,KAAE,OAAO,sBAAsB,EAAE,OAAO;kBA3pB7D,sBAAsB;iBAJvB,qBAAqB;mBAGnB,uBAAuB;iBAEzB,qBAAqB"}
+{"version":3,"file":"style.d.ts","sourceRoot":"","sources":["style.js"],"names":[],"mappings":"AAiEA;;;;;;;GAOG;AACH,4CAHW,KAAK,CAAC,OAAO,qBAAqB,EAAE,IAAI,CAAC,GACxC,OAAO,sBAAsB,EAAE,aAAa,CAwBvD;AAED;;;;;;;GAOG;AACH,sDAHW,KAAK,CAAC,OAAO,qBAAqB,EAAE,SAAS,CAAC,GAC7C,OAAO,sBAAsB,EAAE,aAAa,CA0CvD;AAED;;GAEG;AAEH;;;;GAIG;AAEH;;;;GAIG;AACH,oCAJW,KAAK,CAAC,OAAO,qBAAqB,EAAE,IAAI,CAAC,WACzC,cAAc,GACb,gBAAgB,CA6D3B;AAED;;GAEG;AAEH;;;;;GAKG;AACH,sCALW,SAAS,WACT,cAAc,GACb,cAAc,CAgEzB;wBApQY,OAAO,qBAAqB,EAAE,SAAS;gCAIvC,OAAO,0BAA0B,EAAE,iBAAiB;6BAIpD,OAAO,0BAA0B,EAAE,cAAc;6BAIjD,OAAO,0BAA0B,EAAE,cAAc;gCAIjD,OAAO,mBAAmB,EAAE,iBAAiB;kCAI7C,OAAO,mBAAmB,EAAE,mBAAmB;+BA8F/C,CAAS,IAAiB,EAAjB,iBAAiB,KAAE,KAAK,CAAC,KAAK,CAAC;;;;;YAKvC,mBAAmB;;;;YACnB,KAAK,CAAC,cAAc,CAAC;;6BAsEtB,CAAS,IAAiB,EAAjB,iBAAiB,KAAE,KAAK,GAAC,IAAI;4BAyEtC,CAAS,IAAiB,EAAjB,iBAAiB,KAAE,IAAI,GAAC,IAAI;8BAyCrC,CAAS,IAAiB,EAAjB,iBAAiB,KAAE,MAAM,GAAC,IAAI;4BA2GvC,CAAS,IAAiB,EAAjB,iBAAiB,KAAE,IAAI;6BA0OhC,CAAS,IAAiB,EAAjB,iBAAiB,KAAE,OAAO,sBAAsB,EAAE,OAAO;kBAjpB7D,sBAAsB;iBAJvB,qBAAqB;mBAGnB,uBAAuB;iBAEzB,qBAAqB"}

package/render/canvas/style.js

@@ -392,12 +392,6 @@ function buildStroke(flatStyle, prefix, context) {
     context,
   );
 
-  const evaluateOffset = numberEvaluator(
-    flatStyle,
-    prefix + 'stroke-offset',
-    context,
-  );
-
   const stroke = new Stroke();
   return function (context) {
     if (evaluateColor) {
@@ -444,10 +438,6 @@ function buildStroke(flatStyle, prefix, context) {
       stroke.setMiterLimit(evaluateMiterLimit(context));
     }
 
-    if (evaluateOffset) {
-      stroke.setOffset(evaluateOffset(context));
-    }
-
     return stroke;
   };
 }
@@ -766,20 +756,7 @@ function buildIcon(flatStyle, context) {
     flatStyle,
     prefix + 'anchor-y-units',
   );
-  const colorValue = getExpressionValue(flatStyle, prefix + 'color');
-  let color;
-  let evaluateColor = null;
-  if (colorValue !== undefined) {
-    const isColorExpression =
-      Array.isArray(colorValue) &&
-      colorValue.length > 0 &&
-      typeof colorValue[0] === 'string';
-    if (isColorExpression) {
-      evaluateColor = colorLikeEvaluator(flatStyle, prefix + 'color', context);
-    } else {
-      color = requireColorLike(colorValue, prefix + 'color');
-    }
-  }
+  const color = optionalColorLike(flatStyle, prefix + 'color');
   const crossOrigin = optionalString(flatStyle, prefix + 'cross-origin');
   const offset = optionalNumberArray(flatStyle, prefix + 'offset');
   const offsetOrigin = optionalIconOrigin(flatStyle, prefix + 'offset-origin');
@@ -791,11 +768,12 @@ function buildIcon(flatStyle, context) {
     prefix + 'declutter-mode',
   );
 
-  const iconOptions = {
+  const icon = new Icon({
     src,
     anchorOrigin,
     anchorXUnits,
     anchorYUnits,
+    color,
     crossOrigin,
     offset,
     offsetOrigin,
@@ -803,22 +781,9 @@ function buildIcon(flatStyle, context) {
     width,
     size,
     declutterMode,
-  };
-
-  let icon = null;
+  });
 
   return function (context) {
-    if (!icon) {
-      // lazily create the icon to allow for expression evaluation
-      const initialColor = evaluateColor ? evaluateColor(context) : color;
-      icon = new Icon(
-        initialColor !== undefined
-          ? Object.assign({}, iconOptions, {color: initialColor})
-          : Object.assign({}, iconOptions),
-      );
-    } else if (evaluateColor) {
-      icon.setColor(evaluateColor(context));
-    }
     if (evaluateOpacity) {
       icon.setOpacity(evaluateOpacity(context));
     }
@@ -858,18 +823,7 @@ function buildShape(flatStyle, context) {
   const pointsName = prefix + 'points';
   const radiusName = prefix + 'radius';
   const points = requireNumber(flatStyle[pointsName], pointsName);
-  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;
+  const radius = requireNumber(flatStyle[radiusName], radiusName);
 
   // settable properties
   const evaluateFill = buildFill(flatStyle, prefix, context);
@@ -892,6 +846,7 @@ 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,
@@ -900,19 +855,13 @@ function buildShape(flatStyle, context) {
 
   const shape = new RegularShape({
     points,
-    radius: initialRadius,
-    radius2: initialRadius2,
+    radius,
+    radius2,
     angle,
     declutterMode,
   });
 
   return function (context) {
-    if (evaluateRadius) {
-      shape.setRadius(evaluateRadius(context));
-    }
-    if (evaluateRadius2) {
-      shape.setRadius2(evaluateRadius2(context));
-    }
     if (evaluateFill) {
       shape.setFill(evaluateFill(context));
     }
@@ -1003,19 +952,6 @@ 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.
@@ -1023,11 +959,10 @@ function getExpressionValue(flatStyle, name) {
  * @return {import('../../expr/cpu.js').NumberEvaluator|undefined} The expression evaluator or undefined.
  */
 function numberEvaluator(flatStyle, name, context) {
-  const encoded = getExpressionValue(flatStyle, name);
-  if (encoded === undefined) {
+  if (!(name in flatStyle)) {
     return undefined;
   }
-  const evaluator = buildExpression(encoded, NumberType, context);
+  const evaluator = buildExpression(flatStyle[name], NumberType, context);
   return function (context) {
     return requireNumber(evaluator(context), name);
   };
@@ -1040,11 +975,10 @@ function numberEvaluator(flatStyle, name, context) {
  * @return {import('../../expr/cpu.js').StringEvaluator?} The expression evaluator.
  */
 function stringEvaluator(flatStyle, name, context) {
-  const encoded = getExpressionValue(flatStyle, name);
-  if (encoded === undefined) {
+  if (!(name in flatStyle)) {
     return null;
   }
-  const evaluator = buildExpression(encoded, StringType, context);
+  const evaluator = buildExpression(flatStyle[name], StringType, context);
   return function (context) {
     return requireString(evaluator(context), name);
   };
@@ -1088,11 +1022,10 @@ function patternEvaluator(flatStyle, prefix, context) {
  * @return {import('../../expr/cpu.js').BooleanEvaluator?} The expression evaluator.
  */
 function booleanEvaluator(flatStyle, name, context) {
-  const encoded = getExpressionValue(flatStyle, name);
-  if (encoded === undefined) {
+  if (!(name in flatStyle)) {
     return null;
   }
-  const evaluator = buildExpression(encoded, BooleanType, context);
+  const evaluator = buildExpression(flatStyle[name], BooleanType, context);
   return function (context) {
     const value = evaluator(context);
     if (typeof value !== 'boolean') {
@@ -1109,11 +1042,10 @@ function booleanEvaluator(flatStyle, name, context) {
  * @return {import('../../expr/cpu.js').ColorLikeEvaluator?} The expression evaluator.
  */
 function colorLikeEvaluator(flatStyle, name, context) {
-  const encoded = getExpressionValue(flatStyle, name);
-  if (encoded === undefined) {
+  if (!(name in flatStyle)) {
     return null;
   }
-  const evaluator = buildExpression(encoded, ColorType, context);
+  const evaluator = buildExpression(flatStyle[name], ColorType, context);
   return function (context) {
     return requireColorLike(evaluator(context), name);
   };
@@ -1126,33 +1058,10 @@ function colorLikeEvaluator(flatStyle, name, context) {
  * @return {import('../../expr/cpu.js').NumberArrayEvaluator?} The expression evaluator.
  */
 function numberArrayEvaluator(flatStyle, name, context) {
-  const encoded = getExpressionValue(flatStyle, name);
-  if (encoded === undefined) {
+  if (!(name in flatStyle)) {
     return null;
   }
-  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);
+  const evaluator = buildExpression(flatStyle[name], NumberArrayType, context);
   return function (context) {
     return requireNumberArray(evaluator(context), name);
   };
@@ -1165,11 +1074,10 @@ function numberArrayEvaluator(flatStyle, name, context) {
  * @return {import('../../expr/cpu.js').CoordinateEvaluator?} The expression evaluator.
  */
 function coordinateEvaluator(flatStyle, name, context) {
-  const encoded = getExpressionValue(flatStyle, name);
-  if (encoded === undefined) {
+  if (!(name in flatStyle)) {
     return null;
   }
-  const evaluator = buildExpression(encoded, NumberArrayType, context);
+  const evaluator = buildExpression(flatStyle[name], NumberArrayType, context);
   return function (context) {
     const array = requireNumberArray(evaluator(context), name);
     if (array.length !== 2) {
@@ -1186,11 +1094,10 @@ function coordinateEvaluator(flatStyle, name, context) {
  * @return {import('../../expr/cpu.js').SizeEvaluator?} The expression evaluator.
  */
 function sizeEvaluator(flatStyle, name, context) {
-  const encoded = getExpressionValue(flatStyle, name);
-  if (encoded === undefined) {
+  if (!(name in flatStyle)) {
     return null;
   }
-  const evaluator = buildExpression(encoded, NumberArrayType, context);
+  const evaluator = buildExpression(flatStyle[name], NumberArrayType, context);
   return function (context) {
     return requireSize(evaluator(context), name);
   };
@@ -1203,12 +1110,11 @@ function sizeEvaluator(flatStyle, name, context) {
  * @return {import('../../expr/cpu.js').SizeLikeEvaluator?} The expression evaluator.
  */
 function sizeLikeEvaluator(flatStyle, name, context) {
-  const encoded = getExpressionValue(flatStyle, name);
-  if (encoded === undefined) {
+  if (!(name in flatStyle)) {
     return null;
   }
   const evaluator = buildExpression(
-    encoded,
+    flatStyle[name],
     NumberArrayType | NumberType,
     context,
   );
@@ -1346,6 +1252,19 @@ function optionalDeclutterMode(flatStyle, property) {
   return encoded;
 }
 
+/**
+ * @param {FlatStyle} flatStyle The flat style.
+ * @param {string} property The symbolizer property.
+ * @return {string|Array<number>|undefined} A string or an array of color values or undefined.
+ */
+function optionalColorLike(flatStyle, property) {
+  const encoded = flatStyle[property];
+  if (encoded === undefined) {
+    return undefined;
+  }
+  return requireColorLike(encoded, property);
+}
+
 /**
  * @param {any} value The value.
  * @param {string} property The property.

package/render/canvas.d.ts

@@ -70,7 +70,6 @@ export function drawImageOrLabel(context: CanvasRenderingContext2D | import("../
  * @property {CanvasLineJoin} [currentLineJoin] Current LineJoin.
  * @property {number} [currentLineWidth] Current LineWidth.
  * @property {number} [currentMiterLimit] Current MiterLimit.
- * @property {number} [currentStrokeOffset] Current StrokeOffset.
  * @property {number} [lastStroke] Last stroke.
  * @property {import("../colorlike.js").ColorLike} [fillStyle] FillStyle.
  * @property {import("../colorlike.js").ColorLike} [strokeStyle] StrokeStyle.
@@ -80,7 +79,6 @@ export function drawImageOrLabel(context: CanvasRenderingContext2D | import("../
  * @property {CanvasLineJoin} [lineJoin] LineJoin.
  * @property {number} [lineWidth] LineWidth.
  * @property {number} [miterLimit] MiterLimit.
- * @property {number} [strokeOffset] StrokeOffset.
  * @property {number} [fillPatternScale] Fill pattern scale.
  */
 /**
@@ -91,7 +89,6 @@ export function drawImageOrLabel(context: CanvasRenderingContext2D | import("../
  * @property {CanvasLineJoin} lineJoin LineJoin.
  * @property {number} lineWidth LineWidth.
  * @property {number} miterLimit MiterLimit.
- * @property {number} [strokeOffset] StrokeOffset.
  * @property {import("../colorlike.js").ColorLike} strokeStyle StrokeStyle.
  */
 /**
@@ -156,11 +153,6 @@ export const defaultLineJoin: CanvasLineJoin;
  * @type {number}
  */
 export const defaultMiterLimit: number;
-/**
- * @const
- * @type {number}
- */
-export const defaultStrokeOffset: number;
 /**
  * @const
  * @type {import("../colorlike.js").ColorLike}
@@ -252,10 +244,6 @@ export type FillStrokeState = {
      * Current MiterLimit.
      */
     currentMiterLimit?: number | undefined;
-    /**
-     * Current StrokeOffset.
-     */
-    currentStrokeOffset?: number | undefined;
     /**
      * Last stroke.
      */
@@ -292,10 +280,6 @@ export type FillStrokeState = {
      * MiterLimit.
      */
     miterLimit?: number | undefined;
-    /**
-     * StrokeOffset.
-     */
-    strokeOffset?: number | undefined;
     /**
      * Fill pattern scale.
      */
@@ -326,10 +310,6 @@ export type StrokeState = {
      * MiterLimit.
      */
     miterLimit: number;
-    /**
-     * StrokeOffset.
-     */
-    strokeOffset?: number | undefined;
     /**
      * StrokeStyle.
      */
@@ -371,11 +351,11 @@ export type TextState = {
     /**
      * BackgroundFill.
      */
-    backgroundFill?: import("../style.js").Fill | undefined;
+    backgroundFill?: import("../style/Fill.js").default | undefined;
     /**
      * BackgroundStroke.
      */
-    backgroundStroke?: import("../style.js").Stroke | undefined;
+    backgroundStroke?: import("../style/Stroke.js").default | undefined;
     /**
      * Scale.
      */

package/render/canvas.d.ts.map

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