@tomtom-org/maps-sdk 0.62.1 → 0.62.3

package/map/dist/index.d.ts

@@ -1,4 +1,4 @@
-import { AllLayoutProperties, AllPaintProperties, BackgroundLayerSpecification, CircleLayerSpecification, DataDrivenPropertyValueSpecification, ExpressionFilterSpecification, ExpressionSpecification, FilterSpecification, GeoJSONSource, GeoJSONSourceSpecification, LayerSpecification, LineLayerSpecification, LngLat, Map as Map$1, MapGeoJSONFeature, MapOptions, Source, SourceSpecification, StyleImageInterface, StyleImageMetadata, StyleSpecification, SymbolLayerSpecification } from "maplibre-gl";
+import { AllLayoutProperties, AllPaintProperties, BackgroundLayerSpecification, CircleLayerSpecification, DataDrivenPropertyValueSpecification, ExpressionFilterSpecification, ExpressionSpecification, FillExtrusionLayerSpecification, FillLayerSpecification, FilterSpecification, GeoJSONSource, GeoJSONSourceSpecification, HeatmapLayerSpecification, LayerSpecification, LineLayerSpecification, LngLat, Map as Map$1, MapGeoJSONFeature, MapOptions, Source, SourceSpecification, StyleImageInterface, StyleImageMetadata, StyleSpecification, SymbolLayerSpecification } from "maplibre-gl";
 import { Anything, AreaAnalyticsMetricKey, AreaAnalyticsMetrics, BBox, ChargingSpeed, ChargingStop, ChargingStopProps, CommonPlaceProps, CountrySectionProps, DelayMagnitude, DisplayUnits, DistanceDisplayUnits, EntryPoint, GeopoliticalView, GetPositionEntryPointOption, GlobalConfig, Instruction, Language, POICategory, Place, Places, PolygonFeature, PolygonFeatures, Route, RouteProps, Routes, SectionProps, SectionType, TimeDisplayUnits, TrafficAreaAnalytics, TrafficIncident, TrafficIncidentBaseProperties, TrafficIncidentCategory, TrafficIncidentDetails, TrafficIncidentTimeValidity, TrafficSectionProps, Waypoint, WaypointLike, Waypoints } from "@tomtom-org/maps-sdk/core";
 //#region src/init/types/mapEventsConfig.d.ts
 /**
@@ -1431,16 +1431,42 @@ export declare class LayerFilterComposer extends AbstractLayerComposer<LayerFilt
   private apply;
 }
 //#endregion
+//#region src/styling/styleLayerGroups.d.ts
+/**
+ * The layer groups of the style-owned modules other than the base map, each the style layers one
+ * module controls: {@link POIsModule}, {@link TrafficFlowModule}, {@link TrafficIncidentsModule} and
+ * the hillshade {@link TerrainModule} shows.
+ *
+ * @group Map Styling
+ */
+export declare const styleModuleLayerGroupNames: readonly ["pois", "trafficFlow", "trafficIncidents", "hillshade"];
+/**
+ * One of {@link styleModuleLayerGroupNames}.
+ *
+ * @group Map Styling
+ */
+type StyleModuleLayerGroupName = (typeof styleModuleLayerGroupNames)[number];
+/**
+ * A named group of style layers: one of the base map's ({@link BaseMapLayerGroupName}) or the
+ * layers of another style-owned module ({@link StyleModuleLayerGroupName}).
+ *
+ * @group Map Styling
+ */
+type StyleLayerGroupName = BaseMapLayerGroupName | StyleModuleLayerGroupName;
+//#endregion
 //#region src/styling/layerQuery.d.ts
 /**
- * How {@link StylingModule.layers} picks style layers: by the SDK's base-map group taxonomy, layer
- * type, vector-tile source layer and case-insensitive id fragments. Every constraint given must hold.
+ * How {@link StylingModule.layers} picks style layers: by a named group, layer type, vector-tile
+ * source layer and case-insensitive id fragments. Every constraint given must hold.
  *
  * @group Map Styling
  */
 type LayerQuery = {
-  /** A base-map layer group, the same vocabulary as {@link BaseMapModule}. */
-  group?: BaseMapLayerGroupName;
+  /**
+   * A named group of style layers: a base-map group, the same vocabulary as {@link BaseMapModule},
+   * or the layers of another style-owned module (`pois`, `trafficFlow`, `trafficIncidents`, `hillshade`).
+   */
+  group?: StyleLayerGroupName;
   /** The style's own `metadata.group` values, for groups the SDK does not name. */
   metadataGroups?: string[];
   /** Layer types (`line`, `fill`, `symbol`, …). */
@@ -1468,11 +1494,15 @@ type PropertyOverride = {
  *
  * Overrides are not part of `getConfig()`: they are edits to this style, not portable settings.
  *
+ * **Only the style's own layers.** The layers a data-owned module adds (places, routes, geometries…)
+ * take their overrides through that module's `layers` configuration, and the ones you add are yours.
+ *
  * @example
  * ```typescript
  * styling.layers.query({ group: 'roadLabels' }).setPaint({ 'text-color': '#93c5fd' });
  * styling.layers.query({ metadataGroups: ['water'], layerTypes: ['fill'] }).setPaint({ 'fill-opacity': 0.6 });
  * styling.layers.query({ idIncludes: ['railway'] }).setVisible(false);
+ * styling.layers.query({ group: 'trafficFlow', layerTypes: ['line'] }).setPaint({ 'line-opacity': 0.6 });
  * styling.layers.query({ group: 'roadLabels' }).reset();
  * ```
  *
@@ -1651,8 +1681,8 @@ export declare class StylingModule extends AbstractStyleOwnedMapModule<Record<st
    */
   protected discardShownData(): void;
   /**
-   * The advanced tier: raw MapLibre paint, layout and filter edits over a query of style layers,
-   * re-applied across style switches. Version-coupled by nature — see {@link LayerSelection} for
+   * The advanced tier: raw MapLibre paint, layout and filter edits over a query of the style's own
+   * layers, re-applied across style switches. Version-coupled by nature — see {@link LayerSelection} for
    * the terms — so prefer a knob or {@link setMapColors} wherever one covers the intent.
    *
    * @example
@@ -1778,6 +1808,7 @@ export declare class StylingModule extends AbstractStyleOwnedMapModule<Record<st
    */
   get events(): StylingEvents;
   private indexStyle;
+  private holdTransitionsUntilFirstFrame;
   private resolveMechanism;
   private capture;
   private originalValueOf;
@@ -2145,6 +2176,8 @@ export declare class TomTomMap {
   private styleGivenToMapLibre;
   private styleRequestSequence;
   private styleLoadInFlight;
+  private styleLayerIds;
+  private readonly moduleSourcesAndLayers;
   /**
    * Constructs a new TomTom Map instance and attaches it to a DOM element.
    *
@@ -2299,6 +2332,12 @@ export declare class TomTomMap {
   private applyStyle;
   private loadIntoMapLibre;
   private isSuperseded;
+  private recordStyleLayers;
+  /**
+   * Whether the loaded style itself declares the layer, as opposed to a module or the caller adding it.
+   * @ignore
+   */
+  _isStyleLayer(layerId: string): boolean;
   private notifyHandlers;
   /**
    * The {@link StyleInput} the map was last given, through its parameters or {@link setStyle}.
@@ -2973,6 +3012,14 @@ export declare abstract class AbstractSourceWithLayers<SOURCE_SPEC extends Sourc
   protected get mapRemoved(): boolean;
   isAnyLayerVisible(filter?: LayerSpecFilter): boolean;
   areAllLayersVisible(filter?: LayerSpecFilter): boolean;
+  /**
+   * The features the visible layers draw in the viewport.
+   *
+   * @remarks
+   * Queries only the layers drawn now: MapLibre still returns a just-hidden layer's symbols until
+   * its next placement, a few frames later.
+   */
+  queryRenderedFeatures(): MapGeoJSONFeature[];
   private getLayerSpecs;
   _updateSourceAndLayerIDs(): void;
   private isLayerVisible;
@@ -3782,19 +3829,13 @@ type AvailabilityLevel = 'available' | 'occupied';
  * @example
  * ```typescript
  * // POI category icon
- * const poiIcon: CustomIcon = {
+ * const poiIcon: CustomImage = {
  *   id: 'RESTAURANT',
  *   image: '/icons/restaurant-marker.png',
  * };
  *
- * // Route waypoint icon
- * const waypointIcon: CustomIcon = {
- *   id: WAYPOINT_START_IMAGE_ID,
- *   image: '/icons/waypoint-start.png',
- * };
- *
- * // Charging station icon
- * const chargingIcon: CustomIcon = {
+ * // An icon a route's waypoints or charging stops pick by id through their `icon.mapping`
+ * const chargingIcon: CustomImage = {
  *   id: 'my-charging-station',
  *   image: '/icons/ev-charger-low-res.png',
  *   pixelRatio: 1
@@ -3811,9 +3852,8 @@ type CustomImage<I extends string = string> = {
    * This ID is used to reference the icon when styling map features.
    * The specific values depend on the context:
    * - For POI categories: Use MapStylePOICategory values (e.g., 'RESTAURANT', 'HOTEL_OR_MOTEL')
-   * - For route waypoints: Use waypoint identifiers (e.g., 'waypoint-start', 'waypoint-end')
-   * - For charging stations: Use station type identifiers (e.g., 'CHARGING_LOCATION')
-   * - For custom markers: Use any unique string identifier
+   * - For icons an `icon.mapping` picks by id (route waypoints, charging stops): any unique string,
+   *   the one the mapping returns
    */
   id: I;
   /**
@@ -3970,6 +4010,39 @@ type SVGIconStyleOptions = {
    */
   outlineOpacity?: number;
 };
+/**
+ * One of the SDK's pins: recoloured, or replaced by an image of your own.
+ *
+ * @remarks
+ * Places draw their default pin from one, and route waypoints one per role (start, stop, finish).
+ *
+ * @example
+ * ```typescript
+ * const recoloured: PinIconConfig = { style: { fillColor: '#2FAA4E', outlineColor: '#FFFFFF' } };
+ * const replaced: PinIconConfig = { image: { image: '/icons/flag.svg', pixelRatio: 2 } };
+ * ```
+ *
+ * @group Shared
+ */
+type PinIconConfig = {
+  /**
+   * Colours of the SDK's pin. A `fillColor` left out takes the module's colour.
+   */
+  style?: SVGIconStyleOptions;
+  /**
+   * An image drawn in place of the SDK's pin. Neither `style` nor the image's own `offsetX`,
+   * `offsetY` and `availabilityLevel` apply to it.
+   */
+  image?: Omit<CustomImage, 'id'>;
+};
+/**
+ * A {@link PinIconConfig} that survives JSON — see {@link SerializableCustomImage}.
+ *
+ * @group Shared
+ */
+type SerializablePinIconConfig = Omit<PinIconConfig, 'image'> & {
+  image?: Omit<SerializableCustomImage, 'id'>;
+};
 //#endregion
 //#region src/shared/layers/commonLayerProps.d.ts
 /**
@@ -4165,6 +4238,47 @@ type LabelConfig = {
   /** Font faces, the first one available wins. */
   font?: DataDrivenPropertyValueSpecification<MapFont[]>;
 };
+/**
+ * A {@link LabelConfig} that also sets what the label says, for the labels a module writes beside
+ * the features it shows.
+ *
+ * @typeParam F - The feature the `title` function receives.
+ *
+ * @group Shared
+ */
+type FeatureLabelConfig<F> = LabelConfig & {
+  /**
+   * Text content for the label.
+   *
+   * @remarks
+   * A function is called once per feature when it is shown, and its result is drawn as given. A
+   * MapLibre expression is evaluated per feature by the layer, over the properties the feature is
+   * drawn with, and replaces the module's whole label text.
+   *
+   * @example
+   * ```typescript
+   * // Function
+   * title: (feature) => feature.properties.poi?.name || 'Unknown'
+   *
+   * // MapLibre expression
+   * title: ['get', 'title']
+   * ```
+   *
+   * @see https://maplibre.org/maplibre-style-spec/types/#formatted
+   */
+  title?: ((feature: F) => string) | DataDrivenPropertyValueSpecification<string>;
+};
+/**
+ * A {@link FeatureLabelConfig} that survives JSON: its `title` a MapLibre expression, never a
+ * function — see {@link PlacesModuleSerializableConfig}.
+ *
+ * @typeParam L - The module's label configuration.
+ *
+ * @group Shared
+ */
+type SerializableFeatureLabelConfig<L extends FeatureLabelConfig<never>> = Omit<L, 'title'> & {
+  title?: Exclude<L['title'], (feature: never) => string>;
+};
 //#endregion
 //#region src/shared/types/mapModule.d.ts
 /**
@@ -6428,7 +6542,7 @@ export type CustomGeoJSONImageSpec = {
  * change at runtime and you want a stable identity that is independent of array order.
  *
  * `beforeID` is the ID of an existing map layer the new layer should be inserted
- * before — see MapLibre's `addLayer`.
+ * before — see MapLibre's `addLayer`. One the style lacks puts the layer on top.
  *
  * @group Custom
  */
@@ -6913,14 +7027,11 @@ export type GeometryLabelConfig = LabelConfig & {
   text?: DataDrivenPropertyValueSpecification<string>;
 };
 /**
- * Line/border configuration for geometries — the outline color, opacity, width, an escape hatch for
- * any other line property, and (optionally) where the border layer sits in the map's layer stack.
+ * Line/border configuration for geometries — the outline color, opacity and width.
  *
  * @remarks
- * The curated `color` / `opacity` / `width` fields cover the common cases; the {@link
- * GeometryLineConfig.layer | `layer`} escape hatch accepts a partial MapLibre `LineLayerSpecification`
- * for anything else (`line-gap-width`, `line-cap`, `line-join`, …). The curated fields take precedence
- * over the same `paint` property set via `layer`.
+ * The curated fields cover the common cases; {@link GeometryLayersConfig.line | layers.line} takes any
+ * other line property (`line-gap-width`, `line-cap`, `line-dasharray`, …).
  *
  * @example
  * ```typescript
@@ -6960,34 +7071,50 @@ export type GeometryLineConfig = {
    */
   width?: DataDrivenPropertyValueSpecification<number>;
   /**
-   * Escape hatch for full control over the border (outline) line layer.
-   *
-   * @remarks
-   * Accepts a partial MapLibre `LineLayerSpecification` (without `id`/`source`) that is merged
-   * onto the outline layer: top-level fields first, then `layout` and `paint` are merged per
-   * property so base defaults survive. Use this to set any line property the curated fields above
-   * don't cover (e.g. `line-gap-width`, `line-cap`, `line-join`, `line-pattern`).
+   * A partial MapLibre line layer merged onto the border, under the curated fields above: they
+   * take precedence over the same `paint` properties set here.
    *
-   * The curated fields (`color`, `opacity`, `width`) **take precedence** over the same `paint`
-   * properties set here.
-   *
-   * @example
-   * ```typescript
-   * line: {
-   *     color: '#00A65E',
-   *     layer: { paint: { 'line-gap-width': 3 }, layout: { 'line-cap': 'round' } },
-   * }
-   * ```
+   * @deprecated Use {@link GeometryLayersConfig.line | layers.line}, which takes precedence over
+   * the curated fields, as every module's `layers` entry does.
    */
   layer?: Partial<ToBeAddedLayerSpecTemplate<LineLayerSpecification>>;
 };
+/**
+ * MapLibre overrides for the layers a polygon module draws ({@link GeometriesModule},
+ * {@link ReachableRangesModule}), for what the curated fields don't cover.
+ *
+ * @remarks
+ * Each entry is a partial layer spec merged onto the module's own: top-level fields replace, `layout`
+ * and `paint` merge per property, and what is set here takes precedence over the curated fields.
+ * Where the layers sit is `beforeLayerConfig`'s, so a `beforeID` here is ignored.
+ *
+ * @example
+ * ```typescript
+ * layers: {
+ *     line: { paint: { 'line-dasharray': [2, 1] }, layout: { 'line-cap': 'round' } },
+ *     label: { layout: { 'text-transform': 'uppercase' } },
+ * }
+ * ```
+ *
+ * @group Geometries
+ */
+export type GeometryLayersConfig = {
+  /** The fill. */
+  fill?: Partial<ToBeAddedLayerSpecTemplate<FillLayerSpecification>>;
+  /** The border. */
+  line?: Partial<ToBeAddedLayerSpecTemplate<LineLayerSpecification>>;
+  /** The label at each geometry's center. */
+  label?: Partial<ToBeAddedLayerSpecTemplate<SymbolLayerSpecification>>;
+  /** The labels along the borders, drawn while `lineLabel` is set. */
+  lineLabel?: Partial<ToBeAddedLayerSpecTemplate<SymbolLayerSpecification>>;
+};
 /**
  * How a hovered or clicked geometry is drawn: a denser fill and a wider border, in its own colours.
  *
  * @remarks
  * The factors multiply the fill opacity and border width in force, the configured
  * {@link GeometryFillConfig.opacity | fill.opacity} and {@link GeometryLineConfig.width | line.width}
- * included; a `line.layer` `line-width` is drawn as given. The geometries draw their event states
+ * included; a `line-width` in {@link GeometryLayersConfig.line | layers.line} is drawn as given. The geometries draw their event states
  * once a handler covers them, or {@link GeometriesModule.putEventState} puts one.
  *
  * @example
@@ -7163,8 +7290,9 @@ export type GeometriesModuleConfig = MapModuleCommonConfig & {
    *
    * @remarks
    * `show()` and `clear()` never change it — a hidden module keeps its data until
-   * {@link GeometriesModule.setVisible} shows it again. A border hidden through
-   * `line.layer.layout.visibility` stays hidden while the module is shown.
+   * {@link GeometriesModule.setVisible} shows it again. A layer hidden through its
+   * {@link GeometriesModuleConfig.layers | layers} entry's `layout.visibility` stays hidden while the
+   * module is shown.
    *
    * @default true
    */
@@ -7232,6 +7360,10 @@ export type GeometriesModuleConfig = MapModuleCommonConfig & {
    * ```
    */
   fillStyle?: GeometryFillStyle;
+  /**
+   * MapLibre overrides for the fill, border and label layers.
+   */
+  layers?: GeometryLayersConfig;
   /**
    * Transform applied to features before rendering.
    *
@@ -7309,7 +7441,7 @@ export type GeometriesEvents<CFG = GeometriesModuleConfig> = CombinedEvents<MapG
  *
  * @group Geometries
  */
-export declare abstract class AbstractGeometriesModule<CFG extends MapModuleCommonConfig & Pick<GeometriesModuleConfig, 'visible' | 'beforeLayerConfig' | 'highlight'>> extends AbstractDataOwnedMapModule<GeometrySourcesWithLayers, CFG> {
+export declare abstract class AbstractGeometriesModule<CFG extends MapModuleCommonConfig & Pick<GeometriesModuleConfig, 'visible' | 'beforeLayerConfig' | 'highlight' | 'layers'>> extends AbstractDataOwnedMapModule<GeometrySourcesWithLayers, CFG> {
   private titleLayerSpecs;
   private geometryFillLayerSpecs;
   private geometryOutlineLayerSpecs;
@@ -7812,6 +7944,10 @@ export type ReachableRangesModuleConfig = MapModuleCommonConfig & {
    * @default 'lowestLabel'
    */
   beforeLayerConfig?: GeometryBeforeLayerConfig;
+  /**
+   * MapLibre overrides for the band, border and label layers.
+   */
+  layers?: GeometryLayersConfig;
   /**
    * Each range's title, the text of its labels. Unset, it is the range's `budget`, e.g. `'30 min'`
    * or `'10 km'`, else its position in what `show` was given, from 1.
@@ -7862,8 +7998,8 @@ type ReachableRangesKnob = KnobEntry<ReachableRangesKnobId, Exclude<KnobKind, 'o
  *
  * @remarks
  * A knob is a plain display value in {@link GeometriesModuleConfig}, at the path its id names. Not
- * knobs: `beforeLayerConfig`, `line.layer`, the labels' `text` and `transformFeaturesForDisplay`,
- * which take structured, MapLibre or function values; and `events`.
+ * knobs: `beforeLayerConfig`, `layers`, `line.layer`, the labels' `text` and
+ * `transformFeaturesForDisplay`, which take structured, MapLibre or function values; and `events`.
  * Setting any `lineLabel` knob draws the border labels.
  *
  * @group Geometries
@@ -7882,7 +8018,8 @@ export declare const geometriesKnobIds: readonly GeometriesKnobId[];
  *
  * @remarks
  * A knob is a plain display value in {@link ReachableRangesModuleConfig}, at the path its id names.
- * Not knobs: `beforeLayerConfig` and `title`, which take structured or function values; and `events`.
+ * Not knobs: `beforeLayerConfig`, `layers` and `title`, which take structured, MapLibre or function
+ * values; and `events`.
  *
  * @group Geometries
  */
@@ -7937,7 +8074,7 @@ export type ReachableRangesEvents = GeometriesEvents<ReachableRangesModuleConfig
  * ranges.applyConfig({ fillStyle: 'inverted' });
  * ```
  *
- * @see [Reachable Ranges Guide](https://docs.tomtom.com/maps-sdk-js/guides/services/routing/reachable-ranges)
+ * @see [Reachable Ranges Module Guide](https://docs.tomtom.com/maps-sdk-js/guides/map/reachable-ranges)
  *
  * @group Geometries
  */
@@ -8248,36 +8385,32 @@ type EVAvailabilityConfig = {
   formatText?: (available: number, total: number) => string;
 };
 /**
- * Configuration for the default place icon.
- * * This is the icon that is used for clicked locations and addresses without a specific category.
+ * The default place icon: the pin drawn for clicked locations and addresses without a specific
+ * category. A `style.fillColor` left out takes {@link PlacesModuleConfig.color}.
  *
  * @group Places
  */
-type DefaultPlaceIconConfig = {
-  /**
-   * Base style options for the SVG default icon.
-   *
-   * @remarks
-   * Use this to set the fill color, outline color, and outline opacity for the default waypoint icon.
-   * Without a `fillColor`, the pin takes {@link PlacesModuleConfig.color}.
-   *
-   * Example:
-   * ```typescript
-   * baseStyle: {
-   *   fillColor: '#007AFF',
-   *   outlineColor: '#FFFFFF',
-   *   outlineOpacity: 0.8
-   * }
-   * ```
-   */
-  style?: SVGIconStyleOptions;
-  /**
-   * Custom image for the default icon.
-   *
-   * @remarks
-   * If provided, this image will be used instead of the default icon, and `style` does not apply.
-   */
-  image?: Omit<CustomImage, 'id'>;
+type DefaultPlaceIconConfig = PinIconConfig;
+/**
+ * Picks the icon of each feature a module draws, from the feature itself.
+ *
+ * @remarks
+ * - `imageID`: `fn` returns the id of an image in the style's sprite, or of one the module adds.
+ * - `poiCategory`: `fn` returns a POI category, drawn with the icon the SDK has for it, so data
+ *   that is not a search result can still look like one.
+ *
+ * `fn` returning `undefined` leaves that feature the icon it has without a mapping.
+ *
+ * @typeParam F - The feature `fn` receives.
+ *
+ * @group Places
+ */
+type IconMapping<F> = {
+  to: 'imageID';
+  fn: (feature: F) => string | undefined;
+} | {
+  to: 'poiCategory';
+  fn: (feature: F) => MapStylePOICategory | undefined;
 };
 /**
  * Configuration for place marker icons.
@@ -8308,22 +8441,21 @@ type PlaceIconConfig<P extends CommonPlaceProps = CommonPlaceProps> = {
    *
    * When provided, places matching these categories will use the custom icons
    * instead of the default style.
+   *
+   * @remarks
+   * A place takes the entry for its own category, else the first entry for the map category its
+   * category falls in, as the map's own POIs do: `RESTAURANT` reaches an `ITALIAN_RESTAURANT`, and
+   * `CAFE` a `CAFE_PUB`. That second match takes only entries with an `image` and no
+   * `availabilityLevel`, so the same list given to {@link POIsModuleConfig.icon} restyles both alike.
    */
   categoryIcons?: CustomImage<MapStylePOICategory>[];
   /**
    * Custom mapping to determine the icon for a given place.
    *
    * @remarks
-   * Supports two mapping strategies:
-   *
-   * - **`imageID`**: Directly returns the icon image ID to use for the place.
-   *   This provides full control over icon selection.
-   *
-   * - **`poiCategory`**: Returns a POI category, which is then resolved to an icon
-   *   using the existing category-to-icon logic. This reuses the standard category mapping.
-   *
    * `fn` receives places of the shape the module was created for, so it reads your own
-   * properties typed.
+   * properties typed. A `poiCategory` resolves through the marker type, as a place's own
+   * category does.
    *
    * @example
    * ```typescript
@@ -8340,13 +8472,7 @@ type PlaceIconConfig<P extends CommonPlaceProps = CommonPlaceProps> = {
    * });
    * ```
    */
-  mapping?: {
-    to: 'imageID';
-    fn: (place: Place<P>) => string;
-  } | {
-    to: 'poiCategory';
-    fn: (place: Place<P>) => MapStylePOICategory;
-  };
+  mapping?: IconMapping<Place<P>>;
 };
 /**
  * The content, look and position of the labels next to place markers.
@@ -8381,29 +8507,7 @@ type PlaceIconConfig<P extends CommonPlaceProps = CommonPlaceProps> = {
  *
  * @group Places
  */
-type PlaceLabelConfig<P extends CommonPlaceProps = CommonPlaceProps> = LabelConfig & {
-  /**
-   * Text content for the label.
-   *
-   * Can be a function that extracts text from the place properties (data-based),
-   * or a MapLibre expression for data-driven content (data-driven layer-based). The function
-   * receives places of the shape the module was created for.
-   *
-   * @example
-   * ```typescript
-   * // Function
-   * title: (place) => place.properties.poi?.name || 'Unknown'
-   *
-   * // MapLibre expression
-   * title: ['get', 'title']
-   *
-   * // Conditional expression
-   * title: ['case', ['has', 'name'], ['get', 'name'], ['get', 'address']]
-   * ```
-   *
-   * @see https://maplibre.org/maplibre-style-spec/types/#formatted
-   */
-  title?: ((place: Place<P>) => string) | DataDrivenPropertyValueSpecification<string>;
+type PlaceLabelConfig<P extends CommonPlaceProps = CommonPlaceProps> = FeatureLabelConfig<Place<P>> & {
   /**
    * Text offset from the icon in ems.
    *
@@ -9112,13 +9216,9 @@ type ExtraFeatureProp<P extends CommonPlaceProps = CommonPlaceProps> = FeaturePr
  * @group Places
  */
 type PlacesModuleSerializableConfig = Omit<PlacesModuleConfig, 'label' | 'icon' | 'evAvailability' | 'connections' | 'extraFeatureProps'> & {
-  label?: Omit<PlaceLabelConfig, 'title'> & {
-    title?: Exclude<PlaceLabelConfig['title'], (place: Place) => string>;
-  };
+  label?: SerializableFeatureLabelConfig<PlaceLabelConfig>;
   icon?: Omit<PlaceIconConfig, 'default' | 'categoryIcons' | 'mapping'> & {
-    default?: Omit<DefaultPlaceIconConfig, 'image'> & {
-      image?: Omit<SerializableCustomImage, 'id'>;
-    };
+    default?: SerializablePinIconConfig;
     categoryIcons?: SerializableCustomImage<MapStylePOICategory>[];
   };
   evAvailability?: Omit<EVAvailabilityConfig, 'formatText'>;
@@ -9554,7 +9654,8 @@ export declare class PlacesModule extends AbstractDataOwnedMapModule<PlacesSourc
   private entryPointSourceID;
   private layerIDPrefix;
   private defaultPlaceIconID;
-  private paintedPinStyle?;
+  private paintedPin?;
+  private addedCategoryIcons;
   private shownConnections;
   private readonly shownFeaturesHandlers;
   /**
@@ -9631,8 +9732,6 @@ export declare class PlacesModule extends AbstractDataOwnedMapModule<PlacesSourc
   private applyVisibilityTo;
   private applyPlacesVisibility;
   private setupImages;
-  private addCategoryIcons;
-  private addDefaultIcon;
   private updateData;
   /**
    * Displays the given places on the map.
@@ -9978,6 +10077,37 @@ export declare const poiCategoryGroups: {
 export type POICategoryGroup = keyof typeof poiCategoryGroups;
 //#endregion
 //#region src/pois/types/poisModuleConfig.d.ts
+/**
+ * Custom icons for the POIs the map style draws, per category.
+ *
+ * @remarks
+ * `categoryIcons` takes the entries {@link PlaceIconConfig.categoryIcons} does, so one list restyles
+ * the map's own POIs and the places a {@link PlacesModule} shows alike.
+ *
+ * @example
+ * ```typescript
+ * const categoryIcons = [{ id: 'RESTAURANT', image: restaurantSvg }];
+ * await POIsModule.get(map, { icon: { categoryIcons } });
+ * await PlacesModule.create(map, { markerType: 'base-map', icon: { categoryIcons } });
+ * ```
+ *
+ * @group POIs
+ */
+type POIIconConfig = {
+  /**
+   * An icon per category, drawn in place of the style's own on the POIs of that category.
+   *
+   * @remarks
+   * - The map style knows fewer categories than search does: `CAFE` and `CAFE_PUB` are one category
+   *   on the map, so an entry for either reaches both, and the first entry listed wins.
+   * - The image is scaled with the style's own icons, `pois.sizeFactor` included, so one the size
+   *   of a style POI icon keeps the map's density. `offsetX` and `offsetY` move it.
+   * - Entries without an `image`, and those with an `availabilityLevel`, change nothing: the map's
+   *   POIs carry no availability.
+   * - The micro markers of minor POIs keep the style's dots.
+   */
+  categoryIcons?: NonNullable<PlaceIconConfig['categoryIcons']>;
+};
 /**
  * A POI classification or group that can be filtered.
  *
@@ -10060,6 +10190,10 @@ type POIsModuleConfig = MapModuleCommonConfig & {
    * @default true
    */
   visible?: boolean;
+  /**
+   * Custom icons per POI category, in place of the style's own.
+   */
+  icon?: POIIconConfig;
   /**
    * Optional filters for controlling which POI categories are displayed.
    *
@@ -10124,8 +10258,9 @@ type POIsKnob = KnobEntry<POIsKnobId, 'toggle' | 'enum' | 'enums'>;
  *
  * @remarks
  * A knob is a plain display value in {@link POIsModuleConfig}, at the path its id names: whether
- * POIs show, and which categories. Not knobs: `events`. How the POIs look — size, zoom, label
- * colours, micro markers — is the `pois.*` {@link StylingModule} knobs'.
+ * POIs show, and which categories. Not knobs: `icon.categoryIcons`, which takes images, and `events`.
+ * How the POIs look — size, zoom, label colours, micro markers — is the `pois.*`
+ * {@link StylingModule} knobs'.
  *
  * @group POIs
  */
@@ -10245,8 +10380,9 @@ type PoIsSourcesAndLayers = {
  * and include businesses, landmarks, and other points of interest.
  *
  * @remarks
- * **What this module owns:** whether the style's POIs are shown, and which categories. Their size,
- * label colours and zoom thresholds are `pois.*` knobs on {@link StylingModule}. The knob
+ * **What this module owns:** whether the style's POIs are shown, which categories, and any custom icon
+ * a category is drawn with. Their size, label colours and zoom thresholds are `pois.*` knobs on
+ * {@link StylingModule}. The knob
  * `pois.microMarkers` hides the micro markers within the POIs this module shows, and never shows
  * them while this module hides the POIs.
  * See [Who owns what](https://docs.tomtom.com/maps-sdk-js/guides/map/modules#who-owns-what).
@@ -10255,6 +10391,7 @@ type PoIsSourcesAndLayers = {
  * **Features:**
  * - Toggle POI visibility on/off
  * - Filter by POI categories or category groups
+ * - Custom icons per POI category ({@link POIIconConfig})
  * - Event handling for POI interactions
  * - Based on vector tile data in the map style
  *
@@ -10306,6 +10443,20 @@ type PoIsSourcesAndLayers = {
  * ```
  *
  * @example
+ * Custom icons per category, shared with the places a {@link PlacesModule} shows:
+ * ```typescript
+ * const categoryIcons = [
+ *   { id: 'RESTAURANT', image: restaurantSvg },
+ *   { id: 'HOTEL_OR_MOTEL', image: '/icons/hotel.png', pixelRatio: 2 },
+ * ];
+ * poisModule.updateConfig({ icon: { categoryIcons } });
+ * searchResults.updateConfig({ icon: { categoryIcons } });
+ *
+ * // The style's own icons again
+ * poisModule.updateConfig({ icon: undefined });
+ * ```
+ *
+ * @example
  * Event handling:
  * ```typescript
  * pois.events.on('click', (feature, lngLat) => {
@@ -10320,6 +10471,8 @@ type PoIsSourcesAndLayers = {
  */
 export declare class POIsModule extends AbstractStyleOwnedMapModule<PoIsSourcesAndLayers, POIsModuleConfig> {
   private categoriesFilter?;
+  private styleIconLayout;
+  private addedIcons;
   /**
    * Retrieves a POIsModule instance for the given map.
    *
@@ -10403,6 +10556,7 @@ export declare class POIsModule extends AbstractStyleOwnedMapModule<PoIsSourcesA
   setVisible(visible: boolean): void;
   private _setVisible;
   private applyCategoriesFilter;
+  private applyCategoryIcons;
   /**
    * Returns features currently visible in the viewport.
    *
@@ -10705,57 +10859,207 @@ export declare const sectionDrawsByDefault: (type: DrawnSectionType) => boolean;
  */
 export declare const sectionSourceKey: <T extends DrawnSectionType>(type: T) => SectionSourceKey<T>;
 //#endregion
-//#region src/routing/types/routeModuleConfig.d.ts
+//#region src/routing/types/waypointDisplayProps.d.ts
 /**
- * The MapLibre layer id of a generated section's line layer.
- *
- * @remarks
- * Derived from the section type, so `motorway` is drawn by `routeSectionMotorwayLine`.
  * @group Routing
  */
-type SectionLineLayerName<T extends GeneratedSectionType = GeneratedSectionType> = `routeSection${Capitalize<T>}Line`;
+export declare const START_INDEX = "start";
 /**
- * The MapLibre layer id of a section's icon layer.
- *
- * @remarks
- * Added to a generated section as soon as `sections.<type>.icon` asks for one, so `motorway` draws
- * its icon through `routeSectionMotorwaySymbol`.
  * @group Routing
  */
-type SectionSymbolLayerName<T extends GeneratedSectionType = GeneratedSectionType> = `routeSection${Capitalize<T>}Symbol`;
+export declare const MIDDLE_INDEX = "middle";
 /**
- * The MapLibre layer id drawing the signs of one generated section type.
- *
- * @remarks
- * Present for the types that post their own value on a sign, so `speedLimit` draws its signs
- * through `routeSectionSpeedLimitSign`.
  * @group Routing
  */
-type SectionSignLayerName<T extends GeneratedSectionType = GeneratedSectionType> = `routeSection${Capitalize<T>}Sign`;
+export declare const FINISH_INDEX = "finish";
 /**
- * Detailed configuration for the visual appearance of route layers on the map with the MapLibre specification.
+ * @group Routing
+ */
+export type WaypointIndexType = typeof START_INDEX | typeof MIDDLE_INDEX | typeof FINISH_INDEX;
+/**
+ * Display properties for a waypoint marker on the map.
+ *
+ * Extends location display properties with waypoint-specific information
+ * including position in the route and stop numbering.
  *
  * @remarks
- * Provides fine-grained control over all route visualization layers, including
- * main route lines, waypoints, route sections (ferry, tunnel, toll roads, etc.),
- * turn-by-turn guidance instructions, and route summaries.
+ * Waypoints are displayed differently based on their position:
+ * - **Start**: Origin marker (often "A" or green pin)
+ * - **Middle**: Numbered stop markers (1, 2, 3, etc.)
+ * - **Finish**: Destination marker (often "B" or red pin)
  *
- * All fields are optional. When a field is not provided, the default styling will be used.
+ * @example
+ * ```typescript
+ * // Start waypoint
+ * const start: WaypointDisplayProps = {
+ *   id: 'waypoint-0',
+ *   iconID: 'waypoint-start',
+ *   index: 0,
+ *   indexType: 'start',
+ *   title: 'Amsterdam Central Station'
+ * };
+ *
+ * // Intermediate stop
+ * const stop: WaypointDisplayProps = {
+ *   id: 'waypoint-1',
+ *   iconID: 'waypoint-stop',
+ *   index: 1,
+ *   indexType: 'middle',
+ *   stopDisplayIndex: 1,
+ *   title: 'Schiphol Airport'
+ * };
+ *
+ * // Destination
+ * const finish: WaypointDisplayProps = {
+ *   id: 'waypoint-2',
+ *   iconID: 'waypoint-finish',
+ *   index: 2,
+ *   indexType: 'finish',
+ *   title: 'Rotterdam Central Station'
+ * };
+ * ```
  *
  * @group Routing
  */
-type RouteLayersConfig = {
+export type WaypointDisplayProps = PlaceDisplayProps & {
   /**
-   * Main route line layer specifications.
+   * The index of the waypoint in relation to the other waypoints.
    *
    * @remarks
-   * Defines the visual styling for the primary route path displayed on the map.
-   * Can include both line and symbol layers for enhanced visualization.
+   * Zero-based index of this waypoint in the complete waypoints array,
+   * including start, all stops, and finish.
+   *
+   * @example
+   * ```typescript
+   * index: 0  // First waypoint (start)
+   * index: 1  // Second waypoint (first stop or finish)
+   * index: 2  // Third waypoint
+   * ```
    */
-  mainLines?: {
-    /**
-     * Styling for the primary, selected route line.
-     *
+  index: number;
+  /**
+   * The type associated to the index, describing how the waypoint sits in the list of waypoints.
+   *
+   * @remarks
+   * Determines the waypoint's role and visual representation:
+   * - `start`: Origin point
+   * - `middle`: Intermediate stop
+   * - `finish`: Final destination
+   *
+   * This affects icon selection and labeling behavior.
+   */
+  indexType: WaypointIndexType;
+  /**
+   * The stop index to be displayed.
+   *
+   * @remarks
+   * Stops are the waypoints between origin and destination, numbered starting from 1.
+   * Only present for middle waypoints.
+   *
+   * **Display Behavior:**
+   * - Start waypoint: undefined
+   * - First stop: 1
+   * - Second stop: 2
+   * - Finish waypoint: undefined
+   *
+   * Used for displaying stop numbers (e.g., "Stop 1", "Stop 2") in the UI.
+   *
+   * @example
+   * ```typescript
+   * stopDisplayIndex: 1  // First intermediate stop
+   * stopDisplayIndex: 2  // Second intermediate stop
+   * stopDisplayIndex: undefined  // Start or finish waypoint
+   * ```
+   */
+  stopDisplayIndex?: number;
+  /**
+   * The mark the stop's pin draws inside it, under {@link WaypointsConfig.stopNumbering}: `'2'`
+   * or `'B'` for the second stop.
+   *
+   * @remarks
+   * Absent on the origin and destination, under `'none'`, and on a stop drawn with a `middle.image`
+   * or a mapped icon, none of which carries a mark.
+   */
+  stopDisplayLabel?: string;
+  /**
+   * How long the route waits at this waypoint, formatted for display.
+   *
+   * @remarks
+   * Taken from {@link WaypointProps.pauseDurationSeconds} and rendered on the stop's label by
+   * default (e.g. `30 min`). Absent when the waypoint carries no wait. Charging-stop pins carry
+   * the same property, so both kinds of pin say how long you are there in the same words.
+   *
+   * @example
+   * ```typescript
+   * stopDuration: '30 min'
+   * ```
+   */
+  stopDuration?: string;
+};
+/**
+ * A waypoint as {@link RoutingModule} draws it, as `waypoints.icon.mapping` and
+ * `waypoints.label.title` receive it: the properties it was given — a place's, when it was a search
+ * result — and its {@link WaypointDisplayProps}.
+ *
+ * @group Routing
+ */
+export type DisplayWaypoint = Waypoint<WaypointDisplayProps & Partial<CommonPlaceProps>>;
+/**
+ * @ignore
+ */
+export declare const STOP_DISPLAY_LABEL = "stopDisplayLabel";
+//#endregion
+//#region src/routing/types/routeModuleConfig.d.ts
+/**
+ * The MapLibre layer id of a generated section's line layer.
+ *
+ * @remarks
+ * Derived from the section type, so `motorway` is drawn by `routeSectionMotorwayLine`.
+ * @group Routing
+ */
+type SectionLineLayerName<T extends GeneratedSectionType = GeneratedSectionType> = `routeSection${Capitalize<T>}Line`;
+/**
+ * The MapLibre layer id of a section's icon layer.
+ *
+ * @remarks
+ * Added to a generated section as soon as `sections.<type>.icon` asks for one, so `motorway` draws
+ * its icon through `routeSectionMotorwaySymbol`.
+ * @group Routing
+ */
+type SectionSymbolLayerName<T extends GeneratedSectionType = GeneratedSectionType> = `routeSection${Capitalize<T>}Symbol`;
+/**
+ * The MapLibre layer id drawing the signs of one generated section type.
+ *
+ * @remarks
+ * Present for the types that post their own value on a sign, so `speedLimit` draws its signs
+ * through `routeSectionSpeedLimitSign`.
+ * @group Routing
+ */
+type SectionSignLayerName<T extends GeneratedSectionType = GeneratedSectionType> = `routeSection${Capitalize<T>}Sign`;
+/**
+ * Detailed configuration for the visual appearance of route layers on the map with the MapLibre specification.
+ *
+ * @remarks
+ * Provides fine-grained control over all route visualization layers, including
+ * main route lines, waypoints, route sections (ferry, tunnel, toll roads, etc.),
+ * turn-by-turn guidance instructions, and route summaries.
+ *
+ * All fields are optional. When a field is not provided, the default styling will be used.
+ *
+ * @group Routing
+ */
+type RouteLayersConfig = {
+  /**
+   * Main route line layer specifications.
+   *
+   * @remarks
+   * Defines the visual styling for the primary route path displayed on the map.
+   * Can include both line and symbol layers for enhanced visualization.
+   */
+  mainLines?: {
+    /**
+     * Styling for the primary, selected route line.
+     *
      * @remarks
      * Controls the visual appearance of the active route's line (color, width, dash pattern, etc.).
      */
@@ -11147,48 +11451,142 @@ type ChargingStopsConfig = {
   icon?: ChargingStopIconConfig;
 };
 /**
- * Configuration for controlling waypoint data sources and display behavior.
+ * The waypoint pins: one per role — origin, stops, destination — each in the SDK's pin or an image
+ * of your own, and an optional icon per waypoint picked from its data.
  *
  * @remarks
- * Determines how waypoint position data is processed when rendering waypoints on the map,
- * particularly in relation to entry point information.
+ * A pin's style is laid over, in order: the route colour as its fill, `style`, and the role's own
+ * `style`. A role's `image` replaces its pin, and `mapping` replaces the role's icon for the
+ * waypoints it returns an id or category for.
+ *
+ * @example
+ * ```typescript
+ * const icon: WaypointIconConfig = {
+ *   style: { outlineColor: '#FFFFFF' },
+ *   start: { style: { fillColor: '#1B7A43' } },
+ *   finish: { image: { image: '/flag.svg', pixelRatio: 2 } },
+ *   // Stops that are charging stations look like the map's charging stations:
+ *   mapping: { to: 'poiCategory', fn: (waypoint) => waypoint.properties.poi?.categories?.[0] },
+ * };
+ * ```
  *
  * @group Routing
  */
-type WaypointsConfig = {
+type WaypointIconConfig = {
   /**
-   * Icon display configuration for waypoints.
+   * Style of all three pins, under each role's own `style`.
+   */
+  style?: SVGIconStyleOptions;
+  /**
+   * The origin's pin.
+   */
+  start?: PinIconConfig;
+  /**
+   * The pin of every stop between origin and destination.
+   */
+  middle?: PinIconConfig;
+  /**
+   * The destination's pin.
+   */
+  finish?: PinIconConfig;
+  /**
+   * Images for `mapping` to pick by id.
    *
    * @remarks
-   * Allows customization of the visual style for waypoint icons (origin, destination, stops) on the map.
+   * Added under their own `id`, so `mapping` returns that id. An entry's `offsetX`/`offsetY`
+   * shift that icon from the waypoint's position, and only apply to an entry with an `image`; one
+   * naming a sprite icon by `id` alone ignores them.
+   */
+  customIcons?: CustomImage[];
+  /**
+   * The icon of each waypoint, picked from its data.
    *
+   * @remarks
+   * `fn` receives the waypoint as drawn — its own properties, plus its `indexType` role and the
+   * role's `iconID` — and returning `undefined` keeps the role's pin. A `poiCategory` draws the
+   * pin {@link PlacesModule} draws for that category. A mapped icon carries no
+   * {@link WaypointStopNumbering | stop mark}.
    */
-  icon?: {
-    /**
-     * Base style options for the SVG waypoint icon.
-     *
-     * @remarks
-     * Use this to set the fill color, outline color, and outline opacity for the default waypoint icon.
-     *
-     * Example:
-     * ```typescript
-     * baseStyle: {
-     *   fillColor: '#007AFF',
-     *   outlineColor: '#FFFFFF',
-     *   outlineOpacity: 0.8
-     * }
-     * ```
-     */
-    style?: SVGIconStyleOptions;
-  };
+  mapping?: IconMapping<DisplayWaypoint>;
+};
+/**
+ * How the stops between origin and destination are marked inside their pin.
+ *
+ * @remarks
+ * - `numbers`: 1, 2, 3…
+ * - `letters`: A, B, C…, then AA, AB… after Z.
+ * - `none`: an empty pin.
+ *
+ * Only the SDK's stop pin carries the mark: a `middle.image` or a mapped icon draws without one.
+ *
+ * @group Routing
+ */
+type WaypointStopNumbering = 'numbers' | 'letters' | 'none';
+/**
+ * The waypoint labels: whether they show, what they say and how they look.
+ *
+ * @remarks
+ * Unset colours follow the map's light/dark theme, as the labels of places and geometries do:
+ * `'#333333'` text on a `'#FFFFFF'` halo on a light map, the two swapped on a dark one. By default
+ * a label writes the waypoint's POI name or address, and under it how long the route waits there.
+ *
+ * @group Routing
+ */
+type WaypointLabelConfig = FeatureLabelConfig<DisplayWaypoint> & {
+  /**
+   * Whether the labels show.
+   *
+   * @defaultValue `true`
+   */
+  visible?: boolean;
+};
+/**
+ * How a hovered or clicked waypoint is drawn: its pin and its stop mark grow.
+ *
+ * @remarks
+ * The waypoints draw their event states once a handler covers them, or
+ * `routing.events.waypoints.putEventState` puts one.
+ *
+ * @group Routing
+ */
+type WaypointHighlightConfig = {
   /**
-   * How the waypoint labels look: size, font, colours and opacity.
+   * Multiplier on the size of a hovered or clicked waypoint's pin; `1` draws it as any other.
    *
    * @remarks
-   * Unset colours follow the map's light/dark theme, as the labels of places and geometries do:
-   * `'#333333'` text on a `'#FFFFFF'` halo on a light map, the two swapped on a dark one.
+   * Clamped to {@link ROUTE_WAYPOINT_HIGHLIGHT_SIZE_FACTOR_RANGE}, 1 to 1.5.
+   *
+   * @defaultValue `1.2`
    */
-  label?: LabelConfig;
+  sizeFactor?: number;
+};
+/**
+ * How the module draws the waypoints {@link RoutingModule.showWaypoints} is given.
+ *
+ * @remarks
+ * Each setting reaches the waypoints already shown.
+ *
+ * @group Routing
+ */
+type WaypointsConfig = {
+  /**
+   * The waypoint pins, per role, and an optional icon per waypoint picked from its data.
+   */
+  icon?: WaypointIconConfig;
+  /**
+   * How the stops between origin and destination are marked inside their pin.
+   *
+   * @defaultValue `"numbers"`
+   */
+  stopNumbering?: WaypointStopNumbering;
+  /**
+   * The waypoint labels: whether they show, what they say and how they look.
+   */
+  label?: WaypointLabelConfig;
+  /**
+   * How a hovered or clicked waypoint is drawn.
+   */
+  highlight?: WaypointHighlightConfig;
   /**
    * Controls how entry points are used when displaying waypoints on the map.
    *
@@ -11224,7 +11622,7 @@ type RouteWidth = 's' | 'm' | 'l';
  * Route waypoint icon size preset.
  *
  * @remarks
- * Controls the scale of waypoint pins, and of the stop number inside them, at all zoom levels:
+ * Controls the scale of waypoint pins, and of the stop mark inside them, at all zoom levels:
  * `"s"` is 0.75 × `"m"` and `"l"` is 1.25 × `"m"`. {@link RoutingModuleConfig.waypointSizeFactor}
  * multiplies whichever preset applies.
  *
@@ -11742,11 +12140,14 @@ type RoutingModuleConfig = MapModuleCommonConfig & {
  * @remarks
  * It leaves out what JSON cannot carry, which a replay adds back in code:
  * - `chargingStops.icon.mapping` with `basedOn: 'custom'`, whose `fn` is a function.
- * - `chargingStops.icon.customIcons[].image` as an `HTMLImageElement` — see {@link SerializableCustomImage}.
+ * - `waypoints.icon.mapping` and `waypoints.label.title` as a function — a MapLibre expression
+ *   title serializes.
+ * - Any image given as an `HTMLImageElement`: `chargingStops.icon.customIcons`,
+ *   `waypoints.icon.customIcons` and each waypoint role's `image` — see {@link SerializableCustomImage}.
  *
  * @group Routing
  */
-type RoutingModuleSerializableConfig = Omit<RoutingModuleConfig, 'chargingStops'> & {
+type RoutingModuleSerializableConfig = Omit<RoutingModuleConfig, 'chargingStops' | 'waypoints'> & {
   chargingStops?: Omit<ChargingStopsConfig, 'icon'> & {
     icon?: Omit<ChargingStopIconConfig, 'customIcons' | 'mapping'> & {
       customIcons?: SerializableCustomImage[];
@@ -11755,6 +12156,12 @@ type RoutingModuleSerializableConfig = Omit<RoutingModuleConfig, 'chargingStops'
       }>;
     };
   };
+  waypoints?: Omit<WaypointsConfig, 'icon' | 'label'> & {
+    icon?: Omit<WaypointIconConfig, WaypointIndexType | 'customIcons' | 'mapping'> & { [R in WaypointIndexType]?: SerializablePinIconConfig; } & {
+      customIcons?: SerializableCustomImage[];
+    };
+    label?: SerializableFeatureLabelConfig<WaypointLabelConfig>;
+  };
 };
 //#endregion
 //#region src/routing/types/routingKnobs.d.ts
@@ -11768,7 +12175,7 @@ type LeafPathOf<T> = { [KEY in keyof T & string]-?: NonNullable<T[KEY]> extends
  *
  * @group Routing
  */
-type RoutingKnobId = 'visible' | 'color' | 'width' | 'widthFactor' | `highlight.${keyof RouteHighlightConfig}` | 'waypointSize' | 'waypointSizeFactor' | `waypoints.icon.style.${keyof SVGIconStyleOptions}` | `waypoints.label.${Extract<keyof LabelConfig, 'color' | 'haloColor'>}` | 'waypoints.entryPoints' | `displayUnits.distance.${keyof DistanceDisplayUnits}` | `displayUnits.time.${keyof TimeDisplayUnits}` | 'chargingStops.visible' | 'chargingStops.label.visible' | 'summaryBubbles.visible' | `countryCrossings.${keyof CountryCrossingConfig}` | { [T in DrawnSectionType]: `sections.${T}.${LeafPathOf<SectionDisplayConfig<T>>}`; }[DrawnSectionType];
+type RoutingKnobId = 'visible' | 'color' | 'width' | 'widthFactor' | `highlight.${keyof RouteHighlightConfig}` | 'waypointSize' | 'waypointSizeFactor' | `waypoints.icon.style.${keyof SVGIconStyleOptions}` | `waypoints.icon.${WaypointIndexType}.style.${keyof SVGIconStyleOptions}` | 'waypoints.stopNumbering' | `waypoints.label.${Extract<keyof WaypointLabelConfig, 'visible' | 'color' | 'haloColor'>}` | `waypoints.highlight.${keyof WaypointHighlightConfig}` | 'waypoints.entryPoints' | `displayUnits.distance.${keyof DistanceDisplayUnits}` | `displayUnits.time.${keyof TimeDisplayUnits}` | 'chargingStops.visible' | 'chargingStops.label.visible' | 'summaryBubbles.visible' | `countryCrossings.${keyof CountryCrossingConfig}` | { [T in DrawnSectionType]: `sections.${T}.${LeafPathOf<SectionDisplayConfig<T>>}`; }[DrawnSectionType];
 /**
  * The value type a given routing knob takes: the plain value its path holds in {@link RoutingModuleConfig}.
  *
@@ -11792,8 +12199,9 @@ type RoutingKnob = KnobEntry<RoutingKnobId, Exclude<KnobKind, 'offset' | 'enums'
  *
  * @remarks
  * A knob is a plain display value in {@link RoutingModuleConfig}, at the path its id names. Not
- * knobs: `layers`, `beforeLayerConfig` and the charging stop icons and title, which take structured
- * or MapLibre values, and `events`. A `displayUnits` knob left unset follows the global config.
+ * knobs: `layers`, `beforeLayerConfig`, the charging stop icons and title, the waypoint images, icon
+ * mapping and label title, which take structured, function or MapLibre values, and `events`. A
+ * `displayUnits` knob left unset follows the global config.
  *
  * @group Routing
  */
@@ -11820,12 +12228,10 @@ type TrafficDelayColors = Record<Extract<DelayMagnitude, 'minor' | 'moderate' |
  * @param instanceIndex - Optional instance index for image ID suffixes.
  * @param lightDark - The map style's light/dark theme, which the waypoint labels and the country
  * crossing plaques follow.
- * @param existingLayerID - The anchor a configured `beforeLayerConfig` target resolves to, given the
- * layer it names: that layer when the style has it, else undefined for the top of the stack.
  * @param trafficColors - The colours traffic sections draw each delay magnitude in.
  * @ignore
  */
-export declare const buildRoutingLayers: (config?: RoutingModuleConfig, layerIDPrefix?: string, instanceIndex?: number, lightDark?: LightDark, existingLayerID?: (layerID: string | undefined) => string | undefined, trafficColors?: TrafficDelayColors) => Required<RouteLayersConfig>;
+export declare const buildRoutingLayers: (config?: RoutingModuleConfig, layerIDPrefix?: string, instanceIndex?: number, lightDark?: LightDark, trafficColors?: TrafficDelayColors) => Required<RouteLayersConfig>;
 /**
  * Default routing layers configuration. Calls routingLayers with no parameters.
  *
@@ -11925,6 +12331,14 @@ export declare const ROUTE_WIDTH_FACTOR_RANGE: KnobRange;
  * @group Routing
  */
 export declare const ROUTE_WAYPOINT_SIZE_FACTOR_RANGE: KnobRange;
+/**
+ * The values {@link WaypointHighlightConfig.sizeFactor} is clamped to.
+ *
+ * @remarks
+ * Past 1.5 a hovered pin covers its neighbours' at the zooms where stops sit close together.
+ * @group Routing
+ */
+export declare const ROUTE_WAYPOINT_HIGHLIGHT_SIZE_FACTOR_RANGE: KnobRange;
 /**
  * The values {@link SectionIconConfig.sizeFactor} is clamped to.
  *
@@ -11983,14 +12397,17 @@ export declare const getLineOutlineWidth: (lineWidth?: RouteLineWidth) => Expres
  */
 export declare const getWaypointIconSize: (size?: RouteWaypointSize, sizeFactor?: number) => ExpressionSpecification;
 /**
- * Returns the text size expression of the stop number drawn inside a waypoint pin.
- *
- * @remarks
- * Scales with the pin by {@link getWaypointIconSize}'s factor: the number's offset is in ems, so
- * it stays inside the pin head at every size.
+ * Returns the text size expression of the stop mark drawn inside a waypoint pin: a fixed multiple
+ * of {@link getWaypointIconSize}, so {@link STOP_MARK_TEXT_OFFSET} centres it at every size and zoom.
  * @ignore
  */
 export declare const getWaypointIndexTextSize: (size?: RouteWaypointSize, sizeFactor?: number) => ExpressionSpecification;
+/**
+ * The offset of a stop mark from its waypoint's point, in ems of its text size: the pin head's
+ * centre.
+ * @ignore
+ */
+export declare const STOP_MARK_TEXT_OFFSET: [number, number];
 /**
  * Returns the width expression of a section halo for the given width.
  *
@@ -12611,139 +13028,6 @@ type DisplayTrafficSectionProps = DisplaySectionProps & TrafficSectionProps & {
   title?: string;
 };
 //#endregion
-//#region src/routing/types/waypointDisplayProps.d.ts
-/**
- * @group Routing
- */
-export declare const START_INDEX = "start";
-/**
- * @group Routing
- */
-export declare const MIDDLE_INDEX = "middle";
-/**
- * @group Routing
- */
-export declare const FINISH_INDEX = "finish";
-/**
- * @group Routing
- */
-export type WaypointIndexType = typeof START_INDEX | typeof MIDDLE_INDEX | typeof FINISH_INDEX;
-/**
- * Display properties for a waypoint marker on the map.
- *
- * Extends location display properties with waypoint-specific information
- * including position in the route and stop numbering.
- *
- * @remarks
- * Waypoints are displayed differently based on their position:
- * - **Start**: Origin marker (often "A" or green pin)
- * - **Middle**: Numbered stop markers (1, 2, 3, etc.)
- * - **Finish**: Destination marker (often "B" or red pin)
- *
- * @example
- * ```typescript
- * // Start waypoint
- * const start: WaypointDisplayProps = {
- *   id: 'waypoint-0',
- *   iconID: 'waypoint-start',
- *   index: 0,
- *   indexType: 'start',
- *   title: 'Amsterdam Central Station'
- * };
- *
- * // Intermediate stop
- * const stop: WaypointDisplayProps = {
- *   id: 'waypoint-1',
- *   iconID: 'waypoint-stop',
- *   index: 1,
- *   indexType: 'middle',
- *   stopDisplayIndex: 1,
- *   title: 'Schiphol Airport'
- * };
- *
- * // Destination
- * const finish: WaypointDisplayProps = {
- *   id: 'waypoint-2',
- *   iconID: 'waypoint-finish',
- *   index: 2,
- *   indexType: 'finish',
- *   title: 'Rotterdam Central Station'
- * };
- * ```
- *
- * @group Routing
- */
-export type WaypointDisplayProps = PlaceDisplayProps & {
-  /**
-   * The index of the waypoint in relation to the other waypoints.
-   *
-   * @remarks
-   * Zero-based index of this waypoint in the complete waypoints array,
-   * including start, all stops, and finish.
-   *
-   * @example
-   * ```typescript
-   * index: 0  // First waypoint (start)
-   * index: 1  // Second waypoint (first stop or finish)
-   * index: 2  // Third waypoint
-   * ```
-   */
-  index: number;
-  /**
-   * The type associated to the index, describing how the waypoint sits in the list of waypoints.
-   *
-   * @remarks
-   * Determines the waypoint's role and visual representation:
-   * - `start`: Origin point
-   * - `middle`: Intermediate stop
-   * - `finish`: Final destination
-   *
-   * This affects icon selection and labeling behavior.
-   */
-  indexType: WaypointIndexType;
-  /**
-   * The stop index to be displayed.
-   *
-   * @remarks
-   * Stops are the waypoints between origin and destination, numbered starting from 1.
-   * Only present for middle waypoints.
-   *
-   * **Display Behavior:**
-   * - Start waypoint: undefined
-   * - First stop: 1
-   * - Second stop: 2
-   * - Finish waypoint: undefined
-   *
-   * Used for displaying stop numbers (e.g., "Stop 1", "Stop 2") in the UI.
-   *
-   * @example
-   * ```typescript
-   * stopDisplayIndex: 1  // First intermediate stop
-   * stopDisplayIndex: 2  // Second intermediate stop
-   * stopDisplayIndex: undefined  // Start or finish waypoint
-   * ```
-   */
-  stopDisplayIndex?: number;
-  /**
-   * How long the route waits at this waypoint, formatted for display.
-   *
-   * @remarks
-   * Taken from {@link WaypointProps.pauseDurationSeconds} and rendered on the stop's label by
-   * default (e.g. `30 min`). Absent when the waypoint carries no wait. Charging-stop pins carry
-   * the same property, so both kinds of pin say how long you are there in the same words.
-   *
-   * @example
-   * ```typescript
-   * stopDuration: '30 min'
-   * ```
-   */
-  stopDuration?: string;
-};
-/**
- * @ignore
- */
-export declare const STOP_DISPLAY_INDEX = "stopDisplayIndex";
-//#endregion
 //#region src/routing/types/routingSourcesAndLayers.d.ts
 /**
  * @ignore
@@ -12860,14 +13144,15 @@ export type RoutingEvents = CombinedEvents<MapGeoJSONFeature, RoutingModuleConfi
  * Map module for displaying and managing route visualizations.
  *
  * The RoutingModule provides comprehensive functionality for displaying routes on the map,
- * including route lines, alternative routes, turn-by-turn guidance, and interactive waypoints.
+ * including route lines, alternative routes, turn-by-turn guidance, and waypoints.
  * It integrates seamlessly with the TomTom Routing API.
  *
  * @remarks
  * **Features:**
  * - Display route lines with customizable styling
  * - Show alternative routes with different styling
- * - Interactive waypoint markers (drag, add, remove)
+ * - Waypoint pins per role — origin, numbered or lettered stops, destination — with hover and
+ *   click events
  * - Turn-by-turn guidance instructions
  * - Route section highlighting
  * - Distance and duration information
@@ -12912,7 +13197,8 @@ export type RoutingEvents = CombinedEvents<MapGeoJSONFeature, RoutingModuleConfi
 export declare class RoutingModule extends AbstractDataOwnedMapModule<RoutingSourcesWithLayers, RoutingModuleConfig> {
   private layersSpecs;
   private layerIDPrefix;
-  private appliedRouteColor?;
+  private paintedWaypointPins?;
+  private shownWaypoints?;
   private appliedDisplayUnits?;
   private readonly shownFeaturesHandlers;
   /**
@@ -12965,6 +13251,22 @@ export declare class RoutingModule extends AbstractDataOwnedMapModule<RoutingSou
    * @ignore
    */
   protected _applyConfig(config?: RoutingModuleConfig): RoutingModuleConfig | undefined;
+  /**
+   * Adds the images the configuration brings: each waypoint role's pin, and the custom icons of
+   * the waypoints and charging stops.
+   *
+   * @remarks
+   * Runs on every config change and after every style change, which drops the images. A pin
+   * follows the route colour under the configured styles, so a new accent repaints it too;
+   * {@link paintPin} skips the ones nothing moved.
+   */
+  private addConfiguredImages;
+  /**
+   * Draws the shown waypoints again when a waypoint setting or the time unit their stop durations
+   * read in changed: the icon, stop mark and title each waypoint draws are on the feature.
+   */
+  private reshowWaypoints;
+  private displayWaypointsOf;
   /**
    * Shows the speed limit sections, each carrying the sign that posts it.
    *
@@ -13062,8 +13364,7 @@ export declare class RoutingModule extends AbstractDataOwnedMapModule<RoutingSou
    * @remarks
    * **Waypoints are NOT shown by this method.**
    * Route lines are drawn but start/stop/destination markers are not. To display waypoint
-   * markers, call {@link showWaypoints} separately. Alternatively, use
-   * {@link PlacesModule} to display waypoints as fully customizable place markers.
+   * markers, call {@link showWaypoints} separately.
    *
    * **Behavior:**
    * - Replaces any previously shown routes
@@ -13150,8 +13451,13 @@ export declare class RoutingModule extends AbstractDataOwnedMapModule<RoutingSou
    *
    * @remarks
    * Waypoint markers are **not** shown by {@link showRoutes} — this method must be called
-   * separately to display them. For more control over marker appearance and behavior,
-   * consider using {@link PlacesModule} to render waypoints as place markers instead.
+   * separately to display them.
+   *
+   * Every location the route is calculated through belongs here, so that its pin carries its
+   * role and stop mark and the route's events reach it. A place the user is still choosing
+   * among is a {@link PlacesModule} marker: clear it there once it joins the route. Each pin is
+   * drawn as {@link RoutingModuleConfig.waypoints} sets, the per-role pins and an icon mapped
+   * from the waypoint's data included.
    *
    * @example
    * Show routes and then waypoints:
@@ -13268,6 +13574,28 @@ export declare class RoutingModule extends AbstractDataOwnedMapModule<RoutingSou
   getLayerToRenderLinesUnder(): string | undefined;
 }
 //#endregion
+//#region src/routing/util/displayWaypoints.d.ts
+/**
+ * The label {@link RoutingModule} gives a waypoint when {@link WaypointLabelConfig.title} is not a
+ * function: the POI name, else the free-form address, else none.
+ *
+ * @example
+ * ```typescript
+ * // "Home" at the finish, the default label elsewhere
+ * routingModule.applyConfig({
+ *   waypoints: {
+ *     label: {
+ *       title: (waypoint) =>
+ *         waypoint.properties.indexType === 'finish' ? 'Home' : (buildWaypointTitle(waypoint) ?? ''),
+ *     },
+ *   },
+ * });
+ * ```
+ *
+ * @group Routing
+ */
+export declare const buildWaypointTitle: (waypoint: Waypoint) => string | undefined;
+//#endregion
 //#region src/terrain/types/terrainModuleConfig.d.ts
 /**
  * Configuration of the {@link TerrainModule}: the two ways it draws the relief of the style's
@@ -13861,6 +14189,59 @@ type TrafficAreaAnalyticsModuleConfig = MapModuleCommonConfig & {
    * Display options for the region polygon boundary drawn alongside the analytics data.
    */
   regionPolygon?: AreaAnalyticsRegionPolygonConfig;
+  /**
+   * MapLibre overrides for the heatmap, the cells of each grid and the region boundary. A layer
+   * hidden through its entry's `layout.visibility` stays hidden in its display mode.
+   */
+  layers?: TrafficAreaAnalyticsLayersConfig;
+};
+/**
+ * MapLibre overrides for the layers {@link TrafficAreaAnalyticsModule} draws, for what its
+ * configuration doesn't cover. Each display mode draws its own: `heatmap` the heatmap, `hexgrid-2d`
+ * the hexagon fill and outline, `hexgrid-3d` the hexagon extrusion and its highlight, and the same for
+ * the square grid; the region boundary is drawn in every mode.
+ *
+ * @remarks
+ * Each entry is a partial layer spec merged onto the module's own: top-level fields replace, `layout`
+ * and `paint` merge per property, and what is set here takes precedence over the module's own
+ * settings, the active metric's colours and heights included. A cell layer's `filter` applies
+ * together with the active metric's `filters`. Where the layers sit is `beforeLayerConfig`'s,
+ * so a `beforeID` here is ignored.
+ *
+ * @example
+ * ```typescript
+ * layers: {
+ *     hexgridFill: { paint: { 'fill-opacity': 0.85 } },
+ *     hexgridExtrusion: { paint: { 'fill-extrusion-vertical-gradient': false } },
+ *     regionLine: { paint: { 'line-dasharray': [2, 2] } },
+ * }
+ * ```
+ *
+ * @group Traffic Area Analytics
+ */
+type TrafficAreaAnalyticsLayersConfig = {
+  /** The heatmap. */
+  heatmap?: Partial<ToBeAddedLayerSpecTemplate<HeatmapLayerSpecification>>;
+  /** The flat hexagons. */
+  hexgridFill?: Partial<ToBeAddedLayerSpecTemplate<FillLayerSpecification>>;
+  /** The outline of a hovered or clicked flat hexagon. */
+  hexgridOutline?: Partial<ToBeAddedLayerSpecTemplate<LineLayerSpecification>>;
+  /** The extruded hexagons. */
+  hexgridExtrusion?: Partial<ToBeAddedLayerSpecTemplate<FillExtrusionLayerSpecification>>;
+  /** The overlay of a hovered or clicked extruded hexagon, drawn over its `hexgridExtrusion`. */
+  hexgridExtrusionHighlight?: Partial<ToBeAddedLayerSpecTemplate<FillExtrusionLayerSpecification>>;
+  /** The flat squares. */
+  squareFill?: Partial<ToBeAddedLayerSpecTemplate<FillLayerSpecification>>;
+  /** The outline of a hovered or clicked flat square. */
+  squareOutline?: Partial<ToBeAddedLayerSpecTemplate<LineLayerSpecification>>;
+  /** The extruded squares. */
+  squareExtrusion?: Partial<ToBeAddedLayerSpecTemplate<FillExtrusionLayerSpecification>>;
+  /** The overlay of a hovered or clicked extruded square, drawn over its `squareExtrusion`. */
+  squareExtrusionHighlight?: Partial<ToBeAddedLayerSpecTemplate<FillExtrusionLayerSpecification>>;
+  /** The region's fill. */
+  regionFill?: Partial<ToBeAddedLayerSpecTemplate<FillLayerSpecification>>;
+  /** The region's boundary. */
+  regionLine?: Partial<ToBeAddedLayerSpecTemplate<LineLayerSpecification>>;
 };
 //#endregion
 //#region src/traffic/types/trafficCommonConfig.d.ts
@@ -14103,6 +14484,45 @@ export type IncidentFocusStyle = {
    */
   widthFactor?: number;
 };
+/**
+ * MapLibre overrides for the layers {@link TrafficIncidentDetailsModule} draws, bottom to top, for
+ * what its configuration doesn't cover.
+ *
+ * @remarks
+ * Each entry is a partial layer spec merged onto the module's own: top-level fields replace, `layout`
+ * and `paint` merge per property, and what is set here takes precedence over the module's own
+ * settings, the incident colours and the focus treatment included. Where the layers sit is
+ * `beforeLayerConfig`'s, so a `beforeID` here is ignored.
+ *
+ * @example
+ * ```typescript
+ * layers: {
+ *     // Markers from zoom 11, and no delay text next to the jams
+ *     incidentMarker: { minzoom: 11 },
+ *     jamMarker: { layout: { 'text-field': '' } },
+ * }
+ * ```
+ *
+ * @group Traffic
+ */
+export type TrafficIncidentDetailsLayersConfig = {
+  /** The outline beneath a focused, hovered or clicked incident; absent with `focus: false`. */
+  focusHalo?: Partial<ToBeAddedLayerSpecTemplate<LineLayerSpecification>>;
+  /** Every incident's outline, in its magnitude's colour. */
+  outline?: Partial<ToBeAddedLayerSpecTemplate<LineLayerSpecification>>;
+  /** The stripe of the incidents with a known delay (`minor`, `moderate`, `major`). */
+  innerSolid?: Partial<ToBeAddedLayerSpecTemplate<LineLayerSpecification>>;
+  /** The direction chevrons over that stripe, from zoom 12. */
+  innerChevron?: Partial<ToBeAddedLayerSpecTemplate<LineLayerSpecification>>;
+  /** The patterned stripe of the `unknown` (no delay) and `indefinite` (road closed) incidents. */
+  innerPattern?: Partial<ToBeAddedLayerSpecTemplate<LineLayerSpecification>>;
+  /** The category icon of every incident but jams and closed roads. */
+  incidentMarker?: Partial<ToBeAddedLayerSpecTemplate<SymbolLayerSpecification>>;
+  /** The jam icon with its delay text. */
+  jamMarker?: Partial<ToBeAddedLayerSpecTemplate<SymbolLayerSpecification>>;
+  /** The closed-road icon. */
+  closedRoadMarker?: Partial<ToBeAddedLayerSpecTemplate<SymbolLayerSpecification>>;
+};
 /**
  * Configuration for {@link TrafficIncidentDetailsModule}.
  *
@@ -14136,6 +14556,11 @@ export type TrafficIncidentDetailsModuleConfig = MapModuleCommonConfig & {
    *   default treatment.
    */
   focus?: false | IncidentFocusStyle;
+  /**
+   * MapLibre overrides for the incident lines and markers. A layer hidden through its entry's
+   * `layout.visibility` stays hidden while the module is shown.
+   */
+  layers?: TrafficIncidentDetailsLayersConfig;
 };
 //#endregion
 //#region src/traffic/types/trafficIncidentsConfig.d.ts
@@ -14459,8 +14884,8 @@ export declare const trafficIncidentsKnobIds: readonly TrafficIncidentsKnobId[];
  *
  * @remarks
  * The incident lines take the colours of the style's own incident layers, which are
- * `StylingModule`'s `traffic.incidents.*` knobs. Not knobs: `beforeLayerConfig`, `focus: false`,
- * which turns the focus treatment off, and `events`.
+ * `StylingModule`'s `traffic.incidents.*` knobs. Not knobs: `beforeLayerConfig`, `layers`, which
+ * takes MapLibre layer overrides, `focus: false`, which turns the focus treatment off, and `events`.
  *
  * @group Traffic
  */
@@ -14477,7 +14902,7 @@ export declare const trafficIncidentDetailsKnobIds: readonly TrafficIncidentDeta
  * Static data, readable with no map loaded.
  *
  * @remarks
- * Not knobs: `colorStops`, `beforeLayerConfig` and `events`, which take structured values.
+ * Not knobs: `colorStops`, `beforeLayerConfig`, `layers` and `events`, which take structured values.
  * The module bounds no height: a height knob's range is the span a UI offers.
  *
  * @group Traffic Area Analytics
@@ -14753,8 +15178,8 @@ export declare class TrafficAreaAnalyticsModule extends AbstractDataOwnedMapModu
   /** @ignore */
   protected applyVisibility(config: TrafficAreaAnalyticsModuleConfig | undefined): void;
   private hideAllDataLayers;
+  private setLayersVisible;
   private addHighlightLayersToMap;
-  private setHighlightLayerVisible;
   private applyLayerConfig;
   private applyRegionConfig;
   private applyFiltersToLayers;
@@ -15594,4 +16019,4 @@ export declare const calculatePaddedCenter: (options: CalculateMapCenterOptions)
  */
 export declare const calculateFittingBBox: (options: CalculateFittingBBoxOptions) => BBox | null;
 //#endregion
-export type { AREA_ANALYTICS_DEFAULTS, AreaAnalyticsBeforeLayerConfig, AreaAnalyticsColorStop, AreaAnalyticsColorStopsConfig, AreaAnalyticsDisplayMode, AreaAnalyticsHeightConfig, AreaAnalyticsMetricConfig, AreaAnalyticsMetricFilter, AreaAnalyticsPalette, AreaAnalyticsRegionPolygonConfig, AreaAnalyticsValueType, AvailabilityLevel, BaseMapColorName, BaseMapKnob, BaseMapKnobId, BaseMapKnobValueOf, BeforeLayerConfig, BespokeSectionType, ByIdOrIndex, CSSCursor, ChargingSpeedIconMapping, ChargingStopIconConfig, ChargingStopIconMapping, ChargingStopLabelConfig, ChargingStopsConfig, CleanEventStateOptions, CleanEventStatesOptions, ClickEventType, CountryCrossingAlignment, CountryCrossingConfig, CountryCrossingFeature, CustomGeoJSONKnob, CustomGeoJSONKnobId, CustomGeoJSONKnobValueOf, CustomImage, DefaultPlaceIconConfig, DisplayCountryCrossing, DisplayCountryCrossingProps, DisplayCountryCrossings, DisplayRouteProps, DisplayRouteRelatedProps, DisplayRouteSummaries, DisplayRouteSummary, DisplayRouteSummaryProps, DrawnSectionType, EVAvailabilityConfig, EventHandlerConfig, EventHandlerCursorConfig, EventHandlerHoverConfig, EventState, EventStateIds, EventType, ExtraFeatureProp, FeaturePropValue, FilterablePOICategory, GeneratedSectionType, GeoJSONSourcesWithLayers, GeometriesKnob, GeometriesKnobId, GeometriesKnobValueOf, HasAdditionalLayersConfig, HasBeforeID, HoverEventType, HslColor, LabelConfig, LayerQuery, LayerSpecFilter, LayerSpecTemplate, LayerSpecWithSource, LightDark, MapColorName, MapColors, MapEventsConfig, MapFont, MapModuleCommonConfig, MapStyleLayerID, POIsKnob, POIsKnobId, POIsKnobValueOf, POIsModuleConfig, POIsModuleFeature, PartsBeforeLayerConfig, PlaceClusterBadgeConfig, PlaceConnectionDisplay, PlaceConnectionLayerName, PlaceConnectionsConfig, PlaceConnectionsLayersConfig, PlaceEntryPointFeature, PlaceEntryPointProps, PlaceEntryPointsConfig, PlaceEntryPointsLayersConfig, PlaceEntryPointsShowFor, PlaceIconConfig, PlaceLabelConfig, PlaceLayerName, PlaceLayersConfig, PlacesBeforeLayerConfig, PlacesClusterConfig, PlacesKnob, PlacesKnobId, PlacesKnobValueOf, PlacesMarkerType, PlacesModuleConfig, PlacesModuleSerializableConfig, PlanningWaypoint, PutEventStateOptions, RGBAColor, ReachableRangesKnob, ReachableRangesKnobId, ReachableRangesKnobValueOf, RouteHighlightConfig, RouteLayersConfig, RouteStateProps, RouteWaypointSize, RouteWidth, RoutingBeforeLayerConfig, RoutingKnob, RoutingKnobId, RoutingKnobValueOf, RoutingModuleConfig, RoutingModuleSerializableConfig, SVGIconStyleOptions, SectionDisplayConfig, SectionDrawStyle, SectionIconConfig, SectionIconPlacement, SectionKnobName, SectionKnobOf, SectionLineLayerName, SectionLinePattern, SectionSignConfig, SectionSignLayerName, SectionSignPlacement, SectionSignPriority, SectionSignUnit, SectionSourceKey, SectionSymbolLayerName, SectionsDisplayConfig, SerializableCustomImage, SourceWithLayerIDs, SourceWithLayers, SourcesWithLayers, StyleSourcesWithLayers, StylingColorKnobId, StylingKnob, StylingKnobAppliesTo, StylingKnobId, StylingKnobKind, StylingKnobRange, StylingKnobValue, StylingKnobValueOf, StylingPreset, StylingPresetId, StylingSettings, SupportsEvents, SymbolLayerSpecWithoutSource, TerrainKnob, TerrainKnobId, TerrainKnobValueOf, TerrainModuleConfig, ToBeAddedLayerSpec, ToBeAddedLayerSpecTemplate, ToBeAddedLayerSpecWithoutSource, TrafficAreaAnalyticsKnob, TrafficAreaAnalyticsKnobId, TrafficAreaAnalyticsKnobValueOf, TrafficAreaAnalyticsModuleConfig, TrafficFlowKnob, TrafficFlowKnobId, TrafficFlowKnobValueOf, TrafficIncidentDetailsKnob, TrafficIncidentDetailsKnobId, TrafficIncidentDetailsKnobValueOf, TrafficIncidentsKnob, TrafficIncidentsKnobId, TrafficIncidentsKnobValueOf, UserEventHandler, WaypointsConfig };
+export type { AREA_ANALYTICS_DEFAULTS, AreaAnalyticsBeforeLayerConfig, AreaAnalyticsColorStop, AreaAnalyticsColorStopsConfig, AreaAnalyticsDisplayMode, AreaAnalyticsHeightConfig, AreaAnalyticsMetricConfig, AreaAnalyticsMetricFilter, AreaAnalyticsPalette, AreaAnalyticsRegionPolygonConfig, AreaAnalyticsValueType, AvailabilityLevel, BaseMapColorName, BaseMapKnob, BaseMapKnobId, BaseMapKnobValueOf, BeforeLayerConfig, BespokeSectionType, ByIdOrIndex, CSSCursor, ChargingSpeedIconMapping, ChargingStopIconConfig, ChargingStopIconMapping, ChargingStopLabelConfig, ChargingStopsConfig, CleanEventStateOptions, CleanEventStatesOptions, ClickEventType, CountryCrossingAlignment, CountryCrossingConfig, CountryCrossingFeature, CustomGeoJSONKnob, CustomGeoJSONKnobId, CustomGeoJSONKnobValueOf, CustomImage, DefaultPlaceIconConfig, DisplayCountryCrossing, DisplayCountryCrossingProps, DisplayCountryCrossings, DisplayRouteProps, DisplayRouteRelatedProps, DisplayRouteSummaries, DisplayRouteSummary, DisplayRouteSummaryProps, DrawnSectionType, EVAvailabilityConfig, EventHandlerConfig, EventHandlerCursorConfig, EventHandlerHoverConfig, EventState, EventStateIds, EventType, ExtraFeatureProp, FeatureLabelConfig, FeaturePropValue, FilterablePOICategory, GeneratedSectionType, GeoJSONSourcesWithLayers, GeometriesKnob, GeometriesKnobId, GeometriesKnobValueOf, HasAdditionalLayersConfig, HasBeforeID, HoverEventType, HslColor, IconMapping, LabelConfig, LayerQuery, LayerSpecFilter, LayerSpecTemplate, LayerSpecWithSource, LightDark, MapColorName, MapColors, MapEventsConfig, MapFont, MapModuleCommonConfig, MapStyleLayerID, POIIconConfig, POIsKnob, POIsKnobId, POIsKnobValueOf, POIsModuleConfig, POIsModuleFeature, PartsBeforeLayerConfig, PinIconConfig, PlaceClusterBadgeConfig, PlaceConnectionDisplay, PlaceConnectionLayerName, PlaceConnectionsConfig, PlaceConnectionsLayersConfig, PlaceEntryPointFeature, PlaceEntryPointProps, PlaceEntryPointsConfig, PlaceEntryPointsLayersConfig, PlaceEntryPointsShowFor, PlaceIconConfig, PlaceLabelConfig, PlaceLayerName, PlaceLayersConfig, PlacesBeforeLayerConfig, PlacesClusterConfig, PlacesKnob, PlacesKnobId, PlacesKnobValueOf, PlacesMarkerType, PlacesModuleConfig, PlacesModuleSerializableConfig, PlanningWaypoint, PutEventStateOptions, RGBAColor, ReachableRangesKnob, ReachableRangesKnobId, ReachableRangesKnobValueOf, RouteHighlightConfig, RouteLayersConfig, RouteStateProps, RouteWaypointSize, RouteWidth, RoutingBeforeLayerConfig, RoutingKnob, RoutingKnobId, RoutingKnobValueOf, RoutingModuleConfig, RoutingModuleSerializableConfig, SVGIconStyleOptions, SectionDisplayConfig, SectionDrawStyle, SectionIconConfig, SectionIconPlacement, SectionKnobName, SectionKnobOf, SectionLineLayerName, SectionLinePattern, SectionSignConfig, SectionSignLayerName, SectionSignPlacement, SectionSignPriority, SectionSignUnit, SectionSourceKey, SectionSymbolLayerName, SectionsDisplayConfig, SerializableCustomImage, SerializableFeatureLabelConfig, SerializablePinIconConfig, SourceWithLayerIDs, SourceWithLayers, SourcesWithLayers, StyleLayerGroupName, StyleModuleLayerGroupName, StyleSourcesWithLayers, StylingColorKnobId, StylingKnob, StylingKnobAppliesTo, StylingKnobId, StylingKnobKind, StylingKnobRange, StylingKnobValue, StylingKnobValueOf, StylingPreset, StylingPresetId, StylingSettings, SupportsEvents, SymbolLayerSpecWithoutSource, TerrainKnob, TerrainKnobId, TerrainKnobValueOf, TerrainModuleConfig, ToBeAddedLayerSpec, ToBeAddedLayerSpecTemplate, ToBeAddedLayerSpecWithoutSource, TrafficAreaAnalyticsKnob, TrafficAreaAnalyticsKnobId, TrafficAreaAnalyticsKnobValueOf, TrafficAreaAnalyticsLayersConfig, TrafficAreaAnalyticsModuleConfig, TrafficFlowKnob, TrafficFlowKnobId, TrafficFlowKnobValueOf, TrafficIncidentDetailsKnob, TrafficIncidentDetailsKnobId, TrafficIncidentDetailsKnobValueOf, TrafficIncidentsKnob, TrafficIncidentsKnobId, TrafficIncidentsKnobValueOf, UserEventHandler, WaypointHighlightConfig, WaypointIconConfig, WaypointLabelConfig, WaypointStopNumbering, WaypointsConfig };