isard 0.7.0 → 0.8.0

package/dist/wasm/isard.js

@@ -228,14 +228,16 @@ export class Engine {
     /**
      * 3D Tiles (b3dm / glb textured meshes, external tilesets) from the URL of a `tileset.json`. `max_error`:
      * screen-space error (CSS pixels) above which a tile is refined; 16 is the usual value, lower is finer.
+     * `geoid`: its heights are altitudes (NGF-IGN69), each tile raised by the RAF20 geoid onto the relief.
      * @param {string} url
      * @param {number} max_error
+     * @param {boolean | null} [geoid]
      * @returns {number}
      */
-    addTiles3d(url, max_error) {
+    addTiles3d(url, max_error, geoid) {
         const ptr0 = passStringToWasm0(url, wasm.__wbindgen_malloc, wasm.__wbindgen_realloc);
         const len0 = WASM_VECTOR_LEN;
-        const ret = wasm.engine_addTiles3d(this.__wbg_ptr, ptr0, len0, max_error);
+        const ret = wasm.engine_addTiles3d(this.__wbg_ptr, ptr0, len0, max_error, isLikeNone(geoid) ? 0xFFFFFF : geoid ? 1 : 0);
         if (ret[2]) {
             throw takeFromExternrefTable0(ret[1]);
         }
@@ -259,6 +261,12 @@ export class Engine {
         const ret = wasm.engine_camera(this.__wbg_ptr);
         return ret;
     }
+    /**
+     * Removes the panorama
+     */
+    clearPanorama() {
+        wasm.engine_clearPanorama(this.__wbg_ptr);
+    }
     clearPreload() {
         wasm.engine_clearPreload(this.__wbg_ptr);
     }
@@ -286,6 +294,28 @@ export class Engine {
         }
         return v1;
     }
+    /**
+     * Altitude of the relief at a position (metres, exaggeration included), from the copy of its tiles kept on the
+     * CPU (as coarse as the tiles loaded there); undefined without relief or where none is loaded
+     * @param {number} lon
+     * @param {number} lat
+     * @returns {number | undefined}
+     */
+    elevationAt(lon, lat) {
+        const ret = wasm.engine_elevationAt(this.__wbg_ptr, lon, lat);
+        return ret[0] === 0 ? undefined : ret[1];
+    }
+    /**
+     * Height of the RAF20 geoid above the ellipsoid at a position (metres; 0 away from mainland France): what raises
+     * the altitudes (NGF-IGN69) of a source onto the IGN relief
+     * @param {number} lon
+     * @param {number} lat
+     * @returns {number}
+     */
+    static geoidHeight(lon, lat) {
+        const ret = wasm.engine_geoidHeight(lon, lat);
+        return ret;
+    }
     /**
      * Position under a screen point (CSS pixels), undefined above the horizon; on the relief itself
      * @param {number} x
@@ -307,6 +337,21 @@ export class Engine {
     linkExtrusionNetwork(id, network, max) {
         wasm.engine_linkExtrusionNetwork(this.__wbg_ptr, id, isLikeNone(network) ? Number.MAX_SAFE_INTEGER : (network) >>> 0, max);
     }
+    /**
+     * Model-view-projection matrix (16 numbers, column-major) of the local frame at a longitude, latitude (degrees)
+     * and altitude (metres), x east, y north, z up, in metres, for the last frame drawn (else the camera): the 3D
+     * overlays of the page (`Panel`) placed with it after each frame
+     * @param {number} lon
+     * @param {number} lat
+     * @param {number} altitude
+     * @returns {Float32Array}
+     */
+    localMatrix(lon, lat, altitude) {
+        const ret = wasm.engine_localMatrix(this.__wbg_ptr, lon, lat, altitude);
+        var v1 = getArrayF32FromWasm0(ret[0], ret[1]).slice();
+        wasm.__wbindgen_free(ret[0], ret[1] * 4, 4);
+        return v1;
+    }
     /**
      * Moves a layer to a drawing position (0 = bottom)
      * @param {number} id
@@ -666,6 +711,20 @@ export class Engine {
         const len3 = WASM_VECTOR_LEN;
         wasm.engine_setFills(this.__wbg_ptr, id, ptr0, len0, ptr1, len1, ptr2, len2, ptr3, len3);
     }
+    /**
+     * A street-level view: the eye `height` metres above the ground at `lon`, `lat` (degrees), looking `bearing`
+     * (degrees clockwise from north) and `pitch` (0 straight down, 90 level, 180 straight up), with a vertical field
+     * of view of `fov` degrees. A camera set with `setCamera` turns around a point again
+     * @param {number} lon
+     * @param {number} lat
+     * @param {number} height
+     * @param {number} bearing
+     * @param {number} pitch
+     * @param {number} fov
+     */
+    setFirstPerson(lon, lat, height, bearing, pitch, fov) {
+        wasm.engine_setFirstPerson(this.__wbg_ptr, lon, lat, height, bearing, pitch, fov);
+    }
     /**
      * Color of the globe under the tiles (polar caps)
      * @param {number} r
@@ -887,6 +946,41 @@ export class Engine {
         const len0 = WASM_VECTOR_LEN;
         wasm.engine_setNetworkValues(this.__wbg_ptr, id, ptr0, len0);
     }
+    /**
+     * The image of camera `index` of the panorama (the images sharing the size of the first)
+     * @param {number} index
+     * @param {ImageBitmap} image
+     */
+    setPanoramaImage(index, image) {
+        const ret = wasm.engine_setPanoramaImage(this.__wbg_ptr, index, image);
+        if (ret[1]) {
+            throw takeFromExternrefTable0(ret[0]);
+        }
+    }
+    /**
+     * Shows a panorama: at `lon`, `lat` (degrees) and `height` (metres above the ellipsoid), turned by `rotation`
+     * (9 numbers, row-major: its frame to east, north, up), its `cameras` (25 numbers each: rotation from the panorama
+     * frame, row-major, 9; position in it, 3; focal x, y; center x, y; skew; image width, height; principal point of
+     * the distortion x, y; its coefficients r³, r⁵, r⁷; its limit, pixels), a backdrop sphere of `radius` metres, at
+     * `opacity`. Its images come after (`setPanoramaImage`)
+     * @param {number} lon
+     * @param {number} lat
+     * @param {number} height
+     * @param {Float64Array} rotation
+     * @param {Float64Array} cameras
+     * @param {number} radius
+     * @param {number} opacity
+     */
+    setPanorama(lon, lat, height, rotation, cameras, radius, opacity) {
+        const ptr0 = passArrayF64ToWasm0(rotation, wasm.__wbindgen_malloc);
+        const len0 = WASM_VECTOR_LEN;
+        const ptr1 = passArrayF64ToWasm0(cameras, wasm.__wbindgen_malloc);
+        const len1 = WASM_VECTOR_LEN;
+        const ret = wasm.engine_setPanorama(this.__wbg_ptr, lon, lat, height, ptr0, len0, ptr1, len1, radius, opacity);
+        if (ret[1]) {
+            throw takeFromExternrefTable0(ret[0]);
+        }
+    }
     /**
      * The style of a point cloud: 14 numbers (see `Style::parse`), the colors of the 256 classes (RGBA,
      * alpha 0 hides a class) and the ramp of the altitudes (256 RGBA texels)
@@ -912,6 +1006,22 @@ export class Engine {
     setRasterStyle(id, opacity, saturation) {
         wasm.engine_setRasterStyle(this.__wbg_ptr, id, opacity, saturation);
     }
+    /**
+     * The headers added to the engine's requests by URL prefix (`setRequestHeaders`, the same for every map of the
+     * page): `prefixes[i]` with `counts[i]` name and value pairs, in order, flattened into `pairs`
+     * @param {string[]} prefixes
+     * @param {Uint32Array} counts
+     * @param {string[]} pairs
+     */
+    setRequestHeaders(prefixes, counts, pairs) {
+        const ptr0 = passArrayJsValueToWasm0(prefixes, wasm.__wbindgen_malloc);
+        const len0 = WASM_VECTOR_LEN;
+        const ptr1 = passArray32ToWasm0(counts, wasm.__wbindgen_malloc);
+        const len1 = WASM_VECTOR_LEN;
+        const ptr2 = passArrayJsValueToWasm0(pairs, wasm.__wbindgen_malloc);
+        const len2 = WASM_VECTOR_LEN;
+        wasm.engine_setRequestHeaders(this.__wbg_ptr, ptr0, len0, ptr1, len1, ptr2, len2);
+    }
     /**
      * Space behind the globe (stars, atmosphere halo), in the globe projection
      * @param {boolean} enabled
@@ -919,6 +1029,18 @@ export class Engine {
     setSky(enabled) {
         wasm.engine_setSky(this.__wbg_ptr, enabled);
     }
+    /**
+     * Shows `layers` on one side of a vertical line only, the others beneath on the other side (comparing two states
+     * of a place): left of `x` (CSS pixels from the left of the canvas), or right of it; a non-finite `x` stops
+     * @param {number} x
+     * @param {boolean} right
+     * @param {Uint32Array} layers
+     */
+    setSwipe(x, right, layers) {
+        const ptr0 = passArray32ToWasm0(layers, wasm.__wbindgen_malloc);
+        const len0 = WASM_VECTOR_LEN;
+        wasm.engine_setSwipe(this.__wbg_ptr, x, right, ptr0, len0);
+    }
     /**
      * Layer-wide style of a symbol layer: size scale and opacity as zoom stops (four zooms then four values each),
      * zoom range, visibility
@@ -993,14 +1115,18 @@ export class Engine {
         wasm.engine_setTileLoader(this.__wbg_ptr, loader);
     }
     /**
-     * Screen-space error threshold, opacity and size of the points (CSS pixels, 2 if not given) of a 3D Tiles layer
+     * Screen-space error threshold, opacity, size of the points (CSS pixels, 2 if not given) and color (RGB 0-1, empty
+     * for none: it tints the textures and colors the untextured meshes) of a 3D Tiles layer
      * @param {number} id
      * @param {number} max_error
      * @param {number} opacity
-     * @param {number | null} [point_size]
+     * @param {number | null | undefined} point_size
+     * @param {Float32Array} color
      */
-    setTiles3dStyle(id, max_error, opacity, point_size) {
-        wasm.engine_setTiles3dStyle(this.__wbg_ptr, id, max_error, opacity, !isLikeNone(point_size), isLikeNone(point_size) ? 0 : point_size);
+    setTiles3dStyle(id, max_error, opacity, point_size, color) {
+        const ptr0 = passArrayF32ToWasm0(color, wasm.__wbindgen_malloc);
+        const len0 = WASM_VECTOR_LEN;
+        wasm.engine_setTiles3dStyle(this.__wbg_ptr, id, max_error, opacity, !isLikeNone(point_size), isLikeNone(point_size) ? 0 : point_size, ptr0, len0);
     }
     /**
      * Shows what can be seen from points, each within its range: `observers` holds 8 numbers per observer
@@ -1075,6 +1201,18 @@ export class Engine {
         const ret = wasm.engine_textureFormats(this.__wbg_ptr);
         return ret;
     }
+    /**
+     * The feature of a picked handle (`pick`'s index on a 3D Tiles layer): `[properties, feature]`, its properties
+     * (undefined when its tile has none) and its index in its tile; undefined if the handle is not of the last picking
+     * pass
+     * @param {number} id
+     * @param {number} index
+     * @returns {[properties: Record<string, unknown> | undefined, feature: number] | undefined}
+     */
+    tiles3dFeature(id, index) {
+        const ret = wasm.engine_tiles3dFeature(this.__wbg_ptr, id, index);
+        return ret;
+    }
     /**
      * Counters of a 3D Tiles layer, undefined if there is none with this id
      * @param {number} id
@@ -1740,6 +1878,10 @@ function __wbg_get_imports() {
             const ret = Reflect.get(arg0, arg1);
             return ret;
         }, arguments); },
+        __wbg_get_806853698d9fc227: function() { return handleError(function (arg0, arg1) {
+            const ret = Reflect.get(arg0, arg1 >>> 0);
+            return ret;
+        }, arguments); },
         __wbg_get_f75619e20cb68514: function() { return handleError(function (arg0, arg1, arg2, arg3) {
             const ret = arg1.get(getStringFromWasm0(arg2, arg3));
             var ptr1 = isLikeNone(ret) ? 0 : passStringToWasm0(ret, wasm.__wbindgen_malloc, wasm.__wbindgen_realloc);
@@ -2364,6 +2506,12 @@ function __wbg_get_imports() {
         __wbg_useProgram_e075c2902e420761: function(arg0, arg1) {
             arg0.useProgram(arg1);
         },
+        __wbg_vertexAttrib1f_37ce0547e8fa5f36: function(arg0, arg1, arg2) {
+            arg0.vertexAttrib1f(arg1 >>> 0, arg2);
+        },
+        __wbg_vertexAttrib1f_470b2556c148483a: function(arg0, arg1, arg2) {
+            arg0.vertexAttrib1f(arg1 >>> 0, arg2);
+        },
         __wbg_vertexAttribDivisorANGLE_659fb027198a47c3: function(arg0, arg1, arg2) {
             arg0.vertexAttribDivisorANGLE(arg1 >>> 0, arg2 >>> 0);
         },
@@ -2393,7 +2541,7 @@ function __wbg_get_imports() {
             return ret;
         },
         __wbindgen_generic_0000000000000001: function(arg0, arg1) {
-            // Cast intrinsic for `Closure(Closure { owned: true, function: Function { arguments: [Externref], shim_idx: 197, ret: Result(Unit), inner_ret: Some(Result(Unit)) }, mutable: true }) -> Externref`.
+            // Cast intrinsic for `Closure(Closure { owned: true, function: Function { arguments: [Externref], shim_idx: 198, ret: Result(Unit), inner_ret: Some(Result(Unit)) }, mutable: true }) -> Externref`.
             const ret = makeMutClosure(arg0, arg1, wasm_bindgen_2e566c63402fe7fa___convert__closures_____invoke___wasm_bindgen_2e566c63402fe7fa___JsValue__core_37ee0ce0c4cd57d5___result__Result_____wasm_bindgen_2e566c63402fe7fa___JsError___true_);
             return ret;
         },
@@ -2744,6 +2892,16 @@ function passArrayF64ToWasm0(arg, malloc) {
     return ptr;
 }
 
+function passArrayJsValueToWasm0(array, malloc) {
+    const ptr = malloc(array.length * 4, 4) >>> 0;
+    for (let i = 0; i < array.length; i++) {
+        const add = addToExternrefTable0(array[i]);
+        getDataViewMemory0().setUint32(ptr + 4 * i, add, true);
+    }
+    WASM_VECTOR_LEN = array.length;
+    return ptr;
+}
+
 function passStringToWasm0(arg, malloc, realloc) {
     if (realloc === undefined) {
         const buf = cachedTextEncoder.encode(arg);

package/dist/wasm/isard_core.d.ts

@@ -130,6 +130,16 @@ export class Engine {
      * callback of a custom layer. Static: the engine is borrowed while it draws
      */
     static customMatrix(lon: number, lat: number, altitude: number): Float32Array | undefined;
+    /**
+     * Altitude of the relief at a position (metres, exaggeration included), from the copy of its tiles kept on the
+     * CPU (as coarse as the tiles loaded there); undefined without relief or where none is loaded
+     */
+    elevationAt(lon: number, lat: number): number | undefined;
+    /**
+     * Height of the RAF20 geoid above the ellipsoid at a position (metres; 0 away from mainland France): what raises
+     * the altitudes (NGF-IGN69) of a source onto the IGN relief
+     */
+    static geoidHeight(lon: number, lat: number): number;
     /**
      * Position under a screen point (CSS pixels), undefined above the horizon; on the relief itself
      */
@@ -140,6 +150,12 @@ export class Engine {
      * through the layer's ramp, up to `max` (above: its own color)
      */
     linkExtrusionNetwork(id: number, network: number | null | undefined, max: number): void;
+    /**
+     * Model-view-projection matrix (16 numbers, column-major) of the local frame at a longitude, latitude (degrees)
+     * and altitude (metres), x east, y north, z up, in metres, for the last frame drawn (else the camera): the 3D
+     * overlays of the page (`Panel`) placed with it after each frame
+     */
+    localMatrix(lon: number, lat: number, altitude: number): Float32Array;
     /**
      * Moves a layer to a drawing position (0 = bottom)
      */
@@ -255,6 +271,12 @@ export class Engine {
      * New polygons for a fill layer (same arguments as `addFills`, the same features)
      */
     setFills(id: number, points: Float64Array, ring_start: Uint32Array, polygon_start: Uint32Array, feature: Uint32Array): void;
+    /**
+     * A street-level view: the eye `height` metres above the ground at `lon`, `lat` (degrees), looking `bearing`
+     * (degrees clockwise from north) and `pitch` (0 straight down, 90 level, 180 straight up), with a vertical field
+     * of view of `fov` degrees. A camera set with `setCamera` turns around a point again
+     */
+    setFirstPerson(lon: number, lat: number, height: number, bearing: number, pitch: number, fov: number): void;
     /**
      * Color of the globe under the tiles (polar caps)
      */
@@ -331,10 +353,20 @@ export class Engine {
      */
     setNetworkValues(id: number, values: Float32Array): void;
     setRasterStyle(id: number, opacity: number, saturation: number): void;
+    /**
+     * The headers added to the engine's requests by URL prefix (`setRequestHeaders`, the same for every map of the
+     * page): `prefixes[i]` with `counts[i]` name and value pairs, in order, flattened into `pairs`
+     */
+    setRequestHeaders(prefixes: string[], counts: Uint32Array, pairs: string[]): void;
     /**
      * Space behind the globe (stars, atmosphere halo), in the globe projection
      */
     setSky(enabled: boolean): void;
+    /**
+     * Shows `layers` on one side of a vertical line only, the others beneath on the other side (comparing two states
+     * of a place): left of `x` (CSS pixels from the left of the canvas), or right of it; a non-finite `x` stops
+     */
+    setSwipe(x: number, right: boolean, layers: Uint32Array): void;
     /**
      * Layer-wide style of a symbol layer: size scale and opacity as zoom stops (four zooms then four values each),
      * zoom range, visibility
@@ -425,8 +457,11 @@ export interface InitOutput {
     readonly engine_clearPreload: (a: number) => void;
     readonly engine_clearViewshed: (a: number) => void;
     readonly engine_customMatrix: (a: number, b: number, c: number) => [number, number];
+    readonly engine_elevationAt: (a: number, b: number, c: number) => [number, number];
+    readonly engine_geoidHeight: (a: number, b: number) => number;
     readonly engine_ground: (a: number, b: number, c: number) => any;
     readonly engine_linkExtrusionNetwork: (a: number, b: number, c: number, d: number) => void;
+    readonly engine_localMatrix: (a: number, b: number, c: number, d: number) => [number, number];
     readonly engine_moveLayer: (a: number, b: number, c: number) => void;
     readonly engine_networkStats: (a: number, b: number) => any;
     readonly engine_new: (a: any, b: any) => [number, number, number];
@@ -455,6 +490,7 @@ export interface InitOutput {
     readonly engine_setFeatureStyle: (a: number, b: number, c: number, d: number, e: number) => void;
     readonly engine_setFeatureValues: (a: number, b: number, c: number, d: number, e: number) => void;
     readonly engine_setFills: (a: number, b: number, c: number, d: number, e: number, f: number, g: number, h: number, i: number, j: number) => void;
+    readonly engine_setFirstPerson: (a: number, b: number, c: number, d: number, e: number, f: number, g: number) => void;
     readonly engine_setGlobe: (a: number, b: number) => void;
     readonly engine_setGlobeColor: (a: number, b: number, c: number, d: number) => void;
     readonly engine_setGlyphAtlas: (a: number, b: number, c: number, d: number, e: number) => [number, number];
@@ -474,7 +510,9 @@ export interface InitOutput {
     readonly engine_setNetworkStyle: (a: number, b: number, c: number, d: number) => void;
     readonly engine_setNetworkValues: (a: number, b: number, c: number, d: number) => void;
     readonly engine_setRasterStyle: (a: number, b: number, c: number, d: number) => void;
+    readonly engine_setRequestHeaders: (a: number, b: number, c: number, d: number, e: number, f: number, g: number) => void;
     readonly engine_setSky: (a: number, b: number) => void;
+    readonly engine_setSwipe: (a: number, b: number, c: number, d: number, e: number) => void;
     readonly engine_setSymbolLayer: (a: number, b: number, c: number, d: number, e: number, f: number, g: number, h: number, i: number) => void;
     readonly engine_setSymbols: (a: number, b: number, c: number, d: number, e: number, f: number, g: number, h: number, i: number, j: number) => [number, number];
     readonly engine_setTerrain: (a: number, b: number, c: number, d: number, e: number, f: number, g: number) => [number, number];

package/dist/wasm/isard_core.js

@@ -233,6 +233,28 @@ export class Engine {
         }
         return v1;
     }
+    /**
+     * Altitude of the relief at a position (metres, exaggeration included), from the copy of its tiles kept on the
+     * CPU (as coarse as the tiles loaded there); undefined without relief or where none is loaded
+     * @param {number} lon
+     * @param {number} lat
+     * @returns {number | undefined}
+     */
+    elevationAt(lon, lat) {
+        const ret = wasm.engine_elevationAt(this.__wbg_ptr, lon, lat);
+        return ret[0] === 0 ? undefined : ret[1];
+    }
+    /**
+     * Height of the RAF20 geoid above the ellipsoid at a position (metres; 0 away from mainland France): what raises
+     * the altitudes (NGF-IGN69) of a source onto the IGN relief
+     * @param {number} lon
+     * @param {number} lat
+     * @returns {number}
+     */
+    static geoidHeight(lon, lat) {
+        const ret = wasm.engine_geoidHeight(lon, lat);
+        return ret;
+    }
     /**
      * Position under a screen point (CSS pixels), undefined above the horizon; on the relief itself
      * @param {number} x
@@ -254,6 +276,21 @@ export class Engine {
     linkExtrusionNetwork(id, network, max) {
         wasm.engine_linkExtrusionNetwork(this.__wbg_ptr, id, isLikeNone(network) ? Number.MAX_SAFE_INTEGER : (network) >>> 0, max);
     }
+    /**
+     * Model-view-projection matrix (16 numbers, column-major) of the local frame at a longitude, latitude (degrees)
+     * and altitude (metres), x east, y north, z up, in metres, for the last frame drawn (else the camera): the 3D
+     * overlays of the page (`Panel`) placed with it after each frame
+     * @param {number} lon
+     * @param {number} lat
+     * @param {number} altitude
+     * @returns {Float32Array}
+     */
+    localMatrix(lon, lat, altitude) {
+        const ret = wasm.engine_localMatrix(this.__wbg_ptr, lon, lat, altitude);
+        var v1 = getArrayF32FromWasm0(ret[0], ret[1]).slice();
+        wasm.__wbindgen_free(ret[0], ret[1] * 4, 4);
+        return v1;
+    }
     /**
      * Moves a layer to a drawing position (0 = bottom)
      * @param {number} id
@@ -584,6 +621,20 @@ export class Engine {
         const len3 = WASM_VECTOR_LEN;
         wasm.engine_setFills(this.__wbg_ptr, id, ptr0, len0, ptr1, len1, ptr2, len2, ptr3, len3);
     }
+    /**
+     * A street-level view: the eye `height` metres above the ground at `lon`, `lat` (degrees), looking `bearing`
+     * (degrees clockwise from north) and `pitch` (0 straight down, 90 level, 180 straight up), with a vertical field
+     * of view of `fov` degrees. A camera set with `setCamera` turns around a point again
+     * @param {number} lon
+     * @param {number} lat
+     * @param {number} height
+     * @param {number} bearing
+     * @param {number} pitch
+     * @param {number} fov
+     */
+    setFirstPerson(lon, lat, height, bearing, pitch, fov) {
+        wasm.engine_setFirstPerson(this.__wbg_ptr, lon, lat, height, bearing, pitch, fov);
+    }
     /**
      * Color of the globe under the tiles (polar caps)
      * @param {number} r
@@ -802,6 +853,22 @@ export class Engine {
     setRasterStyle(id, opacity, saturation) {
         wasm.engine_setRasterStyle(this.__wbg_ptr, id, opacity, saturation);
     }
+    /**
+     * The headers added to the engine's requests by URL prefix (`setRequestHeaders`, the same for every map of the
+     * page): `prefixes[i]` with `counts[i]` name and value pairs, in order, flattened into `pairs`
+     * @param {string[]} prefixes
+     * @param {Uint32Array} counts
+     * @param {string[]} pairs
+     */
+    setRequestHeaders(prefixes, counts, pairs) {
+        const ptr0 = passArrayJsValueToWasm0(prefixes, wasm.__wbindgen_malloc);
+        const len0 = WASM_VECTOR_LEN;
+        const ptr1 = passArray32ToWasm0(counts, wasm.__wbindgen_malloc);
+        const len1 = WASM_VECTOR_LEN;
+        const ptr2 = passArrayJsValueToWasm0(pairs, wasm.__wbindgen_malloc);
+        const len2 = WASM_VECTOR_LEN;
+        wasm.engine_setRequestHeaders(this.__wbg_ptr, ptr0, len0, ptr1, len1, ptr2, len2);
+    }
     /**
      * Space behind the globe (stars, atmosphere halo), in the globe projection
      * @param {boolean} enabled
@@ -809,6 +876,18 @@ export class Engine {
     setSky(enabled) {
         wasm.engine_setSky(this.__wbg_ptr, enabled);
     }
+    /**
+     * Shows `layers` on one side of a vertical line only, the others beneath on the other side (comparing two states
+     * of a place): left of `x` (CSS pixels from the left of the canvas), or right of it; a non-finite `x` stops
+     * @param {number} x
+     * @param {boolean} right
+     * @param {Uint32Array} layers
+     */
+    setSwipe(x, right, layers) {
+        const ptr0 = passArray32ToWasm0(layers, wasm.__wbindgen_malloc);
+        const len0 = WASM_VECTOR_LEN;
+        wasm.engine_setSwipe(this.__wbg_ptr, x, right, ptr0, len0);
+    }
     /**
      * Layer-wide style of a symbol layer: size scale and opacity as zoom stops (four zooms then four values each),
      * zoom range, visibility
@@ -1637,6 +1716,10 @@ function __wbg_get_imports() {
             const ret = new Object();
             return ret;
         },
+        __wbg_new_83ca405eae412a62: function() { return handleError(function () {
+            const ret = new Headers();
+            return ret;
+        }, arguments); },
         __wbg_new_ee2291f50781bf1d: function() {
             const ret = new Array();
             return ret;
@@ -1725,6 +1808,9 @@ function __wbg_get_imports() {
             const ret = Reflect.set(arg0, arg1, arg2);
             return ret;
         }, arguments); },
+        __wbg_set_af5932e3f78b5648: function() { return handleError(function (arg0, arg1, arg2, arg3, arg4) {
+            arg0.set(getStringFromWasm0(arg1, arg2), getStringFromWasm0(arg3, arg4));
+        }, arguments); },
         __wbg_set_alpha_6dea851a46253adf: function(arg0, arg1) {
             arg0.alpha = arg1 !== 0;
         },
@@ -1740,6 +1826,9 @@ function __wbg_get_imports() {
         __wbg_set_depth_8b49de49803d4e60: function(arg0, arg1) {
             arg0.depth = arg1 !== 0;
         },
+        __wbg_set_headers_40ad33dcf016613f: function(arg0, arg1) {
+            arg0.headers = arg1;
+        },
         __wbg_set_power_preference_6ef22d4c8baf517f: function(arg0, arg1) {
             arg0.powerPreference = __wbindgen_enum_WebGlPowerPreference[arg1];
         },
@@ -2358,6 +2447,16 @@ function passArrayF64ToWasm0(arg, malloc) {
     return ptr;
 }
 
+function passArrayJsValueToWasm0(array, malloc) {
+    const ptr = malloc(array.length * 4, 4) >>> 0;
+    for (let i = 0; i < array.length; i++) {
+        const add = addToExternrefTable0(array[i]);
+        getDataViewMemory0().setUint32(ptr + 4 * i, add, true);
+    }
+    WASM_VECTOR_LEN = array.length;
+    return ptr;
+}
+
 function passStringToWasm0(arg, malloc, realloc) {
     if (realloc === undefined) {
         const buf = cachedTextEncoder.encode(arg);

package/dist/wmts.js

@@ -3,6 +3,7 @@
  * sizes), the layer's limits in it and its extent, for `addRaster({ url, grid })`.
  */
 import { epsgCode, isGeographic } from "./crs.js";
+import { withHeaders } from "./requests.js";
 import { child, children, childText, parseXml } from "./xml.js";
 /** Metres per degree, as WMTS counts the scale of a grid in degrees (OGC 07-057r7, 6.1) */
 const METRES_PER_DEGREE = (2 * Math.PI * 6378137) / 360;
@@ -68,7 +69,7 @@ export function parseWmtsGrid(xml, layer, matrixSet) {
  * raster's URL writes the matrix set, {z} for the matrix, {x} and {y} for the column and the row
  */
 export async function wmtsGrid(capabilities, layer, matrixSet, options = {}) {
-    const response = await fetch(capabilities, options.signal ? { signal: options.signal } : {});
+    const response = await fetch(capabilities, withHeaders(capabilities, options.signal ? { signal: options.signal } : {}));
     if (!response.ok)
         throw new Error(`isard: ${response.status} for the WMTS capabilities`);
     return parseWmtsGrid(await response.text(), layer, matrixSet);

package/dist/wmts.js.map

@@ -1 +1 @@
-{"version":3,"file":"wmts.js","sourceRoot":"","sources":["../src/wmts.ts"],"names":[],"mappings":"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","sourcesContent":["/**\n * The tile grid of a WMTS layer, read from the service's capabilities: its tile matrix set (CRS, levels, origin, tile\n * sizes), the layer's limits in it and its extent, for `addRaster({ url, grid })`.\n */\nimport { epsgCode, isGeographic } from './crs.ts';\nimport type { TileGrid, TileMatrix } from './grid.ts';\nimport { child, children, childText, parseXml } from './xml.ts';\n\n/** Metres per degree, as WMTS counts the scale of a grid in degrees (OGC 07-057r7, 6.1) */\nconst METRES_PER_DEGREE = (2 * Math.PI * 6378137) / 360;\n/** The size of a pixel by which WMTS turns scale denominators into resolutions, metres */\nconst PIXEL = 0.00028;\n\nconst numbers = (text: string | undefined) => (text ?? '').trim().split(/\\s+/).map(Number);\n\n/**\n * The tile grid of `layer` in the capabilities document `xml`: its tile matrix set `matrixSet` (default the layer's\n * first), with the layer's tile limits and longitude-latitude extent. Throws if the layer or the set is missing\n */\nexport function parseWmtsGrid(xml: string, layer: string, matrixSet?: string): TileGrid {\n  const contents = child(parseXml(xml), 'Contents');\n  const entry = children(contents, 'Layer').find((l) => childText(l, 'Identifier') === layer);\n  if (!entry) throw new Error(`isard: no WMTS layer ${layer}`);\n  const links = children(entry, 'TileMatrixSetLink');\n  const link = matrixSet === undefined ? links[0] : links.find((l) => childText(l, 'TileMatrixSet') === matrixSet);\n  const name = childText(link, 'TileMatrixSet');\n  const set = children(contents, 'TileMatrixSet').find((s) => childText(s, 'Identifier') === name);\n  if (!name || !set) throw new Error(`isard: no tile matrix set ${matrixSet ?? ''} for the WMTS layer ${layer}`);\n  const crs = childText(set, 'SupportedCRS') ?? '';\n  const geographic = isGeographic(crs);\n  // EPSG's geographic CRSs have their latitude first (CRS:84 and the IGN's WGS84G do not)\n  const latFirst = geographic && epsgCode(crs) === 4326 && /EPSG/i.test(crs);\n  const unit = geographic ? METRES_PER_DEGREE : 1;\n  const limits = new Map<string, TileMatrix['limits']>();\n  for (const l of children(child(link, 'TileMatrixSetLimits'), 'TileMatrixLimits')) {\n    const [minRow, maxRow, minCol, maxCol] = ['MinTileRow', 'MaxTileRow', 'MinTileCol', 'MaxTileCol'].map((k) =>\n      Number(childText(l, k)),\n    ) as [number, number, number, number];\n    limits.set(childText(l, 'TileMatrix') ?? '', [minCol, minRow, maxCol, maxRow]);\n  }\n  const matrices = children(set, 'TileMatrix').map((m): TileMatrix => {\n    const id = childText(m, 'Identifier') ?? '';\n    const [a = 0, b = 0] = numbers(childText(m, 'TopLeftCorner'));\n    const limit = limits.get(id);\n    return {\n      id,\n      resolution: (Number(childText(m, 'ScaleDenominator')) * PIXEL) / unit,\n      origin: latFirst ? [b, a] : [a, b],\n      tileWidth: Number(childText(m, 'TileWidth') ?? 256),\n      tileHeight: Number(childText(m, 'TileHeight') ?? 256),\n      matrixWidth: Number(childText(m, 'MatrixWidth') ?? Infinity),\n      matrixHeight: Number(childText(m, 'MatrixHeight') ?? Infinity),\n      ...(limit ? { limits: limit } : {}),\n    };\n  });\n  // A layer's limits leave out the matrices it does not have\n  const served = limits.size > 0 ? matrices.filter((m) => limits.has(String(m.id))) : matrices;\n  const box = child(entry, 'WGS84BoundingBox');\n  const [west, south] = numbers(childText(box, 'LowerCorner'));\n  const [east, north] = numbers(childText(box, 'UpperCorner'));\n  const bounds = [west, south, east, north];\n  return {\n    crs,\n    matrices: served,\n    name,\n    ...(bounds.every(Number.isFinite) ? { bounds: bounds as [number, number, number, number] } : {}),\n  };\n}\n\n/**\n * The tile grid of a WMTS layer, from the service's capabilities at `capabilities` (fetched with CORS), for\n * `addRaster`: `await wmtsGrid('https://…/wmts?SERVICE=WMTS&REQUEST=GetCapabilities', 'LAYER', 'MATRIXSET')`. The\n * raster's URL writes the matrix set, {z} for the matrix, {x} and {y} for the column and the row\n */\nexport async function wmtsGrid(\n  capabilities: string | URL,\n  layer: string,\n  matrixSet?: string,\n  options: { signal?: AbortSignal } = {},\n): Promise<TileGrid> {\n  const response = await fetch(capabilities, options.signal ? { signal: options.signal } : {});\n  if (!response.ok) throw new Error(`isard: ${response.status} for the WMTS capabilities`);\n  return parseWmtsGrid(await response.text(), layer, matrixSet);\n}\n"]}
+{"version":3,"file":"wmts.js","sourceRoot":"","sources":["../src/wmts.ts"],"names":[],"mappings":"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","sourcesContent":["/**\n * The tile grid of a WMTS layer, read from the service's capabilities: its tile matrix set (CRS, levels, origin, tile\n * sizes), the layer's limits in it and its extent, for `addRaster({ url, grid })`.\n */\nimport { epsgCode, isGeographic } from './crs.ts';\nimport type { TileGrid, TileMatrix } from './grid.ts';\nimport { withHeaders } from './requests.ts';\nimport { child, children, childText, parseXml } from './xml.ts';\n\n/** Metres per degree, as WMTS counts the scale of a grid in degrees (OGC 07-057r7, 6.1) */\nconst METRES_PER_DEGREE = (2 * Math.PI * 6378137) / 360;\n/** The size of a pixel by which WMTS turns scale denominators into resolutions, metres */\nconst PIXEL = 0.00028;\n\nconst numbers = (text: string | undefined) => (text ?? '').trim().split(/\\s+/).map(Number);\n\n/**\n * The tile grid of `layer` in the capabilities document `xml`: its tile matrix set `matrixSet` (default the layer's\n * first), with the layer's tile limits and longitude-latitude extent. Throws if the layer or the set is missing\n */\nexport function parseWmtsGrid(xml: string, layer: string, matrixSet?: string): TileGrid {\n  const contents = child(parseXml(xml), 'Contents');\n  const entry = children(contents, 'Layer').find((l) => childText(l, 'Identifier') === layer);\n  if (!entry) throw new Error(`isard: no WMTS layer ${layer}`);\n  const links = children(entry, 'TileMatrixSetLink');\n  const link = matrixSet === undefined ? links[0] : links.find((l) => childText(l, 'TileMatrixSet') === matrixSet);\n  const name = childText(link, 'TileMatrixSet');\n  const set = children(contents, 'TileMatrixSet').find((s) => childText(s, 'Identifier') === name);\n  if (!name || !set) throw new Error(`isard: no tile matrix set ${matrixSet ?? ''} for the WMTS layer ${layer}`);\n  const crs = childText(set, 'SupportedCRS') ?? '';\n  const geographic = isGeographic(crs);\n  // EPSG's geographic CRSs have their latitude first (CRS:84 and the IGN's WGS84G do not)\n  const latFirst = geographic && epsgCode(crs) === 4326 && /EPSG/i.test(crs);\n  const unit = geographic ? METRES_PER_DEGREE : 1;\n  const limits = new Map<string, TileMatrix['limits']>();\n  for (const l of children(child(link, 'TileMatrixSetLimits'), 'TileMatrixLimits')) {\n    const [minRow, maxRow, minCol, maxCol] = ['MinTileRow', 'MaxTileRow', 'MinTileCol', 'MaxTileCol'].map((k) =>\n      Number(childText(l, k)),\n    ) as [number, number, number, number];\n    limits.set(childText(l, 'TileMatrix') ?? '', [minCol, minRow, maxCol, maxRow]);\n  }\n  const matrices = children(set, 'TileMatrix').map((m): TileMatrix => {\n    const id = childText(m, 'Identifier') ?? '';\n    const [a = 0, b = 0] = numbers(childText(m, 'TopLeftCorner'));\n    const limit = limits.get(id);\n    return {\n      id,\n      resolution: (Number(childText(m, 'ScaleDenominator')) * PIXEL) / unit,\n      origin: latFirst ? [b, a] : [a, b],\n      tileWidth: Number(childText(m, 'TileWidth') ?? 256),\n      tileHeight: Number(childText(m, 'TileHeight') ?? 256),\n      matrixWidth: Number(childText(m, 'MatrixWidth') ?? Infinity),\n      matrixHeight: Number(childText(m, 'MatrixHeight') ?? Infinity),\n      ...(limit ? { limits: limit } : {}),\n    };\n  });\n  // A layer's limits leave out the matrices it does not have\n  const served = limits.size > 0 ? matrices.filter((m) => limits.has(String(m.id))) : matrices;\n  const box = child(entry, 'WGS84BoundingBox');\n  const [west, south] = numbers(childText(box, 'LowerCorner'));\n  const [east, north] = numbers(childText(box, 'UpperCorner'));\n  const bounds = [west, south, east, north];\n  return {\n    crs,\n    matrices: served,\n    name,\n    ...(bounds.every(Number.isFinite) ? { bounds: bounds as [number, number, number, number] } : {}),\n  };\n}\n\n/**\n * The tile grid of a WMTS layer, from the service's capabilities at `capabilities` (fetched with CORS), for\n * `addRaster`: `await wmtsGrid('https://…/wmts?SERVICE=WMTS&REQUEST=GetCapabilities', 'LAYER', 'MATRIXSET')`. The\n * raster's URL writes the matrix set, {z} for the matrix, {x} and {y} for the column and the row\n */\nexport async function wmtsGrid(\n  capabilities: string | URL,\n  layer: string,\n  matrixSet?: string,\n  options: { signal?: AbortSignal } = {},\n): Promise<TileGrid> {\n  const response = await fetch(\n    capabilities,\n    withHeaders(capabilities, options.signal ? { signal: options.signal } : {}),\n  );\n  if (!response.ok) throw new Error(`isard: ${response.status} for the WMTS capabilities`);\n  return parseWmtsGrid(await response.text(), layer, matrixSet);\n}\n"]}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "isard",
-  "version": "0.7.0",
+  "version": "0.8.0",
   "description": "A WebGL2 map engine for large, interactive data layers, labels and 3D Tiles over raster or vector basemaps (Rust core in WebAssembly)",
   "license": "MIT",
   "author": "Kevin Graff",