col-browser 2.5.0 → 2.6.1

package/es/taxonBreakdown.js

@@ -1,9 +1,9 @@
 import { w } from "./chunks/withTheme-Dh6PRuII.js";
 import { j as o } from "./chunks/jsx-runtime-BzflLqGi.js";
-import { T } from "./chunks/TaxonBreakdown-D9g3tYXL.js";
+import { T } from "./chunks/TaxonBreakdown-DqdQ18QM.js";
 import { useState as e, useEffect as A } from "react";
 import { s as b, c as r, R as v, b as B } from "./chunks/router-CssZk5qZ.js";
-import { c as s } from "./chunks/config-D4b3a4Yi.js";
+import { c as s } from "./chunks/config--bs_09I6.js";
 import { Row as D, Col as C, Spin as E } from "antd";
 const S = ({
   taxonId: n,

package/es/taxonDistribution.js

@@ -2,9 +2,9 @@ import { w as $ } from "./chunks/withTheme-Dh6PRuII.js";
 import { j as n } from "./chunks/jsx-runtime-BzflLqGi.js";
 import { useState as a, useEffect as D } from "react";
 import { s as T, c as s, R as g, b as k } from "./chunks/router-CssZk5qZ.js";
-import { c as l } from "./chunks/config-D4b3a4Yi.js";
+import { c as l } from "./chunks/config--bs_09I6.js";
 import { Row as v, Col as w, Spin as A } from "antd";
-import { D as C } from "./chunks/Distributions-Dwjo7KhA.js";
+import { D as C } from "./chunks/Distributions-Czffme5Y.js";
 const E = ({
   taxonId: o,
   datasetKey: i,

package/es/tree.js

@@ -8,13 +8,13 @@ import j, { createContext as at } from "react";
 import { Popover as ot, Divider as it, Spin as q, Tag as nt, Alert as w, Skeleton as rt, Tree as lt, Button as dt, Row as ht, Col as I, Checkbox as N } from "antd";
 import { sortBy as _, get as m, isUndefined as A, flatten as ct, isArray as O } from "lodash-es";
 import { L as P, c as K, R as H, s as ut, b as pt } from "./chunks/router-CssZk5qZ.js";
-import { c as D } from "./chunks/config-D4b3a4Yi.js";
+import { c as D } from "./chunks/config--bs_09I6.js";
 import L from "dataloader";
-import { c as V, b as z, g as ft } from "./chunks/dataset-D_gmg2Zv.js";
-import { M as xt } from "./chunks/MergedDataBadge-FvHUdT7B.js";
+import { c as V, b as z, g as ft } from "./chunks/dataset-BZpjo3Yq.js";
+import { M as xt } from "./chunks/MergedDataBadge-DK53L3R8.js";
 import { E as gt } from "./chunks/ErrorMsg-K8k5PPTp.js";
-import { g as yt } from "./chunks/sector-CE-w32Gs.js";
-import { C as R, N as mt } from "./chunks/DatasetCitation-BnOkKDTv.js";
+import { g as yt } from "./chunks/sector-ucUgPp75.js";
+import { C as R, N as mt } from "./chunks/DatasetCitation-Cep2dces.js";
 import { r as F, w as M } from "./chunks/storage-BgdCo9fV.js";
 const E = at({
   datasetLoader: null,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "col-browser",
-  "version": "2.5.0",
+  "version": "2.6.1",
   "description": "Catalogue of Life browse and search React components",
   "main": "umd/col-browser.js",
   "module": "es/index.js",

package/types/index.d.ts

@@ -159,6 +159,13 @@ export interface ColBrowserConfig {
    * CARTO's keyless Positron CDN. Stored verbatim — not URL-normalised.
    */
   basemapStyle: string | Record<string, unknown>;
+  /**
+   * CARTO Basemaps API key. When set, every cartocdn.com request the
+   * distribution map makes — style, vector tiles, glyphs, sprites — carries
+   * `?key=`. Defaults to "" (unauthenticated). Not needed if `basemapStyle`
+   * points at a non-CARTO provider.
+   */
+  cartoKey: string;
 }
 
 /**

package/umd/col-browser.js

@@ -67809,10 +67809,15 @@ html body {
     // `style` works: a style URL (bake your provider's API key into it) or an
     // inline style object. The default is CARTO's public Positron CDN, which
     // needs no key.
-    basemapStyle: "https://basemaps.cartocdn.com/gl/positron-gl-style/style.json"
+    basemapStyle: "https://basemaps.cartocdn.com/gl/positron-gl-style/style.json",
+    // CARTO Basemaps API key. Empty means unauthenticated (fine today, but
+    // CARTO is moving to enforce keys). Set it and every cartocdn.com request
+    // the map makes — style, vector tiles, glyphs, sprites — carries `?key=`.
+    // Not needed when `basemapStyle` points at a non-CARTO provider.
+    cartoKey: ""
   };
   const SLASH_TERMINATED = /* @__PURE__ */ new Set(["dataApi"]);
-  const VERBATIM = /* @__PURE__ */ new Set(["basemapStyle"]);
+  const VERBATIM = /* @__PURE__ */ new Set(["basemapStyle", "cartoKey"]);
   const normalize = (key2, value) => SLASH_TERMINATED.has(key2) ? value.replace(/\/*$/, "/") : value.replace(/\/+$/, "");
   function configure(overrides = {}) {
     Object.entries(overrides).forEach(([key2, value]) => {
@@ -69848,6 +69853,24 @@ html body {
       (res) => res.data
     );
   };
+  const vocabCache = /* @__PURE__ */ new Map();
+  const cachedVocab = (path, transform2) => {
+    const url = `${config.dataApi}vocab/${path}`;
+    if (!vocabCache.has(url)) {
+      vocabCache.set(
+        url,
+        client(url).then((res) => transform2(res.data)).catch((err) => {
+          vocabCache.delete(url);
+          throw err;
+        })
+      );
+    }
+    return vocabCache.get(url);
+  };
+  const getNomStatusVocab = () => cachedVocab(
+    "nomstatus",
+    (data) => data.reduce((a, c) => (a[c.name] = c, a), {})
+  );
   const token = "%[a-f0-9]{2}";
   const singleMatcher = new RegExp("(" + token + ")|([^%]+?)", "gi");
   const multiMatcher = new RegExp("(" + token + ")+", "gi");
@@ -77533,12 +77556,43 @@ html body {
     if (total <= visible && !showAll) return null;
     return /* @__PURE__ */ jsxRuntimeExports.jsx("a", { onClick: () => onChange(!showAll), style: { cursor: "pointer" }, children: showAll ? "Show less" : `Show all (${total})` });
   };
+  const NOM_CODES = /* @__PURE__ */ new Set([
+    "bacterial",
+    "botanical",
+    "cultivars",
+    "phyto",
+    "phylo",
+    "virus",
+    "zoological"
+  ]);
+  const nomStatusLabel = (vocab, nomStatus, code) => {
+    if (!nomStatus) return "";
+    const term = vocab == null ? void 0 : vocab[nomStatus];
+    if (!term) return nomStatus;
+    const key2 = NOM_CODES.has(code) && typeof term[code] === "string" ? code : "zoological";
+    return term[key2] || term.name || nomStatus;
+  };
+  const NomStatus = ({ nomStatus, code, brackets }) => {
+    const [vocab, setVocab] = reactExports.useState(null);
+    reactExports.useEffect(() => {
+      let cancelled = false;
+      getNomStatusVocab().then((v2) => {
+        if (!cancelled) setVocab(v2);
+      }).catch(() => {
+      });
+      return () => {
+        cancelled = true;
+      };
+    }, []);
+    if (!nomStatus) return null;
+    const label = nomStatusLabel(vocab, nomStatus, code);
+    return /* @__PURE__ */ jsxRuntimeExports.jsx(jsxRuntimeExports.Fragment, { children: brackets ? `(${label})` : label });
+  };
   const TOP_N = 5;
   const SynonymsTable = ({
     datasetKey,
     data,
     style: style2,
-    nomStatus,
     references,
     decisions,
     typeMaterial,
@@ -77547,7 +77601,6 @@ html body {
     misapplied
   }) => {
     const [showAll, setShowAll] = reactExports.useState(false);
-    const getNomStatus = (taxon) => !nomStatus ? get(taxon, "name.nomStatus") : nomStatus[get(taxon, "name.nomStatus")][get(taxon, "name.code"), "zoological"];
     const sorter = (a, b2) => {
       if (get(a, "name.combinationAuthorship.year") && get(b2, "name.combinationAuthorship.year")) {
         return get(b2, "name.combinationAuthorship.year") - get(a, "name.combinationAuthorship.year");
@@ -77625,7 +77678,14 @@ html body {
         }
       ),
       " ",
-      get(s, "name.nomStatus") ? `(${getNomStatus(s)})` : "",
+      /* @__PURE__ */ jsxRuntimeExports.jsx(
+        NomStatus,
+        {
+          nomStatus: get(s, "name.nomStatus"),
+          code: get(s, "name.code"),
+          brackets: true
+        }
+      ),
       " ",
       get(s, "status") === "misapplied" && get(s, "accordingTo") ? get(s, "accordingTo") : "",
       get(s, "status") === "ambiguous synonym" && "(Ambiguous)",
@@ -77987,6 +78047,23 @@ html body {
     return out;
   };
   const resolveBasemapStyle = (prop) => prop ?? config.basemapStyle;
+  const CARTO_HOST = /(^|\.)cartocdn\.com$/i;
+  const cartoTransformRequest = (key2 = config.cartoKey) => {
+    if (!key2) return void 0;
+    return (url) => {
+      let parsed;
+      try {
+        parsed = new URL(url);
+      } catch {
+        return { url };
+      }
+      if (!CARTO_HOST.test(parsed.hostname) || parsed.searchParams.has("key")) {
+        return { url };
+      }
+      parsed.searchParams.set("key", key2);
+      return { url: parsed.toString() };
+    };
+  };
   const wrapStyle = {
     position: "absolute",
     bottom: 8,
@@ -78345,13 +78422,15 @@ html body {
     }, [descendantState, descendantColors, visibleTaxonIds]);
     const showDescendantLegend = descendantLegend.visibleGroups.length > 0;
     const styleSpec = resolveBasemapStyle(basemapStyle);
-    const styleKey = typeof styleSpec === "string" ? styleSpec : JSON.stringify(styleSpec);
+    const cartoKey = config.cartoKey;
+    const styleKey = `${typeof styleSpec === "string" ? styleSpec : JSON.stringify(styleSpec)}|${cartoKey || ""}`;
     reactExports.useEffect(() => {
       if (!containerRef.current || mapRef.current) return;
       if (!supported()) return;
       const map = new maplibregl.Map({
         container: containerRef.current,
         style: styleSpec,
+        transformRequest: cartoTransformRequest(cartoKey),
         center: [0, 20],
         zoom: 1,
         minZoom: 0,
@@ -88258,7 +88337,6 @@ Please report this to https://github.com/markedjs/marked.`, e2) {
           this.getInfo(taxonKey);
           this.getRank(taxonKey);
           this.getIncludes(taxonKey);
-          this.getNomStatus(taxonKey);
         }
       });
       __publicField(this, "getCatalogue", () => {
@@ -88421,13 +88499,6 @@ Please report this to https://github.com/markedjs/marked.`, e2) {
           (res) => this.setState({ rank: res.data.map((r2) => r2.name) })
         );
       });
-      __publicField(this, "getNomStatus", () => {
-        client(`${config.dataApi}vocab/nomstatus`).then(
-          (res) => this.setState({
-            nomStatus: res.data.reduce((a, c) => (a[c.name] = c, a), {})
-          })
-        );
-      });
       __publicField(this, "getIncludes", (taxonKey) => {
         const { datasetKey } = this.props;
         client(
@@ -88460,7 +88531,6 @@ Please report this to https://github.com/markedjs/marked.`, e2) {
         sourceDataset: null,
         includes: [],
         rank: [],
-        nomStatus: null,
         catalogue: null,
         referenceIndexMap: {},
         sourceDatasetKeyMap: null
@@ -88472,7 +88542,6 @@ Please report this to https://github.com/markedjs/marked.`, e2) {
         this.getInfo(taxonKey);
         this.getRank(taxonKey);
         this.getIncludes(taxonKey);
-        this.getNomStatus(taxonKey);
       }
     }
     render() {
@@ -88490,7 +88559,6 @@ Please report this to https://github.com/markedjs/marked.`, e2) {
         sourceDataset,
         includes: includes2,
         rank,
-        nomStatus,
         taxonError,
         synonymsError,
         classificationError,
@@ -88674,7 +88742,13 @@ Please report this to https://github.com/markedjs/marked.`, e2) {
                 )
               ] })
             ] }),
-            get(taxon, "name.nomStatus") && nomStatus && /* @__PURE__ */ jsxRuntimeExports.jsx(PresentationItem$1, { md, label: "Nomenclatural Status", children: nomStatus[get(taxon, "name.nomStatus")][get(taxon, "name.code"), "zoological"] }),
+            get(taxon, "name.nomStatus") && /* @__PURE__ */ jsxRuntimeExports.jsx(PresentationItem$1, { md, label: "Nomenclatural Status", children: /* @__PURE__ */ jsxRuntimeExports.jsx(
+              NomStatus,
+              {
+                nomStatus: get(taxon, "name.nomStatus"),
+                code: get(taxon, "name.code")
+              }
+            ) }),
             infoError && /* @__PURE__ */ jsxRuntimeExports.jsx(Alert, { message: /* @__PURE__ */ jsxRuntimeExports.jsx(ErrorMsg, { error: infoError }), type: "error" }),
             !isSynonym && get(info, "synonyms") && /* @__PURE__ */ jsxRuntimeExports.jsx(PresentationItem$1, { md, label: "Synonyms and combinations", children: /* @__PURE__ */ jsxRuntimeExports.jsx(
               SynonymsTable,