isard 0.6.1 → 0.7.0

package/dist/geoplateforme.d.ts

@@ -40,9 +40,10 @@ export declare function geoplateformeWms(layers: string, options?: {
 /**
  * Features of the Géoplateforme's WFS in a box (west, south, east, north, degrees), as GeoJSON in longitudes and
  * latitudes: `await geoplateformeWfs('BDTOPO_V3:batiment', [2.41, 48.84, 2.43, 48.85])`. At most `count` features
- * (default 5000). The type names are those of its capabilities (BD TOPO, ADMIN EXPRESS…). With `srsName`
- * (`'EPSG:2154'`), the features come in that CRS (the box stays in degrees), the collection naming it in its `crs`
- * member: the feature layers reproject it by themselves
+ * (default 50 000), asked by pages of 5000: the first one tells how many there are, the others are asked together.
+ * The type names are those of its capabilities (BD TOPO, ADMIN EXPRESS…). With `srsName` (`'EPSG:2154'`), the
+ * features come in that CRS (the box stays in degrees), the collection naming it in its `crs` member: the feature
+ * layers reproject it by themselves
  */
 export declare function geoplateformeWfs<P = Properties>(typeName: string, [west, south, east, north]: [number, number, number, number], options?: {
     count?: number;

package/dist/geoplateforme.js

@@ -63,29 +63,52 @@ export function geoplateformeWms(layers, options = {}) {
             `&STYLES=${encodeURIComponent(styles)}&FORMAT=${format}`,
     };
 }
+/** Features the Géoplateforme's WFS returns per request at most */
+const WFS_PAGE = 5000;
 /**
  * Features of the Géoplateforme's WFS in a box (west, south, east, north, degrees), as GeoJSON in longitudes and
  * latitudes: `await geoplateformeWfs('BDTOPO_V3:batiment', [2.41, 48.84, 2.43, 48.85])`. At most `count` features
- * (default 5000). The type names are those of its capabilities (BD TOPO, ADMIN EXPRESS…). With `srsName`
- * (`'EPSG:2154'`), the features come in that CRS (the box stays in degrees), the collection naming it in its `crs`
- * member: the feature layers reproject it by themselves
+ * (default 50 000), asked by pages of 5000: the first one tells how many there are, the others are asked together.
+ * The type names are those of its capabilities (BD TOPO, ADMIN EXPRESS…). With `srsName` (`'EPSG:2154'`), the
+ * features come in that CRS (the box stays in degrees), the collection naming it in its `crs` member: the feature
+ * layers reproject it by themselves
  */
 export async function geoplateformeWfs(typeName, [west, south, east, north], options = {}) {
-    const url = new URL('https://data.geopf.fr/wfs/ows');
-    url.search = new URLSearchParams({
-        SERVICE: 'WFS',
-        VERSION: '2.0.0',
-        REQUEST: 'GetFeature',
-        TYPENAMES: typeName,
-        OUTPUTFORMAT: 'application/json',
-        SRSNAME: options.srsName ?? 'EPSG:4326',
-        // WFS 2.0 in EPSG:4326: latitude first
-        BBOX: `${south},${west},${north},${east},urn:ogc:def:crs:EPSG::4326`,
-        COUNT: String(options.count ?? 5000),
-    }).toString();
-    const response = await fetch(url, options.signal ? { signal: options.signal } : {});
-    if (!response.ok)
-        throw new Error(`isard: ${typeName}: ${response.status}`);
-    return response.json();
+    const limit = Math.max(1, options.count ?? 50_000);
+    const page = async (start, count) => {
+        const url = new URL('https://data.geopf.fr/wfs/ows');
+        url.search = new URLSearchParams({
+            SERVICE: 'WFS',
+            VERSION: '2.0.0',
+            REQUEST: 'GetFeature',
+            TYPENAMES: typeName,
+            OUTPUTFORMAT: 'application/json',
+            SRSNAME: options.srsName ?? 'EPSG:4326',
+            // WFS 2.0 in EPSG:4326: latitude first
+            BBOX: `${south},${west},${north},${east},urn:ogc:def:crs:EPSG::4326`,
+            COUNT: String(count),
+            // The first page as a single request always was
+            ...(start > 0 ? { STARTINDEX: String(start) } : {}),
+        }).toString();
+        const response = await fetch(url, options.signal ? { signal: options.signal } : {});
+        if (!response.ok)
+            throw new Error(`isard: ${typeName}: ${response.status}`);
+        return response.json();
+    };
+    const first = await page(0, Math.min(WFS_PAGE, limit));
+    const matched = Number(first.numberMatched);
+    const total = Math.min(Number.isFinite(matched) ? matched : 0, limit);
+    if (first.features.length < WFS_PAGE || total <= first.features.length)
+        return first;
+    const starts = [];
+    for (let start = first.features.length; start < total; start += WFS_PAGE)
+        starts.push(start);
+    const rest = await Promise.all(starts.map((start) => page(start, Math.min(WFS_PAGE, total - start))));
+    // Pages may overlap where the server's order shifts: each feature once, by its id
+    const seen = new Set();
+    const features = [first, ...rest]
+        .flatMap((r) => r.features)
+        .filter((f) => f.id === undefined || (!seen.has(f.id) && seen.add(f.id) !== undefined));
+    return { ...first, features };
 }
 //# sourceMappingURL=geoplateforme.js.map

package/dist/geoplateforme.js.map

@@ -1 +1 @@
-{"version":3,"file":"geoplateforme.js","sourceRoot":"","sources":["../src/geoplateforme.ts"],"names":[],"mappings":"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","sourcesContent":["/**\n * The Géoplateforme's data (IGN, France; open, no key): its WMTS and WMS rasters as raster layers, its WFS features as\n * GeoJSON. Its basemaps, hillshade, terrain model and vector styles are named options of the map (`'ign-plan'`,\n * `hillshade`, `terrain: 'ign'`, `PLAN_STYLES`); the rasters credit the IGN by themselves.\n */\nimport type { FeatureCollection, Properties } from './features.ts';\nimport type { TileGrid, TileMatrix } from './grid.ts';\nimport type { RasterOptions } from './types.ts';\n\n/** Credits of the Géoplateforme's data: its basemaps, hillshade, terrain model, rasters and features */\nexport const IGN_ATTRIBUTION =\n  '<a href=\"https://www.ign.fr/\">© IGN</a> – <a href=\"https://geoservices.ign.fr/\">Géoplateforme</a>';\n\n/** France (metropolitan, Corsica included) in longitudes and latitudes, where the Géoplateforme's Lambert-93 layers\n * lie */\nconst FRANCE: [number, number, number, number] = [-5.5, 41, 10, 51.5];\n\n/**\n * The Géoplateforme's Lambert-93 tile matrix sets of 5 and 10 cm (`2154_10cm_6_20`, `2154_5cm_6_22`…: one pyramid,\n * 209 715.2 m per pixel at level 0, halved at each level, from the corner (0, 12 000 000)), levels `min` to `max`, over\n * France\n */\nexport function lambert93Grid(name: string, min: number, max: number): TileGrid {\n  const matrices: TileMatrix[] = [];\n  for (let level = min; level <= max; level += 1) {\n    matrices.push({ id: level, resolution: 209715.2 / 2 ** level, origin: [0, 12000000] });\n  }\n  return { crs: 'EPSG:2154', matrices, bounds: FRANCE, name };\n}\n\n/**\n * A layer of the Géoplateforme's WMTS as raster options for `addRaster`, crediting the IGN:\n * `geoplateformeWmts('ORTHOIMAGERY.ORTHOPHOTOS', { format: 'image/jpeg' })`. The layer names are those of its\n * capabilities (https://data.geopf.fr/wmts?SERVICE=WMTS&REQUEST=GetCapabilities). In its Web Mercator grid (`PM`) by\n * default; a Lambert-93 layer in its matrix set (`matrixSet: '2154_10cm_6_20'`, a set of 5 or 10 cm, read from the\n * capabilities) or another `grid` (from `wmtsGrid`, its set named) is reprojected by the map\n */\nexport function geoplateformeWmts(\n  layer: string,\n  options: { format?: string; style?: string; matrixSet?: string } & Omit<RasterOptions, 'url'> = {},\n): RasterOptions {\n  const { format = 'image/png', style = 'normal', matrixSet, ...raster } = options;\n  const set = (typeof raster.grid === 'object' ? raster.grid.name : undefined) ?? matrixSet ?? 'PM';\n  const lambert = /^2154_(?:5|10)cm_(\\d+)_(\\d+)$/.exec(set);\n  if (lambert && raster.grid === undefined) raster.grid = lambert93Grid(set, Number(lambert[1]), Number(lambert[2]));\n  else if (set !== 'PM' && raster.grid === undefined) {\n    throw new Error(`isard: the grid of the matrix set ${set}: wmtsGrid(capabilities, '${layer}', '${set}')`);\n  }\n  return {\n    ...(raster.grid === undefined ? { maxZoom: 19 } : {}),\n    attribution: IGN_ATTRIBUTION,\n    ...raster,\n    url:\n      `https://data.geopf.fr/wmts?SERVICE=WMTS&REQUEST=GetTile&VERSION=1.0.0&STYLE=${encodeURIComponent(style)}` +\n      `&TILEMATRIXSET=${encodeURIComponent(set)}&TILEMATRIX={z}&TILEROW={y}&TILECOL={x}` +\n      `&LAYER=${encodeURIComponent(layer)}&FORMAT=${format}`,\n  };\n}\n\n/**\n * Layers of the Géoplateforme's WMS (raster, `wms-r`) as raster options for `addRaster`, crediting the IGN: 256 px\n * images of each tile, transparent where empty. `geoplateformeWms('CADASTRALPARCELS.PARCELLAIRE_EXPRESS')`. Asked for\n * in EPSG:3857, or in `crs` (`'EPSG:2154'`: the box of each tile in Lambert-93, at the tile's `size`, reprojected by\n * the map; `'EPSG:4326'` is asked for as CRS:84, longitude first)\n */\nexport function geoplateformeWms(\n  layers: string,\n  options: { format?: string; styles?: string; crs?: string } & Omit<RasterOptions, 'url'> = {},\n): RasterOptions {\n  const { format = 'image/png', styles = '', crs = 'EPSG:3857', ...raster } = options;\n  const projected = crs !== 'EPSG:3857';\n  // WMS 1.3 puts the latitude first in EPSG:4326; {bbox} is x, y\n  const asked = crs === 'EPSG:4326' ? 'CRS:84' : crs;\n  return {\n    maxZoom: 20,\n    attribution: IGN_ATTRIBUTION,\n    ...(projected ? { grid: { crs, ...(crs === 'EPSG:2154' ? { bounds: FRANCE } : {}) } } : {}),\n    ...raster,\n    url:\n      `https://data.geopf.fr/wms-r/wms?SERVICE=WMS&VERSION=1.3.0&REQUEST=GetMap&CRS=${asked}&BBOX={bbox}` +\n      // Reprojected, the image of each tile at its size\n      `&${projected ? 'WIDTH={width}&HEIGHT={height}' : 'WIDTH=256&HEIGHT=256'}&TRANSPARENT=TRUE` +\n      `&LAYERS=${encodeURIComponent(layers)}` +\n      `&STYLES=${encodeURIComponent(styles)}&FORMAT=${format}`,\n  };\n}\n\n/**\n * Features of the Géoplateforme's WFS in a box (west, south, east, north, degrees), as GeoJSON in longitudes and\n * latitudes: `await geoplateformeWfs('BDTOPO_V3:batiment', [2.41, 48.84, 2.43, 48.85])`. At most `count` features\n * (default 5000). The type names are those of its capabilities (BD TOPO, ADMIN EXPRESS…). With `srsName`\n * (`'EPSG:2154'`), the features come in that CRS (the box stays in degrees), the collection naming it in its `crs`\n * member: the feature layers reproject it by themselves\n */\nexport async function geoplateformeWfs<P = Properties>(\n  typeName: string,\n  [west, south, east, north]: [number, number, number, number],\n  options: { count?: number; signal?: AbortSignal; srsName?: string } = {},\n): Promise<FeatureCollection<P>> {\n  const url = new URL('https://data.geopf.fr/wfs/ows');\n  url.search = new URLSearchParams({\n    SERVICE: 'WFS',\n    VERSION: '2.0.0',\n    REQUEST: 'GetFeature',\n    TYPENAMES: typeName,\n    OUTPUTFORMAT: 'application/json',\n    SRSNAME: options.srsName ?? 'EPSG:4326',\n    // WFS 2.0 in EPSG:4326: latitude first\n    BBOX: `${south},${west},${north},${east},urn:ogc:def:crs:EPSG::4326`,\n    COUNT: String(options.count ?? 5000),\n  }).toString();\n  const response = await fetch(url, options.signal ? { signal: options.signal } : {});\n  if (!response.ok) throw new Error(`isard: ${typeName}: ${response.status}`);\n  return response.json() as Promise<FeatureCollection<P>>;\n}\n"]}
+{"version":3,"file":"geoplateforme.js","sourceRoot":"","sources":["../src/geoplateforme.ts"],"names":[],"mappings":"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","sourcesContent":["/**\n * The Géoplateforme's data (IGN, France; open, no key): its WMTS and WMS rasters as raster layers, its WFS features as\n * GeoJSON. Its basemaps, hillshade, terrain model and vector styles are named options of the map (`'ign-plan'`,\n * `hillshade`, `terrain: 'ign'`, `PLAN_STYLES`); the rasters credit the IGN by themselves.\n */\nimport type { FeatureCollection, Properties } from './features.ts';\nimport type { TileGrid, TileMatrix } from './grid.ts';\nimport type { RasterOptions } from './types.ts';\n\n/** Credits of the Géoplateforme's data: its basemaps, hillshade, terrain model, rasters and features */\nexport const IGN_ATTRIBUTION =\n  '<a href=\"https://www.ign.fr/\">© IGN</a> – <a href=\"https://geoservices.ign.fr/\">Géoplateforme</a>';\n\n/** France (metropolitan, Corsica included) in longitudes and latitudes, where the Géoplateforme's Lambert-93 layers\n * lie */\nconst FRANCE: [number, number, number, number] = [-5.5, 41, 10, 51.5];\n\n/**\n * The Géoplateforme's Lambert-93 tile matrix sets of 5 and 10 cm (`2154_10cm_6_20`, `2154_5cm_6_22`…: one pyramid,\n * 209 715.2 m per pixel at level 0, halved at each level, from the corner (0, 12 000 000)), levels `min` to `max`, over\n * France\n */\nexport function lambert93Grid(name: string, min: number, max: number): TileGrid {\n  const matrices: TileMatrix[] = [];\n  for (let level = min; level <= max; level += 1) {\n    matrices.push({ id: level, resolution: 209715.2 / 2 ** level, origin: [0, 12000000] });\n  }\n  return { crs: 'EPSG:2154', matrices, bounds: FRANCE, name };\n}\n\n/**\n * A layer of the Géoplateforme's WMTS as raster options for `addRaster`, crediting the IGN:\n * `geoplateformeWmts('ORTHOIMAGERY.ORTHOPHOTOS', { format: 'image/jpeg' })`. The layer names are those of its\n * capabilities (https://data.geopf.fr/wmts?SERVICE=WMTS&REQUEST=GetCapabilities). In its Web Mercator grid (`PM`) by\n * default; a Lambert-93 layer in its matrix set (`matrixSet: '2154_10cm_6_20'`, a set of 5 or 10 cm, read from the\n * capabilities) or another `grid` (from `wmtsGrid`, its set named) is reprojected by the map\n */\nexport function geoplateformeWmts(\n  layer: string,\n  options: { format?: string; style?: string; matrixSet?: string } & Omit<RasterOptions, 'url'> = {},\n): RasterOptions {\n  const { format = 'image/png', style = 'normal', matrixSet, ...raster } = options;\n  const set = (typeof raster.grid === 'object' ? raster.grid.name : undefined) ?? matrixSet ?? 'PM';\n  const lambert = /^2154_(?:5|10)cm_(\\d+)_(\\d+)$/.exec(set);\n  if (lambert && raster.grid === undefined) raster.grid = lambert93Grid(set, Number(lambert[1]), Number(lambert[2]));\n  else if (set !== 'PM' && raster.grid === undefined) {\n    throw new Error(`isard: the grid of the matrix set ${set}: wmtsGrid(capabilities, '${layer}', '${set}')`);\n  }\n  return {\n    ...(raster.grid === undefined ? { maxZoom: 19 } : {}),\n    attribution: IGN_ATTRIBUTION,\n    ...raster,\n    url:\n      `https://data.geopf.fr/wmts?SERVICE=WMTS&REQUEST=GetTile&VERSION=1.0.0&STYLE=${encodeURIComponent(style)}` +\n      `&TILEMATRIXSET=${encodeURIComponent(set)}&TILEMATRIX={z}&TILEROW={y}&TILECOL={x}` +\n      `&LAYER=${encodeURIComponent(layer)}&FORMAT=${format}`,\n  };\n}\n\n/**\n * Layers of the Géoplateforme's WMS (raster, `wms-r`) as raster options for `addRaster`, crediting the IGN: 256 px\n * images of each tile, transparent where empty. `geoplateformeWms('CADASTRALPARCELS.PARCELLAIRE_EXPRESS')`. Asked for\n * in EPSG:3857, or in `crs` (`'EPSG:2154'`: the box of each tile in Lambert-93, at the tile's `size`, reprojected by\n * the map; `'EPSG:4326'` is asked for as CRS:84, longitude first)\n */\nexport function geoplateformeWms(\n  layers: string,\n  options: { format?: string; styles?: string; crs?: string } & Omit<RasterOptions, 'url'> = {},\n): RasterOptions {\n  const { format = 'image/png', styles = '', crs = 'EPSG:3857', ...raster } = options;\n  const projected = crs !== 'EPSG:3857';\n  // WMS 1.3 puts the latitude first in EPSG:4326; {bbox} is x, y\n  const asked = crs === 'EPSG:4326' ? 'CRS:84' : crs;\n  return {\n    maxZoom: 20,\n    attribution: IGN_ATTRIBUTION,\n    ...(projected ? { grid: { crs, ...(crs === 'EPSG:2154' ? { bounds: FRANCE } : {}) } } : {}),\n    ...raster,\n    url:\n      `https://data.geopf.fr/wms-r/wms?SERVICE=WMS&VERSION=1.3.0&REQUEST=GetMap&CRS=${asked}&BBOX={bbox}` +\n      // Reprojected, the image of each tile at its size\n      `&${projected ? 'WIDTH={width}&HEIGHT={height}' : 'WIDTH=256&HEIGHT=256'}&TRANSPARENT=TRUE` +\n      `&LAYERS=${encodeURIComponent(layers)}` +\n      `&STYLES=${encodeURIComponent(styles)}&FORMAT=${format}`,\n  };\n}\n\n/** Features the Géoplateforme's WFS returns per request at most */\nconst WFS_PAGE = 5000;\n\n/**\n * Features of the Géoplateforme's WFS in a box (west, south, east, north, degrees), as GeoJSON in longitudes and\n * latitudes: `await geoplateformeWfs('BDTOPO_V3:batiment', [2.41, 48.84, 2.43, 48.85])`. At most `count` features\n * (default 50 000), asked by pages of 5000: the first one tells how many there are, the others are asked together.\n * The type names are those of its capabilities (BD TOPO, ADMIN EXPRESS…). With `srsName` (`'EPSG:2154'`), the\n * features come in that CRS (the box stays in degrees), the collection naming it in its `crs` member: the feature\n * layers reproject it by themselves\n */\nexport async function geoplateformeWfs<P = Properties>(\n  typeName: string,\n  [west, south, east, north]: [number, number, number, number],\n  options: { count?: number; signal?: AbortSignal; srsName?: string } = {},\n): Promise<FeatureCollection<P>> {\n  const limit = Math.max(1, options.count ?? 50_000);\n  const page = async (start: number, count: number) => {\n    const url = new URL('https://data.geopf.fr/wfs/ows');\n    url.search = new URLSearchParams({\n      SERVICE: 'WFS',\n      VERSION: '2.0.0',\n      REQUEST: 'GetFeature',\n      TYPENAMES: typeName,\n      OUTPUTFORMAT: 'application/json',\n      SRSNAME: options.srsName ?? 'EPSG:4326',\n      // WFS 2.0 in EPSG:4326: latitude first\n      BBOX: `${south},${west},${north},${east},urn:ogc:def:crs:EPSG::4326`,\n      COUNT: String(count),\n      // The first page as a single request always was\n      ...(start > 0 ? { STARTINDEX: String(start) } : {}),\n    }).toString();\n    const response = await fetch(url, options.signal ? { signal: options.signal } : {});\n    if (!response.ok) throw new Error(`isard: ${typeName}: ${response.status}`);\n    return response.json() as Promise<FeatureCollection<P> & { numberMatched?: number | string }>;\n  };\n  const first = await page(0, Math.min(WFS_PAGE, limit));\n  const matched = Number(first.numberMatched);\n  const total = Math.min(Number.isFinite(matched) ? matched : 0, limit);\n  if (first.features.length < WFS_PAGE || total <= first.features.length) return first;\n  const starts: number[] = [];\n  for (let start = first.features.length; start < total; start += WFS_PAGE) starts.push(start);\n  const rest = await Promise.all(starts.map((start) => page(start, Math.min(WFS_PAGE, total - start))));\n  // Pages may overlap where the server's order shifts: each feature once, by its id\n  const seen = new Set<unknown>();\n  const features = [first, ...rest]\n    .flatMap((r) => r.features)\n    .filter((f) => f.id === undefined || (!seen.has(f.id) && seen.add(f.id) !== undefined));\n  return { ...first, features };\n}\n"]}

package/dist/map.d.ts

@@ -171,10 +171,22 @@ export declare class GeoMap {
     private requestHoverPick;
     private readonly pollHoverPick;
     private cancelHoverPick;
-    /** Screen point (CSS pixels) of a position, undefined behind the camera */
-    project(lonLat: LonLat): Point | undefined;
+    /** Screen point (CSS pixels) of a position on the ground (the relief), or `height` metres above it, undefined
+     * behind the camera */
+    project(lonLat: LonLat, height?: number): Point | undefined;
     /** Position under a screen point (CSS pixels), undefined above the horizon */
     unproject(point: Point): LonLat | undefined;
+    /** What is drawn under a screen point (CSS pixels), on the relief or standing on it (a roof, a wall, a mesh): its
+     * position and its height above the relief, in metres; undefined where nothing was drawn. The last frame's scene is
+     * drawn again and read back, waiting for the GPU (a stall): for clicks and drags */
+    pickSurface(point: Point): {
+        lonLat: LonLat;
+        height: number;
+    } | undefined;
+    /** The height above the relief, in metres, of the top of what stands at a position: a roof, a mesh, 0 on the bare
+     * ground; undefined where nothing of the last frame is there. The scene is drawn from above into a single pixel and
+     * read back: cheap, but it waits for the GPU */
+    surfaceAt(lonLat: LonLat): number | undefined;
     /** Adds a control in a corner of the map; controls stack from the corner inward */
     addControl(control: Control, position?: ControlPosition): this;
     removeControl(control: Control): this;

package/dist/map.js

@@ -532,7 +532,7 @@ export class GeoMap {
             ...(o.direction === undefined
                 ? [Number.NaN, 0, 0, 0]
                 : [o.direction, o.tilt ?? 0, o.fov ?? 60, o.verticalFov ?? 40]),
-        ])), new Float32Array(rgb(first.visibleColor ?? '#2f9e44')), new Float32Array(rgb(first.hiddenColor ?? '#e03131')), first.opacity ?? 0.55);
+        ])), new Float32Array(rgb(first.visibleColor ?? '#2f9e44')), new Float32Array(rgb(first.hiddenColor ?? '#e03131')), first.opacity ?? 0.7, new Float32Array(first.coneColor ? rgb(first.coneColor) : []));
         this.requestRender();
     }
     /** Relief under the basemap: true for the body's terrain model (on the Earth the worldwide Terrain Tiles, NASA's
@@ -634,14 +634,28 @@ export class GeoMap {
         cancelAnimationFrame(this.hoverPoll);
         this.hoverPoll = 0;
     }
-    /** Screen point (CSS pixels) of a position, undefined behind the camera */
-    project(lonLat) {
-        return this.engine.project(lonLat[0], lonLat[1]);
+    /** Screen point (CSS pixels) of a position on the ground (the relief), or `height` metres above it, undefined
+     * behind the camera */
+    project(lonLat, height = 0) {
+        return this.engine.project(lonLat[0], lonLat[1], height);
     }
     /** Position under a screen point (CSS pixels), undefined above the horizon */
     unproject(point) {
         return this.engine.ground(point[0], point[1]);
     }
+    /** What is drawn under a screen point (CSS pixels), on the relief or standing on it (a roof, a wall, a mesh): its
+     * position and its height above the relief, in metres; undefined where nothing was drawn. The last frame's scene is
+     * drawn again and read back, waiting for the GPU (a stall): for clicks and drags */
+    pickSurface(point) {
+        const hit = this.engine.surface(point[0], point[1]);
+        return hit && { lonLat: [hit[0], hit[1]], height: hit[2] };
+    }
+    /** The height above the relief, in metres, of the top of what stands at a position: a roof, a mesh, 0 on the bare
+     * ground; undefined where nothing of the last frame is there. The scene is drawn from above into a single pixel and
+     * read back: cheap, but it waits for the GPU */
+    surfaceAt(lonLat) {
+        return this.engine.surfaceAt(lonLat[0], lonLat[1]);
+    }
     // ── Overlays and controls ──
     /** Adds a control in a corner of the map; controls stack from the corner inward */
     addControl(control, position = 'top-right') {