azure-maps-control 2.3.1 → 3.0.0-preview.10

package/typings/index.d.ts

@@ -1,4 +1,5 @@
-import * as AuthenticationContext from "adal-angular";
+import { PublicClientApplication } from "@azure/msal-browser";
+import { DataDrivenPropertyValueSpecification, PropertyValueSpecification, ExpressionFilterSpecification, PositionAnchor } from "azuremaps-maplibre-gl";
 
 type Position = atlas.data.Position;
 declare namespace atlas {
@@ -1315,6 +1316,21 @@ declare namespace atlas {
              */
             getShape(sourceLayer: string, filter?: Expression): Array<atlas.data.Feature<atlas.data.Geometry, any>>;
         }
+
+        /**
+         * Elevation tile source describes how to access elevation (raster DEM) tile data. 
+         * It can then be used to enable map elevation via `map.enableElevation(elevationSource)`
+         */
+        export class ElevationTileSource extends Source {
+            private options: ElevationTileSourceOptions;
+
+            constructor (id?: string, options?: ElevationTileSourceOptions);
+
+            /**
+             * Gets the options of the ElevationTileSource.
+             */
+            public getOptions (): ElevationTileSourceOptions;
+        }
     }
 
     //math functions
@@ -2075,6 +2091,17 @@ declare namespace atlas {
          * result in only a single frame being rendered.
          */
         triggerRepaint(): void;
+        /**
+         * Loads a 3D terrain mesh, based on a "raster-dem" source.
+         *
+         * @param elevationSource elevation tile source
+         * @param exaggeration the elevation exaggeration factor
+         */
+        enableElevation(elevationSource: string | ElevationTileSource, exaggeration?: number): void;
+        /**
+         * Disables the 3D terrain mesh.
+         */
+        disableElevation(): void;
         /**
          * The callback used when styleOptions.autoResize is true.
          */
@@ -2820,38 +2847,38 @@ declare namespace atlas {
          * Default `"#1A73AA"`.
          * @default "#1A73AA"
          */
-        color?: string | Expression;
+        color?: string | DataDrivenPropertyValueSpecification<string>;
         /**
          * The amount to blur the circles.
          * A value of 1 blurs the circles such that only the center point if at full opacity.
          * Default `0`.
          * @default 0
          */
-        blur?: number | Expression;
+        blur?: number | DataDrivenPropertyValueSpecification<number>;
         /**
          * A number between 0 and 1 that indicates the opacity at which the circles will be drawn.
          * Default `1`.
          * @default 1
          */
-        opacity?: number | Expression;
+        opacity?: number | DataDrivenPropertyValueSpecification<number>;
         /**
          * The color of the circles' outlines.
          * Default `"#FFFFFF"`.
          * @default "#FFFFFF"
          */
-        strokeColor?: string | Expression;
+        strokeColor?: string | DataDrivenPropertyValueSpecification<string>;
         /**
          * A number between 0 and 1 that indicates the opacity at which the circles' outlines will be drawn.
          * Default `1`.
          * @default 1
          */
-        strokeOpacity?: number | Expression;
+        strokeOpacity?: number | DataDrivenPropertyValueSpecification<number>;
         /**
          * The width of the circles' outlines in pixels.
          * Default `2`.
          * @default 2
          */
-        strokeWidth?: number | Expression;
+        strokeWidth?: number | DataDrivenPropertyValueSpecification<number>;
         /**
          * Specifies the orientation of circle when map is pitched.
          * <p>`"map"`: The circle is aligned to the plane of the map.</p>
@@ -2866,7 +2893,7 @@ declare namespace atlas {
          * Default `8`.
          * @default 8
          */
-        radius?: number | Expression;
+        radius?: number | DataDrivenPropertyValueSpecification<number>;
     }
 
     /**
@@ -2895,7 +2922,7 @@ declare namespace atlas {
          * Default `"bottom"`.
          * @default "bottom"
          */
-        anchor?: "center" | "left" | "right" | "top" | "bottom" | "top-left" | "top-right" | "bottom-left" | "bottom-right" | Expression;
+        anchor?: PositionAnchor | DataDrivenPropertyValueSpecification<PositionAnchor>;
         /**
          * Specifies if other symbols can overlap this symbol.
          * If true, other symbols can be visible even if they collide with the icon.
@@ -2911,7 +2938,7 @@ declare namespace atlas {
          * Default `"marker-blue"`.
          * @default "marker-blue"
          */
-        image?: string | Expression;
+        image?: string | DataDrivenPropertyValueSpecification<string>;
         /**
          * Specifies an offset distance of the icon from its anchor in pixels.
          * Positive values indicate right and down, while negative values indicate left and up.
@@ -2920,7 +2947,7 @@ declare namespace atlas {
          * Default `[0, 0]`.
          * @default [0, 0]
          */
-        offset?: atlas.Pixel | Expression;
+        offset?: Pixel | DataDrivenPropertyValueSpecification<Pixel>;
         /**
          * Specifies if a symbols icon can be hidden but its text displayed if it is overlapped with another symbol.
          * If true, text will display without their corresponding icons
@@ -2934,7 +2961,7 @@ declare namespace atlas {
          * Default `2`.
          * @default 2
          */
-        padding?: number | Expression;
+        padding?: number | DataDrivenPropertyValueSpecification<number>;
         /**
          * Specifies the orientation of the icon when the map is pitched.
          * <p>`"auto"`: Automatically matches the value of `rotationAlignment`.</p>
@@ -2949,7 +2976,7 @@ declare namespace atlas {
          * Default `0`.
          * @default 0
          */
-        rotation?: number | Expression;
+        rotation?: number | DataDrivenPropertyValueSpecification<number>;
         /**
          * In combination with the placement property of a SymbolLayerOptions
          * this determines the rotation behavior of icons.
@@ -2968,13 +2995,13 @@ declare namespace atlas {
          * Default `1`.
          * @default 1
          */
-        size?: number | Expression;
+        size?: number | DataDrivenPropertyValueSpecification<number>;
         /**
          * A number between 0 and 1 that indicates the opacity at which the icon will be drawn.
          * Default `1`.
          * @default 1
          */
-        opacity?: number | Expression;
+        opacity?: number | DataDrivenPropertyValueSpecification<number>;
     }
 
     /**
@@ -3038,14 +3065,14 @@ declare namespace atlas {
          * Default `1`
          * @default 1
          */
