col-browser 2.1.0 → 2.2.1

package/umd/col-browser.js

@@ -69613,6 +69613,21 @@ html body {
       ] })
     ] });
   };
+  const PREFIX = "col-browser:";
+  function readSetting(key2, fallback) {
+    try {
+      const raw = window.localStorage.getItem(PREFIX + key2);
+      return raw === null ? fallback : JSON.parse(raw);
+    } catch {
+      return fallback;
+    }
+  }
+  function writeSetting(key2, value) {
+    try {
+      window.localStorage.setItem(PREFIX + key2, JSON.stringify(value));
+    } catch {
+    }
+  }
   const INFRASPECIFIC_RANKS$1 = [
     "infraspecific name",
     "species",
@@ -69684,8 +69699,10 @@ html body {
                 /* @__PURE__ */ jsxRuntimeExports.jsx(
                   Checkbox,
                   {
+                    defaultChecked: this.state.showInfo,
                     onChange: ({ target: { checked } }) => {
                       this.setState({ showInfo: checked });
+                      writeSetting("tree-show-source", checked);
                     },
                     children: "Source"
                   }
@@ -69693,9 +69710,10 @@ html body {
                 /* @__PURE__ */ jsxRuntimeExports.jsx(
                   Checkbox,
                   {
-                    defaultChecked: false,
+                    defaultChecked: this.state.hideExtinct,
                     onChange: ({ target: { checked } }) => {
                       this.setState({ hideExtinct: checked });
+                      writeSetting("tree-extant-only", checked);
                     },
                     children: "Extant only"
                   }
@@ -69721,8 +69739,8 @@ html body {
       });
       setAuth(this.props.auth);
       this.state = {
-        hideExtinct: false,
-        showInfo: false,
+        hideExtinct: readSetting("tree-extant-only", false),
+        showInfo: readSetting("tree-show-source", false),
         dataset: null
       };
       this.cache = createTreeCache(this.props.datasetKey);
@@ -70651,6 +70669,7 @@ html body {
       this.getDatasets.cancel();
     }
   }
+  const CONTENT_TYPE_KEY = "search-content-type";
   const FormItem = Form.Item;
   const RadioGroup = Radio.Group;
   const FACET_VOCAB = [
@@ -70781,8 +70800,12 @@ html body {
           params.TAXON_ID = defaultTaxonKey;
         }
         if (isEmpty(params)) {
-          params = defaultParams;
-          this.pushParams(defaultParams);
+          params = { ...defaultParams };
+          const storedContentType = readSetting(CONTENT_TYPE_KEY, void 0);
+          if (storedContentType !== void 0 && storedContentType !== null) {
+            params.sectorMode = storedContentType;
+          }
+          this.pushParams(params);
         } else if (!params.facet) {
           params.facet = FACET_VOCAB;
         }
@@ -70856,6 +70879,7 @@ html body {
         this.setState({ params: query }, () => this.pushParams(query));
       });
       __publicField(this, "updateSearch", (params) => {
+        if ("sectorMode" in params) writeSetting(CONTENT_TYPE_KEY, params.sectorMode);
         let newParams = { ...this.state.params, offset: 0, limit: 50 };
         forEach(params, (v2, k) => {
           newParams[k] = v2;
@@ -78025,25 +78049,9 @@ html body {
     return k == null ? MISSING_COLOR : ESTABLISHMENT_COLORS[k];
   };
   const POSITRON_STYLE = "https://basemaps.cartocdn.com/gl/positron-gl-style/style.json";
-  const GBIF_VISIBLE_STORAGE_KEY = "col-browser:gbif-visible";
-  const readStoredGbifVisible = (defaultValue) => {
-    try {
-      const v2 = window.sessionStorage.getItem(GBIF_VISIBLE_STORAGE_KEY);
-      if (v2 === "true") return true;
-      if (v2 === "false") return false;
-    } catch {
-    }
-    return defaultValue;
-  };
-  const writeStoredGbifVisible = (visible) => {
-    try {
-      window.sessionStorage.setItem(
-        GBIF_VISIBLE_STORAGE_KEY,
-        visible ? "true" : "false"
-      );
-    } catch {
-    }
-  };
+  const GBIF_VISIBLE_KEY = "gbif-visible";
+  const readStoredGbifVisible = (defaultValue) => readSetting(GBIF_VISIBLE_KEY, defaultValue);
+  const writeStoredGbifVisible = (visible) => writeSetting(GBIF_VISIBLE_KEY, visible);
   const GBIF_TILE_PATH = "/v2/map/occurrence/density/{z}/{x}/{y}@1x.png?srs=EPSG%3A3857&style=iNaturalist.poly&bin=hex&hexPerTile=64&hasCoordinate=true&hasGeospatialIssue=false&occurrenceStatus=PRESENT&checklistKey={checklistKey}&taxonKey={taxonKey}";
   const FOCAL_SOURCE = "col-focal-distributions";
   const FOCAL_FILL = "col-focal-fill";
@@ -78175,7 +78183,7 @@ html body {
     const [focalVisible, setFocalVisible] = reactExports.useState(true);
     const isGbifOnly = !!gbifChecklistKey && (!records || records.length === 0);
     const [gbifVisible, setGbifVisible] = reactExports.useState(
-      () => isGbifOnly ? true : readStoredGbifVisible(true)
+      () => readStoredGbifVisible(true)
     );
     const [visibleTaxonIds, setVisibleTaxonIds] = reactExports.useState(/* @__PURE__ */ new Set());
     const [controlOpen, setControlOpen] = reactExports.useState(false);
@@ -78183,10 +78191,14 @@ html body {
     const handleToggleGbif = () => {
       setGbifVisible((v2) => {
         const next2 = !v2;
-        if (!isGbifOnly) writeStoredGbifVisible(next2);
+        writeStoredGbifVisible(next2);
         return next2;
       });
     };
+    const activateGbif = () => {
+      setGbifVisible(true);
+      writeStoredGbifVisible(true);
+    };
     const presentMeans = reactExports.useMemo(() => {
       if (!(records == null ? void 0 : records.length)) return [];
       const seen = /* @__PURE__ */ new Set();
@@ -78603,6 +78615,44 @@ html body {
         }
       );
     }
+    if (isGbifOnly && !gbifVisible) {
+      return /* @__PURE__ */ jsxRuntimeExports.jsxs(
+        "div",
+        {
+          className: "col-distributions-map col-distributions-map--collapsed",
+          style: {
+            display: "flex",
+            alignItems: "center",
+            gap: 6,
+            padding: "8px 12px",
+            background: "#fafafa",
+            border: "1px solid #eee",
+            borderRadius: 4,
+            color: "#666",
+            fontSize: 12
+          },
+          children: [
+            /* @__PURE__ */ jsxRuntimeExports.jsx("span", { children: "No curated distribution data." }),
+            /* @__PURE__ */ jsxRuntimeExports.jsx(
+              "a",
+              {
+                role: "button",
+                tabIndex: 0,
+                style: { cursor: "pointer" },
+                onClick: activateGbif,
+                onKeyDown: (e2) => {
+                  if (e2.key === "Enter" || e2.key === " ") {
+                    e2.preventDefault();
+                    activateGbif();
+                  }
+                },
+                children: "Show GBIF occurrences"
+              }
+            )
+          ]
+        }
+      );
+    }
     const focalName = ((_a2 = focalTaxon == null ? void 0 : focalTaxon.name) == null ? void 0 : _a2.scientificName) || "This taxon";
     return /* @__PURE__ */ jsxRuntimeExports.jsxs("div", { className: "col-distributions-map", style: { position: "relative" }, children: [
       /* @__PURE__ */ jsxRuntimeExports.jsx(
@@ -86546,6 +86596,7 @@ html body {
   }
   var highchartsReact_minExports = requireHighchartsReact_min();
   const HighchartsReact = /* @__PURE__ */ getDefaultExportFromCjs(highchartsReact_minExports);
+  const BREAKDOWN_LEVEL_KEY = "breakdown-level";
   const MAX_SLICES_PER_RING = 100;
   const canonicalRanks = [
     "kingdom",
@@ -86588,10 +86639,15 @@ html body {
     const [options, setOptions] = reactExports.useState(null);
     const [loading, setLoading] = reactExports.useState(false);
     const [invalid, setInvalid] = reactExports.useState(false);
-    const [activeLevel, setActiveLevel] = reactExports.useState(level);
+    const [activeLevel, setActiveLevel] = reactExports.useState(
+      () => showLevelSwitch ? readSetting(BREAKDOWN_LEVEL_KEY, level) : level
+    );
     reactExports.useEffect(() => {
-      setActiveLevel(level);
-    }, [level]);
+      if (!showLevelSwitch) setActiveLevel(level);
+    }, [level, showLevelSwitch]);
+    reactExports.useEffect(() => {
+      if (showLevelSwitch) writeSetting(BREAKDOWN_LEVEL_KEY, activeLevel);
+    }, [activeLevel, showLevelSwitch]);
     reactExports.useEffect(() => {
       if ((taxon == null ? void 0 : taxon.id) && datasetKey) {
         getData();
@@ -89713,8 +89769,10 @@ Please report this to https://github.com/markedjs/marked.`, e2) {
     level = 1,
     showLevelSwitch = false,
     darkMode,
+    auth,
     ...routerProps
   }) => {
+    setAuth(auth);
     const [taxon, setTaxon] = reactExports.useState(null);
     const [dataset, setDataset] = reactExports.useState(null);
     const [rank, setRank] = reactExports.useState([]);
@@ -89753,8 +89811,10 @@ Please report this to https://github.com/markedjs/marked.`, e2) {
     datasetKey,
     gbifChecklistKey,
     style: style2,
+    auth,
     ...routerProps
   }) => {
+    setAuth(auth);
     const [taxon, setTaxon] = reactExports.useState(null);
     const [distributions, setDistributions] = reactExports.useState(null);
     const [rank, setRank] = reactExports.useState([]);
@@ -89827,40 +89887,41 @@ Please report this to https://github.com/markedjs/marked.`, e2) {
     window.addEventListener(evt, cb);
     return () => window.removeEventListener(evt, cb);
   };
-  const hrefFor = (mode, prefix2, args) => {
+  const hrefFor = (mode, prefix2, args, reserved = {}) => {
     if (!prefix2) return null;
     const arg = args == null ? "" : typeof args === "object" ? "" : String(args);
-    const tail = typeof args === "object" && args && Object.keys(args).length > 0 ? `?${queryString.stringify(args, { arrayFormat: "none" })}` : "";
+    const queryObj = typeof args === "object" && args ? { ...args, ...reserved } : { ...reserved };
+    const tail = Object.keys(queryObj).length > 0 ? `?${queryString.stringify(queryObj, { arrayFormat: "none" })}` : "";
     const url = `${prefix2}${arg}${tail}`;
     return isHash(mode) ? `#${url}` : url;
   };
-  const navigate = (mode, navigation2, prefix2, args) => {
+  const navigate = (mode, navigation2, prefix2, args, reserved = {}) => {
     if (!prefix2) return;
     if (navigation2 === "reload") {
-      const url = hrefFor(mode, prefix2, args);
+      const url = hrefFor(mode, prefix2, args, reserved);
       if (url != null && typeof window !== "undefined") {
         window.location.assign(url);
       }
       return;
     }
     let path = prefix2;
-    let search = null;
+    let search = Object.keys(reserved).length > 0 ? { ...reserved } : null;
     if (typeof args === "string" || typeof args === "number") {
       path = `${prefix2}${args}`;
     } else if (args && typeof args === "object") {
-      search = args;
+      search = { ...search || {}, ...args };
     }
     writeLocation(mode, path, search);
   };
-  const buildNavProps = (mode, navigation2, paths) => ({
-    hrefForTaxon: (id) => hrefFor(mode, paths.taxon, id),
-    hrefForTree: (a) => hrefFor(mode, paths.tree, a),
-    hrefForSearch: (a) => hrefFor(mode, paths.search, a),
-    hrefForSource: (id) => hrefFor(mode, paths.source, id),
-    onNavigateToTaxon: (id) => navigate(mode, navigation2, paths.taxon, id),
-    onNavigateToTree: (a) => navigate(mode, navigation2, paths.tree, a),
-    onNavigateToSearch: (a) => navigate(mode, navigation2, paths.search, a),
-    onNavigateToSource: (id) => navigate(mode, navigation2, paths.source, id)
+  const buildNavProps = (mode, navigation2, paths, reserved = {}) => ({
+    hrefForTaxon: (id) => hrefFor(mode, paths.taxon, id, reserved),
+    hrefForTree: (a) => hrefFor(mode, paths.tree, a, reserved),
+    hrefForSearch: (a) => hrefFor(mode, paths.search, a, reserved),
+    hrefForSource: (id) => hrefFor(mode, paths.source, id, reserved),
+    onNavigateToTaxon: (id) => navigate(mode, navigation2, paths.taxon, id, reserved),
+    onNavigateToTree: (a) => navigate(mode, navigation2, paths.tree, a, reserved),
+    onNavigateToSearch: (a) => navigate(mode, navigation2, paths.search, a, reserved),
+    onNavigateToSource: (id) => navigate(mode, navigation2, paths.source, id, reserved)
   });
   const lastSegmentAfter = (path, prefix2) => {
     if (!prefix2) return void 0;
@@ -89872,12 +89933,20 @@ Please report this to https://github.com/markedjs/marked.`, e2) {
     return path.slice(prefix2.length).split("/").filter(Boolean).pop();
   };
   function withRouting(Component, options) {
-    const { kind, mode = "path", navigation: navigation2 = "spa", paths = {} } = options;
+    const { kind, mode = "path", navigation: navigation2 = "spa", paths = {}, query = "" } = options;
+    const reserved = query ? queryString.parse(query) : {};
+    const reservedKeys = Object.keys(reserved);
+    const stripReserved = (obj) => {
+      if (reservedKeys.length === 0) return obj;
+      const out = { ...obj };
+      for (const k of reservedKeys) delete out[k];
+      return out;
+    };
     const Wrapped = (props) => {
       const [tick, setTick] = reactExports.useState(0);
       reactExports.useEffect(() => subscribe(mode, () => setTick((t2) => t2 + 1)), []);
       const { path, search } = readLocationKind(mode);
-      const navProps = reactExports.useMemo(() => buildNavProps(mode, navigation2, paths), []);
+      const navProps = reactExports.useMemo(() => buildNavProps(mode, navigation2, paths, reserved), []);
       let extra = {};
       if (kind === "taxon") {
         extra.taxonKey = lastSegmentAfter(path, paths.taxon);
@@ -89890,7 +89959,7 @@ Please report this to https://github.com/markedjs/marked.`, e2) {
       } else if (kind === "bibtex") {
         extra.sourceDatasetKey = lastSegmentAfter(path, paths.bibtex);
       } else if (kind === "tree") {
-        const parsed = queryString.parse(search);
+        const parsed = stripReserved(queryString.parse(search));
         extra.expandedTaxonKey = parsed.taxonKey || void 0;
         extra.onExpandedTaxonKeyChange = reactExports.useCallback((id) => {
           const cur = readLocationKind(mode);
@@ -89900,11 +89969,11 @@ Please report this to https://github.com/markedjs/marked.`, e2) {
           writeLocation(mode, cur.path || paths.tree || "/", next2);
         }, []);
       } else if (kind === "search") {
-        const parsed = queryString.parse(search, { arrayFormat: "none" });
+        const parsed = stripReserved(queryString.parse(search, { arrayFormat: "none" }));
         extra.filters = parsed;
         extra.onFiltersChange = reactExports.useCallback((filters) => {
           const cur = readLocationKind(mode);
-          writeLocation(mode, cur.path || paths.search || "/", filters);
+          writeLocation(mode, cur.path || paths.search || "/", { ...reserved, ...filters });
         }, []);
       }
       return /* @__PURE__ */ jsxRuntimeExports.jsx(Component, { ...navProps, ...extra, ...props });