isard 1.0.0 → 1.2.0

package/dist/bind/layers.d.ts

@@ -0,0 +1,46 @@
+/**
+ * What a framework's binding (isard/react, isard/vue) does when the description of a layer changes: the least the
+ * layer needs (its data, its style, its instances), or a new layer in its place when what changed is set at creation
+ * (its URL, its grid, its nodes). Free of any framework.
+ */
+import type { Layer } from '../layers/layers.ts';
+import type { GeoMap, LayerSpec } from '../map.ts';
+/** A layer as a binding describes it: the options of `map.add`, and the values of its features or nodes
+ * (`setValues`: what colors them by a ramp) */
+export type BoundLayerSpec<P = Record<string, unknown>> = LayerSpec<P> & {
+    values?: Float32Array;
+};
+/** What to do with a layer whose description went from `prev` to `next` */
+export type LayerChange = {
+    rebuild: true;
+} | {
+    rebuild: false;
+    /** The keys changed, with their new values */
+    style: Record<string, unknown>;
+    own: Record<string, unknown>;
+};
+/**
+ * The change from one description to the next, or `undefined` when nothing changed. Values are compared by identity:
+ * data, functions and arrays given anew at each render are changes (keep them in a memo)
+ */
+export declare const layerChange: (prev: BoundLayerSpec, next: BoundLayerSpec) => LayerChange | undefined;
+/** Applies a change that keeps the layer (`rebuild: false`) */
+export declare const applyLayerChange: (layer: Layer, next: BoundLayerSpec, change: Extract<LayerChange, {
+    rebuild: false;
+}>) => void;
+/** Adds a layer from its description, its values set */
+export declare const addBoundLayer: (map: GeoMap, { values, ...spec }: BoundLayerSpec) => Layer;
+/** A layer made anew from its description in the place of `old`, its values set */
+export declare const rebuildBoundLayer: (map: GeoMap, old: Layer, { values, ...spec }: BoundLayerSpec) => Layer;
+/**
+ * The layers of a binding in their declared order: `order` (default 0) from the bottom up, layers of the same order by
+ * the time they came. A layer added or made anew is moved under the first layer above it
+ */
+export declare class LayerOrder {
+    private readonly entries;
+    private seq;
+    /** Places a new layer, or a layer made anew in place of `old` */
+    place(layer: Layer, order: number, old?: Layer): void;
+    /** Forgets a layer removed */
+    remove(layer: Layer): void;
+}

package/dist/bind/layers.js

@@ -0,0 +1,154 @@
+/**
+ * What a framework's binding (isard/react, isard/vue) does when the description of a layer changes: the least the
+ * layer needs (its data, its style, its instances), or a new layer in its place when what changed is set at creation
+ * (its URL, its grid, its nodes). Free of any framework.
+ */
+/** The keys `setStyle` takes, by layer type; `'all'`: every key but the data (the feature layers) */
+const STYLE_KEYS = {
+    lines: 'all',
+    circles: 'all',
+    fills: 'all',
+    symbols: 'all',
+    extrusions: 'all',
+    raster: new Set(['opacity', 'saturation']),
+    network: new Set(['width', 'max', 'contour', 'opacity', 'halo', 'haloOpacity', 'ramp', 'unreachedColor', 'fade']),
+    tiles3d: new Set(['maxScreenSpaceError', 'opacity', 'pointSize', 'color']),
+    pointcloud: new Set([
+        'colorBy',
+        'pointSize',
+        'maxPointSize',
+        'sizeMode',
+        'shape',
+        'edl',
+        'classifications',
+        'elevationRange',
+        'elevationRamp',
+        'intensityRange',
+        'maxScreenSpaceError',
+        'pointBudget',
+    ]),
+    models: new Set(),
+    ground: new Set(),
+};
+/** Keys a layer takes by a method of its own, by layer type */
+const OWN_SETTERS = {
+    lines: new Set(['data', 'filter', 'values']),
+    circles: new Set(['data', 'filter', 'values']),
+    fills: new Set(['data', 'filter', 'values']),
+    symbols: new Set(['data', 'filter']),
+    extrusions: new Set(['data', 'filter', 'values']),
+    network: new Set(['costs', 'edgeWidths', 'values']),
+    models: new Set(['instances', 'altitudeReference']),
+    ground: new Set(['uniforms', 'textures']),
+};
+/** The keys of a description and their values */
+const fields = (spec) => new Map(Object.entries(spec));
+/**
+ * The change from one description to the next, or `undefined` when nothing changed. Values are compared by identity:
+ * data, functions and arrays given anew at each render are changes (keep them in a memo)
+ */
+export const layerChange = (prev, next) => {
+    if (prev.type !== next.type)
+        return { rebuild: true };
+    const before = fields(prev);
+    const after = fields(next);
+    const styleKeys = STYLE_KEYS[next.type];
+    const own = OWN_SETTERS[next.type];
+    const change = { rebuild: false, style: {}, own: {} };
+    const keys = [...new Set([...before.keys(), ...after.keys()])].filter((key) => key !== 'type' && !Object.is(before.get(key), after.get(key)));
+    if (keys.length === 0)
+        return undefined;
+    const isStyle = (key) => key !== 'before' && (styleKeys === 'all' || styleKeys.has(key));
+    // A style or setting taken away: the layer goes back to its defaults, as made anew
+    if (keys.some((key) => !after.has(key) || !(own?.has(key) || isStyle(key))))
+        return { rebuild: true };
+    keys.forEach((key) => {
+        if (own?.has(key))
+            change.own[key] = after.get(key);
+        else
+            change.style[key] = after.get(key);
+    });
+    return change;
+};
+/** Calls a setter of the layer, if its type has it */
+const set = (layer, setter, ...args) => {
+    const method = Reflect.get(layer, setter);
+    if (typeof method === 'function')
+        method.apply(layer, args);
+};
+/** Applies a change that keeps the layer (`rebuild: false`) */
+export const applyLayerChange = (layer, next, change) => {
+    const spec = fields(next);
+    const own = change.own;
+    if ('data' in own)
+        set(layer, 'setData', own.data);
+    if ('filter' in own)
+        set(layer, 'setFilter', own.filter);
+    if ('values' in own)
+        set(layer, 'setValues', own.values);
+    if ('costs' in own)
+        set(layer, 'setCosts', own.costs);
+    if ('edgeWidths' in own)
+        set(layer, 'setEdgeWidths', own.edgeWidths);
+    if ('instances' in own || 'altitudeReference' in own) {
+        set(layer, 'setInstances', spec.get('instances'), spec.get('altitudeReference'));
+    }
+    if ('uniforms' in own) {
+        Object.entries(own.uniforms ?? {}).forEach(([name, value]) => {
+            set(layer, 'setUniform', name, value);
+        });
+    }
+    if ('textures' in own) {
+        Object.entries(own.textures ?? {}).forEach(([name, texture]) => {
+            set(layer, 'setTexture', name, texture);
+        });
+    }
+    if (Object.keys(change.style).length > 0)
+        set(layer, 'setStyle', change.style);
+};
+/** Adds a layer from its description, its values set */
+export const addBoundLayer = (map, { values, ...spec }) => {
+    const layer = map.add(spec);
+    if (values)
+        set(layer, 'setValues', values);
+    return layer;
+};
+/** A layer made anew from its description in the place of `old`, its values set */
+export const rebuildBoundLayer = (map, old, { values, ...spec }) => {
+    const layer = map.rebuildLayer(old, spec);
+    if (values)
+        set(layer, 'setValues', values);
+    return layer;
+};
+/**
+ * The layers of a binding in their declared order: `order` (default 0) from the bottom up, layers of the same order by
+ * the time they came. A layer added or made anew is moved under the first layer above it
+ */
+export class LayerOrder {
+    entries = [];
+    seq = 0;
+    /** Places a new layer, or a layer made anew in place of `old` */
+    place(layer, order, old) {
+        const index = old ? this.entries.findIndex((e) => e.layer === old) : -1;
+        const entry = index >= 0 ? this.entries[index] : undefined;
+        if (entry) {
+            entry.layer = layer;
+            entry.order = order;
+        }
+        else {
+            this.entries.push({ layer, order, seq: this.seq++ });
+        }
+        this.entries.sort((a, b) => a.order - b.order || a.seq - b.seq);
+        const at = this.entries.findIndex((e) => e.layer === layer);
+        const above = this.entries[at + 1]?.layer;
+        if (above)
+            layer.moveBefore(above);
+    }
+    /** Forgets a layer removed */
+    remove(layer) {
+        const index = this.entries.findIndex((e) => e.layer === layer);
+        if (index >= 0)
+            this.entries.splice(index, 1);
+    }
+}
+//# sourceMappingURL=layers.js.map