-        intensity?: number | Expression;
+        intensity?: number | PropertyValueSpecification<number>;
 
         /**
          * The opacity at which the heatmap layer will be rendered defined as a number between 0 and 1.
          * Default `1`.
          * @default 1
          */
-        opacity?: number | Expression;
+        opacity?: number | PropertyValueSpecification<number>;
 
         /**
          * The radius in pixels used to render a data point on the heatmap.
@@ -3053,7 +3080,7 @@ declare namespace atlas {
          * Default `30`.
          * @default 30
          */
-        radius?: number | Expression;
+        radius?: number | PropertyValueSpecification<number>;
 
         /**
          * Specifies how much an individual data point contributes to the heatmap.
@@ -3062,7 +3089,7 @@ declare namespace atlas {
          * Default `1`
          * @default 1
          */
-        weight?: number | Expression;
+        weight?: number | PropertyValueSpecification<number>;
     }
 
     /**
@@ -3123,13 +3150,13 @@ declare namespace atlas {
          * Default `0`.
          * @default 0
          */
-        blur?: number | Expression;
+        blur?: number | DataDrivenPropertyValueSpecification<number>;
         /**
          * Specifies the color of the line.
          * Default `"#1E90FF"`.
          * @default "#1E90FF"
          */
-        strokeColor?: string | Expression;
+        strokeColor?: string | DataDrivenPropertyValueSpecification<string>;
         /**
          * Specifies the lengths of the alternating dashes and gaps that form the dash pattern.
          * Numbers must be equal or greater than 0. The lengths are scaled by the strokeWidth.
@@ -3149,13 +3176,13 @@ declare namespace atlas {
          * Default `0`.
          * @default 0
          */
-        offset?: number | Expression;
+        offset?: number | DataDrivenPropertyValueSpecification<number>;
         /**
          * A number between 0 and 1 that indicates the opacity at which the line will be drawn.
          * Default `1`.
          * @default 1
          */
-        strokeOpacity?: number | Expression;
+        strokeOpacity?: number | DataDrivenPropertyValueSpecification<number>;
         /**
          * The amount of offset in pixels to render the line relative to where it would render normally.
          * Negative values indicate left and up.
@@ -3176,7 +3203,7 @@ declare namespace atlas {
          * Default `2`.
          * @default 2
          */
