ol-elevation-profile 0.6.0 → 1.1.0

package/dist/ol-elevation-profile.js

@@ -1,9 +1,9 @@
 /*! ol-elevation-profile | MIT License | https://github.com/lc-4918/ol-elevation-profile */
 (function (global, factory) {
-  typeof exports === 'object' && typeof module !== 'undefined' ? module.exports = factory(require('ol/control/Control.js'), require('ol/Overlay.js'), require('ol/Observable.js'), require('ol/proj.js'), require('ol/sphere.js'), require('ol/extent.js'), require('d3')) :
-  typeof define === 'function' && define.amd ? define(['ol/control/Control.js', 'ol/Overlay.js', 'ol/Observable.js', 'ol/proj.js', 'ol/sphere.js', 'ol/extent.js', 'd3'], factory) :
-  (global = typeof globalThis !== 'undefined' ? globalThis : global || self, global.OlElevationProfile = factory(global.ol.control.Control, global.ol.Overlay, global.ol.Observable, global.ol.proj, global.ol.sphere, global.ol.extent, global.d3));
-})(this, (function (Control, Overlay, Observable_js, proj_js, sphere_js, extent_js, d3) { 'use strict';
+  typeof exports === 'object' && typeof module !== 'undefined' ? module.exports = factory(require('ol/control/Control.js'), require('ol/Overlay.js'), require('ol/Observable.js'), require('ol/proj.js'), require('ol/TileState.js'), require('ol/sphere.js'), require('ol/extent.js'), require('d3')) :
+  typeof define === 'function' && define.amd ? define(['ol/control/Control.js', 'ol/Overlay.js', 'ol/Observable.js', 'ol/proj.js', 'ol/TileState.js', 'ol/sphere.js', 'ol/extent.js', 'd3'], factory) :
+  (global = typeof globalThis !== 'undefined' ? globalThis : global || self, global.OlElevationProfile = factory(global.ol.control.Control, global.ol.Overlay, global.ol.Observable, global.ol.proj, global.ol.TileState, global.ol.sphere, global.ol.extent, global.d3));
+})(this, (function (Control, Overlay, Observable_js, proj_js, TileState, sphere_js, extent_js, d3) { 'use strict';
 
   function _interopNamespaceDefault(e) {
     var n = Object.create(null);
@@ -27,9 +27,11 @@
   /**
    * Synchronized elevation profile control for OpenLayers, rendered with d3.
    *
-   * Reads elevation (Z) directly from 3D line geometries (`[lon, lat, z]`),
-   * so no external elevation service is queried. Clicking (or hovering) a track
-   * shows its profile; a marker stays synchronized on both the map and the chart.
+   * Reads elevation (Z) directly from 3D line geometries (`[lon, lat, z]`). A track without
+   * Z is completed from a terrain model - keyless AWS Terrain Tiles by default, which means
+   * the control fetches tiles on its own; set `dem: null` to keep it entirely offline.
+   * Clicking (or hovering) a track shows its profile; a marker stays synchronized on both
+   * the map and the chart.
    *
    * Peer dependencies (provided by the host application, not bundled):
    *  - OpenLayers >= 6  (https://openlayers.org/)
@@ -53,25 +55,26 @@
     const DEFAULTS = {
       immersion: 'docked',
       position: 'bottom',
-      width: 520,                   // nombre (px, plafonné à la largeur de la carte) ou 'auto'/'100%'/'full' = largeur de la carte
+      width: 520,                   // number (px, capped to the map width) or 'auto'/'100%'/'full' = map width
       height: 180,
       margins: { unit: 'px', top: 20, right: 24, bottom: 30, left: 48 },
       units: 'meters',
       dataProjection: null,
+      dem: 'terrarium',             // AWS tiles by default; null = off; or { url, encoding, zoom, maxTiles }
       maxPoints: 2000,
-      smoothing: 0,                 // lissage de l'altitude : fenêtre en MÈTRES (0 = aucun)
+      smoothing: 0,                 // elevation smoothing: window in METRES (0 = none)
       theme: 'steelblue',
-      color: null,                  // null=thème, 'auto'=couleur de la trace, ou couleur CSS
+      color: null,                  // null = theme, 'auto' = track colour, or a CSS colour
       trackLayer: null,
       transparency: false,          // false | true | nombre 0..1
       transparencyLevel: 0.45,
       grid: true,
       slope: false,
       slopeClassSize: 2.5,
-      slopeColors: null,            // null = dégradé bleu->rouge (HSL) ; sinon tableau interpolé
-      slopeSeparators: true,        // ligne verticale à chaque changement de classe
+      slopeColors: null,            // null = blue->red ramp (HSL); otherwise an interpolated array
+      slopeSeparators: true,        // vertical line at each class change
       slopeLegend: true,
-      maxClasses: 8,                // nombre maximal de classes de pente (couleurs + légende)
+      maxClasses: 8,                // maximum number of slope classes (colours + legend)
       xTicks: null,
       yTicks: null,
       show: 'click',
@@ -80,11 +83,12 @@
       followMap: true,
       marker: true,
       hideOnMapClick: true,
-      responsive: true,             // adapte la largeur/placement, mobile inclus
-      mobileBreakpoint: 640,        // <= largeur écran -> mode mobile (100% largeur, top/bottom)
-      zoom: false,                  // boutons début/fin pour recadrer carte + profil sur A..B
-      ignoreStops: true,            // durée = temps en mouvement (ignore les arrêts)
-      stopSpeed: 0.5,               // seuil d'arrêt en m/s (~1,8 km/h)
+      responsive: true,             // adapts width/placement, mobile included
+      mobileBreakpoint: 640,        // <= screen width -> mobile mode (100% width, top/bottom)
+      zoom: false,                  // start/end buttons cropping map + profile to A..B
+      exportPng: false,             // toolbar button exporting the panel as a PNG
+      ignoreStops: true,            // duration = moving time (stops excluded)
+      stopSpeed: 0.5,               // stop threshold in m/s (~1.8 km/h)
       tooltipItems: ['distance', 'elevation'],
       headerItems: ['distance', 'ascent', 'descent', 'minmax'],
       titleProperty: 'name',
@@ -94,7 +98,9 @@
         ascent: 'D+', descent: 'D-', empty: 'Cliquez un tracé',
         time: 'Temps', duration: 'Durée',
         durationUnits: { s: 'sec', m: 'min', h: 'h', d: 'j' },
-        zoomStart: 'Définir le début (A)', zoomEnd: 'Définir la fin (B)', zoomAll: 'Tout voir'
+        zoomStart: 'Définir le début (A)', zoomEnd: 'Définir la fin (B)', zoomAll: 'Tout voir',
+        exportPng: 'Exporter en PNG',
+        loading: 'Chargement du profil altimétrique'
       }
     };
 
@@ -111,15 +117,44 @@
     const esc = (s) => String(s).replace(/[&<>"']/g, (c) => ({ '&': '&amp;', '<': '&lt;', '>': '&gt;', '"': '&quot;', "'": '&#39;' }[c]));
     const isUrl = (v) => typeof v === 'string' && /^(https?:)?\/\/|^mailto:/i.test(v);
 
-    // Extrait un tableau plat de timestamps (ms epoch) aligné sur l'ordre plat des coordonnées,
-    // depuis properties.coordTimes (ISO ou nombre), coordinateProperties.times, ou la 4e dimension (M).
+    /**
+     * Coordinate segments to profile, whatever the geometry type: an array of point arrays.
+     *
+     * A polygon is profiled along its **outer ring only**; the holes are not part of the
+     * outline itself. The ring being closed, the profile returns to its starting point -
+     * that is the outline, faithfully, not a defect.
+     *
+     * One place for the five that used to test `getType()` themselves: they all wrapped
+     * `getCoordinates()` in one extra array unless it was a MultiLineString, which silently
+     * made a polygon iterate over its rings as if they were points.
+     */
+    function geomLines(geom) {
+      if (!geom || !geom.getCoordinates) return [];
+      const c = geom.getCoordinates();
+      switch (geom.getType()) {
+        case 'LineString':
+        case 'LinearRing': return [c];
+        case 'MultiLineString': return c;
+        case 'Polygon': return c.length ? [c[0]] : [];
+        case 'MultiPolygon': return c.map((poly) => poly[0]).filter(Boolean);
+        default: return [];
+      }
+    }
+
+    /** Whether a geometry can be profiled at all - the map-selection filter and nothing more. */
+    function isProfilable(geom) {
+      return !!geom && /^(Multi)?(LineString|Polygon)$|^LinearRing$/.test(geom.getType());
+    }
+
+    // Flat array of timestamps (epoch ms) aligned on the flat coordinate order, read from
+    // properties.coordTimes (ISO or number), coordinateProperties.times, or the 4th (M) dimension.
     function extractTimes(feature, lines) {
       const props = (feature && feature.getProperties) ? feature.getProperties() : {};
       let raw = props.coordTimes;
       if (raw == null && props.coordinateProperties) raw = props.coordinateProperties.times || props.coordinateProperties.coordTimes;
       let flat = null;
       if (Array.isArray(raw)) flat = Array.isArray(raw[0]) ? raw.reduce((a, b) => a.concat(b), []) : raw.slice();
-      if (!flat && lines) {                          // repli : 4e dimension M (layout XYZM)
+      if (!flat && lines) {                          // fallback: 4th M dimension (XYZM layout)
         const tmp = []; let any = false;
         for (const seg of lines) for (const c of seg) { const v = c.length > 3 ? c[3] : null; tmp.push(v); if (v != null && isFinite(v)) any = true; }
         flat = any ? tmp : null;
@@ -170,8 +205,541 @@
     const ICON_EXPAND = '<svg viewBox="0 0 24 24"><path d="M3 19l5-7 4 4 4-6 5 9z" fill="currentColor" opacity=".85"/></svg>';
     const ICON_A = '<svg viewBox="0 0 24 24"><path d="M7 5v14M11 12h8m0 0-3-3m3 3-3 3" fill="none" stroke="currentColor" stroke-width="2" stroke-linecap="round" stroke-linejoin="round"/></svg>';
     const ICON_B = '<svg viewBox="0 0 24 24"><path d="M17 5v14M13 12H5m0 0 3-3m-3 3 3 3" fill="none" stroke="currentColor" stroke-width="2" stroke-linecap="round" stroke-linejoin="round"/></svg>';
+    const ICON_PNG = '<svg viewBox="0 0 24 24"><path d="M12 4v10m0 0 4-4m-4 4-4-4M5 18h14" fill="none" stroke="currentColor" stroke-width="2" stroke-linecap="round" stroke-linejoin="round"/></svg>';
     const ICON_ALL = '<svg viewBox="0 0 24 24"><path d="M4 12h16M4 12l4-4M4 12l4 4M20 12l-4-4M20 12l-4 4" fill="none" stroke="currentColor" stroke-width="2" stroke-linecap="round" stroke-linejoin="round"/></svg>';
 
+    // ----- digital elevation model (DEM) -----------------------------------
+    /**
+     * Known terrain-tile sources.
+     *
+     * A PNG tile carries elevation in its R/G/B channels; it is read on a canvas rather
+     * than queried point by point from an API. That is what makes a 10 000-point track a
+     * handful of requests, with no key, no quota and no rate limit — where the free
+     * elevation APIs cap out at 100 or 200 points per call.
+     *
+     * Attribution is not automatic: the library does not own the map. It is up to the
+     * application to carry `attributions` in its own basemap source - and since the DEM is
+     * on by default, that obligation arrives without having been asked for. `dem: null`
+     * turns the whole thing off.
+     */
+    const DEM_PRESETS = {
+      terrarium: {
+        url: 'https://s3.amazonaws.com/elevation-tiles-prod/terrarium/{z}/{x}/{y}.png',
+        encoding: 'terrarium',
+        maxZoom: 14,
+        attributions: 'Elevation: <a href="https://registry.opendata.aws/terrain-tiles/">Terrain Tiles</a> (AWS Open Data)'
+      },
+      /**
+       * IGN Géoplateforme, serving the RGE ALTI over France and its overseas territories.
+       *
+       * A point API rather than tiles, hence its own sampler: it answers 200 points per
+       * request and announces one request per second, so a 10 000 point track takes about
+       * fifty calls spread over as many seconds. In exchange it is metre-accurate where the
+       * world models are at ninety.
+       *
+       * **No key is required** on the public endpoint - verified against the live service.
+       * `apiKey` exists for a deployment that does demand one; it is appended as a query
+       * parameter, named by `apiKeyParam`.
+       *
+       * Outside its coverage the service does not error: it answers OUT_OF_COVERAGE for the
+       * point. No border is coded here - one asks, and it says itself where it does not know.
+       */
+      ign: {
+        api: 'ign',
+        url: 'https://data.geopf.fr/altimetrie/1.0/calcul/alti/rest/elevation.json',
+        resource: 'ign_rge_alti_wld',
+        batch: 200,            // more fits, but the URL grows ~20 bytes a point and hits 414
+        minInterval: 1100,     // ms between calls; the service announces 1 req/s
+        attributions: 'Elevation: <a href="https://geoservices.ign.fr/rgealti">RGE ALTI</a> (IGN)'
+      }
+    };
+
+    /** Value the IGN service returns where it holds no measurement. */
+    const IGN_NO_DATA = -99999;
+
+    /**
+     * Request URL for one batch, in the order given: the response returns the elevations in
+     * the same one.
+     *
+     * `zonly=true` cuts the response down to the elevations alone, without echoing the
+     * coordinates - a third of the weight for the same information. Coordinates rounded to
+     * the millionth of a degree, about ten centimetres: beyond that one only adds digits to
+     * the URL.
+     */
+    function ignUrl(cfg, pts) {
+      const f = (v) => v.toFixed(6);
+      const sep = cfg.url.indexOf('?') >= 0 ? '&' : '?';
+      let u = cfg.url + sep + 'resource=' + encodeURIComponent(cfg.resource) +
+        '&delimiter=|&zonly=true' +
+        '&lon=' + pts.map((p) => f(p[0])).join('|') +
+        '&lat=' + pts.map((p) => f(p[1])).join('|');
+      if (cfg.apiKey) u += '&' + (cfg.apiKeyParam || 'apikey') + '=' + encodeURIComponent(cfg.apiKey);
+      return u;
+    }
+
+    /**
+     * Sampler for the IGN service: batches, paces, and maps out-of-coverage to null.
+     *
+     * A batch whose response does not carry exactly as many elevations as points were asked
+     * for fails the whole fill. Elevations one can no longer map to their points are worse
+     * than absent ones: they would land on the wrong places, silently.
+     */
+    function ignSampler(cfg) {
+      const size = Math.max(1, cfg.batch || 200);
+      const gap = cfg.minInterval || 0;
+      return (lonlats) => {
+        const out = [];
+        let last = 0;
+        const step = (i) => {
+          if (i >= lonlats.length) return Promise.resolve(out);
+          const chunk = lonlats.slice(i, i + size);
+          const wait = Math.max(0, gap - (Date.now() - last));
+          return new Promise((r) => setTimeout(r, wait))
+            .then(() => { last = Date.now(); return fetch(ignUrl(cfg, chunk)); })
+            .then((r) => (r && r.ok) ? r.json() : null)
+            .then((body) => {
+              const z = body && body.elevations;
+              if (!Array.isArray(z) || z.length !== chunk.length) return null;
+              for (const v of z) out.push((v == null || v <= IGN_NO_DATA) ? null : v);
+              return step(i + size);
+            });
+        };
+        return step(0);
+      };
+    }
+
+    const DEM_DEFAULTS = { source: 'terrarium', zoom: 'auto', maxZoom: 14, maxTiles: 32, concurrency: 6, tileSize: 256 };
+
+    /**
+     * RGB → metres decoders, one per encoding convention.
+     *
+     * `encoding` also takes a function `(r, g, b, a) => metres`, for a tile set that packs
+     * elevation its own way. Return null where the pixel carries no measurement: the fill is
+     * abandoned rather than guessed.
+     *
+     * A GeoServer greyscale DEM is NOT decoded here. What a WMS returns is a rendered image,
+     * stretched and quantised by its style, not the coverage values; reading it back would
+     * be reading the rendering. Those go through `featureInfo`, which asks the server for the
+     * band value itself (see demConfig).
+     */
+    const DEM_DECODERS = {
+      terrarium: (r, g, b) => (r * 256 + g + b / 256) - 32768,
+      mapbox: (r, g, b) => -1e4 + (r * 65536 + g * 256 + b) * 0.1
+    };
+
+    /** Half the Web Mercator world, in metres: the bound of EPSG:3857. */
+    const MERC_HALF = 20037508.342789244;
+
+    /** Extent of an XYZ tile in EPSG:3857, for the WMS requests built below. */
+    function tileExtent(z, x, y) {
+      const span = 2 * MERC_HALF / Math.pow(2, z);
+      const minX = -MERC_HALF + x * span, maxY = MERC_HALF - y * span;
+      return [minX, maxY - span, minX + span, maxY];
+    }
+
+    function query(base, params) {
+      const sep = base.indexOf('?') >= 0 ? '&' : '?';
+      return base.replace(/[?&]$/, '') + sep +
+        Object.keys(params).map((k) => k + '=' + encodeURIComponent(params[k])).join('&');
+    }
+
+    /**
+     * WMS GetMap URL covering one XYZ tile, so a WMS behaves like any other tile source.
+     *
+     * The axis-order trap: WMS 1.3.0 names the reference system `CRS`, 1.1.1 names it `SRS`,
+     * and sending the wrong one gets the request rejected or silently mis-georeferenced.
+     * The version actually in force decides, after the caller's params are merged in.
+     */
+    function wmsTileUrl(w, z, x, y, tileSize) {
+      const p = Object.assign({
+        SERVICE: 'WMS', REQUEST: 'GetMap', VERSION: '1.3.0', FORMAT: 'image/png',
+        TRANSPARENT: 'false', STYLES: ''
+      }, w.params || {});
+      const key = String(p.VERSION).indexOf('1.1') === 0 ? 'SRS' : 'CRS';
+      delete p.SRS; delete p.CRS;
+      p[key] = w.projection || 'EPSG:3857';
+      p.LAYERS = w.layers;
+      p.WIDTH = tileSize; p.HEIGHT = tileSize;
+      p.BBOX = tileExtent(z, x, y).join(',');
+      return query(w.url, p);
+    }
+
+    /**
+     * Where a tile comes from: an OpenLayers source, a WMS, or an XYZ template.
+     *
+     * Handing an `ol/source/TileImage` (XYZ, TileWMS, or any subclass) delegates URL building
+     * to OpenLayers itself, which already knows that source's quirks - subdomains, custom
+     * params, tile grid. Cheaper and safer than reimplementing each one here.
+     */
+    function tileUrlFn(cfg) {
+      const src = cfg.olSource;
+      if (src && typeof src.getTileUrlFunction === 'function') {
+        const fn = src.getTileUrlFunction();
+        const proj = proj_js.get('EPSG:3857');
+        return (z, x, y) => fn([z, x, y], 1, proj);
+      }
+      if (cfg.wms) return (z, x, y) => wmsTileUrl(cfg.wms, z, x, y, cfg.tileSize);
+      return (z, x, y) => cfg.url.replace('{z}', z).replace('{x}', x).replace('{y}', y);
+    }
+
+    /**
+     * Values of one DataTile, or null if it never arrived.
+     *
+     * A DataTile carries no URL: it is loaded by the source itself and its values are read
+     * back with getData(). The state has to be watched rather than awaited - OpenLayers
+     * announces it through a `change` event, not a promise.
+     */
+    function loadDataTile(tile) {
+      return new Promise((resolve) => {
+        const settle = () => {
+          const st = tile.getState();
+          if (st === TileState.LOADED) { resolve(tile.getData ? tile.getData() : null); return true; }
+          if (st === TileState.ERROR || st === TileState.EMPTY) { resolve(null); return true; }
+          return false;
+        };
+        if (settle()) return;
+        const onChange = () => { if (settle()) tile.removeEventListener('change', onChange); };
+        tile.addEventListener('change', onChange);
+        if (tile.load) tile.load();
+      });
+    }
+
+    /**
+     * Sampler for an `ol/source/DataTile` - `ol/source/GeoTIFF` above all.
+     *
+     * Its own path because such a source shares nothing with the XYZ one: no URL, no Web
+     * Mercator, no 256 pixel tiles. A GeoTIFF keeps **its own projection and its own tile
+     * grid**, both only known once `getView()` has resolved, and its values are real numbers
+     * rather than colours - so nothing here goes through a decoder.
+     *
+     * Positions are held in grid pixels, as with the XYZ tiles and for the same reason: the
+     * four neighbours of a point straddle two tiles as soon as it runs along an edge.
+     *
+     * `normalize: false` matters on the source, otherwise OpenLayers rescales the values to
+     * 0..1 and the profile comes out in fractions of nothing.
+     */
+    function dataTileSampler(cfg) {
+      const src = cfg.olSource;
+      const band = cfg.band || 0;
+      return (lonlats) => {
+        // getView() is only awaited when the grid is not known yet - which is the GeoTIFF
+        // case, where it settles once the metadata has been read. On a plain DataTile that
+        // promise never settles at all, and awaiting it unconditionally hangs the fill.
+        const known = src.getTileGrid && src.getTileGrid();
+        const ready = known ? Promise.resolve(null) : Promise.resolve(src.getView ? src.getView() : null);
+        return ready.then((view) => {
+        const grid = known || (src.getTileGrid && src.getTileGrid()) || (view && view.tileGrid);
+        if (!grid) return null;
+        const proj = proj_js.get((view && view.projection) || (src.getProjection && src.getProjection()) || 'EPSG:3857');
+        const zs = grid.getResolutions ? grid.getResolutions().length - 1 : 0;
+        const bands = src.bandCount || 1;
+        const coords = lonlats.map((ll) => proj_js.transform([ll[0], ll[1]], 'EPSG:4326', proj));
+
+        // Finest level whose tile count stays within maxTiles, as for the XYZ tiles: it is
+        // the tiling that widens with the track, not the model that degrades.
+        // Pixel bounds of the coverage, when it declares an extent. A point inside the raster
+        // but within half a pixel of its edge lands on a neighbour that does not exist: its
+        // tile would come back empty and the all-or-nothing rule would drop the whole track.
+        // Half a pixel of tolerance at the borders, as on any regular grid.
+        const ext = (grid.getExtent && grid.getExtent()) || (view && view.extent) || null;
+        const plan = (z) => {
+          const res = grid.getResolution(z), origin = grid.getOrigin(z);
+          let ts = grid.getTileSize(z); ts = Array.isArray(ts) ? ts : [ts, ts];
+          const cols = ext ? Math.round((ext[2] - ext[0]) / res) : Infinity;
+          const rows = ext ? Math.round((ext[3] - ext[1]) / res) : Infinity;
+          const clampI = (i) => Math.min(cols - 1, Math.max(0, i));
+          const clampJ = (j) => Math.min(rows - 1, Math.max(0, j));
+          const need = new Map();
+          const at = coords.map((c) => {
+            const px = (c[0] - origin[0]) / res - 0.5, py = (origin[1] - c[1]) / res - 0.5;
+            const i0 = clampI(Math.floor(px)), j0 = clampJ(Math.floor(py));
+            for (let di = 0; di < 2; di++) for (let dj = 0; dj < 2; dj++) {
+              const tx = Math.floor(clampI(i0 + di) / ts[0]), ty = Math.floor(clampJ(j0 + dj) / ts[1]);
+              need.set(tx + '/' + ty, [tx, ty]);
+            }
+            // Interpolation fractions clamped too: a point beyond the last pixel centre keeps
+            // that pixel's value rather than extrapolating past the edge of the data.
+            return { i0, j0, tx: Math.min(1, Math.max(0, px - i0)), ty: Math.min(1, Math.max(0, py - j0)), clampI, clampJ };
+          });
+          return { res, origin, ts, need, at, clampI, clampJ };
+        };
+        let z = zs, p = plan(z);
+        while (z > 0 && p.need.size > cfg.maxTiles) { z--; p = plan(z); }
+        if (p.need.size > cfg.maxTiles) return null;
+
+        const keys = Array.from(p.need.keys());
+        return Promise.all(keys.map((k) => {
+          const t = p.need.get(k);
+          return loadDataTile(src.getTile(z, t[0], t[1], 1, proj)).then((d) => [k, d]);
+        })).then((pairs) => {
+          const tiles = new Map(pairs);
+          const value = (i, j) => {
+            const tx = Math.floor(p.clampI(i) / p.ts[0]), ty = Math.floor(p.clampJ(j) / p.ts[1]);
+            i = p.clampI(i); j = p.clampJ(j);
+            const d = tiles.get(tx + '/' + ty);
+            if (!d) return null;
+            const col = i - tx * p.ts[0], row = j - ty * p.ts[1];
+            const v = d[(row * p.ts[0] + col) * bands + band];
+            return (v == null || !isFinite(v)) ? null : v;
+          };
+          return p.at.map((n) => {
+            const a = value(n.i0, n.j0), b = value(n.i0 + 1, n.j0);
+            const c = value(n.i0, n.j0 + 1), e = value(n.i0 + 1, n.j0 + 1);
+            if (a == null || b == null || c == null || e == null) return null;
+            const north = a + (b - a) * n.tx, south = c + (e - c) * n.tx;
+            return north + (south - north) * n.ty;
+          });
+        });
+        });
+      };
+    }
+
+    /**
+     * WMS GetFeatureInfo sampler: one request per point, for a coverage served as a rendered
+     * greyscale that cannot be decoded from its pixels.
+     *
+     * **It is slow**, unavoidably: a thousand-point track is a thousand round trips, where a
+     * tile source needs a handful. Worth it only when nothing else can reach the data - and
+     * `concurrency` is what keeps it bearable.
+     */
+    function featureInfoSampler(cfg) {
+      const fi = cfg.featureInfo;
+      const lanes = Math.max(1, cfg.concurrency || 6);
+      return (lonlats) => {
+        const out = new Array(lonlats.length);
+        let next = 0, broken = false;
+        const one = () => {
+          if (broken || next >= lonlats.length) return Promise.resolve();
+          const i = next++;
+          return fetch(featureInfoUrl(fi, lonlats[i]))
+            .then((r) => (r && r.ok) ? r.json() : null)
+            .then((body) => { out[i] = bandValue(body, fi.property); return one(); })
+            .catch(() => { broken = true; });
+        };
+        const running = [];
+        for (let i = 0; i < Math.min(lanes, lonlats.length); i++) running.push(one());
+        return Promise.all(running).then(() => broken ? null : out);
+      };
+    }
+
+    /** GetFeatureInfo URL for one point: a one-pixel image centred on it. */
+    function featureInfoUrl(fi, ll) {
+      const c = proj_js.fromLonLat([ll[0], ll[1]]);
+      const d = fi.resolution || 1;                       // half-size of the box, in metres
+      const p = Object.assign({
+        SERVICE: 'WMS', REQUEST: 'GetFeatureInfo', VERSION: '1.3.0',
+        INFO_FORMAT: 'application/json', STYLES: '', FEATURE_COUNT: 1
+      }, fi.params || {});
+      const key = String(p.VERSION).indexOf('1.1') === 0 ? 'SRS' : 'CRS';
+      delete p.SRS; delete p.CRS;
+      p[key] = fi.projection || 'EPSG:3857';
+      p.LAYERS = fi.layers;
+      p.QUERY_LAYERS = fi.queryLayers || fi.layers;
+      p.WIDTH = 1; p.HEIGHT = 1; p.I = 0; p.J = 0; p.X = 0; p.Y = 0;   // I/J is 1.3.0, X/Y is 1.1.1
+      p.BBOX = [c[0] - d, c[1] - d, c[0] + d, c[1] + d].join(',');
+      return query(fi.url, p);
+    }
+
+    /**
+     * Band value in a GetFeatureInfo response.
+     *
+     * The band's property name is not standard - GeoServer calls it GRAY_INDEX for a
+     * single-band coverage, but a styled or renamed layer answers otherwise. Without an
+     * explicit `property` the first finite number wins, which is right whenever the coverage
+     * carries one band, and is why `property` exists for when it does not.
+     */
+    function bandValue(body, property) {
+      const f = body && body.features && body.features[0];
+      const props = f && f.properties;
+      if (!props) return null;
+      if (property) { const v = Number(props[property]); return isFinite(v) ? v : null; }
+      for (const k of Object.keys(props)) { const v = Number(props[k]); if (props[k] !== null && props[k] !== '' && isFinite(v)) return v; }
+      return null;
+    }
+
+    /** Web Mercator pixel coordinates at zoom `z`, origin at the top-left corner of the world. */
+    function worldPixel(lon, lat, z, tileSize) {
+      const n = tileSize * Math.pow(2, z);
+      const s = Math.sin(lat * Math.PI / 180);
+      return [(lon + 180) / 360 * n, (0.5 - Math.log((1 + s) / (1 - s)) / (4 * Math.PI)) * n];
+    }
+
+    /**
+     * Reads elevations from a set of terrain tiles.
+     *
+     * Positions are held in **world pixels** rather than tile by tile: the four neighbours
+     * of a point can fall in two different tiles whenever it runs along an edge, which is
+     * the common case on a track. Converting to world pixels first, then resolving the
+     * tile, makes the edge case disappear instead of handling it.
+     */
+    class DemSampler {
+      /** @param {Object} cfg `url`, `encoding`, `tileSize`, `concurrency`. */
+      constructor(cfg) {
+        this.cfg = cfg;
+        this.decode = (typeof cfg.encoding === 'function') ? cfg.encoding
+          : (DEM_DECODERS[cfg.encoding] || DEM_DECODERS.terrarium);
+        this.tileUrl = tileUrlFn(cfg);
+        this.tiles = new Map();          // "z/x/y" -> RGBA pixels, or null if the tile was lost
+      }
+
+      /**
+       * North-west neighbour of the point plus the interpolation fractions, in world pixels.
+       *
+       * The half-pixel subtracted is not a fudge: pixel centres fall on half-integers, and
+       * without that shift `floor()` would return the cell containing the point rather than
+       * its western neighbour, offsetting the whole profile by half a pixel.
+       */
+      _neighbours(lon, lat, z) {
+        const wp = worldPixel(lon, lat, z, this.cfg.tileSize);
+        const px = wp[0] - 0.5, py = wp[1] - 0.5;
+        const i0 = Math.floor(px), j0 = Math.floor(py);
+        return { i0, j0, tx: px - i0, ty: py - j0 };
+      }
+
+      /** Tile key of a world pixel; x wraps around the globe, y clamps at the poles. */
+      _key(i, j, z) {
+        const ts = this.cfg.tileSize, span = ts * Math.pow(2, z);
+        const jj = Math.min(span - 1, Math.max(0, j)), ii = ((i % span) + span) % span;
+        return { key: z + '/' + Math.floor(ii / ts) + '/' + Math.floor(jj / ts), ii, jj };
+      }
+
+      /** Elevation of one pixel, or null if its tile is missing. */
+      _at(i, j, z) {
+        const ts = this.cfg.tileSize;
+        const r = this._key(i, j, z);
+        const data = this.tiles.get(r.key);
+        if (!data) return null;
+        const o = ((r.jj % ts) * ts + (r.ii % ts)) * 4;
+        const v = this.decode(data[o], data[o + 1], data[o + 2], data[o + 3]);
+        return (v == null || !isFinite(v)) ? null : v;
+      }
+
+      /**
+       * Elevation **bilinearly interpolated** between the four surrounding pixels; null as
+       * soon as a single one is missing.
+       *
+       * Bilinear rather than "the pixel containing the point": on a 30 or 90 m model, taking
+       * the pixel value makes the profile advance in stairs, and every stair counts as a
+       * climb then a descent in the ascent total. The interpolation invents no relief — it
+       * renders the same surface, without the steps of the sampling grid.
+       */
+      sample(lon, lat, z) {
+        const n = this._neighbours(lon, lat, z);
+        const a = this._at(n.i0, n.j0, z), b = this._at(n.i0 + 1, n.j0, z);
+        const c = this._at(n.i0, n.j0 + 1, z), d = this._at(n.i0 + 1, n.j0 + 1, z);
+        if (a == null || b == null || c == null || d == null) return null;
+        const north = a + (b - a) * n.tx, south = c + (d - c) * n.tx;
+        return north + (south - north) * n.ty;
+      }
+
+      /** Keys of the tiles needed by the four neighbours of each of the points. */
+      tilesFor(lonlats, z) {
+        const keys = new Set();
+        for (const ll of lonlats) {
+          const n = this._neighbours(ll[0], ll[1], z);
+          for (let di = 0; di < 2; di++) for (let dj = 0; dj < 2; dj++) keys.add(this._key(n.i0 + di, n.j0 + dj, z).key);
+        }
+        return keys;
+      }
+
+      /** Pixels of one tile, or null if it could not be read. */
+      _fetch(key) {
+        const parts = key.split('/');
+        const url = this.tileUrl(+parts[0], +parts[1], +parts[2]);
+        return new Promise((resolve) => {
+          const img = new Image();
+          // Without this attribute the canvas is tainted and getImageData throws: the tile
+          // would display, but stay unreadable. The intended sources answer with
+          // Access-Control-Allow-Origin: *.
+          img.crossOrigin = 'anonymous';
+          img.onload = () => {
+            try {
+              const ts = this.cfg.tileSize;
+              const cv = document.createElement('canvas');
+              cv.width = ts; cv.height = ts;
+              const ctx = cv.getContext('2d', { willReadFrequently: true });
+              ctx.drawImage(img, 0, 0, ts, ts);
+              resolve(ctx.getImageData(0, 0, ts, ts).data);
+            } catch (e) { resolve(null); }
+          };
+          img.onerror = () => resolve(null);
+          img.src = url;
+        });
+      }
+
+      /**
+       * Loads the missing tiles, `concurrency` in flight. Resolves false if one is missing.
+       *
+       * Lost tiles are remembered as such: without that, a second pass over the same track
+       * would fire the same requests, doomed to fail again.
+       */
+      load(keys) {
+        const todo = Array.from(keys).filter((k) => !this.tiles.has(k));
+        let next = 0, ok = true;
+        const worker = () => {
+          if (next >= todo.length) return Promise.resolve();
+          const k = todo[next++];
+          return this._fetch(k).then((data) => { this.tiles.set(k, data); if (!data) ok = false; return worker(); });
+        };
+        const lanes = [];
+        for (let i = 0; i < Math.min(this.cfg.concurrency, todo.length); i++) lanes.push(worker());
+        return Promise.all(lanes).then(() => ok);
+      }
+    }
+
+    /**
+     * The `dem` option (true | source name | sampling function | object) → a full
+     * configuration, or null.
+     *
+     * A `sample` function short-circuits the tile machinery entirely: the application
+     * answers with the elevations itself, from wherever it can reach them - a GeoServer
+     * WCS coverage, a GeoTIFF decoded with geotiff.js, a national elevation API. Only the
+     * transport is delegated; the control keeps the sequencing, the all-or-nothing rule,
+     * the spinner and the `demload` event, which is where the subtle parts live.
+     *
+     * That extension point rather than a WMS/WCS/GeoTIFF mode per protocol: reading a
+     * GeoTIFF means a full decoder, and this library has no runtime dependency to spend
+     * on one that most users would never load.
+     */
+    function demConfig(opt) {
+      if (!opt) return null;
+      if (typeof opt === 'function') return Object.assign({}, DEM_DEFAULTS, { sample: opt });
+      const raw = (opt === true || typeof opt === 'string') ? { source: opt === true ? 'terrarium' : opt } : Object.assign({}, opt);
+      if (typeof raw.sample === 'function') return Object.assign({}, DEM_DEFAULTS, raw);
+      // A point-query source: no tile grid, no pixel decoding.
+      if (raw.featureInfo) {
+        const fiCfg = Object.assign({}, DEM_DEFAULTS, raw);
+        fiCfg.sample = featureInfoSampler(fiCfg);
+        return fiCfg;
+      }
+      // An ol/source/DataTile (GeoTIFF above all) carries values, not URLs: its own path.
+      if (raw.olSource && typeof raw.olSource.getTileUrlFunction !== 'function' &&
+          typeof raw.olSource.getTile === 'function') {
+        const dtCfg = Object.assign({}, DEM_DEFAULTS, raw);
+        dtCfg.sample = dataTileSampler(dtCfg);
+        return dtCfg;
+      }
+      // Tiles: an OpenLayers source or a WMS both stand in for the url template.
+      const hasTiles = raw.url || raw.wms || raw.olSource;
+      const preset = DEM_PRESETS[raw.source] || (hasTiles ? {} : DEM_PRESETS.terrarium);
+      const cfg = Object.assign({}, DEM_DEFAULTS, preset, raw);
+      if (cfg.api === 'ign') { cfg.sample = ignSampler(cfg); return cfg; }   // a point API
+      return (cfg.url || cfg.wms || cfg.olSource) ? cfg : null;
+    }
+
+    /**
+     * Zoom at which to download the model: the finest one that fits within `maxTiles`.
+     *
+     * It is the tiling that widens as the track grows, not a model that degrades: a 10 km
+     * track is read at the finest step available, a 300 km one at a coarser step rather
+     * than in three hundred requests.
+     */
+    function demZoomFor(sampler, lonlats, cfg) {
+      if (typeof cfg.zoom === 'number') return cfg.zoom;
+      for (let z = cfg.maxZoom; z > 0; z--) if (sampler.tilesFor(lonlats, z).size <= cfg.maxTiles) return z;
+      return 1;
+    }
+
     // =======================================================================
     /**
      * @typedef {Object} ElevationProfileOptions
@@ -205,6 +773,7 @@
      * @property {boolean} [responsive=true] Adapt width/placement; mobile included.
      * @property {number} [mobileBreakpoint=640] Below this width: mobile mode (100% width, top/bottom only).
      * @property {boolean} [zoom=false] A/B buttons to crop map + profile to a sub-range.
+     * @property {boolean} [exportPng=false] Toolbar button exporting the whole panel as a PNG.
      * @property {boolean} [ignoreStops=true] When computing time, ignore stopped segments (moving time).
      * @property {number} [stopSpeed=0.5] Speed threshold (m/s) below which a segment counts as a stop.
      * @property {Array<'distance'|'elevation'|'slope'|'time'>} [tooltipItems=['distance','elevation']] Tooltip content (`'time'` = elapsed time at the cursor, if the track has time data).
@@ -213,6 +782,16 @@
      * @property {?string} [titleLink=null] Feature property holding a URL → clickable title.
      * @property {number} [maxPoints=2000] Decimation for render/interaction (stats use full data).
      * @property {?import('ol/proj/Projection').default|string} [dataProjection=null] Projection of the feature coordinates.
+     * @property {?(boolean|string|Function|Object)} [dem='terrarium'] Fill missing elevations
+     *   from a terrain model. Sources: `'terrarium'` (default) or `true` = AWS Terrain Tiles;
+     *   `'ign'` = IGN Géoplateforme RGE ALTI (France, keyless, `apiKey` optional);
+     *   `{url}` = XYZ template; `{wms:{url,layers,params}}` = WMS tiles;
+     *   `{olSource}` = any `ol/source/TileImage` (XYZ, TileWMS, …);
+     *   `{featureInfo:{url,layers,property}}` = WMS GetFeatureInfo, one request per point,
+     *   for a greyscale coverage that cannot be decoded from its pixels (slow);
+     *   a function or `{sample}` `(lonlats, ctx) => number[]|Promise<number[]>` to source them
+     *   yourself; `null` disables the whole thing.
+     *   Decoding: `encoding` is `'terrarium'`, `'mapbox'`, or a function `(r,g,b,a) => metres`.
      */
 
     /**
@@ -240,12 +819,13 @@
         this._marker = null;
         this._collapsed = !!o.collapsed;
         this._cropMode = false; this._zoomA = null; this._zoomB = null; this._armed = null; this._fitRes = null;
+        this._demZ = null; this._demFor = null; this._demSeq = 0; this._demLoading = false;
         this._onResize = () => { if (this._feature && !this._collapsed) this._render(); };
         this._buildDom(element);
         element.style.display = 'none';
       }
 
-      // ---------- util statique ----------------------------------------
+      // ---------- static helpers ----------------------------------------
       /**
        * Whether a feature has any Z (elevation) coordinate.
        * @param {import('ol/Feature').default} feature
@@ -254,8 +834,7 @@
       static featureHasZ(feature) {
         const g = feature && feature.getGeometry && feature.getGeometry();
         if (!g) return false;
-        const coords = g.getType() === 'MultiLineString' ? g.getCoordinates() : [g.getCoordinates()];
-        for (const seg of coords) for (const c of seg) if (c.length > 2 && isFinite(c[2])) return true;
+        for (const seg of geomLines(g)) for (const c of seg) if (c.length > 2 && isFinite(c[2])) return true;
         return false;
       }
 
@@ -267,8 +846,7 @@
       static featureHasTime(feature) {
         const g = feature && feature.getGeometry && feature.getGeometry();
         if (!g) return false;
-        const lines = g.getType() === 'MultiLineString' ? g.getCoordinates() : [g.getCoordinates()];
-        return !!extractTimes(feature, lines);
+        return !!extractTimes(feature, geomLines(g));
       }
 
       // ---------- DOM ---------------------------------------------------
@@ -294,6 +872,8 @@
         this._btnA = mkBtn('oep-a', ICON_A, o.labels.zoomStart, () => this._arm('A'));
         this._btnB = mkBtn('oep-b', ICON_B, o.labels.zoomEnd, () => this._arm('B'));
         this._btnAll = mkBtn('oep-all', ICON_ALL, o.labels.zoomAll, () => this._exitZoom());
+        // Last of the toolbar, so it sits to the right of the zoom buttons.
+        this._btnPng = mkBtn('oep-png', ICON_PNG, o.labels.exportPng, () => this.exportPNG());
         header.appendChild(this._toolbar);
 
         const btn = document.createElement('button');
@@ -357,7 +937,7 @@
         this._adjustAttribution();
       }
 
-      // ---------- responsive -------------------------------------------
+      // ---------- responsive --------------------------------------------
       _availWidth() {
         const map = this.getMap();
         const t = map && map.getTargetElement && map.getTargetElement();
@@ -373,7 +953,7 @@
         return mobile;
       }
 
-      // remonte les attributions OL au-dessus du profil quand celui-ci occupe le coin bas-droite
+      // Lift the OL attribution above the profile when the profile takes the bottom-right corner
       _adjustAttribution() {
         const map = this.getMap();
         const target = map && map.getTargetElement && map.getTargetElement();
@@ -384,17 +964,17 @@
         const mapR = target.getBoundingClientRect();
         const pR = this.element.getBoundingClientRect();
         if (!pR.height) return;
-        const bottomGap = mapR.bottom - pR.bottom;                     // bord bas de carte <-> bas du profil
+        const bottomGap = mapR.bottom - pR.bottom;                     // map bottom edge <-> profile bottom
         const rightGap = mapR.right - pR.right;
-        const atBottom = bottomGap < pR.height;                        // profil dans la bande basse
-        const reachesRight = rightGap < 24;                            // atteint le coin bas-droite (attributions)
+        const atBottom = bottomGap < pR.height;                        // profile sits in the bottom band
+        const reachesRight = rightGap < 24;                            // reaches the bottom-right corner (attributions)
         if (atBottom && reachesRight) {
           attr.style.right = `${Math.max(0, Math.round(rightGap))}px`;
-          attr.style.bottom = `${Math.round(pR.height + 2 * bottomGap)}px`;  // même écart au-dessus du profil
+          attr.style.bottom = `${Math.round(pR.height + 2 * bottomGap)}px`;  // same gap above the profile
         }
       }
 
-      // ---------- carte -------------------------------------------------
+      // ---------- map ---------------------------------------------------
       setMap(map) {
         const prev = this.getMap();
         super.setMap(map);
@@ -413,7 +993,7 @@
         if (typeof window !== 'undefined') window.addEventListener('resize', this._onResize);
 
         const lineAt = (pixel) => map.forEachFeatureAtPixel(pixel, (f) => {
-          const g = f.getGeometry(); return (g && /LineString/.test(g.getType())) ? f : undefined;
+          const g = f.getGeometry(); return isProfilable(g) ? f : undefined;
         });
 
         this._mapKeys = [];
@@ -423,11 +1003,11 @@
         if (o.hideOnMapClick) this._mapKeys.push(map.on('click', (evt) => { if (!lineAt(evt.pixel) && this._feature) this.clear(); }));
         if (o.followMap) this._mapKeys.push(map.on('pointermove', (evt) => {
           if (!this._feature || this._collapsed) return;
-          const cp = this._feature.getGeometry().getClosestPoint(evt.coordinate);
+          const cp = this._closestOnProfile(evt.coordinate); if (!cp) return;
           const px = map.getPixelFromCoordinate(cp); if (!px) return;
           if (Math.hypot(px[0] - evt.pixel[0], px[1] - evt.pixel[1]) < 14) this._focusByCoord(cp); else this._clearFocus();
         }));
-        // sortie du zoom au dézoom de la carte
+        // leave the A/B crop when the map is zoomed out
         this._mapKeys.push(map.on('moveend', () => {
           if (this._cropMode && this._fitRes && map.getView().getResolution() > this._fitRes * 1.25) this._exitZoom();
         }));
@@ -436,7 +1016,8 @@
 
       // ---------- API ---------------------------------------------------
       /**
-       * Show the profile for the given feature (LineString/MultiLineString, ideally 3D).
+       * Show the profile for the given feature (LineString, MultiLineString, or a Polygon /
+       * MultiPolygon profiled along its outer ring), ideally 3D.
        * Passing a falsy value hides the control.
        * @param {?import('ol/Feature').default} feature
        * @returns {this}
@@ -444,17 +1025,21 @@
       setFeature(feature) {
         this._feature = feature || null;
         this._cropMode = false; this._zoomA = null; this._zoomB = null; this._armed = null;
-        if (!feature) { this._fullSamples = this._samples = null; this._clear(); return this; }
+        if (!feature) { this._fullSamples = this._samples = null; this._demZ = this._demFor = null; this._clear(); return this; }
         this.element.style.display = '';
         this._compute();
+        // Before the render, not after: it is _fillFromDem that knows whether a fill is
+        // starting, and the render needs that to draw the spinner instead of a flat profile.
+        this._fillFromDem(feature);
         this._updateZoomButtons();
-        if (!this._collapsed) this._render();
+        if (this._collapsed) this._renderTitle(); else this._render();
         return this;
       }
       /** Hide the profile and clear the current feature. @returns {this} */
       clear() { return this.setFeature(null); }
       /**
-       * @returns {?{distance:number,ascent:number,descent:number,min:number,max:number,maxAbsSlope:number,points:number}}
+       * @returns {?{distance:number,duration:?number,ascent:number,descent:number,min:number,max:number,maxAbsSlope:number,points:number}}
+       * `duration` is `null` when the track carries no time data.
        */
       getStats() { return this._stats; }
       /** @param {string|Object} t Theme name or colors object. @returns {this} */
@@ -473,22 +1058,125 @@
         if (patch && (patch.theme || 'color' in patch)) this._applyTheme();
         if (patch && ('transparency' in patch || 'transparencyLevel' in patch)) this._applyTransparency();
         if (patch && 'collapsable' in patch) this._applyCollapsable();
-        if (patch && 'zoom' in patch) this._updateZoomButtons();
+        if (patch && ('zoom' in patch || 'exportPng' in patch)) this._updateZoomButtons();
         if (patch && typeof patch.width !== 'undefined' && typeof patch.width === 'number') this.options.width = patch.width;
-        if (this._feature) { this._compute(); this._updateZoomButtons(); if (!this._collapsed) this._render(); }
+        if (patch && 'dem' in patch) { this._demZ = null; this._demFor = null; }
+        if (this._feature) { this._compute(); this._fillFromDem(this._feature); this._updateZoomButtons(); if (this._collapsed) this._renderTitle(); else this._render(); }
         return this;
       }
 
-      // ---------- calcul ------------------------------------------------
+      // ---------- digital elevation model -------------------------------
+      /**
+       * Fills the missing elevations from a terrain model, then redraws.
+       *
+       * **A track is filled entirely or not at all.** A profile missing a few points is not
+       * an incomplete profile: points without Z count as zero, the line dives to sea level
+       * and the ascent total becomes absurd. Better the flat profile we would have had
+       * without the DEM.
+       *
+       * Nothing is reported to the user on failure — the fill is a supplement, it has no
+       * business breaking a display that succeeded without it. The `demload` event lets the
+       * application know if it wants to.
+       *
+       * @param {import('ol/Feature').default} feature
+       * @fires demload
+       * @private
+       */
+      _fillFromDem(feature) {
+        const cfg = demConfig(this.options.dem);
+        if (!cfg || !feature || this._demFor === feature) return;
+        if (ElevationProfile.featureHasZ(feature)) return;              // the track already carries its Z
+        // Canvas decoding needs a browser; a `sample` function does not, and must stay
+        // usable where there is no DOM.
+        if (!cfg.sample && (typeof Image === 'undefined' || typeof document === 'undefined')) return;
+
+        const geom = feature.getGeometry && feature.getGeometry();
+        if (!geom) return;
+        const lines = geomLines(geom);
+        const dataProj = this.options.dataProjection || (this.getMap() && this.getMap().getView().getProjection()) || 'EPSG:3857';
+        const lonlats = [];
+        for (const seg of lines) for (const c of seg) lonlats.push(proj_js.toLonLat(c, dataProj));
+        if (!lonlats.length) return;
+
+        // Sequence number: a track clicked while another is loading must win, otherwise the
+        // slowest response would overwrite the profile on screen.
+        const seq = ++this._demSeq;
+        this._demLoading = true;
+
+        // A misconfigured source must not take the profile down with it. _fillFromDem runs
+        // inside setFeature, so anything thrown here would reach the caller and leave no
+        // chart at all - where the whole point is that the fill is a supplement.
+        try {
+          this._startFill(cfg, seq, feature, lonlats, dataProj);
+        } catch (e) {
+          this._demDone(seq, feature, null, lonlats.length, null, 0);
+        }
+      }
+
+      /** @private */
+      _startFill(cfg, seq, feature, lonlats, dataProj) {
+        if (cfg.sample) {
+          // Wrapped in a promise chain so a function that throws synchronously fails the
+          // same way as one that rejects - a source that misbehaves must not leave the
+          // spinner turning forever.
+          Promise.resolve()
+            .then(() => cfg.sample(lonlats, { feature, projection: dataProj }))
+            .then((zs) => this._demDone(seq, feature, zs, lonlats.length, null, 0))
+            .catch(() => this._demDone(seq, feature, null, lonlats.length, null, 0));
+          return;
+        }
+
+        const sampler = new DemSampler(cfg);
+        const z = demZoomFor(sampler, lonlats, cfg);
+        sampler.load(sampler.tilesFor(lonlats, z)).then((ok) => {
+          const zs = ok ? lonlats.map((ll) => sampler.sample(ll[0], ll[1], z)) : null;
+          this._demDone(seq, feature, zs, lonlats.length, z, sampler.tiles.size);
+        }).catch(() => this._demDone(seq, feature, null, lonlats.length, z, 0));
+      }
+
+      /**
+       * Outcome of a fill, whatever produced it: adopt the elevations, drop the spinner,
+       * redraw, announce.
+       *
+       * A result of the wrong length is refused outright rather than padded. Elevations one
+       * can no longer map to their points are worse than absent ones: they would land on the
+       * wrong places, and nothing downstream would notice.
+       *
+       * @fires demload
+       * @private
+       */
+      _demDone(seq, feature, zs, expected, zoom, tiles) {
+        // A newer fill has taken over: it owns _demLoading and will clear it itself.
+        if (seq !== this._demSeq || this._feature !== feature) return;
+        const usable = Array.isArray(zs) && zs.length === expected && zs.every((v) => v != null && isFinite(v));
+        this._demLoading = false;
+        if (usable) { this._demZ = zs; this._demFor = feature; this._compute(); }
+        // Redrawn even on failure: the spinner has to give way to the flat profile.
+        this._updateZoomButtons();
+        if (!this._collapsed) this._render();
+        /**
+         * Fired once a terrain-model fill has completed (or failed).
+         * @event demload
+         * @property {boolean} ok Whether every point could be sampled.
+         * @property {?number} zoom Tile zoom level used, `null` for a custom sampler.
+         * @property {number} tiles Tiles fetched, `0` for a custom sampler.
+         */
+        this.dispatchEvent({ type: 'demload', ok: usable, zoom, tiles });
+      }
+
+      // ---------- computation -------------------------------------------
       _compute() {
         const o = this.options;
         const geom = this._feature.getGeometry();
-        const lines = geom.getType() === 'MultiLineString' ? geom.getCoordinates() : [geom.getCoordinates()];
+        const lines = geomLines(geom);
         const dataProj = o.dataProjection || (this.getMap() && this.getMap().getView().getProjection()) || 'EPSG:3857';
 
+        // Terrain-model elevations, if they were loaded for THIS feature.
+        const demZ = (this._demFor === this._feature) ? this._demZ : null;
+
         const times = extractTimes(this._feature, lines);
         this._hasTime = !!times;
-        const ignoreStops = o.ignoreStops !== false;                   // défaut : ignore les arrêts
+        const ignoreStops = o.ignoreStops !== false;                   // default: stops are excluded
         const stopSpeed = (o.stopSpeed != null ? o.stopSpeed : 0.5);   // m/s
         const pts = [];
         let cum = 0, prev = null, i = -1, tAcc = 0, prevMs = null;
@@ -501,13 +1189,14 @@
           if (times && times[i] != null) {
             const ms = times[i];
             if (prevMs != null) {
-              const dt = (ms - prevMs) / 1000;                          // s sur le segment
+              const dt = (ms - prevMs) / 1000;                          // seconds over the segment
               if (dt > 0 && (!ignoreStops || (dseg / dt) >= stopSpeed)) tAcc += dt;
             }
             t = tAcc; prevMs = ms;
           }
           prev = ll;
-          pts.push({ x: cum, z: (c.length > 2 && isFinite(c[2])) ? c[2] : 0, coord: c, t });
+          const z = (c.length > 2 && isFinite(c[2])) ? c[2] : (demZ ? demZ[i] : 0);
+          pts.push({ x: cum, z, coord: c, t });
         }
         if (o.smoothing > 0) this._smooth(pts, o.smoothing);
 
@@ -527,11 +1216,13 @@
         const distance = samples.length ? samples[samples.length - 1].x - samples[0].x : 0;
         const ta = samples.length ? samples[0].t : null, tb = samples.length ? samples[samples.length - 1].t : null;
         const duration = (ta != null && tb != null) ? (tb - ta) : null;
+        // Reported for a closed ring too, where they are equal by construction: on a loop,
+        // D+ is exactly the figure one is after.
         return { distance, duration, ascent, descent, min: isFinite(zmin) ? zmin : 0, max: isFinite(zmax) ? zmax : 0, maxAbsSlope: maxAbs, points: samples.length };
       }
       _smooth(pts, meters) {
         if (!(meters > 0) || pts.length < 3) return;
-        const half = meters / 2;                     // fenêtre = ±(meters/2) le long du tracé
+        const half = meters / 2;                     // window = +/-(meters/2) along the track
         const z = pts.map((p) => p.z);
         let lo = 0, hi = 0, sum = 0;
         for (let i = 0; i < pts.length; i++) {
@@ -556,20 +1247,20 @@
         if (samples.length) samples[0].slope = samples.length > 1 ? samples[1].slope : 0;
       }
 
-      // ---------- pente : couleurs --------------------------------------
+      // ---------- slope: colours ----------------------------------------
       _slopeScale() {
         const cs = this.options.slopeClassSize || 2.5;
         const maxClasses = this.options.maxClasses || 8;
         const realIdx = Math.max(1, Math.floor((this._stats.maxAbsSlope || 0) / cs));
-        const maxIdx = Math.min(realIdx, maxClasses - 1);   // au plus `maxClasses` classes (défaut 8)
-        const capped = realIdx > maxIdx;                    // des pentes dépassent la dernière classe
+        const maxIdx = Math.min(realIdx, maxClasses - 1);   // at most `maxClasses` classes (default 8)
+        const capped = realIdx > maxIdx;                    // some slopes overflow the last class
         let colorByIndex;
         if (this.slopeColors && this.slopeColors.length) {
           const interp = d3__namespace.interpolateRgbBasis(this.slopeColors);
           colorByIndex = (idx) => interp(maxIdx ? idx / maxIdx : 0);
         } else {
-          // rampe à arrêts non uniformes : partie froide (bleu-vert, peu lisible) compressée,
-          // jaune PUR au milieu, puis orange, rouge. classe 0 = bleu, classe max = rouge.
+          // Ramp with non-uniform stops: the cold end (blue-green, hard to read) is squeezed,
+          // PURE yellow in the middle, then orange, red. Class 0 = blue, top class = red.
           const ramp = d3__namespace.scaleLinear()
             .domain([0, 0.16, 0.42, 0.68, 1])
             .range(['#2166ac', '#27a35a', '#ffe000', '#f4791f', '#d7191c'])
@@ -581,8 +1272,8 @@
       }
       _classIndex(slope, sc) { return Math.min(sc.maxIdx, Math.floor(Math.abs(slope) / sc.classSize)); }
 
-      // ---------- temps : format adaptatif ------------------------------
-      // 7 sec · 26 min · 1 h 48 min · 2 j 3 h (jours + heures normalisés)
+      // ---------- time: adaptive format ---------------------------------
+      // 7 sec | 26 min | 1 h 48 min | 2 d 3 h (days + hours normalised)
       _fmtDuration(sec) {
         if (sec == null || !isFinite(sec)) return '';
         const u = (this.options.labels && this.options.labels.durationUnits) || { s: 'sec', m: 'min', h: 'h', d: 'j' };
@@ -599,14 +1290,35 @@
         return h ? `${d} ${u.d} ${h} ${u.h}` : `${d} ${u.d}`;
       }
 
-      // ---------- entête + légende --------------------------------------
-      _renderHeader() {
-        const o = this.options, s = this._stats, f = this._feature;
+      // ---------- header + legend ---------------------------------------
+      /**
+       * Track title, and its optional link.
+       *
+       * Its own method because it is the only part of the header that stays visible once
+       * collapsed — the CSS hides the body, the stats, the legend and the toolbar. `_render`
+       * is skipped while collapsed, so without a separate entry point the title would keep
+       * naming the previous track after a change of feature.
+       */
+      _renderTitle() {
+        const o = this.options, f = this._feature;
+        if (!f) return;
         const name = (f.get && f.get(o.titleProperty)) || 'Profil';
         const linkUrl = o.titleLink && f.get && f.get(o.titleLink);
         if (isUrl(linkUrl)) this._titleEl.innerHTML = `<a href="${esc(linkUrl)}" target="_blank" rel="noopener">${esc(name)}</a>`;
         else this._titleEl.textContent = name;
         this._titleEl.setAttribute('title', name);
+      }
+
+      _renderHeader() {
+        const o = this.options, s = this._stats, f = this._feature;
+        this._renderTitle();
+        // While the elevations are still unknown, every figure would read zero: a D+ of 0 m
+        // then jumping to 1 200 is worse than no figure at all.
+        if (this._demLoading) {
+          this._statsEl.innerHTML = ''; this._statsEl.removeAttribute('title');
+          this._legendEl.innerHTML = ''; this._legendEl.style.display = 'none';
+          return;
+        }
 
         const html = [], text = [];
         o.headerItems.forEach((it) => {
@@ -642,18 +1354,40 @@
         } else this._legendEl.style.display = 'none';
       }
 
-      // ---------- rendu -------------------------------------------------
+      /**
+       * Spinner shown in place of the chart while the terrain model loads.
+       *
+       * It keeps the chart's height so the panel does not jump when the profile replaces it,
+       * and it carries no colour of its own: the CSS takes `--oep-area`, which `_applyTheme`
+       * has just set - the theme colour, or the track colour under `color: 'auto'`.
+       */
+      _renderSpinner() {
+        const H = typeof this.options.height === 'number' ? this.options.height : 180;
+        this._body.innerHTML = '';
+        const box = document.createElement('div');
+        box.className = 'oep-loading';
+        box.style.height = `${H}px`;
+        box.setAttribute('role', 'status');
+        box.setAttribute('aria-label', this.options.labels.loading);
+        const sp = document.createElement('div');
+        sp.className = 'oep-spinner';
+        box.appendChild(sp);
+        this._body.appendChild(box);
+      }
+
+      // ---------- rendering ---------------------------------------------
       _render() {
         const o = this.options, s = this._stats, data = this._samples;
         if (!data || !data.length) return;
         this._applyTheme();
         const mobile = this._applyPlacement();
         this._renderHeader();
+        if (this._demLoading) { this._renderSpinner(); return; }
 
         const m = o.margins, u = m.unit || 'px';
         const toPx = (v) => u === 'px' ? v : v * (parseFloat(getComputedStyle(this.element).fontSize) || 16);
 
-        // largeur : 100% en mobile ; 'auto'/'100%'/'full' = largeur de la carte ; sinon nombre plafonné à la carte
+        // Width: 100% on mobile; 'auto'/'100%'/'full' = map width; otherwise a number capped to the map
         const avail = this._availWidth();
         const isAuto = (o.width === 'auto' || o.width === '100%' || o.width === 'full');
         const desktopW = isAuto ? avail : Math.min(typeof o.width === 'number' ? o.width : (parseFloat(o.width) || avail), avail);
@@ -690,7 +1424,7 @@
             const cls = this._classIndex(data[i].slope, sc);
             let j = i; while (j + 1 < data.length && this._classIndex(data[j + 1].slope, sc) === cls) j++;
             g.append('path').datum(data.slice(i - 1, j + 1)).attr('class', 'oep-area-slope').attr('fill', sc.colorByIndex(cls)).attr('d', areaGen);
-            if (i > 1) seps.push(data[i - 1]);   // changement de classe = frontière
+            if (i > 1) seps.push(data[i - 1]);   // a class change is a boundary
             i = j + 1;
           }
           if (o.slopeSeparators) seps.forEach((d) => {
@@ -706,7 +1440,7 @@
         g.append('text').attr('class', 'oep-axis-label').attr('x', innerW).attr('y', innerH + mb - 4).attr('text-anchor', 'end').text(distAxisLabel(o.units));
         g.append('g').attr('class', 'oep-axis oep-axis-y').call(d3__namespace.axisLeft(y).ticks(yTicks).tickFormat((d) => o.units === 'imperial' ? Math.round(d * 3.28084) : d));
 
-        // marqueurs A / B en cours de sélection
+        // A / B markers while a range is being picked
         if (o.zoom && !this._cropMode) {
           [['A', this._zoomA], ['B', this._zoomB]].forEach(([nm, val]) => {
             if (val == null) return;
@@ -741,11 +1475,147 @@
         this._adjustAttribution();
       }
 
+      // ---------- PNG export ---------------------------------------------
+      /**
+       * Properties frozen onto the exported clone.
+       *
+       * A serialized SVG carries no stylesheet: rules that live in the CSS file, and every
+       * `var(--oep-*)` they resolve, vanish the moment the markup leaves the document. The
+       * export would come out as black shapes on nothing. So the computed value of each
+       * painting property is written inline, node by node.
+       */
+      static get _EXPORT_PROPS() {
+        return ['fill', 'fill-opacity', 'stroke', 'stroke-width', 'stroke-dasharray',
+          'stroke-linecap', 'stroke-linejoin', 'opacity', 'font-family', 'font-size',
+          'font-weight', 'text-anchor', 'shape-rendering'];
+      }
+
+      /** Copies the computed painting styles of `src` onto `dst`, recursively. */
+      _freezeStyles(src, dst) {
+        const props = ElevationProfile._EXPORT_PROPS;
+        const cs = getComputedStyle(src);
+        let inline = '';
+        for (const p of props) { const v = cs.getPropertyValue(p); if (v) inline += `${p}:${v};`; }
+        dst.setAttribute('style', inline);
+        const a = src.children, b = dst.children;
+        for (let i = 0; i < a.length && i < b.length; i++) this._freezeStyles(a[i], b[i]);
+      }
+
+      /**
+       * The whole panel as an SVG string: background, title, stats, legend, chart.
+       *
+       * Rebuilt rather than screenshotted. The header is HTML and the chart is SVG, and the
+       * only way to put HTML in an SVG is a `foreignObject`, which browsers refuse to
+       * rasterise consistently. Redrawing the two text lines as `<text>` is a handful of
+       * lines and works everywhere.
+       *
+       * The current-position indicator is dropped: it marks where the pointer happens to be,
+       * which means nothing once the image is saved.
+       */
+      _exportSvg() {
+        const chart = this._body.querySelector('svg');
+        if (!chart) return null;
+        const cs = getComputedStyle(this.element);
+        const bg = cs.getPropertyValue('--oep-bg').trim() || '#fff';
+        const fg = cs.getPropertyValue('--oep-text').trim() || '#222';
+        const font = cs.fontFamily || 'system-ui, sans-serif';
+        const W = +chart.getAttribute('width'), H = +chart.getAttribute('height');
+        const pad = 8, titleH = 20, statsH = this._statsEl.textContent ? 15 : 0;
+        const legend = (this._legendEl.style.display !== 'none') ? this._legendEl : null;
+        const legH = legend ? 18 : 0;
+        const top = pad + titleH + statsH + legH;
+
+        const clone = chart.cloneNode(true);
+        // The pointer indicator and the hit-test overlay have no place in a saved image.
+        clone.querySelectorAll('.oep-focus, .oep-overlay').forEach((n) => n.remove());
+        this._freezeStyles(chart, clone);
+        // width/height are kept: a nested <svg> without them fills the parent viewport, so
+        // the chart would be stretched over the header's height as well.
+
+        const esc2 = (t) => esc(String(t));
+        const parts = [];
+        parts.push(`<rect width="${W + 2 * pad}" height="${H + top + pad}" fill="${esc2(bg)}"/>`);
+        parts.push(`<text x="${pad}" y="${pad + 13}" style="font-family:${esc2(font)};font-size:13px;font-weight:600;fill:${esc2(fg)}">${esc2(this._titleEl.textContent)}</text>`);
+        if (statsH) parts.push(`<text x="${pad}" y="${pad + titleH + 10}" style="font-family:${esc2(font)};font-size:11px;fill:${esc2(fg)};opacity:.85">${esc2(this._statsEl.textContent)}</text>`);
+        if (legend) {
+          let x = pad;
+          const y = pad + titleH + statsH + 12;
+          for (const item of legend.querySelectorAll('.oep-leg-it')) {
+            const sw = item.querySelector('.oep-sw');
+            const color = sw ? getComputedStyle(sw).backgroundColor : 'none';
+            const label = item.textContent.trim();
+            parts.push(`<rect x="${x}" y="${y - 8}" width="10" height="10" fill="${esc2(color)}"/>`);
+            parts.push(`<text x="${x + 14}" y="${y}" style="font-family:${esc2(font)};font-size:10px;fill:${esc2(fg)}">${esc2(label)}</text>`);
+            x += 14 + label.length * 5.6 + 10;
+          }
+        }
+        parts.push(`<g transform="translate(${pad},${top})">${new XMLSerializer().serializeToString(clone)}</g>`);
+        return {
+          width: W + 2 * pad, height: H + top + pad,
+          svg: `<svg xmlns="http://www.w3.org/2000/svg" width="${W + 2 * pad}" height="${H + top + pad}" ` +
+               `viewBox="0 0 ${W + 2 * pad} ${H + top + pad}">${parts.join('')}</svg>`
+        };
+      }
+
+      /**
+       * Export the whole panel - title, stats, legend and chart - as a PNG.
+       *
+       * Resolves with the Blob. Unless `download` is false, it also saves the file, which is
+       * what the toolbar button does.
+       *
+       * @param {{scale?:number, filename?:string, download?:boolean}} [opts]
+       *   `scale` defaults to the device pixel ratio, so the image is not soft on a retina
+       *   screen. `filename` defaults to the track title.
+       * @returns {Promise<Blob>}
+       */
+      exportPNG(opts) {
+        const o = opts || {};
+        const built = this._exportSvg();
+        if (!built) return Promise.reject(new Error('ol-elevation-profile: nothing to export'));
+        const scale = o.scale || (typeof window !== 'undefined' && window.devicePixelRatio) || 1;
+        return new Promise((resolve, reject) => {
+          const img = new Image();
+          img.onload = () => {
+            try {
+              const cv = document.createElement('canvas');
+              cv.width = Math.round(built.width * scale);
+              cv.height = Math.round(built.height * scale);
+              const ctx = cv.getContext('2d');
+              ctx.scale(scale, scale);
+              ctx.drawImage(img, 0, 0);
+              cv.toBlob((blob) => {
+                if (!blob) { reject(new Error('ol-elevation-profile: PNG encoding failed')); return; }
+                if (o.download !== false) this._save(blob, o.filename);
+                resolve(blob);
+              }, 'image/png');
+            } catch (e) { reject(e); }
+          };
+          img.onerror = () => reject(new Error('ol-elevation-profile: SVG could not be rasterised'));
+          // Encoded as a data URL rather than a blob: URL - a blob: source taints the canvas
+          // in some browsers, and toBlob would then throw a security error.
+          img.src = 'data:image/svg+xml;charset=utf-8,' + encodeURIComponent(built.svg);
+        });
+      }
+
+      /** @private */
+      _save(blob, filename) {
+        const name = filename || `${(this._titleEl.textContent || 'profile').replace(/[\\/:*?"<>|]+/g, '-').trim()}.png`;
+        const url = URL.createObjectURL(blob);
+        const a = document.createElement('a');
+        a.href = url; a.download = name;
+        document.body.appendChild(a); a.click(); a.remove();
+        setTimeout(() => URL.revokeObjectURL(url), 1000);
+      }
+
       // ---------- zoom A/B ----------------------------------------------
       _arm(which) { this._armed = (this._armed === which) ? null : which; this._updateZoomButtons(); if (this._focus) this._render(); }
       _updateZoomButtons() {
-        const show = !!this.options.zoom && !!this._feature;
-        this._toolbar.style.display = show ? '' : 'none';
+        const o = this.options, has = !!this._feature;
+        const show = !!o.zoom && has;
+        const png = !!o.exportPng && has;
+        // The toolbar carries both: it stays visible as long as either has something to show.
+        this._toolbar.style.display = (show || png) ? '' : 'none';
+        this._btnPng.style.display = png ? '' : 'none';
         const crop = this._cropMode;
         this._btnA.style.display = show && !crop ? '' : 'none';
         this._btnB.style.display = show && !crop ? '' : 'none';
@@ -779,6 +1649,29 @@
         if (map && this._feature) map.getView().fit(this._feature.getGeometry().getExtent(), { padding: [40, 40, 40, 40], duration: 400 });
       }
 
+      /**
+       * Point of the profiled outline closest to a map coordinate.
+       *
+       * A polygon's own `getClosestPoint` answers for its **surface**: with the cursor inside
+       * the ring it returns the cursor itself, so the marker would follow the pointer across
+       * the whole shape instead of sliding along the outline. Lines keep the geometry's own
+       * answer, which is exact rather than limited to the decimated samples.
+       */
+      _closestOnProfile(coordinate) {
+        const g = this._feature && this._feature.getGeometry();
+        if (!g) return null;
+        if (!/Polygon/.test(g.getType())) return g.getClosestPoint(coordinate);
+        const data = this._fullSamples;
+        if (!data || !data.length) return null;
+        let best = null, bd = Infinity;
+        for (const p of data) {
+          const dx = p.coord[0] - coordinate[0], dy = p.coord[1] - coordinate[1];
+          const dd = dx * dx + dy * dy;
+          if (dd < bd) { bd = dd; best = p.coord; }
+        }
+        return best;
+      }
+
       // ---------- focus -------------------------------------------------
       _tooltipText(d) {
         const o = this.options, parts = [];
@@ -816,7 +1709,7 @@
         this._legendEl.innerHTML = ''; this._legendEl.style.display = 'none';
         this._titleEl.textContent = this.options.labels.empty; this._titleEl.removeAttribute('title');
         this._statsEl.innerHTML = ''; this._statsEl.removeAttribute('title');
-        this._cropMode = false; this._updateZoomButtons();
+        this._cropMode = false; this._demLoading = false; this._updateZoomButtons();
         this._clearFocus();
         this.element.style.display = 'none';
         this._adjustAttribution();
@@ -830,6 +1723,9 @@
      */
     ElevationProfile.addTheme = (name, colors) => { THEMES[name] = colors; };
     ElevationProfile.THEMES = THEMES;
+    /** Known keyless terrain-tile sources, keyed by `dem.source` name. */
+    ElevationProfile.DEM_PRESETS = DEM_PRESETS;
+    ElevationProfile.DemSampler = DemSampler;
     ElevationProfile.POSITIONS = POSITIONS;
     ElevationProfile.version = '0.6.0';