package/dist/bind/layers.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"layers.js","sourceRoot":"","sources":["../../src/bind/layers.ts"],"names":[],"mappings":"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","sourcesContent":["/**\n * What a framework's binding (isard/react, isard/vue) does when the description of a layer changes: the least the\n * layer needs (its data, its style, its instances), or a new layer in its place when what changed is set at creation\n * (its URL, its grid, its nodes). Free of any framework.\n */\n\nimport type { Layer } from '../layers/layers.ts';\nimport type { GeoMap, LayerSpec } from '../map.ts';\n\n/** A layer as a binding describes it: the options of `map.add`, and the values of its features or nodes\n * (`setValues`: what colors them by a ramp) */\nexport type BoundLayerSpec<P = Record<string, unknown>> = LayerSpec<P> & { values?: Float32Array };\n\n/** The keys `setStyle` takes, by layer type; `'all'`: every key but the data (the feature layers) */\nconst STYLE_KEYS: Record<LayerSpec['type'], 'all' | ReadonlySet<string>> = {\n  lines: 'all',\n  circles: 'all',\n  fills: 'all',\n  symbols: 'all',\n  extrusions: 'all',\n  raster: new Set(['opacity', 'saturation']),\n  network: new Set(['width', 'max', 'contour', 'opacity', 'halo', 'haloOpacity', 'ramp', 'unreachedColor', 'fade']),\n  tiles3d: new Set(['maxScreenSpaceError', 'opacity', 'pointSize', 'color']),\n  pointcloud: new Set([\n    'colorBy',\n    'pointSize',\n    'maxPointSize',\n    'sizeMode',\n    'shape',\n    'edl',\n    'classifications',\n    'elevationRange',\n    'elevationRamp',\n    'intensityRange',\n    'maxScreenSpaceError',\n    'pointBudget',\n  ]),\n  models: new Set(),\n  ground: new Set(),\n};\n\n/** Keys a layer takes by a method of its own, by layer type */\nconst OWN_SETTERS: Partial<Record<LayerSpec['type'], ReadonlySet<string>>> = {\n  lines: new Set(['data', 'filter', 'values']),\n  circles: new Set(['data', 'filter', 'values']),\n  fills: new Set(['data', 'filter', 'values']),\n  symbols: new Set(['data', 'filter']),\n  extrusions: new Set(['data', 'filter', 'values']),\n  network: new Set(['costs', 'edgeWidths', 'values']),\n  models: new Set(['instances', 'altitudeReference']),\n  ground: new Set(['uniforms', 'textures']),\n};\n\n/** The keys of a description and their values */\nconst fields = (spec: BoundLayerSpec): Map<string, unknown> => new Map(Object.entries(spec));\n\n/** What to do with a layer whose description went from `prev` to `next` */\nexport type LayerChange =\n  | { rebuild: true }\n  | {\n      rebuild: false;\n      /** The keys changed, with their new values */\n      style: Record<string, unknown>;\n      own: Record<string, unknown>;\n    };\n\n/**\n * The change from one description to the next, or `undefined` when nothing changed. Values are compared by identity:\n * data, functions and arrays given anew at each render are changes (keep them in a memo)\n */\nexport const layerChange = (prev: BoundLayerSpec, next: BoundLayerSpec): LayerChange | undefined => {\n  if (prev.type !== next.type) return { rebuild: true };\n\n  const before = fields(prev);\n  const after = fields(next);\n  const styleKeys = STYLE_KEYS[next.type];\n  const own = OWN_SETTERS[next.type];\n  const change: Extract<LayerChange, { rebuild: false }> = { rebuild: false, style: {}, own: {} };\n  const keys = [...new Set([...before.keys(), ...after.keys()])].filter(\n    (key) => key !== 'type' && !Object.is(before.get(key), after.get(key)),\n  );\n\n  if (keys.length === 0) return undefined;\n\n  const isStyle = (key: string) => key !== 'before' && (styleKeys === 'all' || styleKeys.has(key));\n\n  // A style or setting taken away: the layer goes back to its defaults, as made anew\n  if (keys.some((key) => !after.has(key) || !(own?.has(key) || isStyle(key)))) return { rebuild: true };\n  keys.forEach((key) => {\n    if (own?.has(key)) change.own[key] = after.get(key);\n    else change.style[key] = after.get(key);\n  });\n\n  return change;\n};\n\n/** The methods a change calls on a layer, those of its type */\ntype Setter =\n  | 'setStyle'\n  | 'setData'\n  | 'setFilter'\n  | 'setValues'\n  | 'setCosts'\n  | 'setEdgeWidths'\n  | 'setInstances'\n  | 'setUniform'\n  | 'setTexture';\n\n/** Calls a setter of the layer, if its type has it */\nconst set = (layer: Layer, setter: Setter, ...args: unknown[]): void => {\n  const method: unknown = Reflect.get(layer, setter);\n\n  if (typeof method === 'function') method.apply(layer, args);\n};\n\n/** Applies a change that keeps the layer (`rebuild: false`) */\nexport const applyLayerChange = (\n  layer: Layer,\n  next: BoundLayerSpec,\n  change: Extract<LayerChange, { rebuild: false }>,\n): void => {\n  const spec = fields(next);\n  const own = change.own;\n\n  if ('data' in own) set(layer, 'setData', own.data);\n  if ('filter' in own) set(layer, 'setFilter', own.filter);\n  if ('values' in own) set(layer, 'setValues', own.values);\n  if ('costs' in own) set(layer, 'setCosts', own.costs);\n  if ('edgeWidths' in own) set(layer, 'setEdgeWidths', own.edgeWidths);\n  if ('instances' in own || 'altitudeReference' in own) {\n    set(layer, 'setInstances', spec.get('instances'), spec.get('altitudeReference'));\n  }\n  if ('uniforms' in own) {\n    Object.entries(own.uniforms ?? {}).forEach(([name, value]) => {\n      set(layer, 'setUniform', name, value);\n    });\n  }\n  if ('textures' in own) {\n    Object.entries(own.textures ?? {}).forEach(([name, texture]) => {\n      set(layer, 'setTexture', name, texture);\n    });\n  }\n  if (Object.keys(change.style).length > 0) set(layer, 'setStyle', change.style);\n};\n\n/** Adds a layer from its description, its values set */\nexport const addBoundLayer = (map: GeoMap, { values, ...spec }: BoundLayerSpec): Layer => {\n  const layer = map.add(spec as LayerSpec);\n\n  if (values) set(layer, 'setValues', values);\n\n  return layer;\n};\n\n/** A layer made anew from its description in the place of `old`, its values set */\nexport const rebuildBoundLayer = (map: GeoMap, old: Layer, { values, ...spec }: BoundLayerSpec): Layer => {\n  const layer = map.rebuildLayer(old, spec as LayerSpec);\n\n  if (values) set(layer, 'setValues', values);\n\n  return layer;\n};\n\n/**\n * The layers of a binding in their declared order: `order` (default 0) from the bottom up, layers of the same order by\n * the time they came. A layer added or made anew is moved under the first layer above it\n */\nexport class LayerOrder {\n  private readonly entries: { layer: Layer; order: number; seq: number }[] = [];\n  private seq = 0;\n\n  /** Places a new layer, or a layer made anew in place of `old` */\n  place(layer: Layer, order: number, old?: Layer): void {\n    const index = old ? this.entries.findIndex((e) => e.layer === old) : -1;\n    const entry = index >= 0 ? this.entries[index] : undefined;\n\n    if (entry) {\n      entry.layer = layer;\n      entry.order = order;\n    } else {\n      this.entries.push({ layer, order, seq: this.seq++ });\n    }\n    this.entries.sort((a, b) => a.order - b.order || a.seq - b.seq);\n\n    const at = this.entries.findIndex((e) => e.layer === layer);\n    const above = this.entries[at + 1]?.layer;\n\n    if (above) layer.moveBefore(above);\n  }\n\n  /** Forgets a layer removed */\n  remove(layer: Layer): void {\n    const index = this.entries.findIndex((e) => e.layer === layer);\n\n    if (index >= 0) this.entries.splice(index, 1);\n  }\n}\n"]}