-        strokeWidth?: number | Expression;
+        strokeWidth?: number | DataDrivenPropertyValueSpecification<number>;
     }
 
     /**
@@ -3250,14 +3277,14 @@ declare namespace atlas {
          * Default `0`.
          * @default 0
          */
-        base?: number | Expression;
+        base?: number | DataDrivenPropertyValueSpecification<number>;
         /**
          * The color to fill the polygons with.
          * Ignored if `fillPattern` is set.
          * Default `"#1E90FF"`.
          * @default "#1E90FF"
          */
-        fillColor?: string | Expression;
+        fillColor?: string | DataDrivenPropertyValueSpecification<string>;
         /**
          * The height in meters to extrude this layer.
          * This height is relative to the ground.
@@ -3265,7 +3292,7 @@ declare namespace atlas {
          * Default `0`
          * @default 0
          */
-        height?: number | Expression;
+        height?: number | DataDrivenPropertyValueSpecification<number>;
         /**
          * A number between 0 and 1 that indicates the opacity at which the fill will be drawn.
          * Default `1`.
@@ -3319,18 +3346,18 @@ declare namespace atlas {
          * Default `"#1E90FF"`.
          * @default "#1E90FF"
          */
-        fillColor?: string | Expression;
+        fillColor?: string | DataDrivenPropertyValueSpecification<string>;
         /**
          * A number between 0 and 1 that indicates the opacity at which the fill will be drawn.
          * Default `0.5`.
          * @default 0.5
          */
-        fillOpacity?: number | Expression;
+        fillOpacity?: number | DataDrivenPropertyValueSpecification<number>;
 
         /**
          * Name of image in sprite to use for drawing image fills. For seamless patterns, image width must be a factor of two (2, 4, 8, ..., 512).
          */
-        fillPattern?: string | Expression;
+        fillPattern?: string | DataDrivenPropertyValueSpecification<string>;
     }
 
     /**
@@ -3374,7 +3401,7 @@ declare namespace atlas {
          * Default `undefined`.
          * @default undefined
          */
-        sortKey?: number | Expression;
+        sortKey?: number | DataDrivenPropertyValueSpecification<number>;
         /**
          * Determines whether overlapping symbols in the same layer are rendered in the order
          * that they appear in the data source, or by their y position relative to the viewport.
@@ -3393,7 +3420,7 @@ declare namespace atlas {
          * Default `250`.
          * @default 250
          */
-        lineSpacing?: number | Expression;
+        lineSpacing?: number | PropertyValueSpecification<number>;
     }
 
     /**
@@ -3421,11 +3448,11 @@ declare namespace atlas {
          * Default `"center"`.
          * @default "center"
          */
-        anchor?: "center" | "left" | "right" | "top" | "bottom" | "top-left" | "top-right" | "bottom-left" | "bottom-right" | Expression;
+        anchor?: PositionAnchor | DataDrivenPropertyValueSpecification<PositionAnchor>;
         /**
          * Specifies the name of a property on the features to use for a text label.
          */
-        textField?: string | Expression;
+        textField?: string | DataDrivenPropertyValueSpecification<string>;
         /**
          * The font stack to use for displaying text.
          * Possible values: `"SegoeFrutigerHelveticaMYingHei-Bold"`, `"SegoeFrutigerHelveticaMYingHei-Medium"`,
@@ -3438,7 +3465,7 @@ declare namespace atlas {
          * Default `["StandardFont-Regular"]`.
          * @default ["StandardFont-Regular"]
          */
-        font?: string[] | Expression;
+        font?: string[] | DataDrivenPropertyValueSpecification<string[]>;
         /**
          * Specifies if the other symbols are allowed to collide with the text.
          * If true, other symbols can be visible even if they collide with the text.
@@ -3462,7 +3489,7 @@ declare namespace atlas {
          * Default `[0, 0]`.
          * @default [0, 0]
          */
-        offset?: atlas.Pixel | Expression;
+        offset?: Pixel | DataDrivenPropertyValueSpecification<Pixel>;
         /**
          * Specifies if the text can be hidden if it is overlapped by another symbol.
          * If true, icons will display without their corresponding text
@@ -3477,7 +3504,7 @@ declare namespace atlas {
          * Default `2`.
          * @default 2
          */
