@sakuzu/maplibre-gl-draw 1.0.0 → 2.0.0

package/dist/shared/config/feature-style.js

@@ -150,5 +150,14 @@ export function mergeFeatureStyleConfig(base, override) {
                 ...override.tentative?.circleRadiusHandle,
             },
         },
+        ...mergeOptionalPart('circle', base, override),
+        ...mergeOptionalPart('image', base, override),
     };
 }
+/** An optional part of the configuration: the override over the base, when either has it */
+function mergeOptionalPart(key, base, override) {
+    const value = override[key] ?? base[key];
+    return value === undefined
+        ? {}
+        : { [key]: structuredClone(value) };
+}

package/dist/shared/config/rendering.d.ts

@@ -43,8 +43,8 @@ export interface BoxSelectionStyleConfig {
 /**
  * Rendering settings: the look of the box selection and two switches of the renderer
  *
- * Give the settings to change through the `renderingStyle` option of `createMapLibreGLDraw`;
- * the ones left out keep their defaults.
+ * The engine reads them from the `rendering` and `selectionStyle` options of `createDraw`,
+ * translated to this shape; the ones left out keep their defaults.
  */
 export interface RenderingConfig {
     /**
@@ -85,7 +85,7 @@ export interface RenderingConfig {
      *
      * A complete frame is not yet a complete picture: the map's tiles and the DEM arrive
      * asynchronously. Wait for the map's `idle`, then for
-     * {@link MapLibreGLDraw.hasPendingWork} to return false, which also covers the work that no
+     * `draw.hasPendingWork()` to return false, which also covers the work that no
      * setting can make synchronous (the responses of a provider, an overlay renderer that
      * prepares resources over several frames).
      *

package/dist/shared/config/selection-highlight.d.ts

@@ -1,18 +1,3 @@
-/**
- * How the selection highlight of datasets looks
- *
- * Two rendering paths read the same values.
- *
- * - Immediate mode (`highlightFeature` in `display/selection.ts`). Draws points, and the
- *   polygons and lines that do not go through the analysis drape (dashed outlines and so on)
- * - Analysis drape (`view/terrain/drape/renderer.ts`). Draws the selection highlight for the
- *   band (z > 11) that draws polygons and lines as pixels of the ground surface
- *
- * Putting separate constants in the two places would make the color or the width change when
- * crossing a band. This single file owns the values.
- *
- * This file imports nothing, so that it depends on neither path.
- */
 /** Base color of the selection highlight (#FF2D55, the same as the selection UI) */
 export declare const SELECTION_HIGHLIGHT_COLOR = "#FF2D55";
 /** Opacity of the polygon fill of the selection highlight */

package/dist/shared/config/selection-highlight.js

@@ -5,7 +5,7 @@
  *
  * Two rendering paths read the same values.
  *
- * - Immediate mode (`highlightFeature` in `display/selection.ts`). Draws points, and the
+ * - Immediate mode (`highlightFeature` in `dataset/selection.ts`). Draws points, and the
  *   polygons and lines that do not go through the analysis drape (dashed outlines and so on)
  * - Analysis drape (`view/terrain/drape/renderer.ts`). Draws the selection highlight for the
  *   band (z > 11) that draws polygons and lines as pixels of the ground surface
@@ -13,8 +13,9 @@
  * Putting separate constants in the two places would make the color or the width change when
  * crossing a band. This single file owns the values.
  *
- * This file imports nothing, so that it depends on neither path.
+ * This file imports only the color parser, so that it depends on neither path.
  */
+import { toColor } from '../color.js';
 /** Base color of the selection highlight (#FF2D55, the same as the selection UI) */
 export const SELECTION_HIGHLIGHT_COLOR = '#FF2D55';
 /** Opacity of the polygon fill of the selection highlight */
@@ -28,8 +29,4 @@ export const SELECTION_HIGHLIGHT_RING_EXTRA = 3;
  *
  * Used to pass it to a shader uniform (the color is a constant, so it is parsed only once).
  */
-export const SELECTION_HIGHLIGHT_RGB = [
-    Number.parseInt(SELECTION_HIGHLIGHT_COLOR.slice(1, 3), 16) / 255,
-    Number.parseInt(SELECTION_HIGHLIGHT_COLOR.slice(3, 5), 16) / 255,
-    Number.parseInt(SELECTION_HIGHLIGHT_COLOR.slice(5, 7), 16) / 255,
-];
+export const SELECTION_HIGHLIGHT_RGB = toColor(SELECTION_HIGHLIGHT_COLOR).slice(0, 3);

package/dist/shared/config/selection.d.ts

@@ -137,8 +137,8 @@ export interface RadiusLineStyle {
 /**
  * How the selection UI looks: the box around the selection and its handles
  *
- * Give the parts to change through the `selectionStyle` option of `createMapLibreGLDraw`;
- * the parts left out keep their defaults. Sizes and widths are in CSS pixels and stay the
+ * The engine reads it from the `selectionStyle` option of `createDraw`, translated to this
+ * shape; the parts left out keep their defaults. Sizes and widths are in CSS pixels and stay the
  * same at every zoom.
  *
  * A single selection shows the box with the resize handles at its corners and the rotate
@@ -146,18 +146,6 @@ export interface RadiusLineStyle {
  * its center marker, radius line and radius handle. A multiple selection shows one box around
  * every selected feature, with the resize and rotate handles, and a box without handles around
  * each feature. A locked feature shows the box without handles.
- *
- * @example
- * ```ts
- * const draw = createMapLibreGLDraw(map, {
- *   selectionStyle: {
- *     boundingBox: {
- *       stroke: { width: 1, color: [0, 0.4, 1, 1], opacity: 1, lineStyle: 'solid' },
- *       margin: 6,
- *     },
- *   },
- * });
- * ```
  */
 export interface SelectionUIConfig {
     /**
@@ -213,24 +201,6 @@ export interface SelectionUIConfig {
  * Default selection UI configuration
  */
 export declare const DEFAULT_SELECTION_CONFIG: SelectionUIConfig;
-/**
- * Style changes on hover
- */
-export declare const HOVER_STYLE_MODIFIERS: {
-    /** Enlargement factor for the size */
-    sizeMultiplier: number;
-    /** Increase in opacity */
-    opacityIncrease: number;
-};
-/**
- * Style changes while dragging
- */
-export declare const DRAGGING_STYLE_MODIFIERS: {
-    /** Reduction factor for the size */
-    sizeMultiplier: number;
-    /** Opacity */
-    opacity: number;
-};
 /**
  * Threshold at which handle thinning kicks in
  *

package/dist/shared/config/selection.js

@@ -127,24 +127,6 @@ export const DEFAULT_SELECTION_CONFIG = {
         },
     },
 };
-/**
- * Style changes on hover
- */
-export const HOVER_STYLE_MODIFIERS = {
-    /** Enlargement factor for the size */
-    sizeMultiplier: 1.2,
-    /** Increase in opacity */
-    opacityIncrease: 0.2,
-};
-/**
- * Style changes while dragging
- */
-export const DRAGGING_STYLE_MODIFIERS = {
-    /** Reduction factor for the size */
-    sizeMultiplier: 0.9,
-    /** Opacity */
-    opacity: 0.8,
-};
 /**
  * Threshold at which handle thinning kicks in
  *

package/dist/shared/config/topology.d.ts

@@ -8,8 +8,8 @@
 /**
  * Settings that keep a boundary shared by adjacent features intact while it is edited
  *
- * Give them through the `topology` option of `createMapLibreGLDraw`, or change them later
- * through `draw.topology`. Everything is off by default.
+ * The engine reads them from the `topology` option of `createDraw`, which
+ * `draw.options.update` changes later. Everything is off by default.
  */
 export interface TopologyConfig {
     /**

package/dist/shared/config/trace.d.ts

@@ -5,15 +5,15 @@
  * and takes in its vertex sequence (edge tracing). It is enabled by default; when disabled,
  * drawing behaves exactly as it did before tracing was introduced.
  *
- * The configuration object is shared as the same instance between Context and ModeContext.
- * When `draw.tracing.setEnabled()` rewrites this object, the drawing modes run with the new
+ * The configuration object is shared as the same instance between the context of the engine
+ * and the modes. When `draw.options.update` rewrites this object, the drawing modes run with the new
  * value from the next click or move onward.
  */
 /**
  * The setting of edge tracing: following the boundary of an existing feature while drawing
  *
- * Give it through the `trace` option of `createMapLibreGLDraw`, or change it later with
- * `draw.tracing.setEnabled()`.
+ * The engine reads it from the `tracing` option of `createDraw`, which
+ * `draw.options.update` changes later.
  */
 export interface TraceOptions {
     /**

package/dist/shared/math/angle.d.ts

@@ -5,7 +5,7 @@
  * radius handle.
  */
 import type { Coordinate } from '../types/model.js';
-export { getPointAtAngle } from '../../geometry/index.js';
+export { getPointAtAngle } from '../../geometry/angle.js';
 /**
  * Computes the angle between two points (the bearing as seen from the center)
  *

package/dist/shared/math/angle.js

@@ -3,7 +3,7 @@
 import { toRadians } from './distance.js';
 // The actual generation of a coordinate from a bearing lives in the geometry module (single
 // implementation)
-export { getPointAtAngle } from '../../geometry/index.js';
+export { getPointAtAngle } from '../../geometry/angle.js';
 /**
  * Computes the angle between two points (the bearing as seen from the center)
  *

package/dist/shared/math/circle.d.ts

@@ -3,4 +3,4 @@
  *
  * Functions for rendering a circle by approximating it with a polygon (64 vertices).
  */
-export { generateCirclePolygon } from '../../geometry/index.js';
+export { generateCirclePolygon } from '../../geometry/circle.js';

package/dist/shared/math/circle.js

@@ -7,4 +7,4 @@
  */
 // The actual generation of a geodesic circle lives in the geometry module (single
 // implementation)
-export { generateCirclePolygon } from '../../geometry/index.js';
+export { generateCirclePolygon } from '../../geometry/circle.js';

package/dist/shared/math/distance.d.ts

@@ -1,5 +1,6 @@
 import type { Coordinate } from '../types/model.js';
-export { haversineDistanceMeters, toDegrees, toRadians } from '../../geometry/index.js';
+export { haversineDistanceMeters } from '../../geometry/distance.js';
+export { toDegrees, toRadians } from '../../geometry/units.js';
 /**
  * Distance between two points (a simple version that returns a distance in degrees from
  * coordinates in degrees)

package/dist/shared/math/distance.js

@@ -3,11 +3,12 @@
 /**
  * Distance computation utilities
  */
-import { toRadians } from '../../geometry/index.js';
+import { toRadians } from '../../geometry/units.js';
 import { DEFAULT_TILE_SIZE, EARTH } from './constants.js';
 // The actual angle conversion and geodesic distance live in the geometry module (single
 // implementation)
-export { haversineDistanceMeters, toDegrees, toRadians } from '../../geometry/index.js';
+export { haversineDistanceMeters } from '../../geometry/distance.js';
+export { toDegrees, toRadians } from '../../geometry/units.js';
 /**
  * Distance between two points (a simple version that returns a distance in degrees from
  * coordinates in degrees)

package/dist/shared/math/index.d.ts

@@ -14,4 +14,4 @@ export type { OBB } from './obb.js';
 export { createOBB, distanceToOBB, getOBBAABB, getOBBCorners, pointInOBB } from './obb.js';
 export { computeRotatedQuadCorners, ecefToWGS84, kmToDegrees, pixelsToDegrees, rotateCoordinateOnSphere, rotateCoordinatesOnSphere, wgs84ToECEF, } from './rotation.js';
 export type { AnchorProjector, CoordinateTransform, LngLat, MercatorCoord, ScreenPoint, } from './transform.js';
-export { applyMarginToBoundingBox, clampCoordinate, clampLatitude, createCoordinateTransform, getAnchorProjector, lngLatToMercator, setAnchorProjector, } from './transform.js';
+export { applyMarginToBoundingBox, clampCoordinate, clampLatitude, createCoordinateTransform, expandQuad, getAnchorProjector, lngLatToMercator, setAnchorProjector, } from './transform.js';

package/dist/shared/math/index.js

@@ -18,4 +18,4 @@ export { pointInRectangle, rectangleIntersectsCircle, rectangleIntersectsLineStr
 export { createOBB, distanceToOBB, getOBBAABB, getOBBCorners, pointInOBB } from './obb.js';
 // Rotation computation
 export { computeRotatedQuadCorners, ecefToWGS84, kmToDegrees, pixelsToDegrees, rotateCoordinateOnSphere, rotateCoordinatesOnSphere, wgs84ToECEF, } from './rotation.js';
-export { applyMarginToBoundingBox, clampCoordinate, clampLatitude, createCoordinateTransform, getAnchorProjector, lngLatToMercator, setAnchorProjector, } from './transform.js';
+export { applyMarginToBoundingBox, clampCoordinate, clampLatitude, createCoordinateTransform, expandQuad, getAnchorProjector, lngLatToMercator, setAnchorProjector, } from './transform.js';

package/dist/shared/math/transform.d.ts

@@ -109,9 +109,32 @@ export declare function getAnchorProjector(map: MapLibreMap): AnchorProjector |
  * @returns A CoordinateTransform instance
  */
 export declare function createCoordinateTransform(map: MapLibreMap): CoordinateTransform;
+/**
+ * Moves every edge of a four-cornered outline outward by a margin
+ *
+ * The corners are in the order top left, top right, bottom right, bottom left of the shape as
+ * it stands unturned, in a space whose y axis points down (the screen). Each corner moves by
+ * the margin along both edges that meet at it, so the frame keeps the margin on every side and
+ * its corners stay on the diagonals of the outline turned as it is. An edge of no length (the
+ * outline of a straight horizontal or vertical line) takes the direction square to the other
+ * one, and an outline of no size is widened as an unturned square.
+ *
+ * @param corners The four corners
+ * @param margin The margin, in the unit of the corners
+ * @returns The four corners moved outward, in the same order
+ */
+export declare function expandQuad(corners: readonly {
+    x: number;
+    y: number;
+}[], margin: number): {
+    x: number;
+    y: number;
+}[];
 /**
  * Applies a margin in pixels to a bounding box
  *
+ * Every edge moves outward by the margin ({@link expandQuad}).
+ *
  * When zoom is passed, the expansion is done on the map plane. When it is not passed, the
  * expansion round-trips through screen coordinates. It must not round-trip when there is
  * terrain: with terrain enabled, project projects a point at the height of the ground surface

package/dist/shared/math/transform.js

@@ -90,9 +90,48 @@ export function createCoordinateTransform(map) {
         },
     };
 }
+/**
+ * Moves every edge of a four-cornered outline outward by a margin
+ *
+ * The corners are in the order top left, top right, bottom right, bottom left of the shape as
+ * it stands unturned, in a space whose y axis points down (the screen). Each corner moves by
+ * the margin along both edges that meet at it, so the frame keeps the margin on every side and
+ * its corners stay on the diagonals of the outline turned as it is. An edge of no length (the
+ * outline of a straight horizontal or vertical line) takes the direction square to the other
+ * one, and an outline of no size is widened as an unturned square.
+ *
+ * @param corners The four corners
+ * @param margin The margin, in the unit of the corners
+ * @returns The four corners moved outward, in the same order
+ */
+export function expandQuad(corners, margin) {
+    const [tl, tr, br, bl] = corners;
+    const unit = (from, to) => {
+        const dx = to.x - from.x;
+        const dy = to.y - from.y;
+        const length = Math.hypot(dx, dy);
+        return length > 0 ? { x: dx / length, y: dy / length } : null;
+    };
+    let u = unit(tl, tr) ?? unit(bl, br);
+    let v = unit(tl, bl) ?? unit(tr, br);
+    // With y pointing down, the bottom direction is the right direction turned clockwise
+    if (!u && v)
+        u = { x: v.y, y: -v.x };
+    if (u && !v)
+        v = { x: -u.y, y: u.x };
+    const right = u ?? { x: 1, y: 0 };
+    const down = v ?? { x: 0, y: 1 };
+    const at = (corner, alongRight, alongDown) => ({
+        x: corner.x + (right.x * alongRight + down.x * alongDown) * margin,
+        y: corner.y + (right.y * alongRight + down.y * alongDown) * margin,
+    });
+    return [at(tl, -1, -1), at(tr, 1, -1), at(br, 1, 1), at(bl, -1, 1)];
+}
 /**
  * Applies a margin in pixels to a bounding box
  *
+ * Every edge moves outward by the margin ({@link expandQuad}).
+ *
  * When zoom is passed, the expansion is done on the map plane. When it is not passed, the
  * expansion round-trips through screen coordinates. It must not round-trip when there is
  * terrain: with terrain enabled, project projects a point at the height of the ground surface
@@ -119,23 +158,8 @@ export function applyMarginToBoundingBox(coords, margin, transform, zoom) {
         transform.project(clampCoordinate(coords.bottomRight)),
         transform.project(clampCoordinate(coords.bottomLeft)),
     ];
-    // Compute the center of the OBB
-    const centerX = (corners[0].x + corners[1].x + corners[2].x + corners[3].x) / 4;
-    const centerY = (corners[0].y + corners[1].y + corners[2].y + corners[3].y) / 4;
-    // Expand each vertex outward from the center
-    const expandedCorners = corners.map((corner) => {
-        const dx = corner.x - centerX;
-        const dy = corner.y - centerY;
-        const dist = Math.sqrt(dx * dx + dy * dy);
-        if (dist === 0)
-            return corner;
-        // Extend by the margin while keeping the direction of the vector
-        const scale = (dist + margin) / dist;
-        return {
-            x: centerX + dx * scale,
-            y: centerY + dy * scale,
-        };
-    });
+    // Move every edge outward by the margin
+    const expandedCorners = expandQuad(corners, margin);
     // Convert into geographic coordinates
     const topLeftResult = transform.unproject(expandedCorners[0]);
     const topRightResult = transform.unproject(expandedCorners[1]);
@@ -169,17 +193,12 @@ function marginOnMapPlane(coords, margin, zoom) {
             bottomLeft: coords.bottomLeft,
         };
     }
-    // The vertical and horizontal scales differ, so convert into pixel-equivalent amounts
-    // first and then widen
-    const expanded = corners.map(([lng, lat]) => {
-        const dx = (lng - centerLng) / degPerPxLng;
-        const dy = (lat - centerLat) / degPerPxLat;
-        const dist = Math.sqrt(dx * dx + dy * dy);
-        if (dist === 0)
-            return [lng, lat];
-        const scale = (dist + margin) / dist;
-        return [centerLng + dx * scale * degPerPxLng, centerLat + dy * scale * degPerPxLat];
-    });
+    // The vertical and horizontal scales differ, so convert into pixels (y down, as on the
+    // screen) first and then widen
+    const expanded = expandQuad(corners.map(([lng, lat]) => ({
+        x: (lng - centerLng) / degPerPxLng,
+        y: -(lat - centerLat) / degPerPxLat,
+    })), margin).map(({ x, y }) => [centerLng + x * degPerPxLng, centerLat - y * degPerPxLat]);
     return {
         topLeft: expanded[0],
         topRight: expanded[1],

package/dist/shared/properties.d.ts

@@ -0,0 +1,18 @@
+/**
+ * The values the library keeps in the `properties` of a feature
+ *
+ * Every value the library owns is stored under a key that starts with
+ * {@link DRAW_PROPERTY_PREFIX}; every other key is an attribute of the user. The code reads and
+ * writes these values only through the accessors of this module, never through string
+ * literals, so that the keys are spelled in one place.
+ */
+/** The prefix of the keys of `properties` that hold the values of the library. */
+export declare const DRAW_PROPERTY_PREFIX: "maplibre-gl-draw:";
+/**
+ * Whether a key of `properties` holds a value of the library, so that an attribute panel can
+ * leave it out.
+ *
+ * @param key - A key of `properties`
+ * @returns True when the key starts with {@link DRAW_PROPERTY_PREFIX}
+ */
+export declare function isDrawProperty(key: string): boolean;

package/dist/shared/properties.js

@@ -0,0 +1,129 @@
+// SPDX-FileCopyrightText: 2026 SAKAIDA Atsushi
+// SPDX-License-Identifier: AGPL-3.0-only
+/**
+ * The values the library keeps in the `properties` of a feature
+ *
+ * Every value the library owns is stored under a key that starts with
+ * {@link DRAW_PROPERTY_PREFIX}; every other key is an attribute of the user. The code reads and
+ * writes these values only through the accessors of this module, never through string
+ * literals, so that the keys are spelled in one place.
+ */
+/** The prefix of the keys of `properties` that hold the values of the library. */
+export const DRAW_PROPERTY_PREFIX = 'maplibre-gl-draw:';
+/**
+ * The key of `properties` that holds each value of the library
+ *
+ * @internal
+ */
+export const DRAW_PROPERTY_KEYS = {
+    createdZoom: `${DRAW_PROPERTY_PREFIX}createdZoom`,
+    rotation: `${DRAW_PROPERTY_PREFIX}rotation`,
+    scale: `${DRAW_PROPERTY_PREFIX}scale`,
+    radiusMeters: `${DRAW_PROPERTY_PREFIX}radiusMeters`,
+    radiusHandleAngle: `${DRAW_PROPERTY_PREFIX}radiusHandleAngle`,
+    imageFileId: `${DRAW_PROPERTY_PREFIX}imageFileId`,
+    imageWidth: `${DRAW_PROPERTY_PREFIX}imageWidth`,
+    imageHeight: `${DRAW_PROPERTY_PREFIX}imageHeight`,
+};
+/**
+ * The names of the values of the library, in a stable order
+ *
+ * @internal
+ */
+export const DRAW_PROPERTY_NAMES = Object.keys(DRAW_PROPERTY_KEYS);
+/** The type each value must have to be read */
+const VALUE_TYPES = {
+    createdZoom: 'number',
+    rotation: 'number',
+    scale: 'number',
+    radiusMeters: 'number',
+    radiusHandleAngle: 'number',
+    imageFileId: 'string',
+    imageWidth: 'number',
+    imageHeight: 'number',
+};
+/**
+ * Whether a key of `properties` holds a value of the library, so that an attribute panel can
+ * leave it out.
+ *
+ * @param key - A key of `properties`
+ * @returns True when the key starts with {@link DRAW_PROPERTY_PREFIX}
+ */
+export function isDrawProperty(key) {
+    return key.startsWith(DRAW_PROPERTY_PREFIX);
+}
+/**
+ * The key of `properties` that holds a value of the library
+ *
+ * @internal
+ */
+export function drawPropertyKey(name) {
+    return DRAW_PROPERTY_KEYS[name];
+}
+/**
+ * Reads a value of the library from `properties`
+ *
+ * @param properties - The `properties` of a feature
+ * @param name - The name of the value
+ * @returns The value, or undefined when it is absent or not of its type
+ * @internal
+ */
+export function readDrawProperty(properties, name) {
+    const value = properties?.[DRAW_PROPERTY_KEYS[name]];
+    return typeof value === VALUE_TYPES[name] ? value : undefined;
+}
+/**
+ * Reads a value of the library from the `properties` of a feature
+ *
+ * @param feature - The feature
+ * @param name - The name of the value
+ * @returns The value, or undefined when it is absent or not of its type
+ * @internal
+ */
+export function getDrawProperty(feature, name) {
+    return readDrawProperty(feature.properties, name);
+}
+/**
+ * Whether `properties` has a key for a value of the library (whatever its value)
+ *
+ * @internal
+ */
+export function hasDrawProperty(properties, name) {
+    return properties != null && DRAW_PROPERTY_KEYS[name] in properties;
+}
+/**
+ * Writes a value of the library into a `properties` object; `undefined` removes the key
+ *
+ * @param properties - The `properties` object to write into (changed in place)
+ * @param name - The name of the value
+ * @param value - The value
+ * @internal
+ */
+export function setDrawProperty(properties, name, value) {
+    const key = DRAW_PROPERTY_KEYS[name];
+    if (value === undefined) {
+        delete properties[key];
+    }
+    else {
+        properties[key] = value;
+    }
+}
+/**
+ * The entries of `properties` for some values of the library, to spread into a new
+ * `properties` object (a value given as `undefined` is left out)
+ *
+ * @example
+ * ```ts
+ * const properties = { ...feature.properties, ...drawProperties({ scale: 2 }) };
+ * ```
+ * @internal
+ */
+export function drawProperties(values) {
+    const result = {};
+    for (const name of Object.keys(values)) {
+        const value = values[name];
+        if (value !== undefined)
+            result[DRAW_PROPERTY_KEYS[name]] = value;
+    }
+    return result;
+}

package/dist/shared/types/events.d.ts

@@ -38,12 +38,17 @@ export interface DatasetClickEventPayload {
     /** The feature that was hit. null when there was no hit */
     feature: Feature | null;
     /**
-     * The row of the feature in its dataset (its index in the features given to the
-     * dataset, or its row in a columnar table). null when there was no hit
+     * The row of the feature in its dataset (its index in the rows given to the
+     * dataset, or its row in a table). null when there was no hit
      */
     row: number | null;
     /** Map coordinate [lng, lat] */
     lngLat: Coordinate;
+    /** The point on the screen, in CSS pixels */
+    point?: {
+        x: number;
+        y: number;
+    };
 }
 /**
  * A geographic coordinate (the same shape as the lngLat of a normalized event)
@@ -81,8 +86,11 @@ export interface SnapTargetSegment {
  * by the rendering of the guide line.
  */
 export interface SnapTarget {
-    /** The kind of the target */
-    kind: SnapTargetKind;
+    /**
+     * The kind of the target: one of the engine, or the kind of its own a provider of the
+     * extension contract gave its candidate (ranked as a vertex)
+     */
+    kind: SnapTargetKind | (string & Record<never, never>);
     /** The feature ID of the target (only for candidates originating from the Store) */
     featureId?: string;
     /**
@@ -115,10 +123,10 @@ export interface SnapResult {
  *
  * When the `isExternalEntry` option marks entries of the layer order as external, the draw
  * instance draws each run between them in a maplibre custom layer of its own, so the host can
- * place its own maplibre layers between the frames. `getRenderSlots()` lists the frames, and
- * the `draw.renderslots.change` event announces a change of them.
+ * place its own maplibre layers between the frames. `draw.getLayerStack()` lists the frames,
+ * and the `layerStack.changed` event announces a change of them.
  */
-export interface RenderSlot {
+export interface StackSlot {
     /** The maplibre layer ID of the custom layer that draws this run */
     readonly layerId: string;
     /** The index in the layer order where the run starts (inclusive) */