package/dist/{crs.d.ts → data/crs.d.ts}

@@ -9,7 +9,7 @@
  * they differ by less than a metre. Any other CRS is plugged in as an object with `forward` and `inverse`, such as
  * `proj4('EPSG:27572')`, directly or by name through `registerCrs`.
  */
-import type { FeatureCollection, FeatureData } from './features.ts';
+import type { FeatureCollection, FeatureData } from '../layers/features.ts';
 /** A CRS: longitudes and latitudes (degrees) to its coordinates (x east, y north), and back. A converter of proj4
  * (`proj4('EPSG:2154')`) is one */
 export interface Crs {
@@ -22,7 +22,7 @@ export type CrsLike = string | Crs;
  * Lambert Conformal Conic with two standard parallels (EPSG method 9802), angles in degrees: the projection of
  * Lambert-93 and of the CC zones, and of many national grids
  */
-export declare function lambertConformalConic(p: {
+export declare const lambertConformalConic: (p: {
     /** Semi-major axis (metres) and flattening (default GRS80) */
     ellipsoid?: [a: number, f: number];
     lat0: number;
@@ -31,12 +31,12 @@ export declare function lambertConformalConic(p: {
     lat2: number;
     x0: number;
     y0: number;
-}): Crs;
+}) => Crs;
 /**
  * Transverse Mercator (EPSG method 9807) by Krüger's series to the sixth order (Karney, 2011), angles in degrees:
  * exact to the tenth of a millimetre within 4000 km of the central meridian. The projection of the UTM zones
  */
-export declare function transverseMercator(p: {
+export declare const transverseMercator: (p: {
     /** Semi-major axis (metres) and flattening (default GRS80) */
     ellipsoid?: [a: number, f: number];
     lon0: number;
@@ -44,24 +44,24 @@ export declare function transverseMercator(p: {
     k0: number;
     x0: number;
     y0: number;
-}): Crs;
+}) => Crs;
 /**
  * The EPSG code of a CRS name: `EPSG:2154`, `urn:ogc:def:crs:EPSG::2154`, `urn:ogc:def:crs:EPSG:6.3:2154`,
  * `http://www.opengis.net/def/crs/EPSG/0/2154`; `CRS:84`, `OGC:CRS84` and the IGN's `IGNF:WGS84G` are 4326, its
  * `IGNF:LAMB93` 2154, the old names of Web Mercator 3857. Undefined for another name
  */
-export declare function epsgCode(name: string): number | undefined;
+export declare const epsgCode: (name: string) => number | undefined;
 /** Whether a CRS name is longitudes and latitudes (needs no reprojection) */
-export declare function isGeographic(name: string): boolean;
+export declare const isGeographic: (name: string) => boolean;
 /**
  * Names a CRS for every place that takes one (`registerCrs('EPSG:27572', proj4('EPSG:27572'))`): the `crs` of a tile
  * grid, the `crs` member of GeoJSON, `reproject`. A registered name wins over a built-in one
  */
-export declare function registerCrs(name: string, crs: Crs): void;
+export declare const registerCrs: (name: string, crs: Crs) => void;
 /** The CRS of a name (registered or built in), or the CRS given; throws for an unknown name */
-export declare function getCrs(crs: CrsLike): Crs;
+export declare const getCrs: (crs: CrsLike) => Crs;
 /** The name in the legacy `crs` member of GeoJSON (`{ type: 'name', properties: { name } }`), if any */
-export declare function crsOf(data: unknown): string | undefined;
+export declare const crsOf: (data: unknown) => string | undefined;
 /**
  * GeoJSON in `from` (default: the CRS its `crs` member names) as GeoJSON in longitudes and latitudes, for the feature
  * layers: `map.addFills({ data: reproject(parcels, 'EPSG:2154') })`. The features are copied with new geometries, their
@@ -69,4 +69,4 @@ export declare function crsOf(data: unknown): string | undefined;
  * The feature layers do this by themselves for a collection whose `crs` member names its CRS (a WFS's output in
  * EPSG:2154)
  */
-export declare function reproject<P>(data: FeatureData<P>, from?: CrsLike): FeatureCollection<P>;
+export declare const reproject: <P>(data: FeatureData<P>, from?: CrsLike) => FeatureCollection<P>;

package/dist/{crs.js → data/crs.js}

@@ -1,10 +1,11 @@
+import { isRecord } from "../util/guards.js";
 const GRS80 = [6378137, 1 / 298.257222101];
 const WGS84 = [6378137, 1 / 298.257223563];
 const RAD = Math.PI / 180;
 /** Isometric latitude of a latitude (radians) on an ellipsoid of eccentricity `e` */
 const isometric = (phi, e) => Math.atanh(Math.sin(phi)) - e * Math.atanh(e * Math.sin(phi));
 /** Latitude (radians) of an isometric latitude, by fixed-point iteration (converges by e² at each step) */
-function fromIsometric(psi, e) {
+const fromIsometric = (psi, e) => {
     let phi = Math.asin(Math.tanh(psi));
     for (let i = 0; i < 20; i += 1) {
         const next = Math.asin(Math.tanh(psi + e * Math.atanh(e * Math.sin(phi))));
@@ -13,14 +14,14 @@ function fromIsometric(psi, e) {
         phi = next;
     }
     return phi;
-}
+};
 /** An angle (radians) brought into [-π, π] */
 const wrap = (angle) => angle - 2 * Math.PI * Math.round(angle / (2 * Math.PI));
 /**
  * Lambert Conformal Conic with two standard parallels (EPSG method 9802), angles in degrees: the projection of
  * Lambert-93 and of the CC zones, and of many national grids
  */
-export function lambertConformalConic(p) {
+export const lambertConformalConic = (p) => {
     const [a, f] = p.ellipsoid ?? GRS80;
     const e = Math.sqrt(f * (2 - f));
     const m = (phi) => Math.cos(phi) / Math.sqrt(1 - (e * Math.sin(phi)) ** 2);
@@ -45,12 +46,12 @@ export function lambertConformalConic(p) {
             return [(theta / n + lon0) / RAD, fromIsometric(-Math.log(r / aF) / n, e) / RAD];
         },
     };
-}
+};
 /**
  * Transverse Mercator (EPSG method 9807) by Krüger's series to the sixth order (Karney, 2011), angles in degrees:
  * exact to the tenth of a millimetre within 4000 km of the central meridian. The projection of the UTM zones
  */
-export function transverseMercator(p) {
+export const transverseMercator = (p) => {
     const [a, f] = p.ellipsoid ?? GRS80;
     const e = Math.sqrt(f * (2 - f));
     const n = f / (2 - f);
@@ -97,7 +98,7 @@ export function transverseMercator(p) {
             return [(lon0 + Math.atan2(Math.sinh(eta), Math.cos(xi))) / RAD, fromIsometric(Math.asinh(t), e) / RAD];
         },
     };
-}
+};
 /** Longitudes and latitudes themselves */
 const GEOGRAPHIC = {
     forward: ([lon, lat]) => [lon, lat],
@@ -118,7 +119,7 @@ const made = new Map();
  * `http://www.opengis.net/def/crs/EPSG/0/2154`; `CRS:84`, `OGC:CRS84` and the IGN's `IGNF:WGS84G` are 4326, its
  * `IGNF:LAMB93` 2154, the old names of Web Mercator 3857. Undefined for another name
  */
-export function epsgCode(name) {
+export const epsgCode = (name) => {
     const n = name.trim().toUpperCase();
     if (/CRS:?84$/.test(n) || n === 'IGNF:WGS84G')
         return 4326;
@@ -129,9 +130,9 @@ export function epsgCode(name) {
         return undefined;
     const c = Number(code);
     return c === 900913 || c === 3785 || c === 102100 || c === 102113 ? 3857 : c;
-}
+};
 /** A built-in CRS by EPSG code; undefined if not built in */
-function builtin(code) {
+const builtin = (code) => {
     if (code === 4326 || code === 4258 || code === 4171)
         return GEOGRAPHIC;
     if (code === 3857)
@@ -152,12 +153,12 @@ function builtin(code) {
     if (code >= 25828 && code <= 25838)
         return utm(code - 25800, false, GRS80);
     return undefined;
-}
+};
 /** Whether a CRS name is longitudes and latitudes (needs no reprojection) */
-export function isGeographic(name) {
+export const isGeographic = (name) => {
     const code = epsgCode(name);
     return !registered.has(normalize(name)) && code !== undefined && builtin(code) === GEOGRAPHIC;
-}
+};
 const normalize = (name) => {
     const code = epsgCode(name);
     return code === undefined ? name.trim().toUpperCase() : `EPSG:${code}`;
@@ -166,11 +167,11 @@ const normalize = (name) => {
  * Names a CRS for every place that takes one (`registerCrs('EPSG:27572', proj4('EPSG:27572'))`): the `crs` of a tile
  * grid, the `crs` member of GeoJSON, `reproject`. A registered name wins over a built-in one
  */
-export function registerCrs(name, crs) {
+export const registerCrs = (name, crs) => {
     registered.set(normalize(name), crs);
-}
+};
 /** The CRS of a name (registered or built in), or the CRS given; throws for an unknown name */
-export function getCrs(crs) {
+export const getCrs = (crs) => {
     if (typeof crs !== 'string')
         return crs;
     const found = registered.get(normalize(crs));
@@ -178,25 +179,23 @@ export function getCrs(crs) {
         return found;
     const code = epsgCode(crs);
     if (code !== undefined) {
-        let c = made.get(code);
-        if (!c) {
-            c = builtin(code);
-            if (c)
-                made.set(code, c);
-        }
-        if (c)
+        const c = made.get(code) ?? builtin(code);
+        if (c) {
+            made.set(code, c);
             return c;
+        }
     }
     throw new Error(`isard: unknown CRS ${crs}: registerCrs('${crs}', proj4('${crs}')) names it`);
-}
+};
 /** The name in the legacy `crs` member of GeoJSON (`{ type: 'name', properties: { name } }`), if any */
-export function crsOf(data) {
-    const member = data?.crs;
-    const name = member?.properties?.name;
+export const crsOf = (data) => {
+    const member = isRecord(data) ? data.crs : undefined;
+    const properties = isRecord(member) ? member.properties : undefined;
+    const name = isRecord(properties) ? properties.name : undefined;
     return typeof name === 'string' ? name : undefined;
-}
+};
 /** A geometry with its positions mapped */
-function mapGeometry(g, f) {
+const mapGeometry = (g, f) => {
     switch (g.type) {
         case 'Point':
             return { type: g.type, coordinates: f(g.coordinates) };
@@ -211,7 +210,7 @@ function mapGeometry(g, f) {
         case 'GeometryCollection':
             return { type: g.type, geometries: g.geometries.map((child) => mapGeometry(child, f)) };
     }
-}
+};
 /**
  * GeoJSON in `from` (default: the CRS its `crs` member names) as GeoJSON in longitudes and latitudes, for the feature
  * layers: `map.addFills({ data: reproject(parcels, 'EPSG:2154') })`. The features are copied with new geometries, their
@@ -219,10 +218,15 @@ function mapGeometry(g, f) {
  * The feature layers do this by themselves for a collection whose `crs` member names its CRS (a WFS's output in
  * EPSG:2154)
  */
-export function reproject(data, from) {
-    let features = Array.isArray(data) ? data : [data];
-    if (!Array.isArray(data) && data.type === 'FeatureCollection')
-        features = data.features;
+export const reproject = (data, from) => {
+    const featuresOf = () => {
+        if (Array.isArray(data))
+            return data;
+        if (data.type === 'FeatureCollection')
+            return data.features;
+        return [data];
+    };
+    const features = featuresOf();
     const source = from ?? crsOf(data);
     if (source === undefined || (typeof source === 'string' && isGeographic(source))) {
         return { type: 'FeatureCollection', features };
@@ -239,5 +243,5 @@ export function reproject(data, from) {
             geometry: feature.geometry && mapGeometry(feature.geometry, f),
         })),
     };
-}
+};
 //# sourceMappingURL=crs.js.map

package/dist/data/crs.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"crs.js","sourceRoot":"","sources":["../../src/data/crs.ts"],"names":[],"mappings":"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","sourcesContent":["/**\n * Coordinate reference systems of the data: a CRS turns longitudes and latitudes (degrees) into its coordinates\n * (`forward`) and back (`inverse`). The map stays in Web Mercator (or the globe): data in another CRS is reprojected\n * into it, as rasters (see `TileGrid`) or as GeoJSON (`reproject`).\n *\n * Built in, exact to the millimetre against PROJ: EPSG:4326 (and the geographic ETRS89, RGF93), EPSG:3857, Lambert-93\n * (EPSG:2154), the nine conic zones CC42 to CC50 (EPSG:3942 to 3950), the UTM zones of WGS 84 (EPSG:32601 to 32660\n * north, 32701 to 32760 south) and of ETRS89 (EPSG:25828 to 25838). WGS 84, ETRS89 and RGF93 are taken as one datum:\n * they differ by less than a metre. Any other CRS is plugged in as an object with `forward` and `inverse`, such as\n * `proj4('EPSG:27572')`, directly or by name through `registerCrs`.\n */\nimport type { Feature, FeatureCollection, FeatureData, Geometry, Position } from '../layers/features.ts';\nimport { isRecord } from '../util/guards.ts';\n\n/** A CRS: longitudes and latitudes (degrees) to its coordinates (x east, y north), and back. A converter of proj4\n * (`proj4('EPSG:2154')`) is one */\nexport interface Crs {\n  forward(lonLat: [number, number]): readonly number[];\n  inverse(xy: [number, number]): readonly number[];\n}\n\n/** A CRS by name (`'EPSG:2154'`, `'urn:ogc:def:crs:EPSG::2154'`, `'CRS:84'`…; built in or registered), or itself */\nexport type CrsLike = string | Crs;\n\n/** An ellipsoid: semi-major axis (metres) and flattening */\ntype Ellipsoid = [a: number, f: number];\nconst GRS80: Ellipsoid = [6378137, 1 / 298.257222101];\nconst WGS84: Ellipsoid = [6378137, 1 / 298.257223563];\n\nconst RAD = Math.PI / 180;\n\n/** Isometric latitude of a latitude (radians) on an ellipsoid of eccentricity `e` */\nconst isometric = (phi: number, e: number) => Math.atanh(Math.sin(phi)) - e * Math.atanh(e * Math.sin(phi));\n\n/** Latitude (radians) of an isometric latitude, by fixed-point iteration (converges by e² at each step) */\nconst fromIsometric = (psi: number, e: number): number => {\n  let phi = Math.asin(Math.tanh(psi));\n\n  for (let i = 0; i < 20; i += 1) {\n    const next = Math.asin(Math.tanh(psi + e * Math.atanh(e * Math.sin(phi))));\n\n    if (Math.abs(next - phi) < 1e-15) return next;\n    phi = next;\n  }\n\n  return phi;\n};\n\n/** An angle (radians) brought into [-π, π] */\nconst wrap = (angle: number) => angle - 2 * Math.PI * Math.round(angle / (2 * Math.PI));\n\n/**\n * Lambert Conformal Conic with two standard parallels (EPSG method 9802), angles in degrees: the projection of\n * Lambert-93 and of the CC zones, and of many national grids\n */\nexport const lambertConformalConic = (p: {\n  /** Semi-major axis (metres) and flattening (default GRS80) */\n  ellipsoid?: [a: number, f: number];\n  lat0: number;\n  lon0: number;\n  lat1: number;\n  lat2: number;\n  x0: number;\n  y0: number;\n}): Crs => {\n  const [a, f] = p.ellipsoid ?? GRS80;\n  const e = Math.sqrt(f * (2 - f));\n  const m = (phi: number) => Math.cos(phi) / Math.sqrt(1 - (e * Math.sin(phi)) ** 2);\n  const [phi1, phi2] = [p.lat1 * RAD, p.lat2 * RAD];\n  const n =\n    phi1 === phi2\n      ? Math.sin(phi1)\n      : (Math.log(m(phi1)) - Math.log(m(phi2))) / (isometric(phi2, e) - isometric(phi1, e));\n  const aF = (a * m(phi1) * Math.exp(n * isometric(phi1, e))) / n;\n  const r0 = aF * Math.exp(-n * isometric(p.lat0 * RAD, e));\n  const lon0 = p.lon0 * RAD;\n\n  return {\n    forward: ([lon, lat]) => {\n      const r = aF * Math.exp(-n * isometric(lat * RAD, e));\n      const theta = n * wrap(lon * RAD - lon0);\n\n      return [p.x0 + r * Math.sin(theta), p.y0 + r0 - r * Math.cos(theta)];\n    },\n    inverse: ([x, y]) => {\n      const s = Math.sign(n);\n      const [dx, dy] = [x - p.x0, r0 - (y - p.y0)];\n      const r = s * Math.hypot(dx, dy);\n      const theta = Math.atan2(s * dx, s * dy);\n\n      return [(theta / n + lon0) / RAD, fromIsometric(-Math.log(r / aF) / n, e) / RAD];\n    },\n  };\n};\n\n/**\n * Transverse Mercator (EPSG method 9807) by Krüger's series to the sixth order (Karney, 2011), angles in degrees:\n * exact to the tenth of a millimetre within 4000 km of the central meridian. The projection of the UTM zones\n */\nexport const transverseMercator = (p: {\n  /** Semi-major axis (metres) and flattening (default GRS80) */\n  ellipsoid?: [a: number, f: number];\n  lon0: number;\n  /** Scale on the central meridian */\n  k0: number;\n  x0: number;\n  y0: number;\n}): Crs => {\n  const [a, f] = p.ellipsoid ?? GRS80;\n  const e = Math.sqrt(f * (2 - f));\n  const n = f / (2 - f);\n  const [n2, n3, n4, n5, n6] = [n ** 2, n ** 3, n ** 4, n ** 5, n ** 6];\n  const kA = (p.k0 * a * (1 + n2 / 4 + n4 / 64 + n6 / 256)) / (1 + n);\n  const alpha = [\n    n / 2 - (2 * n2) / 3 + (5 * n3) / 16 + (41 * n4) / 180 - (127 * n5) / 288 + (7891 * n6) / 37800,\n    (13 * n2) / 48 - (3 * n3) / 5 + (557 * n4) / 1440 + (281 * n5) / 630 - (1983433 * n6) / 1935360,\n    (61 * n3) / 240 - (103 * n4) / 140 + (15061 * n5) / 26880 + (167603 * n6) / 181440,\n    (49561 * n4) / 161280 - (179 * n5) / 168 + (6601661 * n6) / 7257600,\n    (34729 * n5) / 80640 - (3418889 * n6) / 1995840,\n    (212378941 * n6) / 319334400,\n  ];\n  const beta = [\n    n / 2 - (2 * n2) / 3 + (37 * n3) / 96 - n4 / 360 - (81 * n5) / 512 + (96199 * n6) / 604800,\n    n2 / 48 + n3 / 15 - (437 * n4) / 1440 + (46 * n5) / 105 - (1118711 * n6) / 3870720,\n    (17 * n3) / 480 - (37 * n4) / 840 - (209 * n5) / 4480 + (5569 * n6) / 90720,\n    (4397 * n4) / 161280 - (11 * n5) / 504 - (830251 * n6) / 7257600,\n    (4583 * n5) / 161280 - (108847 * n6) / 3991680,\n    (20648693 * n6) / 638668800,\n  ];\n  /** ξ, η moved by the series of coefficients `c`, added (forward) or subtracted (inverse) */\n  const series = (xi: number, eta: number, c: number[], sign: number): [number, number] => {\n    let [x, y] = [xi, eta];\n\n    c.forEach((k, j) => {\n      const w = 2 * (j + 1);\n\n      x += sign * k * Math.sin(w * xi) * Math.cosh(w * eta);\n      y += sign * k * Math.cos(w * xi) * Math.sinh(w * eta);\n    });\n\n    return [x, y];\n  };\n  const lon0 = p.lon0 * RAD;\n\n  return {\n    forward: ([lon, lat]) => {\n      const lambda = wrap(lon * RAD - lon0);\n      // The conformal latitude's tangent\n      const t = Math.sinh(isometric(lat * RAD, e));\n      const [xi, eta] = series(\n        Math.atan2(t, Math.cos(lambda)),\n        Math.asinh(Math.sin(lambda) / Math.hypot(t, Math.cos(lambda))),\n        alpha,\n        1,\n      );\n\n      return [p.x0 + kA * eta, p.y0 + kA * xi];\n    },\n    inverse: ([x, y]) => {\n      const [xi, eta] = series((y - p.y0) / kA, (x - p.x0) / kA, beta, -1);\n      const t = Math.sin(xi) / Math.hypot(Math.sinh(eta), Math.cos(xi));\n\n      return [(lon0 + Math.atan2(Math.sinh(eta), Math.cos(xi))) / RAD, fromIsometric(Math.asinh(t), e) / RAD];\n    },\n  };\n};\n\n/** Longitudes and latitudes themselves */\nconst GEOGRAPHIC: Crs = {\n  forward: ([lon, lat]) => [lon, lat],\n  inverse: ([x, y]) => [x, y],\n};\n\n/** Web Mercator in metres (EPSG:3857) */\nconst R = 6378137;\nconst WEB_MERCATOR: Crs = {\n  forward: ([lon, lat]) => [R * lon * RAD, R * Math.log(Math.tan(Math.PI / 4 + (lat * RAD) / 2))],\n  inverse: ([x, y]) => [x / R / RAD, (2 * Math.atan(Math.exp(y / R)) - Math.PI / 2) / RAD],\n};\n\n/** The CRSs registered by the application, by name */\nconst registered = new Map<string, Crs>();\n/** The built-in CRSs made so far, by EPSG code */\nconst made = new Map<number, Crs>();\n\n/**\n * The EPSG code of a CRS name: `EPSG:2154`, `urn:ogc:def:crs:EPSG::2154`, `urn:ogc:def:crs:EPSG:6.3:2154`,\n * `http://www.opengis.net/def/crs/EPSG/0/2154`; `CRS:84`, `OGC:CRS84` and the IGN's `IGNF:WGS84G` are 4326, its\n * `IGNF:LAMB93` 2154, the old names of Web Mercator 3857. Undefined for another name\n */\nexport const epsgCode = (name: string): number | undefined => {\n  const n = name.trim().toUpperCase();\n\n  if (/CRS:?84$/.test(n) || n === 'IGNF:WGS84G') return 4326;\n  if (n === 'IGNF:LAMB93') return 2154;\n\n  const code = /EPSG(?::+|\\/)(?:[\\d.]+[:/]+)?(\\d+)$/.exec(n)?.[1];\n\n  if (code === undefined) return undefined;\n\n  const c = Number(code);\n\n  return c === 900913 || c === 3785 || c === 102100 || c === 102113 ? 3857 : c;\n};\n\n/** A built-in CRS by EPSG code; undefined if not built in */\nconst builtin = (code: number): Crs | undefined => {\n  if (code === 4326 || code === 4258 || code === 4171) return GEOGRAPHIC;\n  if (code === 3857) return WEB_MERCATOR;\n  if (code === 2154) {\n    return lambertConformalConic({ lat0: 46.5, lon0: 3, lat1: 49, lat2: 44, x0: 700000, y0: 6600000 });\n  }\n  if (code >= 3942 && code <= 3950) {\n    const lat0 = code - 3900;\n    const y0 = (lat0 - 41) * 1000000 + 200000;\n\n    return lambertConformalConic({ lat0, lon0: 3, lat1: lat0 - 0.75, lat2: lat0 + 0.75, x0: 1700000, y0 });\n  }\n\n  const utm = (zone: number, south: boolean, ellipsoid: Ellipsoid) =>\n    transverseMercator({ ellipsoid, lon0: zone * 6 - 183, k0: 0.9996, x0: 500000, y0: south ? 10000000 : 0 });\n\n  if (code >= 32601 && code <= 32660) return utm(code - 32600, false, WGS84);\n  if (code >= 32701 && code <= 32760) return utm(code - 32700, true, WGS84);\n  if (code >= 25828 && code <= 25838) return utm(code - 25800, false, GRS80);\n\n  return undefined;\n};\n\n/** Whether a CRS name is longitudes and latitudes (needs no reprojection) */\nexport const isGeographic = (name: string): boolean => {\n  const code = epsgCode(name);\n\n  return !registered.has(normalize(name)) && code !== undefined && builtin(code) === GEOGRAPHIC;\n};\n\nconst normalize = (name: string) => {\n  const code = epsgCode(name);\n\n  return code === undefined ? name.trim().toUpperCase() : `EPSG:${code}`;\n};\n\n/**\n * Names a CRS for every place that takes one (`registerCrs('EPSG:27572', proj4('EPSG:27572'))`): the `crs` of a tile\n * grid, the `crs` member of GeoJSON, `reproject`. A registered name wins over a built-in one\n */\nexport const registerCrs = (name: string, crs: Crs): void => {\n  registered.set(normalize(name), crs);\n};\n\n/** The CRS of a name (registered or built in), or the CRS given; throws for an unknown name */\nexport const getCrs = (crs: CrsLike): Crs => {\n  if (typeof crs !== 'string') return crs;\n\n  const found = registered.get(normalize(crs));\n\n  if (found) return found;\n\n  const code = epsgCode(crs);\n\n  if (code !== undefined) {\n    const c = made.get(code) ?? builtin(code);\n\n    if (c) {\n      made.set(code, c);\n\n      return c;\n    }\n  }\n  throw new Error(`isard: unknown CRS ${crs}: registerCrs('${crs}', proj4('${crs}')) names it`);\n};\n\n/** The name in the legacy `crs` member of GeoJSON (`{ type: 'name', properties: { name } }`), if any */\nexport const crsOf = (data: unknown): string | undefined => {\n  const member = isRecord(data) ? data.crs : undefined;\n  const properties = isRecord(member) ? member.properties : undefined;\n  const name = isRecord(properties) ? properties.name : undefined;\n\n  return typeof name === 'string' ? name : undefined;\n};\n\n/** A geometry with its positions mapped */\nconst mapGeometry = (g: Geometry, f: (p: Position) => Position): Geometry => {\n  switch (g.type) {\n    case 'Point':\n      return { type: g.type, coordinates: f(g.coordinates) };\n    case 'MultiPoint':\n    case 'LineString':\n      return { type: g.type, coordinates: g.coordinates.map(f) };\n    case 'MultiLineString':\n    case 'Polygon':\n      return { type: g.type, coordinates: g.coordinates.map((line) => line.map(f)) };\n    case 'MultiPolygon':\n      return { type: g.type, coordinates: g.coordinates.map((poly) => poly.map((line) => line.map(f))) };\n    case 'GeometryCollection':\n      return { type: g.type, geometries: g.geometries.map((child) => mapGeometry(child, f)) };\n  }\n};\n\n/**\n * GeoJSON in `from` (default: the CRS its `crs` member names) as GeoJSON in longitudes and latitudes, for the feature\n * layers: `map.addFills({ data: reproject(parcels, 'EPSG:2154') })`. The features are copied with new geometries, their\n * properties shared; altitudes are kept. Data without a CRS, or in longitudes and latitudes, comes back as it is.\n * The feature layers do this by themselves for a collection whose `crs` member names its CRS (a WFS's output in\n * EPSG:2154)\n */\nexport const reproject = <P>(data: FeatureData<P>, from?: CrsLike): FeatureCollection<P> => {\n  const featuresOf = (): Feature<P>[] => {\n    if (Array.isArray(data)) return data;\n    if (data.type === 'FeatureCollection') return data.features;\n\n    return [data];\n  };\n  const features = featuresOf();\n  const source = from ?? crsOf(data);\n\n  if (source === undefined || (typeof source === 'string' && isGeographic(source))) {\n    return { type: 'FeatureCollection', features };\n  }\n\n  const crs = getCrs(source);\n  const f = (p: Position): Position => {\n    const [lon, lat] = crs.inverse([p[0], p[1]]);\n\n    return [lon ?? Number.NaN, lat ?? Number.NaN, ...p.slice(2)];\n  };\n\n  return {\n    type: 'FeatureCollection',\n    features: features.map(\n      (feature): Feature<P> => ({\n        ...feature,\n        geometry: feature.geometry && mapGeometry(feature.geometry, f),\n      }),\n    ),\n  };\n};\n"]}

package/dist/{gpx.d.ts → data/gpx.d.ts}

@@ -1,11 +1,11 @@
 /**
  * GPX to GeoJSON, for the feature layers: `map.addLines({ data: parseGpx(await (await fetch(url)).text()) })`.
  */
-import type { FeatureCollection, Properties } from './features.ts';
+import type { FeatureCollection, Properties } from '../layers/features.ts';
 /**
  * The waypoints, routes and tracks of a GPX file as GeoJSON features: a waypoint as a point (its `time` a property),
  * a route as a line, a track as a line or, of several segments, a multi-line; altitudes (`ele`) as the third
  * coordinate; `name`, `desc`, `cmt`, `type`… as properties, and the times of the points as `times` (one list, or one
  * per segment) when they all have one
  */
-export declare function parseGpx<P = Properties>(text: string): FeatureCollection<P>;
+export declare const parseGpx: <P = Properties>(text: string) => FeatureCollection<P>;