-        padding?: number | Expression;
+        padding?: number | PropertyValueSpecification<number>;
         /**
          * Specifies the orientation of the text when the map is pitched.
          * <p>`"auto"`: Automatically matches the value of `rotationAlignment`.</p>
@@ -3493,13 +3520,13 @@ declare namespace atlas {
          * Default: `0`
          * @default 0
          */
-        radialOffset?: number | Expression;
+        radialOffset?: number | DataDrivenPropertyValueSpecification<number>;
         /**
          * The amount to rotate the text clockwise in degrees.
          * Default `0`
          * @default 0
          */
-        rotation?: number | Expression;
+        rotation?: number | DataDrivenPropertyValueSpecification<number>;
         /**
          * In combination with the `placement` property of the `SymbolLayerOptions`,
          * specifies the rotation behavior of the individual glyphs forming the text.
@@ -3531,33 +3558,33 @@ declare namespace atlas {
          * Default: `undefined`
          * @default undefined
          */
-        variableAnchor?: ("center" | "left" | "right" | "top" | "bottom" | "top-left" | "top-right" | "bottom-left" | "bottom-right")[];
+        variableAnchor?: PositionAnchor[];
         /**
          * The size of the font in pixels.
          * Must be a number greater or equal to 0.
          * Default `16`.
          * @default 16
          */
-        size?: number | Expression;
+        size?: number | DataDrivenPropertyValueSpecification<number>;
         /**
          * The color of the text.
          * Default `"#000000"`.
          * @default "#000000"
          */
-        color?: string | Expression;
+        color?: string | DataDrivenPropertyValueSpecification<string>;
         /**
          * The halo's fadeout distance towards the outside in pixels.
          * Must be a number greater or equal to 0.
          * Default `0`.
          * @default 0
          */
-        haloBlur?: number | Expression;
+        haloBlur?: number | DataDrivenPropertyValueSpecification<number>;
         /**
          * The color of the text's halo, which helps it stand out from backgrounds.
          * Default `"rgba(0,0,0,0)"`.
          * @default "rgba(0,0,0,0)"
          */
-        haloColor?: string | Expression;
+        haloColor?: string | DataDrivenPropertyValueSpecification<string>;
         /**
          * The distance of the halo to the font outline in pixels.
          * Must be a number greater or equal to 0.
@@ -3565,13 +3592,13 @@ declare namespace atlas {
          * Default `0`.
          * @default 0
          */
-        haloWidth?: number | Expression;
+        haloWidth?: number | DataDrivenPropertyValueSpecification<number>;
         /**
          * A number between 0 and 1 that indicates the opacity at which the text will be drawn.
          * Default `1`.
          * @default 1
          */
-        opacity?: number | Expression;
+        opacity?: number | DataDrivenPropertyValueSpecification<number>;
     }
 
     /**
@@ -3766,8 +3793,8 @@ declare namespace atlas {
          * The type of traffic flow to display:
          * <p>"none" is to display no traffic flow data</p>
          * <p>"relative" is the speed of the road relative to free-flow</p>
-         * <p>"absolute" is the absolute speed of the road</p>
-         * <p>"relative-delay" displays relative speed only where they differ from free-flow;
+         * <p>@deprecated "absolute" is the absolute speed of the road</p>
+         * <p>@deprecated "relative-delay" displays relative speed only where they differ from free-flow;
          * false to stop displaying the traffic flow.</p>
          * default `"relative"``
          * @default "relative"
@@ -3903,6 +3930,18 @@ declare namespace atlas {
          * @default 20
          */
         maxZoom?: number;
+        /**
+         * The minimum pitch that the map can be pitched to during the animation. Must be between 0 and 85, and less than or equal to `maxPitch`.
+         * Default `0`.
+         * @default 0
+         */
+        minPitch?: number;
+        /**
+         * The maximum pitch that the map can be pitched to during the animation. Must be between 0 and 85, and greater than or equal to `minPitch`
+         * Default `60`.
+         * @default 60
+         */
+        maxPitch?: number;
         /**
          * A bounding box in which to constrain the viewable map area to.
          * Users won't be able to pan the center of the map outside of this bounding box.
@@ -4013,6 +4052,23 @@ declare namespace atlas {
          * Defines custom properties that are calculated using expressions against all the points within each cluster and added to the properties of each cluster point.
          */
         clusterProperties?: Record<string, AggregateExpression>;
