Website updates

dist/en/main/ol/expr/cpu.d.ts

@@ -10,6 +10,7 @@
  * @property {Object} properties The values for properties used in 'get' expressions.
  * @property {Object} variables The values for variables used in 'var' expressions.
  * @property {number} resolution The map resolution.
+ * @property {string|number|null} featureId The feature id.
  */
 /**
  * @return {EvaluationContext} A new evaluation context.
@@ -59,6 +60,10 @@ export type EvaluationContext = {
      * The map resolution.
      */
     resolution: number;
+    /**
+     * The feature id.
+     */
+    featureId: string | number | null;
 };
 export type ExpressionEvaluator = (arg0: EvaluationContext) => import("./expression.js").LiteralValue;
 export type BooleanEvaluator = (arg0: EvaluationContext) => boolean;

dist/en/main/ol/expr/cpu.js

@@ -24,6 +24,7 @@ import {lchaToRgba, normalize, rgbaToLcha, withAlpha} from '../color.js';
  * @property {Object} properties The values for properties used in 'get' expressions.
  * @property {Object} variables The values for variables used in 'var' expressions.
  * @property {number} resolution The map resolution.
+ * @property {string|number|null} featureId The feature id.
  */
 
 /**
@@ -34,6 +35,7 @@ export function newEvaluationContext() {
     variables: {},
     properties: {},
     resolution: NaN,
+    featureId: null,
   };
 }
 
@@ -108,6 +110,9 @@ function compileExpression(expression, context) {
     case Ops.Var: {
       return compileAccessorExpression(expression, context);
     }
+    case Ops.Id: {
+      return (expression) => expression.featureId;
+    }
     case Ops.Concat: {
       const args = expression.args.map((e) => compileExpression(e, context));
       return (context) =>

dist/en/main/ol/expr/expression.d.ts

@@ -29,6 +29,7 @@ export function isType(type: number, expected: number): boolean;
  * @typedef {Object} ParsingContext
  * @property {Set<string>} variables Variables referenced with the 'var' operator.
  * @property {Set<string>} properties Properties referenced with the 'get' operator.
+ * @property {boolean} featureId The style uses the feature id.
  * @property {import("../style/literal").LiteralStyle} style The style being parsed
  */
 /**
@@ -91,6 +92,10 @@ export type ParsingContext = {
      * Properties referenced with the 'get' operator.
      */
     properties: Set<string>;
+    /**
+     * The style uses the feature id.
+     */
+    featureId: boolean;
     /**
      * The style being parsed
      */

dist/en/main/ol/expr/expression.js

@@ -114,6 +114,7 @@ export class CallExpression {
  * @typedef {Object} ParsingContext
  * @property {Set<string>} variables Variables referenced with the 'var' operator.
  * @property {Set<string>} properties Properties referenced with the 'get' operator.
+ * @property {boolean} featureId The style uses the feature id.
  * @property {import("../style/literal").LiteralStyle} style The style being parsed
  */
 
@@ -124,6 +125,7 @@ export function newParsingContext() {
   return {
     variables: new Set(),
     properties: new Set(),
+    featureId: false,
     style: {},
   };
 }
@@ -228,6 +230,7 @@ export const Ops = {
   String: 'string',
   Array: 'array',
   Color: 'color',
+  Id: 'id',
 };
 
 /**
@@ -241,6 +244,7 @@ export const Ops = {
 const parsers = {
   [Ops.Get]: createParser(AnyType, withArgsCount(1, 1), withGetArgs),
   [Ops.Var]: createParser(AnyType, withArgsCount(1, 1), withVarArgs),
+  [Ops.Id]: createParser(NumberType | StringType, withNoArgs, usesFeatureId),
   [Ops.Concat]: createParser(
     StringType,
     withArgsCount(2, Infinity),
@@ -487,6 +491,13 @@ function withVarArgs(encoded, context) {
   return [arg];
 }
 
+/**
+ * @type ArgValidator
+ */
+function usesFeatureId(encoded, context) {
+  context.featureId = true;
+}
+
 /**
  * @type ArgValidator
  */

dist/en/main/ol/render/canvas/style.js

@@ -76,6 +76,14 @@ export function rulesToStyleFunction(rules) {
   return function (feature, resolution) {
     evaluationContext.properties = feature.getPropertiesInternal();
     evaluationContext.resolution = resolution;
+    if (parsingContext.featureId) {
+      const id = feature.getId();
+      if (id !== undefined) {
+        evaluationContext.featureId = id;
+      } else {
+        evaluationContext.featureId = null;
+      }
+    }
     return evaluator(evaluationContext);
   };
 }
@@ -109,6 +117,14 @@ export function flatStylesToStyleFunction(flatStyles) {
   return function (feature, resolution) {
     evaluationContext.properties = feature.getPropertiesInternal();
     evaluationContext.resolution = resolution;
+    if (parsingContext.featureId) {
+      const id = feature.getId();
+      if (id !== undefined) {
+        evaluationContext.featureId = id;
+      } else {
+        evaluationContext.featureId = null;
+      }
+    }
     let nonNullCount = 0;
     for (let i = 0; i < length; ++i) {
       const style = evaluators[i](evaluationContext);