ol 9.2.5-dev.1718182619798 → 9.2.5-dev.1718470218102

package/interaction/Select.js

@@ -27,7 +27,7 @@ const SelectEventType = {
 };
 
 /**
- * A function that takes an {@link module:ol/Feature~Feature} and returns `true` if the feature may be
+ * A function that takes a {@link module:ol/Feature~Feature} and returns `true` if the feature may be
  * selected or `false` otherwise.
  * @typedef {function(import("../Feature.js").default, import("../layer/Layer.js").default<import("../source/Source").default>):boolean} FilterFunction
  */
@@ -35,12 +35,12 @@ const SelectEventType = {
 /**
  * @typedef {Object} Options
  * @property {import("../events/condition.js").Condition} [addCondition] A function
- * that takes an {@link module:ol/MapBrowserEvent~MapBrowserEvent} and returns a
+ * that takes a {@link module:ol/MapBrowserEvent~MapBrowserEvent} and returns a
  * boolean to indicate whether that event should be handled.
  * By default, this is {@link module:ol/events/condition.never}. Use this if you
  * want to use different events for add and remove instead of `toggle`.
  * @property {import("../events/condition.js").Condition} [condition] A function that
- * takes an {@link module:ol/MapBrowserEvent~MapBrowserEvent} and returns a
+ * takes a {@link module:ol/MapBrowserEvent~MapBrowserEvent} and returns a
  * boolean to indicate whether that event should be handled. This is the event
  * for the selected features as a whole. By default, this is
  * {@link module:ol/events/condition.singleClick}. Clicking on a feature selects that
@@ -60,12 +60,12 @@ const SelectEventType = {
  * any style changes for selected features.
  * If set to a falsey value, the selected feature's style will not change.
  * @property {import("../events/condition.js").Condition} [removeCondition] A function
- * that takes an {@link module:ol/MapBrowserEvent~MapBrowserEvent} and returns a
+ * that takes a {@link module:ol/MapBrowserEvent~MapBrowserEvent} and returns a
  * boolean to indicate whether that event should be handled.
  * By default, this is {@link module:ol/events/condition.never}. Use this if you
  * want to use different events for add and remove instead of `toggle`.
  * @property {import("../events/condition.js").Condition} [toggleCondition] A function
- * that takes an {@link module:ol/MapBrowserEvent~MapBrowserEvent} and returns a
+ * that takes a {@link module:ol/MapBrowserEvent~MapBrowserEvent} and returns a
  * boolean to indicate whether that event should be handled. This is in addition
  * to the `condition` event. By default,
  * {@link module:ol/events/condition.shiftKeyOnly}, i.e. pressing `shift` as
@@ -81,7 +81,7 @@ const SelectEventType = {
  * used by the interaction is returned by
  * {@link module:ol/interaction/Select~Select#getFeatures}.
  * @property {FilterFunction} [filter] A function
- * that takes an {@link module:ol/Feature~Feature} and an
+ * that takes a {@link module:ol/Feature~Feature} and a
  * {@link module:ol/layer/Layer~Layer} and returns `true` if the feature may be
  * selected or `false` otherwise.
  * @property {number} [hitTolerance=0] Hit-detection tolerance. Pixels inside

package/interaction/Translate.d.ts

@@ -1,6 +1,6 @@
 /**
- * A function that takes an {@link module:ol/Feature~Feature} or
- * {@link module:ol/render/Feature~RenderFeature} and an
+ * A function that takes a {@link module:ol/Feature~Feature} or
+ * {@link module:ol/render/Feature~RenderFeature} and a
  * {@link module:ol/layer/Layer~Layer} and returns `true` if the feature may be
  * translated or `false` otherwise.
  * @typedef {function(Feature, import("../layer/Layer.js").default<import("../source/Source").default>):boolean} FilterFunction
@@ -8,7 +8,7 @@
 /**
  * @typedef {Object} Options
  * @property {import("../events/condition.js").Condition} [condition] A function that
- * takes an {@link module:ol/MapBrowserEvent~MapBrowserEvent} and returns a
+ * takes a {@link module:ol/MapBrowserEvent~MapBrowserEvent} and returns a
  * boolean to indicate whether that event should be handled.
  * Default is {@link module:ol/events/condition.always}.
  * @property {Collection<Feature>} [features] Features contained in this collection will be able to be translated together.
@@ -19,7 +19,7 @@
  * absent, all visible layers will be considered translatable.
  * Not used if `features` is provided.
  * @property {FilterFunction} [filter] A function
- * that takes an {@link module:ol/Feature~Feature} and an
+ * that takes a {@link module:ol/Feature~Feature} and an
  * {@link module:ol/layer/Layer~Layer} and returns `true` if the feature may be
  * translated or `false` otherwise. Not used if `features` is provided.
  * @property {number} [hitTolerance=0] Hit-detection tolerance. Pixels inside the radius around the given position
@@ -68,8 +68,8 @@ export class TranslateEvent extends Event {
 }
 export default Translate;
 /**
- * A function that takes an {@link module :ol/Feature~Feature} or
- * {@link module :ol/render/Feature~RenderFeature} and an
+ * A function that takes a {@link module :ol/Feature~Feature} or
+ * {@link module :ol/render/Feature~RenderFeature} and a
  * {@link module :ol/layer/Layer~Layer} and returns `true` if the feature may be
  * translated or `false` otherwise.
  */
@@ -77,7 +77,7 @@ export type FilterFunction = (arg0: Feature, arg1: import("../layer/Layer.js").d
 export type Options = {
     /**
      * A function that
-     * takes an {@link module :ol/MapBrowserEvent~MapBrowserEvent} and returns a
+     * takes a {@link module :ol/MapBrowserEvent~MapBrowserEvent} and returns a
      * boolean to indicate whether that event should be handled.
      * Default is {@link module :ol/events/condition.always}.
      */
@@ -97,7 +97,7 @@ export type Options = {
     layers?: import("../layer/Layer.js").default<import("../source/Source").default, import("../renderer/Layer.js").default<any>>[] | ((arg0: import("../layer/Layer.js").default<import("../source/Source").default>) => boolean) | undefined;
     /**
      * A function
-     * that takes an {@link module :ol/Feature~Feature} and an
+     * that takes a {@link module :ol/Feature~Feature} and an
      * {@link module :ol/layer/Layer~Layer} and returns `true` if the feature may be
      * translated or `false` otherwise. Not used if `features` is provided.
      */

package/interaction/Translate.js

@@ -35,8 +35,8 @@ const TranslateEventType = {
 };
 
 /**
- * A function that takes an {@link module:ol/Feature~Feature} or
- * {@link module:ol/render/Feature~RenderFeature} and an
+ * A function that takes a {@link module:ol/Feature~Feature} or
+ * {@link module:ol/render/Feature~RenderFeature} and a
  * {@link module:ol/layer/Layer~Layer} and returns `true` if the feature may be
  * translated or `false` otherwise.
  * @typedef {function(Feature, import("../layer/Layer.js").default<import("../source/Source").default>):boolean} FilterFunction
@@ -45,7 +45,7 @@ const TranslateEventType = {
 /**
  * @typedef {Object} Options
  * @property {import("../events/condition.js").Condition} [condition] A function that
- * takes an {@link module:ol/MapBrowserEvent~MapBrowserEvent} and returns a
+ * takes a {@link module:ol/MapBrowserEvent~MapBrowserEvent} and returns a
  * boolean to indicate whether that event should be handled.
  * Default is {@link module:ol/events/condition.always}.
  * @property {Collection<Feature>} [features] Features contained in this collection will be able to be translated together.
@@ -56,7 +56,7 @@ const TranslateEventType = {
  * absent, all visible layers will be considered translatable.
  * Not used if `features` is provided.
  * @property {FilterFunction} [filter] A function
- * that takes an {@link module:ol/Feature~Feature} and an
+ * that takes a {@link module:ol/Feature~Feature} and an
  * {@link module:ol/layer/Layer~Layer} and returns `true` if the feature may be
  * translated or `false` otherwise. Not used if `features` is provided.
  * @property {number} [hitTolerance=0] Hit-detection tolerance. Pixels inside the radius around the given position

package/package.json

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

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

@@ -1 +1 @@
-{"version":3,"file":"style.d.ts","sourceRoot":"","sources":["style.js"],"names":[],"mappings":"AAgEA;;;;;;;GAOG;AACH,4CAHW,MAAM,OAAO,qBAAqB,EAAE,IAAI,CAAC,GACxC,OAAO,sBAAsB,EAAE,aAAa,CAwBvD;AAED;;;;;;;GAOG;AACH,sDAHW,MAAM,OAAO,qBAAqB,EAAE,SAAS,CAAC,GAC7C,OAAO,sBAAsB,EAAE,aAAa,CA0CvD;AAED;;GAEG;AAEH;;;;GAIG;AAEH;;;;GAIG;AACH,oCAJW,MAAM,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;sCA8FtC,iBAAiB,KAAE,MAAM,KAAK,CAAC;;;;;YAKvC,mBAAmB;;;;YACnB,MAAM,cAAc,CAAC;;oCAsEb,iBAAiB,KAAE,KAAK,GAAC,IAAI;mCAyE7B,iBAAiB,KAAE,IAAI,GAAC,IAAI;qCAoC5B,iBAAiB,KAAE,MAAM,GAAC,IAAI;mCA2G9B,iBAAiB,KAAE,IAAI;oCAgOvB,iBAAiB,KAAE,OAAO,sBAAsB,EAAE,OAAO;kBA9oB7D,sBAAsB;iBAJvB,qBAAqB;mBAGnB,uBAAuB;iBAEzB,qBAAqB"}
+{"version":3,"file":"style.d.ts","sourceRoot":"","sources":["style.js"],"names":[],"mappings":"AAgEA;;;;;;;GAOG;AACH,4CAHW,MAAM,OAAO,qBAAqB,EAAE,IAAI,CAAC,GACxC,OAAO,sBAAsB,EAAE,aAAa,CAwBvD;AAED;;;;;;;GAOG;AACH,sDAHW,MAAM,OAAO,qBAAqB,EAAE,SAAS,CAAC,GAC7C,OAAO,sBAAsB,EAAE,aAAa,CA0CvD;AAED;;GAEG;AAEH;;;;GAIG;AAEH;;;;GAIG;AACH,oCAJW,MAAM,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;sCA8FtC,iBAAiB,KAAE,MAAM,KAAK,CAAC;;;;;YAKvC,mBAAmB;;;;YACnB,MAAM,cAAc,CAAC;;oCAsEb,iBAAiB,KAAE,KAAK,GAAC,IAAI;mCAyE7B,iBAAiB,KAAE,IAAI,GAAC,IAAI;qCAyC5B,iBAAiB,KAAE,MAAM,GAAC,IAAI;mCA2G9B,iBAAiB,KAAE,IAAI;oCAgOvB,iBAAiB,KAAE,OAAO,sBAAsB,EAAE,OAAO;kBAnpB7D,sBAAsB;iBAJvB,qBAAqB;mBAGnB,uBAAuB;iBAEzB,qBAAqB"}

package/render/canvas/style.js

@@ -308,6 +308,11 @@ function buildFill(flatStyle, prefix, context) {
   if (prefix + 'fill-pattern-src' in flatStyle) {
     evaluateColor = patternEvaluator(flatStyle, prefix + 'fill-', context);
   } else {
+    if (flatStyle[prefix + 'fill-color'] === 'none') {
+      // avoids hit detection
+      return (context) => null;
+    }
+
     evaluateColor = colorLikeEvaluator(
       flatStyle,
       prefix + 'fill-color',
@@ -1029,11 +1034,7 @@ function colorLikeEvaluator(flatStyle, name, context) {
   if (!(name in flatStyle)) {
     return null;
   }
-  const evaluator = buildExpression(
-    flatStyle[name],
-    ColorType | StringType,
-    context,
-  );
+  const evaluator = buildExpression(flatStyle[name], ColorType, context);
   return function (context) {
     return requireColorLike(evaluator(context), name);
   };

package/source/Cluster.d.ts

@@ -18,7 +18,7 @@ export type Options<FeatureType extends import("../Feature.js").FeatureLike> = {
      */
     minDistance?: number | undefined;
     /**
-     * Function that takes an {@link module :ol/Feature~Feature} as argument and returns an
+     * Function that takes a {@link module :ol/Feature~Feature} as argument and returns a
      * {@link module :ol/geom/Point~Point} as cluster calculation point for the feature. When a
      * feature should not be considered for clustering, the function should return
      * `null`. The default, which works when the underlying source contains point
@@ -67,7 +67,7 @@ export type Options<FeatureType extends import("../Feature.js").FeatureLike> = {
  * overlapping icons. As a tradoff, the cluster feature's position will no longer be
  * the center of all its features.
  * @property {function(FeatureType):(Point)} [geometryFunction]
- * Function that takes an {@link module:ol/Feature~Feature} as argument and returns an
+ * Function that takes a {@link module:ol/Feature~Feature} as argument and returns a
  * {@link module:ol/geom/Point~Point} as cluster calculation point for the feature. When a
  * feature should not be considered for clustering, the function should return
  * `null`. The default, which works when the underlying source contains point

package/source/Cluster.js

@@ -28,7 +28,7 @@ import {getUid} from '../util.js';
  * overlapping icons. As a tradoff, the cluster feature's position will no longer be
  * the center of all its features.
  * @property {function(FeatureType):(Point)} [geometryFunction]
- * Function that takes an {@link module:ol/Feature~Feature} as argument and returns an
+ * Function that takes a {@link module:ol/Feature~Feature} as argument and returns a
  * {@link module:ol/geom/Point~Point} as cluster calculation point for the feature. When a
  * feature should not be considered for clustering, the function should return
  * `null`. The default, which works when the underlying source contains point

package/source/Vector.d.ts

@@ -365,7 +365,7 @@ declare class VectorSource<FeatureType extends import("../Feature.js").FeatureLi
      * instead. A feature will not be added to the source if feature with
      * the same id is already there. The reason for this behavior is to avoid
      * feature duplication when using bbox or tile loading strategies.
-     * Note: this also applies if an {@link module:ol/Collection~Collection} is used for features,
+     * Note: this also applies if a {@link module:ol/Collection~Collection} is used for features,
      * meaning that if a feature with a duplicate id is added in the collection, it will
      * be removed from it right away.
      * @param {FeatureType} feature Feature to add.
@@ -483,7 +483,7 @@ declare class VectorSource<FeatureType extends import("../Feature.js").FeatureLi
     /**
      * Get the features collection associated with this source. Will be `null`
      * unless the source was configured with `useSpatialIndex` set to `false`, or
-     * with an {@link module:ol/Collection~Collection} as `features`.
+     * with a {@link module:ol/Collection~Collection} as `features`.
      * @return {Collection<FeatureType>|null} The collection of features.
      * @api
      */

package/source/Vector.js

@@ -328,7 +328,7 @@ class VectorSource extends Source {
    * instead. A feature will not be added to the source if feature with
    * the same id is already there. The reason for this behavior is to avoid
    * feature duplication when using bbox or tile loading strategies.
-   * Note: this also applies if an {@link module:ol/Collection~Collection} is used for features,
+   * Note: this also applies if a {@link module:ol/Collection~Collection} is used for features,
    * meaning that if a feature with a duplicate id is added in the collection, it will
    * be removed from it right away.
    * @param {FeatureType} feature Feature to add.
@@ -706,7 +706,7 @@ class VectorSource extends Source {
   /**
    * Get the features collection associated with this source. Will be `null`
    * unless the source was configured with `useSpatialIndex` set to `false`, or
-   * with an {@link module:ol/Collection~Collection} as `features`.
+   * with a {@link module:ol/Collection~Collection} as `features`.
    * @return {Collection<FeatureType>|null} The collection of features.
    * @api
    */

package/style/Fill.d.ts

@@ -38,7 +38,7 @@ declare class Fill {
      */
     private color_;
     /**
-     * Clones the style. The color is not cloned if it is an {@link module:ol/colorlike~ColorLike}.
+     * Clones the style. The color is not cloned if it is a {@link module:ol/colorlike~ColorLike}.
      * @return {Fill} The cloned style.
      * @api
      */

package/style/Fill.js

@@ -43,7 +43,7 @@ class Fill {
   }
 
   /**
-   * Clones the style. The color is not cloned if it is an {@link module:ol/colorlike~ColorLike}.
+   * Clones the style. The color is not cloned if it is a {@link module:ol/colorlike~ColorLike}.
    * @return {Fill} The cloned style.
    * @api
    */

package/style/Style.d.ts

@@ -28,7 +28,7 @@ export default Style;
  */
 export type DeclutterMode = "declutter" | "obstacle" | "none";
 /**
- * A function that takes an {@link module :ol/Feature~Feature} and a `{number}`
+ * A function that takes a {@link module :ol/Feature~Feature} and a `{number}`
  * representing the view's resolution. The function should return a
  * {@link module :ol/style/Style~Style} or an array of them. This way e.g. a
  * vector layer can be styled. If the function returns `undefined`, the
@@ -40,7 +40,7 @@ export type StyleFunction = (arg0: import("../Feature.js").FeatureLike, arg1: nu
  */
 export type StyleLike = Style | Array<Style> | StyleFunction;
 /**
- * A function that takes an {@link module :ol/Feature~Feature} as argument and returns an
+ * A function that takes a {@link module :ol/Feature~Feature} as argument and returns an
  * {@link module :ol/geom/Geometry~Geometry} that will be rendered and styled for the feature.
  */
 export type GeometryFunction = (arg0: import("../Feature.js").FeatureLike) => (import("../geom/Geometry.js").default | import("../render/Feature.js").default | undefined);
@@ -98,7 +98,7 @@ export type Options = {
  * @typedef {"declutter"|"obstacle"|"none"} DeclutterMode
  */
 /**
- * A function that takes an {@link module:ol/Feature~Feature} and a `{number}`
+ * A function that takes a {@link module:ol/Feature~Feature} and a `{number}`
  * representing the view's resolution. The function should return a
  * {@link module:ol/style/Style~Style} or an array of them. This way e.g. a
  * vector layer can be styled. If the function returns `undefined`, the
@@ -111,7 +111,7 @@ export type Options = {
  * @typedef {Style|Array<Style>|StyleFunction} StyleLike
  */
 /**
- * A function that takes an {@link module:ol/Feature~Feature} as argument and returns an
+ * A function that takes a {@link module:ol/Feature~Feature} as argument and returns an
  * {@link module:ol/geom/Geometry~Geometry} that will be rendered and styled for the feature.
  *
  * @typedef {function(import("../Feature.js").FeatureLike):

package/style/Style.js

@@ -18,7 +18,7 @@ import {assert} from '../asserts.js';
  */
 
 /**
- * A function that takes an {@link module:ol/Feature~Feature} and a `{number}`
+ * A function that takes a {@link module:ol/Feature~Feature} and a `{number}`
  * representing the view's resolution. The function should return a
  * {@link module:ol/style/Style~Style} or an array of them. This way e.g. a
  * vector layer can be styled. If the function returns `undefined`, the
@@ -33,7 +33,7 @@ import {assert} from '../asserts.js';
  */
 
 /**
- * A function that takes an {@link module:ol/Feature~Feature} as argument and returns an
+ * A function that takes a {@link module:ol/Feature~Feature} as argument and returns an
  * {@link module:ol/geom/Geometry~Geometry} that will be rendered and styled for the feature.
  *
  * @typedef {function(import("../Feature.js").FeatureLike):

package/util.js

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

package/webgl/styleparser.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"styleparser.d.ts","sourceRoot":"","sources":["styleparser.js"],"names":[],"mappings":"AAuBA;;;;;;;GAOG;AACH,qDALW,OAAO,gBAAgB,EAAE,kBAAkB,SAC3C,OAAO,uBAAuB,EAAE,iBAAiB,sCAEhD,MAAM,CAWjB;AAED;;;;GAIG;AACH,iCAHW,OAAO,aAAa,EAAE,KAAK,GAAC,MAAM,GACjC,MAAM,MAAM,CAAC,CASxB;AAqCD;;;;GAIG;AACH,mCAHW,MAAO,MAAM,GACZ,MAAM,CAOjB;AAgvBD;;;;;GAKG;AAEH;;;;;;;;;;GAUG;AACH,yCAHW,OAAO,mBAAmB,EAAE,UAAU,GACrC,gBAAgB,CAqJ3B;;;;;aAnKa,aAAa;;;;cACb,OAAO,wCAAwC,EAAE,kBAAkB;;;;gBACnE,OAAO,wCAAwC,EAAE,oBAAoB;;8BA50BvD,oBAAoB"}
+{"version":3,"file":"styleparser.d.ts","sourceRoot":"","sources":["styleparser.js"],"names":[],"mappings":"AAuBA;;;;;;;GAOG;AACH,qDALW,OAAO,gBAAgB,EAAE,kBAAkB,SAC3C,OAAO,uBAAuB,EAAE,iBAAiB,sCAEhD,MAAM,CAUjB;AAED;;;;GAIG;AACH,iCAHW,OAAO,aAAa,EAAE,KAAK,GAAC,MAAM,GACjC,MAAM,MAAM,CAAC,CASxB;AAqCD;;;;GAIG;AACH,mCAHW,MAAO,MAAM,GACZ,MAAM,CAOjB;AAgvBD;;;;;GAKG;AAEH;;;;;;;;;;GAUG;AACH,yCAHW,OAAO,mBAAmB,EAAE,UAAU,GACrC,gBAAgB,CA0I3B;;;;;aAxJa,aAAa;;;;cACb,OAAO,wCAAwC,EAAE,kBAAkB;;;;gBACnE,OAAO,wCAAwC,EAAE,oBAAoB;;8BA30BvD,oBAAoB"}

package/webgl/styleparser.js

@@ -31,7 +31,6 @@ import {asArray} from '../color.js';
  */
 export function expressionToGlsl(compilationContext, value, expectedType) {
   const parsingContext = newParsingContext();
-  parsingContext.style = compilationContext.style;
   return buildExpression(
     value,
     expectedType,
@@ -917,38 +916,32 @@ export function parseLiteralStyle(style) {
   }
 
   // define one uniform per variable
-  Object.keys(fragContext.variables).forEach(function (varName) {
+  for (const varName in fragContext.variables) {
     const variable = fragContext.variables[varName];
     const uniformName = uniformNameForVariable(variable.name);
     builder.addUniform(`${getGlslTypeFromType(variable.type)} ${uniformName}`);
 
-    let callback;
-    if (variable.type === StringType) {
-      callback = () =>
-        getStringNumberEquivalent(
-          /** @type {string} */ (style.variables[variable.name]),
-        );
-    } else if (variable.type === ColorType) {
-      callback = () =>
-        packColor([
-          ...asArray(
-            /** @type {string|Array<number>} */ (
-              style.variables[variable.name]
-            ) || '#eee',
-          ),
-        ]);
-    } else if (variable.type === BooleanType) {
-      callback = () =>
-        /** @type {boolean} */ (style.variables[variable.name]) ? 1.0 : 0.0;
-    } else {
-      callback = () => /** @type {number} */ (style.variables[variable.name]);
-    }
-    uniforms[uniformName] = callback;
-  });
+    uniforms[uniformName] = () => {
+      const value = style.variables[variable.name];
+      if (typeof value === 'number') {
+        return value;
+      }
+      if (typeof value === 'boolean') {
+        return value ? 1 : 0;
+      }
+      if (variable.type === ColorType) {
+        return packColor([...asArray(value || '#eee')]);
+      }
+      if (typeof value === 'string') {
+        return getStringNumberEquivalent(value);
+      }
+      return value;
+    };
+  }
 
   // for each feature attribute used in the fragment shader, define a varying that will be used to pass data
   // from the vertex to the fragment shader, as well as an attribute in the vertex shader (if not already present)
-  Object.keys(fragContext.properties).forEach(function (propName) {
+  for (const propName in fragContext.properties) {
     const property = fragContext.properties[propName];
     if (!vertContext.properties[propName]) {
       vertContext.properties[propName] = property;
@@ -961,41 +954,15 @@ export function parseLiteralStyle(style) {
       builder.addVertexShaderFunction(UNPACK_COLOR_FN);
     }
     builder.addVarying(`v_prop_${property.name}`, type, expression);
-  });
+  }
 
   // for each feature attribute used in the vertex shader, define an attribute in the vertex shader.
-  Object.keys(vertContext.properties).forEach(function (propName) {
+  for (const propName in vertContext.properties) {
     const property = vertContext.properties[propName];
     builder.addAttribute(
       `${getGlslTypeFromType(property.type)} a_prop_${property.name}`,
     );
-  });
-
-  const attributes = Object.keys(vertContext.properties).map(
-    function (propName) {
-      const property = vertContext.properties[propName];
-      let callback;
-      if (property.evaluator) {
-        callback = property.evaluator;
-      } else if (property.type === StringType) {
-        callback = (feature) =>
-          getStringNumberEquivalent(feature.get(property.name));
-      } else if (property.type === ColorType) {
-        callback = (feature) =>
-          packColor([...asArray(feature.get(property.name) || '#eee')]);
-      } else if (property.type === BooleanType) {
-        callback = (feature) => (feature.get(property.name) ? 1.0 : 0.0);
-      } else {
-        callback = (feature) => feature.get(property.name);
-      }
-
-      return {
-        name: property.name,
-        size: getGlslSizeFromType(property.type),
-        callback,
-      };
-    },
-  );
+  }
 
   // add functions that were collected in the compilation contexts
   for (const functionName in vertContext.functions) {
@@ -1005,15 +972,36 @@ export function parseLiteralStyle(style) {
     builder.addFragmentShaderFunction(fragContext.functions[functionName]);
   }
 
-  return {
-    builder: builder,
-    attributes: attributes.reduce(
-      (prev, curr) => ({
-        ...prev,
-        [curr.name]: {callback: curr.callback, size: curr.size},
-      }),
-      {},
-    ),
-    uniforms: uniforms,
-  };
+  /**
+   * @type {import('../render/webgl/VectorStyleRenderer.js').AttributeDefinitions}
+   */
+  const attributes = {};
+  for (const propName in vertContext.properties) {
+    const property = vertContext.properties[propName];
+    let callback;
+    if (property.evaluator) {
+      callback = property.evaluator;
+    } else {
+      callback = (feature) => {
+        const value = feature.get(property.name);
+        if (property.type === ColorType) {
+          return packColor([...asArray(value || '#eee')]);
+        }
+        if (typeof value === 'string') {
+          return getStringNumberEquivalent(value);
+        }
+        if (typeof value === 'boolean') {
+          return value ? 1 : 0;
+        }
+        return value;
+      };
+    }
+
+    attributes[property.name] = {
+      size: getGlslSizeFromType(property.type),
+      callback,
+    };
+  }
+
+  return {builder, attributes, uniforms};
 }