+        /**
+         * Minimum number of points necessary to form a cluster if clustering is enabled.
+         * @default 2
+         */
+        clusterMinPoints?: number | undefined = 2;
+        /**
+         * Whether to generate ids for the geojson features. When enabled, the feature.id property will be auto assigned based on its index in the features array, over-writing any previous values.
+         */
+        generateId?: boolean | undefined = false;
+        /**
+         * A property to use as a feature id (for feature state). Either a property name, or an object of the form {<sourceLayer>: <propertyName>}.
+         */
+        promoteId?: { [key: string]: string } | string | undefined = undefined;
+        /**
+         * An expression for filtering features prior to processing them for rendering.
+         */  
+        filter?: any = undefined
     }
 
     /**
@@ -4056,6 +4112,15 @@ declare namespace atlas {
          *  <ul>
          */
         tiles?: string[];
+        
+        /**
+         * A URL to a TileJSON resource.
+         * Supported protocols are `http:` and `https:`.
+         */
+        url?: string;
+    }
+
+    export interface RasterTileSourceOptions extends VectorTileSourceOptions {
         /**
          * An integer value that specifies the width and height dimensions of the map tiles.
          * For a seamless experience, the tile size must by a multiplier of 2. (i.e. 256, 512, 1024…).
@@ -4063,11 +4128,17 @@ declare namespace atlas {
          * @default 512
          */
         tileSize?: number;
+    }
+
+    export interface ElevationTileSourceOptions extends RasterTileSourceOptions {
         /**
-         * A URL to a TileJSON resource.
-         * Supported protocols are `http:` and `https:`.
+         * DEM tiles encoding format. Supported: `mapbox` or `terrarium`.
+         * <p>`"terrarium": Terrarium format PNG tiles. See https://aws.amazon.com/es/public-datasets/terrain/ for more info.</p>
+         * <p>`"mapbox": Mapbox Terrain RGB tiles. See https://www.mapbox.com/help/access-elevation-data/#mapbox-terrain-rgb for more info.</p>
+         * default `mapbox`
+         * @default mapbox
          */
-        url?: string;
+        encoding?: 'terrarium' | 'mapbox';
     }
 
     /**
@@ -4148,7 +4219,7 @@ declare namespace atlas {
          * Default `"bottom"`
          * @default "bottom"
          */
-        anchor?: string;
+        anchor?: PositionAnchor;
         /**
          * A color value that replaces any {color} placeholder property that has been included in a string htmlContent.
          * default `"#1A73AA"`
@@ -4221,14 +4292,14 @@ declare namespace atlas {
          * Default: `"#FFFFFF"`
          * @default "#FFFFFF"
          */
-        color?: string | Expression;
+        color?: string | DataDrivenPropertyValueSpecification<string>;
         /**
          * Intensity of lighting (on a scale from 0 to 1).
          * Higher numbers will present as more extreme contrast.
          * Default `0.5`
          * @default 0.5
          */
-        intensity?: number | Expression;
+        intensity?: number | DataDrivenPropertyValueSpecification<number>;
         /**
          * Position of the light source relative to lit (extruded) geometries,
          * in [r radial coordinate, a azimuthal angle, p polar angle]
@@ -4299,6 +4370,7 @@ declare namespace atlas {
          * If false all buildings will be rendered as just their footprints.
          * Default `false`
          * @default false
+         * @deprecated
          */
         showBuildingModels?: boolean;
         /**
@@ -4337,7 +4409,7 @@ declare namespace atlas {
         /**
          * Specifies which set of geopolitically disputed borders and labels are displayed on the map. The View parameter (also referred to as “user region parameter”) is a 2-letter ISO-3166 Country Code that will show the correct maps for that country/region. Country/Regions that are not on the View list or if unspecified will default to the “Unified” View.
          * Please see the supported [Views]{@link https://aka.ms/AzureMapsLocalizationViews}
-         * It is your responsibility to determine the location of your users, and then set the View parameter correctly for that location. The View parameter in Azure Maps must be used in compliance with applicable laws, including those regarding mapping, of the country/region where maps, images and other data and third party content that You are authorized to access via Azure Maps is made available.
+         * It is your responsibility to determine the location of your users, and then set the View parameter correctly for that location. The View parameter in Azure Maps must be used in compliance with applicable laws, including those regarding mapping, of the country where maps, images and other data and third party content that You are authorized to access via Azure Maps is made available.
          * default: `undefined`
          * @default undefined
          */
@@ -4356,8 +4428,8 @@ declare namespace atlas {
          * The type of traffic flow to display:
          * <p>"none" is to display no traffic flow data</p>
          * <p>"relative" is the speed of the road relative to free-flow</p>
-         * <p>"absolute" is the absolute speed of the road</p>
-         * <p>"relative-delay" displays relative speed only where they differ from free-flow;
+         * <p>@deprecated "absolute" is the absolute speed of the road</p>
+         * <p>@deprecated "relative-delay" displays relative speed only where they differ from free-flow;
          * false to stop displaying the traffic flow.</p>
          * default `"none"``
          * @default "none"
@@ -4489,7 +4561,7 @@ declare namespace atlas {
         /**
          * The AAD implicit grant mechanism. Recommended for pages protected by a sign-in.
          * By default the page will be redirected to the AAD login when the map control initializes.
-         * Specify a logged-in `AuthenticationContext` in the `AuthenticationOptions`
+         * Specify a logged-in `PublicClientApplication` in the `AuthenticationOptions`
          * for greater control over when/how the users signs in.
          * Literal value `"aad"`
          */
@@ -4552,13 +4624,13 @@ declare namespace atlas {
          */
         sasToken?: string;
         /**
-         * Optionally provide an existing `AuthenticationContext` from the ADAL.js library.
+         * Optionally provide an existing `PublicClientApplication` from the MSAL.js library.
          * This authentication context will be used to acquire the AAD token.
          * Only used with the AAD authentication type.
          * This auth context must be configured to use the same AAD app ID as `this.aadAppId`.
          * If this is not provided all map instances will share their own private auth context.
          */
-        authContext?: AuthenticationContext;
+        authContext?: PublicClientApplication;
         /**
          * Sets the required options to configure the subscription key authentication mechanism.
          * @param subscriptionKey Subscription Key from your azure maps account
@@ -4570,9 +4642,9 @@ declare namespace atlas {
          * @param aadAppId Azure AD App ID
          * @param aadTenant Azure AD Tenant Name
          * @param aadInstance An optional Azure AD Instance
-         * @param authContext An optional `AuthenticationContext` from the ADAL.js library
+         * @param authContext An optional `PublicClientApplication` from the MSAL.js library
          */
-        setAadProperties?(clientId: string, aadAppId: string, aadTenant: string, aadInstance?: string, authContext?: AuthenticationContext): void;
+        setAadProperties?(clientId: string, aadAppId: string, aadTenant: string, aadInstance?: string, authContext?: PublicClientApplication): void;
         /**
          * Sets the required options to configure the anonymous authentication method.
          * @param getTokenCallback Callback function responsible for resolving to an authentication token.
@@ -4725,16 +4797,21 @@ declare namespace atlas {
          * By default, it is set to half the number of CPU cores (capped at 6).
          */
         workerCount?: number;
+        /**
+         * True to validate styles before it's getting applied.
+         * Validation takes significant(few hundred ms) time to process styles during initial load.
+         * @default 'false'
+         */
+        validateStyle?: boolean;
     }
 
-    type ExpressionName = "array" | "boolean" | "collator" | "format" | "literal" | "number" | "object" | "string" | "to-boolean" | "to-color" | "to-number" | "to-string" | "typeof" | "feature-state" | "geometry-type" | "id" | "line-progress" | "properties" | "at" | "get" | "has" | "length" | "!" | "!=" | "<" | "<=" | "==" | ">" | ">=" | "all" | "any" | "case" | "match" | "interpolate" | "interpolate-hcl" | "interpolate-lab" | "step" | "let" | "var" | "concat" | "downcase" | "is-supported-script" | "resolved-locale" | "upcase" | "rgb" | "rgba" | "-" | "*" | "/" | "%" | "^" | "+" | "abs" | "acos" | "asin" | "atan" | "ceil" | "cos" | "e" | "floor" | "ln" | "ln2" | "log10" | "log2" | "max" | "min" | "pi" | "round" | "sin" | "sqrt" | "tan" | "zoom" | "heatmap-density";
     /**
      * Can be specified as the value of filter or certain layer options.
      * An expression defines a formula for computing the value of the property.
      * Expressions are represented as JSON arrays.
      * The first element of an expression is a string naming the expression operator.
      */
-    export type Expression = [ExpressionName, ...any[]];
+    export type Expression = ExpressionFilterSpecification;
 
     /**
     * An aggregate expression defines a calculation that is processed over a set of data.