@macrostrat/column-views 2.1.4 → 2.2.1

package/src/unit-details/panel.ts

@@ -14,8 +14,12 @@ import {
   Parenthetical,
   Value,
 } from "@macrostrat/data-components";
-import { useMacrostratData, useMacrostratDefs } from "../data-provider";
 import {
+  useColumnUnitsMap,
+  useMacrostratData,
+  useMacrostratDefs,
+} from "../data-provider";
+import type {
   Environment,
   UnitLong,
   UnitLongFull,
@@ -40,7 +44,8 @@ export function UnitDetailsPanel({
   ]),
   lithologyFeatures,
   actions,
-  selectUnit,
+  hiddenActions = null,
+  onSelectUnit,
   columnUnits,
   onClickItem,
 }: {
@@ -49,10 +54,11 @@ export function UnitDetailsPanel({
   showLithologyProportions?: boolean;
   className?: string;
   actions?: ReactNode;
+  hiddenActions?: ReactNode;
   features?: Set<UnitDetailsFeature>;
   lithologyFeatures?: Set<LithologyTagFeature>;
   columnUnits?: UnitLong[];
-  selectUnit?: (unitID: number) => void;
+  onSelectUnit?: (unitID: number) => void;
   onClickItem?: (item: any) => void;
 }) {
   const [showJSON, setShowJSON] = useState(false);
@@ -66,24 +72,27 @@ export function UnitDetailsPanel({
       features,
       lithologyFeatures,
       onClickItem,
+      onSelectUnit,
     });
   }
 
   let title = defaultNameFunction(unit);
 
-  let hiddenActions = null;
   if (features.has(UnitDetailsFeature.JSONToggle)) {
-    hiddenActions = h(Button, {
-      icon: "code",
-      small: true,
-      minimal: true,
-      key: "json-view-toggle",
-      className: classNames("json-view-toggle", { enabled: setShowJSON }),
-      onClick(evt) {
-        setShowJSON(!showJSON);
-        evt.stopPropagation();
-      },
-    });
+    hiddenActions = h([
+      h(Button, {
+        icon: "code",
+        small: true,
+        minimal: true,
+        key: "json-view-toggle",
+        className: classNames("json-view-toggle", { enabled: setShowJSON }),
+        onClick(evt) {
+          setShowJSON(!showJSON);
+          evt.stopPropagation();
+        },
+      }),
+      hiddenActions,
+    ]);
   }
 
   return h("div.unit-details-panel", { className }, [
@@ -114,15 +123,13 @@ export function LegendPanelHeader({
   return h("header.legend-panel-header", [
     h("div.title-container", [
       h.if(title != null)("h3", title),
-      h.if(hiddenActions != null || id != null)(
+      h.if(hiddenActions != null)(
         "span.hidden-actions-container",
-        h("div.hidden-actions", [
-          h.if(id != null)("code.unit-id", id),
-          h.if(hiddenActions != null)([hiddenActions]),
-        ]),
+        h("div.hidden-actions", hiddenActions),
       ),
     ]),
     h("div.spacer"),
+    h.if(id != null)("code.unit-id", id),
     h.if(actions != null)(ButtonGroup, { minimal: true }, actions),
     h.if(onClose != null)(Button, {
       icon: "cross",
@@ -145,7 +152,7 @@ export enum UnitDetailsFeature {
 
 function UnitDetailsContent({
   unit,
-  selectUnit,
+  onSelectUnit,
   columnUnits,
   lithologyFeatures = new Set([
     LithologyTagFeature.Proportion,
@@ -159,7 +166,7 @@ function UnitDetailsContent({
   getItemHref,
 }: {
   unit: UnitLong;
-  selectUnit?: (unitID: number) => void;
+  onSelectUnit?: (unitID: number) => void;
   columnUnits?: UnitLong[];
   lithologyFeatures?: Set<LithologyTagFeature>;
   features?: Set<UnitDetailsFeature>;
@@ -269,12 +276,20 @@ function UnitDetailsContent({
       h(
         DataField,
         { label: "Above" },
-        h(UnitIDList, { units: unit.units_above, selectUnit }),
+        h(UnitIDList, {
+          units: unit.units_above,
+          onSelectUnit,
+          showNames: true,
+        }),
       ),
       h(
         DataField,
         { label: "Below" },
-        h(UnitIDList, { units: unit.units_below, selectUnit }),
+        h(UnitIDList, {
+          units: unit.units_below,
+          onSelectUnit,
+          showNames: true,
+        }),
       ),
     ]),
     colorSwatch,
@@ -529,6 +544,20 @@ function enhanceLithologies(
   });
 }
 
+export function ClickableText({
+  onClick,
+  className,
+  children,
+}: {
+  onClick: () => void;
+  className?: string;
+  children: ReactNode;
+}) {
+  /** An optionally clickable text element */
+  const tag = onClick != null ? "a" : "span";
+  return h(tag, { onClick, className }, children);
+}
+
 export function Identifier({
   id,
   onClick,
@@ -539,51 +568,92 @@ export function Identifier({
   className?: string;
 }) {
   /** An item that displays a numeric identifier, optionally clickable */
-  const tag = onClick != null ? "a" : "span";
+  const _onClick = onClick != null ? () => onClick(id) : null;
+
   return h(
-    tag,
+    ClickableText,
     {
-      onClick() {
-        onClick?.(id);
-      },
-      className: classNames(
-        "identifier",
-        { clickable: onClick != null },
-        className,
-      ),
+      onClick: _onClick,
+      className: classNames("identifier", className),
     },
     id,
   );
 }
 
-function UnitIDList({ units, selectUnit }) {
-  const u1 = units.filter((d) => d != 0);
+type UnitInfo = {
+  unitID: number;
+  colID?: number;
+  name?: string;
+};
 
-  if (u1.length === 0) {
-    return h("span.no-units", "None");
-  }
+function UnitIDList({ units, onSelectUnit, showNames = false }) {
+  const unitsMap = useColumnUnitsMap();
+
+  const extUnits: UnitInfo[] = useMemo(() => {
+    const u1 = units.filter((d) => d != 0);
+    if (showNames) {
+      return u1.map((unitID) => {
+        const unitData = unitsMap?.get(unitID);
+        let name: string = undefined;
+        if (unitData != null) {
+          name = defaultNameFunction(unitData);
+        }
+        return {
+          unitID,
+          colID: unitData?.col_id,
+          name,
+        };
+      });
+    } else {
+      return u1.map((unitID) => ({ unitID }));
+    }
+  }, [units, unitsMap]);
 
-  let tag = "span";
-  if (selectUnit != null) {
-    tag = "a";
+  if (extUnits.length === 0) {
+    return h("span.no-units", "None");
   }
 
   return h(
     ItemList,
-    { className: "unit-id-list" },
-    u1.map((unitID) => {
-      return h(Identifier, {
-        className: "unit-id",
-        onClick() {
-          selectUnit?.(unitID);
-        },
-        key: unitID,
-        id: unitID,
-      });
-    }),
+    { className: "units-list" },
+    extUnits.map((info) =>
+      h("span.item", h(UnitIdentifier, { ...info, onSelectUnit })),
+    ),
   );
 }
 
+function UnitIdentifier({
+  unitID,
+  colID,
+  name,
+  onSelectUnit,
+}: UnitInfo & { onSelectUnit?: (unitID: number) => void }) {
+  const onClick = useMemo(() => {
+    if (onSelectUnit == null) return null;
+    return () => {
+      onSelectUnit(unitID);
+    };
+  }, [onSelectUnit]);
+
+  if (name != null) {
+    return h(
+      ClickableText,
+      {
+        className: "unit-name",
+        onClick,
+      },
+      name,
+    );
+  }
+
+  return h(Identifier, {
+    className: "unit-id",
+    onClick,
+    key: unitID,
+    id: unitID,
+  });
+}
+
 function IntervalProportions({ unit, onClickItem }) {
   const i0 = unit.b_int_id;
   const i1 = unit.t_int_id;

package/src/unit-details/popover.ts

@@ -1,7 +1,7 @@
 import hyper from "@macrostrat/hyper";
 import { Popover } from "@blueprintjs/core";
 import styles from "./popover.module.sass";
-import { useSelectedUnit, useUnitSelectionStore } from "../units";
+import { useSelectedUnit, useUnitSelectionStore } from "../data-provider";
 import { UnitDetailsPanel } from "./panel";
 
 const h = hyper.styled(styles);
@@ -54,6 +54,7 @@ function InteractionBarrier({ children }) {
 
 export function UnitSelectionPopover() {
   const unit = useSelectedUnit();
+  const selectUnit = useUnitSelectionStore((state) => state.onUnitSelected);
   const position = useUnitSelectionStore((state) => state.overlayPosition);
   if (unit == null) {
     return null;
@@ -76,6 +77,10 @@ export function UnitSelectionPopover() {
         unit,
         showLithologyProportions: true,
         className: "legend-panel",
+        onSelectUnit: (id: number) => {
+          console.log("Selected unit in popover:", id);
+          selectUnit(id, null, null);
+        },
       }),
     ),
   );

package/src/units/boxes.ts

@@ -12,12 +12,11 @@ import { SizeAwareLabel, Clickable } from "@macrostrat/ui-components";
 import hyper from "@macrostrat/hyper";
 import { forwardRef, ReactNode, useContext, useMemo } from "react";
 import { resolveID, scalePattern } from "./resolvers";
-import { useUnitSelectionTarget } from "./selection";
+import { useUnitSelectionTarget, useLithologies } from "../data-provider";
 import { IUnit } from "./types";
 import styles from "./boxes.module.sass";
 import classNames from "classnames";
 import { getUnitHeightRange } from "../prepare-units/utils";
-import { useLithologies } from "../data-provider";
 import { getMixedUnitColor } from "./colors";
 import type { RectBounds } from "./types";
 
@@ -45,9 +44,7 @@ interface UnitProps extends Clickable, Partial<RectBounds>, UnitRectOptions {
 }
 
 export interface LabeledUnitProps
-  extends UnitRectOptions,
-    Clickable,
-    Partial<RectBounds> {
+  extends UnitRectOptions, Clickable, Partial<RectBounds> {
   division: IUnit;
   patternID?: string | number;
   label: string;
@@ -162,8 +159,6 @@ function Unit(props: UnitProps) {
 
   const [ref, selected, onClick] = useUnitSelectionTarget(d);
 
-  //const key = `unit-${d.unit_id}`;
-
   return h(
     "g.unit",
     {

package/src/units/composite.ts

@@ -16,8 +16,11 @@ import {
 import { BaseUnit } from "@macrostrat/api-types";
 import { LabeledUnit, UnitBoxes } from "./boxes";
 import styles from "./composite.module.sass";
-import { useMacrostratColumnData } from "../data-provider";
-import { useUnitSelectionDispatch } from "../units";
+import {
+  useCompositeScale,
+  useMacrostratColumnData,
+  useUnitSelectionDispatch,
+} from "../data-provider";
 
 const h = hyperStyled(styles);
 
@@ -157,13 +160,12 @@ export function SectionLabelsColumn(props: ICompositeUnitProps) {
     shouldRenderNote,
   } = props;
 
-  const { sections, totalHeight, axisType } = useMacrostratColumnData();
+  const { totalHeight, axisType } = useMacrostratColumnData();
+  const _compositeScale = useCompositeScale();
 
   const unlabeledUnits = useContext(UnlabeledDivisionsContext);
   const unitsToLabel = noteMode == "unlabeled" ? unlabeledUnits : undefined;
 
-  const _compositeScale = compositeScale(sections);
-
   const selectUnit = useUnitSelectionDispatch();
 
   return h("div.section-labels-column", [
@@ -199,57 +201,12 @@ export function SectionLabelsColumn(props: ICompositeUnitProps) {
   ]);
 }
 
-type CompositeScaleOpts = {
-  clamped?: boolean;
-};
-
 export interface CompositeColumnScale {
   (val: number): number;
   copy(): CompositeColumnScale;
   domain(): number[];
 }
 
-export function compositeScale(
-  sections,
-  opts: CompositeScaleOpts = {},
-): CompositeColumnScale {
-  /** A basic composite scale that works across all sections. This isn't a fully featured,
-   * contiuous D3 scale, but it shares enough attributes to be useful for
-   * laying out notes.
-   */
-  const { clamped = true } = opts;
-
-  const scales = sections.map((group) => {
-    const { scaleInfo } = group;
-    return scaleInfo.scale.copy().clamp(clamped);
-  });
-
-  let baseScale: any = (val) => {
-    // Find the scale for the section that contains the value
-    const scale = scales.find((scale) => {
-      return scale.domain()[0] <= val && val <= scale.domain()[1];
-    });
-
-    if (scale) {
-      return scale(val);
-    } else {
-      // return nan
-      return NaN;
-    }
-  };
-
-  baseScale.copy = () => {
-    return baseScale;
-  };
-
-  baseScale.domain = () => {
-    // Return a domain that covers all sections
-    return [scales[0].domain()[0], scales[scales.length - 1].domain()[1]];
-  };
-
-  return baseScale as CompositeColumnScale;
-}
-
 export function ColumnNotesProvider(props) {
   // A fake column axis provider that allows scales to cross
   const { children, scale, totalHeight, pixelScale } = props;

package/src/units/index.ts

@@ -17,7 +17,6 @@ import { Lithology } from "@macrostrat/api-types";
 
 export * from "./composite";
 export * from "./types";
-export * from "./selection";
 export * from "./colors";
 
 export function UnitsColumn({ width = 100 }) {

package/dist/esm/column-views.02f3732a.js.map

@@ -1 +0,0 @@
-{"mappings":";;;;;;;;;;;;;;;;;;;;AAeA,MAAM,0BAAI,CAAA,GAAA,sBAAI,EAAE,MAAM,CAAC,CAAA,GAAA,uEAAK;AAE5B,MAAM,oCAAc,CAAC,SAAE,KAAK,eAAE,cAAc,gBAAI,aAAa,OAAO;IAClE,MAAM,eAAE,WAAW,EAAE,GAAG,CAAA,GAAA,iBAAS,EAAE,CAAA,GAAA,oBAAY;IAC/C,iCAAiC;IACjC,IAAI,IAAI,KAAK,GAAG,CAAC,KAAK,KAAK,CAAC,cAAc,cAAc;IAExD,OAAO,wBAAE,UAAU;QAAE,WAAW;IAAkB,GAAG;QACnD,wBAAE,CAAA,GAAA,iBAAS,GAAG;YACZ,OAAO;wBACP;QACF;KACD;AACH;AAEO,SAAS,0CAAkB,KAAK;IACrC,MAAM,SAAE,QAAQ,aAAO,OAAO,iBAAM,SAAS,UAAE,MAAM,EAAE,GAAG;IAC1D,OAAO,wBACL,wCACA;mBAAE;QAAW,OAAO;oBAAE;QAAO;IAAE,GAC/B;QACE;QACA;QACA,wBAAE,EAAE,CAAC,MAAM,CAAA,GAAA,oBAAY,GAAG;YAAE,WAAW;QAAgB,GAAG;KAC3D;AAEL;AAEO,SAAS;IACd,MAAM,YAAE,QAAQ,YAAE,QAAQ,eAAE,WAAW,EAAE,GAAG,CAAA,GAAA,yCAAsB;IAElE,MAAM,WAAW,SAAS,GAAG,CAAC,CAAC;QAC7B,OAAO;YACL,KAAK,CAAC,QAAQ,EAAE,QAAQ,UAAU,EAAE;YACpC,GAAG,QAAQ,SAAS;QACtB;IACF;IAEA,OAAO,wBAAE,2CAAsB;kBAC7B;kBACA;qBACA;IACF;AACF;AAQO,SAAS,0CAAqB,KAAsC;IACzE,MAAM,YAAE,QAAQ,eAAE,WAAW,YAAE,QAAQ,EAAE,GAAG;IAE5C,IAAI,YAAY,CAAA,GAAA,qBAAa,EAAE,OAAO,EACpC,OAAO;IAGT,IAAI,YAAoB;IACxB,IAAI,WAAW;IACf,IAAI,YAAY,CAAA,GAAA,qBAAa,EAAE,KAAK,EAAE;QACpC,YAAY;QACZ,WAAW;IACb,OAAO,IAAI,YAAY,CAAA,GAAA,qBAAa,EAAE,MAAM,EAAE;QAC5C,YAAY;QACZ,WAAW;IACb;IAEA,OAAO,wBAAE;QACP,wBAAE,2CAAmB;YACnB,OAAO;YACP,MAAM;YACN,QAAQ;QACV;QACA,wBACE,CAAA,GAAA,UAAE,GACF;YACE,WAAW;YACX,OAAO;gBAAE,OAAO,CAAC,IAAI,CAAC;gBAAE,QAAQ,GAAG,YAAY,EAAE,CAAC;YAAC;YACnD,OAAO;YACP,QAAQ;QACV,GACA,SAAS,GAAG,CAAC,CAAC,OAAO;YACnB,MAAM,OAAE,GAAG,SAAE,KAAK,EAAE,GAAG;YAEvB,OAAO,wBAAE,CAAA,GAAA,cAAM,GAAG;qBAChB;gBACA,WAAW;uBACX;gBACA,eAAe;YACjB;QACF;KAEH;AACH;AAEO,SAAS,0CAAU,OAAE,GAAG,EAAE;IAC/B,qEAAqE,GACrE,MAAM,QAAQ,CAAA,GAAA,wCAAgB;IAC9B,MAAM,WAAW,MAAM;IAEvB,QAAQ,GAAG,CAAC,KAAK;IAEjB,IAAI,OAAO,QAAQ,YAAY,MAC7B,OAAO;IAGT,OAAO,wBACL,kBACA;QACE,OAAO;YACL,KAAK;QACP;IACF,GACA;QAAC,wBAAE;QAAa,wBAAE,CAAA,GAAA,yCAAO,GAAG;iBAAE;YAAK,WAAW;QAAQ;KAAG;AAE7D","sources":["packages/column-views/src/age-axis.ts"],"sourcesContent":["import hyper from \"@macrostrat/hyper\";\nimport {\n  SVG,\n  ColumnAxis,\n  ColumnContext,\n  ColumnAxisType,\n  AgeAxis,\n} from \"@macrostrat/column-components\";\nimport { useContext } from \"react\";\nimport styles from \"./age-axis.module.sass\";\nimport { useCompositeScale, useMacrostratColumnData } from \"./data-provider\";\nimport { Parenthetical } from \"@macrostrat/data-components\";\nimport { PackageScaleLayoutData } from \"./prepare-units/composite-scale\";\nimport { AgeLabel } from \"./unit-details\";\n\nconst h = hyper.styled(styles);\n\nconst AgeAxisCore = ({ ticks, tickSpacing = 40, showDomain = false }) => {\n  const { pixelHeight } = useContext(ColumnContext);\n  // A tick roughly every 40 pixels\n  let v = Math.max(Math.round(pixelHeight / tickSpacing), 1);\n\n  return h(\"g.axis\", { transform: \"translate(20 0)\" }, [\n    h(ColumnAxis, {\n      ticks: v,\n      showDomain,\n    }),\n  ]);\n};\n\nexport function VerticalAxisLabel(props) {\n  const { label = \"Age\", unit = \"Ma\", className, height } = props;\n  return h(\n    \"div.column-axis-label.age-axis-label\",\n    { className, style: { height } },\n    [\n      label,\n      \" \",\n      h.if(unit)(Parenthetical, { className: \"age-axis-unit\" }, unit),\n    ],\n  );\n}\n\nexport function CompositeAgeAxis() {\n  const { axisType, sections, totalHeight } = useMacrostratColumnData();\n\n  const packages = sections.map((section) => {\n    return {\n      key: `section-${section.section_id}`,\n      ...section.scaleInfo,\n    };\n  });\n\n  return h(CompositeAgeAxisCore, {\n    axisType,\n    packages,\n    totalHeight,\n  });\n}\n\nexport interface CompositeStratigraphicScaleInfo {\n  axisType: ColumnAxisType;\n  totalHeight: number;\n  packages: PackageScaleLayoutData[];\n}\n\nexport function CompositeAgeAxisCore(props: CompositeStratigraphicScaleInfo) {\n  const { axisType, totalHeight, packages } = props;\n\n  if (axisType == ColumnAxisType.ORDINAL) {\n    return null;\n  }\n\n  let axisLabel: string = \"Age\";\n  let axisUnit = \"Ma\";\n  if (axisType == ColumnAxisType.DEPTH) {\n    axisLabel = \"Depth\";\n    axisUnit = \"m\";\n  } else if (axisType == ColumnAxisType.HEIGHT) {\n    axisLabel = \"Height\";\n    axisUnit = \"m\";\n  }\n\n  return h([\n    h(VerticalAxisLabel, {\n      label: axisLabel,\n      unit: axisUnit,\n      height: totalHeight,\n    }),\n    h(\n      SVG,\n      {\n        className: \"age-axis-column\",\n        style: { width: `22px`, height: `${totalHeight}px` },\n        width: 22,\n        height: totalHeight,\n      },\n      packages.map((group, i) => {\n        const { key, scale } = group;\n\n        return h(AgeAxis, {\n          key,\n          className: \"age-axis\",\n          scale,\n          tickSizeOuter: 3,\n        });\n      }),\n    ),\n  ]);\n}\n\nexport function AgeCursor({ age }) {\n  /** A cursor that shows the age at a specific point on the age axis. */\n  const scale = useCompositeScale();\n  const heightPx = scale(age);\n\n  console.log(age, heightPx);\n\n  if (age == null || heightPx == null) {\n    return null;\n  }\n\n  return h(\n    \"div.age-cursor\",\n    {\n      style: {\n        top: heightPx,\n      },\n    },\n    [h(\"div.line\"), h(AgeLabel, { age, className: \"label\" })],\n  );\n}\n"],"names":[],"version":3,"file":"column-views.02f3732a.js.map"}

package/dist/esm/column-views.0a159282.js

@@ -1,13 +0,0 @@
-import {fetchAllColumns as $33a46f9423c8104a$export$45bd78cd093090fa, useColumnFeatures as $33a46f9423c8104a$export$e3270a4e30e40ff9, fetchLithologies as $33a46f9423c8104a$export$1aa679bd5e605f82, fetchIntervals as $33a46f9423c8104a$export$5d2ec2e733dfe6c7, fetchEnvironments as $33a46f9423c8104a$export$780b4b253712916c, fetchRefs as $33a46f9423c8104a$export$cd7bfa0860f58b96, fetchStratNames as $33a46f9423c8104a$export$8ea8f45a7ffe4183, fetchUnits as $33a46f9423c8104a$export$b97b9bdd6a521298, fetchColumnUnits as $33a46f9423c8104a$export$d3d8b0fabcc76c5d} from "./column-views.3f246167.js";
-import {useMacrostratStore as $774a5efa27d1c77b$export$fb98d5bae3a6800, useMacrostratDefs as $774a5efa27d1c77b$export$89dd4e5ae4a82373, useMacrostratColumns as $774a5efa27d1c77b$export$81eaae0b474404fd, useMacrostratData as $774a5efa27d1c77b$export$b9c9fc603d74a555, MacrostratDataProvider as $774a5efa27d1c77b$export$690613f93cdc5576, MacrostratAPIProvider as $774a5efa27d1c77b$export$3098013bc6cc316d, MacrostratColumnProvider as $774a5efa27d1c77b$export$9e42f9b6e0d67c7d, LithologiesProvider as $774a5efa27d1c77b$export$8492a5cae82b6a70, useLithologies as $774a5efa27d1c77b$export$4d18a90c945d129f, useEnvironments as $774a5efa27d1c77b$export$c6b216bf4c71b61f} from "./column-views.7ca9e1cd.js";
-import {useColumnNav as $b8de97dfa82f4910$export$91cb5ac808759b34, ColumnNavProvider as $b8de97dfa82f4910$export$36fed9e0f93a8fde} from "./column-views.6d6b73b4.js";
-import {MacrostratColumnDataProvider as $d5074f164411387e$export$7fec7bd80ff9c10e, useMacrostratColumnData as $d5074f164411387e$export$f8509b7cce386c7d, useMacrostratUnits as $d5074f164411387e$export$6fb40844db555b2, useCompositeScale as $d5074f164411387e$export$a7fc62995ec4f76} from "./column-views.1e055ed5.js";
-
-
-
-
-
-
-
-export {$33a46f9423c8104a$export$45bd78cd093090fa as fetchAllColumns, $33a46f9423c8104a$export$e3270a4e30e40ff9 as useColumnFeatures, $33a46f9423c8104a$export$1aa679bd5e605f82 as fetchLithologies, $33a46f9423c8104a$export$5d2ec2e733dfe6c7 as fetchIntervals, $33a46f9423c8104a$export$780b4b253712916c as fetchEnvironments, $33a46f9423c8104a$export$cd7bfa0860f58b96 as fetchRefs, $33a46f9423c8104a$export$8ea8f45a7ffe4183 as fetchStratNames, $33a46f9423c8104a$export$b97b9bdd6a521298 as fetchUnits, $33a46f9423c8104a$export$d3d8b0fabcc76c5d as fetchColumnUnits, $774a5efa27d1c77b$export$fb98d5bae3a6800 as useMacrostratStore, $774a5efa27d1c77b$export$89dd4e5ae4a82373 as useMacrostratDefs, $774a5efa27d1c77b$export$81eaae0b474404fd as useMacrostratColumns, $774a5efa27d1c77b$export$b9c9fc603d74a555 as useMacrostratData, $774a5efa27d1c77b$export$690613f93cdc5576 as MacrostratDataProvider, $774a5efa27d1c77b$export$3098013bc6cc316d as MacrostratAPIProvider, $774a5efa27d1c77b$export$9e42f9b6e0d67c7d as MacrostratColumnProvider, $774a5efa27d1c77b$export$8492a5cae82b6a70 as LithologiesProvider, $774a5efa27d1c77b$export$4d18a90c945d129f as useLithologies, $774a5efa27d1c77b$export$c6b216bf4c71b61f as useEnvironments, $b8de97dfa82f4910$export$91cb5ac808759b34 as useColumnNav, $b8de97dfa82f4910$export$36fed9e0f93a8fde as ColumnNavProvider, $d5074f164411387e$export$7fec7bd80ff9c10e as MacrostratColumnDataProvider, $d5074f164411387e$export$f8509b7cce386c7d as useMacrostratColumnData, $d5074f164411387e$export$6fb40844db555b2 as useMacrostratUnits, $d5074f164411387e$export$a7fc62995ec4f76 as useCompositeScale};
-//# sourceMappingURL=column-views.0a159282.js.map

package/dist/esm/column-views.1e055ed5.js

@@ -1,53 +0,0 @@
-import {createCompositeScale as $728f6cf6c12cd490$export$3ada7641926a616d} from "./column-views.4ab0ec82.js";
-import {createContext as $a90Ta$createContext, useMemo as $a90Ta$useMemo, useContext as $a90Ta$useContext} from "react";
-import $a90Ta$macrostrathyper from "@macrostrat/hyper";
-
-
-
-
-const $d5074f164411387e$var$MacrostratColumnDataContext = (0, $a90Ta$createContext)(null);
-function $d5074f164411387e$export$7fec7bd80ff9c10e({ children: children, units: units, sections: sections, totalHeight: totalHeight, axisType: axisType }) {
-    /** Provider for Macrostrat column data.
-   * As a general rule, we want to provide data and column-axis
-   * height calculations through the context, since these need to
-   * be accessed by any component that lays out information on the
-   * column.
-   *
-   * Cross-axis layout and view configuration (e.g., showing and hiding
-   * of different components or labels) should be handled through passing
-   * props to the components themselves.
-   * */ const value = (0, $a90Ta$useMemo)(()=>{
-        return {
-            units: units,
-            sections: sections,
-            totalHeight: totalHeight,
-            axisType: axisType
-        };
-    }, [
-        units,
-        sections,
-        totalHeight,
-        axisType
-    ]);
-    return (0, $a90Ta$macrostrathyper)($d5074f164411387e$var$MacrostratColumnDataContext.Provider, {
-        value: value
-    }, children);
-}
-function $d5074f164411387e$export$f8509b7cce386c7d() {
-    const ctx = (0, $a90Ta$useContext)($d5074f164411387e$var$MacrostratColumnDataContext);
-    if (!ctx) throw new Error("useMacrostratColumnData must be used within a MacrostratColumnDataProvider");
-    return ctx;
-}
-function $d5074f164411387e$export$6fb40844db555b2() {
-    return $d5074f164411387e$export$f8509b7cce386c7d().units;
-}
-function $d5074f164411387e$export$a7fc62995ec4f76() {
-    const ctx = $d5074f164411387e$export$f8509b7cce386c7d();
-    return (0, $a90Ta$useMemo)(()=>(0, $728f6cf6c12cd490$export$3ada7641926a616d)(ctx.sections, true), [
-        ctx.sections
-    ]);
-}
-
-
-export {$d5074f164411387e$export$7fec7bd80ff9c10e as MacrostratColumnDataProvider, $d5074f164411387e$export$f8509b7cce386c7d as useMacrostratColumnData, $d5074f164411387e$export$6fb40844db555b2 as useMacrostratUnits, $d5074f164411387e$export$a7fc62995ec4f76 as useCompositeScale};
-//# sourceMappingURL=column-views.1e055ed5.js.map

package/dist/esm/column-views.1e055ed5.js.map

@@ -1 +0,0 @@
-{"mappings":";;;;;;;AAuBA,MAAM,oDACJ,CAAA,GAAA,oBAAY,EAA+B;AAEtC,SAAS,0CAA6B,YAC3C,QAAQ,SACR,KAAK,YACL,QAAQ,eACR,WAAW,YACX,QAAQ,EAC8C;IACtD;;;;;;;;;KASG,GAEH,MAAM,QAAQ,CAAA,GAAA,cAAM,EAAE;QACpB,OAAO;mBACL;sBACA;yBACA;sBACA;QACF;IACF,GAAG;QAAC;QAAO;QAAU;QAAa;KAAS;IAE3C,OAAO,CAAA,GAAA,sBAAA,EAAE,kDAA4B,QAAQ,EAAE;eAAE;IAAM,GAAG;AAC5D;AAEO,SAAS;IACd,MAAM,MAAM,CAAA,GAAA,iBAAS,EAAE;IACvB,IAAI,CAAC,KACH,MAAM,IAAI,MACR;IAGJ,OAAO;AACT;AAEO,SAAS;IACd,OAAO,4CAA0B,KAAK;AACxC;AAEO,SAAS;IACd,MAAM,MAAM;IACZ,OAAO,CAAA,GAAA,cAAM,EACX,IAAM,CAAA,GAAA,yCAAmB,EAAE,IAAI,QAAQ,EAAE,OACzC;QAAC,IAAI,QAAQ;KAAC;AAElB","sources":["packages/column-views/src/data-provider/store.ts"],"sourcesContent":["import {\n  createContext,\n  useContext,\n  ReactNode,\n  useMemo,\n  useEffect,\n} from \"react\";\nimport h from \"@macrostrat/hyper\";\nimport {\n  createCompositeScale,\n  PackageLayoutData,\n  CompositeColumnScale,\n} from \"../prepare-units/composite-scale\";\nimport { ExtUnit } from \"../prepare-units/helpers\";\nimport { ColumnAxisType } from \"@macrostrat/column-components\";\n\nexport interface MacrostratColumnDataContext {\n  units: ExtUnit[];\n  sections: PackageLayoutData[];\n  totalHeight?: number;\n  axisType?: ColumnAxisType;\n}\n\nconst MacrostratColumnDataContext =\n  createContext<MacrostratColumnDataContext>(null);\n\nexport function MacrostratColumnDataProvider({\n  children,\n  units,\n  sections,\n  totalHeight,\n  axisType,\n}: MacrostratColumnDataContext & { children: ReactNode }) {\n  /** Provider for Macrostrat column data.\n   * As a general rule, we want to provide data and column-axis\n   * height calculations through the context, since these need to\n   * be accessed by any component that lays out information on the\n   * column.\n   *\n   * Cross-axis layout and view configuration (e.g., showing and hiding\n   * of different components or labels) should be handled through passing\n   * props to the components themselves.\n   * */\n\n  const value = useMemo(() => {\n    return {\n      units,\n      sections,\n      totalHeight,\n      axisType,\n    };\n  }, [units, sections, totalHeight, axisType]);\n\n  return h(MacrostratColumnDataContext.Provider, { value }, children);\n}\n\nexport function useMacrostratColumnData() {\n  const ctx = useContext(MacrostratColumnDataContext);\n  if (!ctx) {\n    throw new Error(\n      \"useMacrostratColumnData must be used within a MacrostratColumnDataProvider\",\n    );\n  }\n  return ctx;\n}\n\nexport function useMacrostratUnits() {\n  return useMacrostratColumnData().units;\n}\n\nexport function useCompositeScale(): CompositeColumnScale {\n  const ctx = useMacrostratColumnData();\n  return useMemo(\n    () => createCompositeScale(ctx.sections, true),\n    [ctx.sections],\n  );\n}\n"],"names":[],"version":3,"file":"column-views.1e055ed5.js.map"}

package/dist/esm/column-views.2ff3dd8b.js.map

@@ -1 +0,0 @@
-{"mappings":";;;;;;;;;;;;;;;;;;;;;;AAcA,MAAM,0BAAI,CAAA,GAAA,sBAAI,EAAE,MAAM,CAAC,CAAA,GAAA,uEAAK;AAgB5B,SAAS,sCAAgB,QAAE,IAAI,EAAE;IAC/B,MAAM,UAAE,MAAM,UAAE,MAAM,EAAE,GAAG,CAAA,GAAA,kBAAU;IAErC,MAAM,SAAE,KAAK,SAAE,KAAK,EAAE,GAAG;IACzB,MAAM,IAAI,OAAO;IACjB,MAAM,KAAK,OAAO;IAElB,OAAO,wBAAE,yBAAyB;WAAE;QAAG,OAAO,KAAK;QAAG,GAAG;gBAAG;IAAO;AACrE;AAEA,SAAS,0CAAc,KAAwB;IAC7C,MAAM,QAAE,IAAI,SAAE,KAAK,UAAE,MAAM,SAAE,KAAK,WAAE,OAAO,EAAE,GAAG;IAChD,MAAM,QAAE,IAAI,QAAE,IAAI,EAAE,GAAG;IACvB,MAAM,YAAE,QAAQ,EAAE,GAAG,IAAI,CAAC,EAAE;IAE5B,MAAM,SAAS;IAEf,MAAM,aAAa,SAAS,SAAS;IACrC,MAAM,iBAAiB,aAAa;IAEpC,OAAO,wBACL,sBACA;QAAE,WAAW,CAAA,GAAA,iBAAS,EAAE;YAAE,aAAa;QAAe;IAAG,GACzD;QACE,wBACE,CAAA,GAAA,2BAAmB,GACnB;mBAAE;YAAO,aAAa;YAAQ,gBAAgB;YAAM,eAAe;QAAG,GACtE;YACE,wBAAE,EAAE,CAAC,QAAQ,MAAM,uCAAiB;sBAAE;YAAK;YAC3C,KAAK,GAAG,CAAC,CAAC;gBACR,OAAO,wBAAE,CAAA,GAAA,qBAAa,GAAG;oBACvB,WAAW;oBACX,MAAM,EAAE,aAAa;oBACrB,OAAO;gBACT;YACF;SACD;KAEJ;AAEL;AAEA,MAAM,qCAAe,CAAC,KAAO,CAAC,IAAM,EAAE,OAAO,IAAI,EAAE,CAAC,EAAE,CAAC,OAAO;AAE9D,SAAS,0CAAe,YAAE,QAAQ,SAAE,QAAQ,WAAW;IACrD,MAAM,OAAO,CAAA,GAAA,yCAAsB,EAAE;QAAE,QAAQ;IAAS;IACxD,MAAM,QAAQ,CAAA,GAAA,wCAAiB;IAE/B,MAAM,QAAe,CAAA,GAAA,cAAM,EAAE;QAC3B,IAAI,QAAQ,QAAQ,SAAS,MAAM,OAAO,EAAE;QAC5C,IAAI,aAAa,MAAM,IAAI,CAAC,KAAK,MAAM;QACvC,WAAW,IAAI,CAAC,CAAC,GAAG;YAClB,MAAM,KAAK,MAAM,SAAS,CAAC,mCAAa;YACxC,MAAM,KAAK,MAAM,SAAS,CAAC,mCAAa;YACxC,OAAO,KAAK;QACd;QAEA,MAAM,QAAQ,WAAW,GAAG,CAAC,CAAC;YAC5B,MAAM,OAAO,MAAM,IAAI,CAAC,mCAAa;YACrC,OAAO;gBACL,YAAY,MAAM;gBAClB,QAAQ,MAAM;gBACd,MAAM;sBACN;gBACA,IAAI,MAAM;YACZ;QACF;QAEA,OAAO,MAAM,MAAM,CAAC,CAAC,IAAM,EAAE,IAAI,IAAI;IACvC,GAAG;QAAC;QAAM;KAAM;IAEhB,MAAM,QAAQ;IACd,MAAM,cAAc;IAEpB,MAAM,gBAAgB,QAAQ;IAE9B,MAAM,gBAAgB,CAAA,GAAA,cAAM,EAAE;QAC5B,OAAO,CAAC;YACN,OAAO,wBAAE,2CAAe;gBACtB,OAAO;gBACP,QAAQ;uBACR;gBACA,GAAG,KAAK;YACV;QACF;IACF,GAAG;QAAC;QAAO;KAAM;IAEjB,IAAI,QAAQ,QAAQ,SAAS,MAAM,OAAO;IAE1C,OAAO,wBACL,kBACA,wBAAE,CAAA,GAAA,yCAAU,GAAG;eACb;qBACA;eACA;uBACA;QACA,0BAA0B;IAC5B;AAEJ","sources":["packages/column-views/src/facets/detrital-zircon/index.ts"],"sourcesContent":["import {\n  DetritalSpectrumPlot,\n  DetritalSeries,\n  usePlotArea,\n} from \"@macrostrat/data-components\";\nimport { IUnit } from \"../../units/types\";\nimport hyper from \"@macrostrat/hyper\";\nimport { useDetritalMeasurements, MeasurementInfo } from \"./provider\";\nimport { useMacrostratUnits } from \"../../data-provider\";\nimport { ColumnNotes } from \"../../notes\";\nimport { useMemo } from \"react\";\nimport styles from \"./index.module.sass\";\nimport classNames from \"classnames\";\n\nconst h = hyper.styled(styles);\n\ninterface DetritalItemProps {\n  note: {\n    data: MeasurementInfo[];\n    unit?: IUnit;\n  };\n  spacing?: {\n    below?: number;\n    above?: number;\n  };\n  width?: number;\n  height?: number;\n  color?: string;\n}\n\nfunction DepositionalAge({ unit }) {\n  const { xScale, height } = usePlotArea();\n\n  const { t_age, b_age } = unit;\n  const x = xScale(t_age);\n  const x1 = xScale(b_age);\n\n  return h(\"rect.depositional-age\", { x, width: x1 - x, y: 0, height });\n}\n\nfunction DetritalGroup(props: DetritalItemProps) {\n  const { note, width, height, color, spacing } = props;\n  const { data, unit } = note;\n  const { geo_unit } = data[0];\n\n  const _color = color;\n\n  const spaceBelow = spacing?.below ?? 100;\n  const hideAxisLabels = spaceBelow < 60;\n\n  return h(\n    \"div.detrital-group\",\n    { className: classNames({ \"hide-axis\": hideAxisLabels }) },\n    [\n      h(\n        DetritalSpectrumPlot,\n        { width, innerHeight: height, showAxisLabels: true, paddingBottom: 40 },\n        [\n          h.if(unit != null)(DepositionalAge, { unit }),\n          data.map((d) => {\n            return h(DetritalSeries, {\n              bandwidth: 20,\n              data: d.measure_value,\n              color: _color,\n            });\n          }),\n        ],\n      ),\n    ],\n  );\n}\n\nconst matchingUnit = (dz) => (d) => d.unit_id == dz[0].unit_id;\n\nfunction DetritalColumn({ columnID, color = \"magenta\" }) {\n  const data = useDetritalMeasurements({ col_id: columnID });\n  const units = useMacrostratUnits();\n\n  const notes: any[] = useMemo(() => {\n    if (data == null || units == null) return [];\n    let dzUnitData = Array.from(data.values());\n    dzUnitData.sort((a, b) => {\n      const v1 = units.findIndex(matchingUnit(a));\n      const v2 = units.findIndex(matchingUnit(b));\n      return v1 - v2;\n    });\n\n    const data1 = dzUnitData.map((d) => {\n      const unit = units.find(matchingUnit(d));\n      return {\n        top_height: unit?.t_age,\n        height: unit?.b_age,\n        data: d,\n        unit,\n        id: unit?.unit_id,\n      };\n    });\n\n    return data1.filter((d) => d.unit != null);\n  }, [data, units]);\n\n  const width = 400;\n  const paddingLeft = 40;\n\n  const spectrumWidth = width - paddingLeft;\n\n  const noteComponent = useMemo(() => {\n    return (props) => {\n      return h(DetritalGroup, {\n        width: spectrumWidth,\n        height: 40,\n        color,\n        ...props,\n      });\n    };\n  }, [width, color]);\n\n  if (data == null || units == null) return null;\n\n  return h(\n    \"div.dz-spectra\",\n    h(ColumnNotes, {\n      width,\n      paddingLeft,\n      notes,\n      noteComponent,\n      deltaConnectorAttachment: 20,\n    }),\n  );\n}\n\nexport { DetritalColumn, DetritalGroup };\n"],"names":[],"version":3,"file":"column-views.2ff3dd8b.js.map"}

package/dist/esm/column-views.3048acc1.js

@@ -1,66 +0,0 @@
-import {group as $7EBVZ$group} from "d3-array";
-import {createAPIContext as $7EBVZ$createAPIContext, useAPIResult as $7EBVZ$useAPIResult} from "@macrostrat/ui-components";
-
-
-
-const $a3ff7da576c02df0$var$responseUnwrapper = (d)=>d.records;
-const $a3ff7da576c02df0$var$pbdbAPIContext = (0, $7EBVZ$createAPIContext)({
-    baseURL: "https://training.paleobiodb.org/data1.2",
-    unwrapResponse: $a3ff7da576c02df0$var$responseUnwrapper
-});
-var $a3ff7da576c02df0$export$a990c76b38782f57 = /*#__PURE__*/ function(FossilDataType) {
-    FossilDataType["Occurrences"] = "occs";
-    FossilDataType["Collections"] = "colls";
-    return FossilDataType;
-}({});
-function $a3ff7da576c02df0$export$c4ed16553d869511(type, { col_id: col_id }) {
-    const params = {
-        ms_column: col_id,
-        show: "full,mslink"
-    };
-    return (0, $7EBVZ$useAPIResult)(`/${type}/list.json`, params, {
-        context: $a3ff7da576c02df0$var$pbdbAPIContext
-    });
-}
-function $a3ff7da576c02df0$var$useMacrostratFossilData({ col_id: col_id }) {
-    return (0, $7EBVZ$useAPIResult)("/fossils", {
-        col_id: col_id
-    });
-}
-function $a3ff7da576c02df0$var$createMacrostratCollection(d) {
-    let unit_id = null;
-    let col_id = null;
-    // Standardize names of Macrostrat units and columns
-    if (d.msu !== null) unit_id = parseInt(d.msu.replace(/^\w+:/, ""));
-    if (d.msc !== null) col_id = parseInt(d.msc.replace(/^\w+:/, ""));
-    return {
-        ...d,
-        unit_id: unit_id,
-        col_id: col_id,
-        cltn_id: parseInt(d.oid.replace(/^col:/, "")),
-        cltn_name: d.nam,
-        t_age: d.t_age,
-        b_age: d.b_age
-    };
-}
-function $a3ff7da576c02df0$export$e6af757fa9780077({ col_id: col_id }) {
-    // Fossil links are stored in both Macrostrat and PBDB, depending on how the link was assembled. Here
-    // we create a unified view of data over both sources.
-    const r1 = $a3ff7da576c02df0$export$c4ed16553d869511("colls", {
-        col_id: col_id
-    });
-    const r2 = $a3ff7da576c02df0$var$useMacrostratFossilData({
-        col_id: col_id
-    });
-    if (r1 == null || r2 == null) return null;
-    const r1a = r1.map($a3ff7da576c02df0$var$createMacrostratCollection);
-    const data = [
-        ...r1a,
-        ...r2
-    ];
-    return (0, $7EBVZ$group)(data, (d)=>d.unit_id);
-}
-
-
-export {$a3ff7da576c02df0$export$a990c76b38782f57 as FossilDataType, $a3ff7da576c02df0$export$c4ed16553d869511 as usePBDBFossilData, $a3ff7da576c02df0$export$e6af757fa9780077 as useFossilData};
-//# sourceMappingURL=column-views.3048acc1.js.map

package/dist/esm/column-views.3048acc1.js.map

@@ -1 +0,0 @@
-{"mappings":";;;;;AAGA,MAAM,0CAAoB,CAAC,IAAM,EAAE,OAAO;AAE1C,MAAM,uCAAiB,CAAA,GAAA,uBAAe,EAAE;IACtC,SAAS;IACT,gBAAgB;AAClB;AAEO,IAAA,AAAK,mEAAA;;;WAAA;;AAKL,SAAS,0CACd,IAAoB,EACpB,UAAE,MAAM,EAAE;IAEV,MAAM,SAAS;QACb,WAAW;QACX,MAAM;IACR;IACA,OAAO,CAAA,GAAA,mBAAW,EAAE,CAAC,CAAC,EAAE,KAAK,UAAU,CAAC,EAAE,QAAQ;QAChD,SAAS;IACX;AACF;AAaA,SAAS,8CAAwB,UAAE,MAAM,EAAE;IACzC,OAAO,CAAA,GAAA,mBAAW,EAAE,YAAY;gBAAE;IAAO;AAC3C;AAEA,SAAS,iDAA2B,CAAC;IACnC,IAAI,UAAU;IACd,IAAI,SAAS;IACb,oDAAoD;IACpD,IAAI,EAAE,GAAG,KAAK,MACZ,UAAU,SAAS,EAAE,GAAG,CAAC,OAAO,CAAC,SAAS;IAE5C,IAAI,EAAE,GAAG,KAAK,MACZ,SAAS,SAAS,EAAE,GAAG,CAAC,OAAO,CAAC,SAAS;IAG3C,OAAO;QACL,GAAG,CAAC;iBACJ;gBACA;QACA,SAAS,SAAS,EAAE,GAAG,CAAC,OAAO,CAAC,SAAS;QACzC,WAAW,EAAE,GAAG;QAChB,OAAO,EAAE,KAAK;QACd,OAAO,EAAE,KAAK;IAChB;AACF;AAEO,SAAS,0CAAc,UAAE,MAAM,EAAE;IACtC,qGAAqG;IACrG,sDAAsD;IAEtD,MAAM,KAAK,mDAA8C;gBAAE;IAAO;IAElE,MAAM,KAAK,8CAAwB;gBAAE;IAAO;IAE5C,IAAI,MAAM,QAAQ,MAAM,MAAM,OAAO;IACrC,MAAM,MAAM,GAAG,GAAG,CAAC;IAEnB,MAAM,OAAO;WAAI;WAAQ;KAAG;IAE5B,OAAO,CAAA,GAAA,YAAI,EAAE,MAAM,CAAC,IAAM,EAAE,OAAO;AACrC","sources":["packages/column-views/src/facets/fossils/provider.ts"],"sourcesContent":["import { group } from \"d3-array\";\nimport { createAPIContext, useAPIResult } from \"@macrostrat/ui-components\";\n\nconst responseUnwrapper = (d) => d.records;\n\nconst pbdbAPIContext = createAPIContext({\n  baseURL: \"https://training.paleobiodb.org/data1.2\",\n  unwrapResponse: responseUnwrapper,\n});\n\nexport enum FossilDataType {\n  Occurrences = \"occs\",\n  Collections = \"colls\",\n}\n\nexport function usePBDBFossilData(\n  type: FossilDataType,\n  { col_id },\n): any[] | null {\n  const params = {\n    ms_column: col_id,\n    show: \"full,mslink\",\n  };\n  return useAPIResult(`/${type}/list.json`, params, {\n    context: pbdbAPIContext,\n  });\n}\n\nexport interface PBDBCollection {\n  unit_id: number;\n  col_id: number;\n  cltn_id: number;\n  cltn_name: string;\n  pbdb_occs: number;\n  t_age: number;\n  b_age: number;\n  [key: string]: any; // Allow for additional properties\n}\n\nfunction useMacrostratFossilData({ col_id }): PBDBCollection[] | null {\n  return useAPIResult(\"/fossils\", { col_id });\n}\n\nfunction createMacrostratCollection(d): PBDBCollection {\n  let unit_id = null;\n  let col_id = null;\n  // Standardize names of Macrostrat units and columns\n  if (d.msu !== null) {\n    unit_id = parseInt(d.msu.replace(/^\\w+:/, \"\"));\n  }\n  if (d.msc !== null) {\n    col_id = parseInt(d.msc.replace(/^\\w+:/, \"\"));\n  }\n\n  return {\n    ...d,\n    unit_id,\n    col_id,\n    cltn_id: parseInt(d.oid.replace(/^col:/, \"\")),\n    cltn_name: d.nam,\n    t_age: d.t_age,\n    b_age: d.b_age,\n  };\n}\n\nexport function useFossilData({ col_id }) {\n  // Fossil links are stored in both Macrostrat and PBDB, depending on how the link was assembled. Here\n  // we create a unified view of data over both sources.\n\n  const r1 = usePBDBFossilData(FossilDataType.Collections, { col_id });\n\n  const r2 = useMacrostratFossilData({ col_id });\n\n  if (r1 == null || r2 == null) return null;\n  const r1a = r1.map(createMacrostratCollection);\n\n  const data = [...r1a, ...r2];\n\n  return group(data, (d) => d.unit_id);\n}\n"],"names":[],"version":3,"file":"column-views.3048acc1.js.map"}

package/dist/esm/column-views.38a305a0.js

@@ -1,13 +0,0 @@
-import {TruncatedList as $b9286605a04210d4$export$653e47a7a0da0f0d, PBDBFossilsColumn as $b9286605a04210d4$export$554267114407ef68, BaseMeasurementsColumn as $b9286605a04210d4$export$ce5c4f2fdf4e644d} from "./column-views.8703a35b.js";
-import {DetritalGroup as $715dd5fedd79146a$export$1b3047373cd1c8c7, DetritalColumn as $715dd5fedd79146a$export$f176396e104db8d5} from "./column-views.2ff3dd8b.js";
-import {IsotopesDataset as $d71d096cfe00860f$export$c69bd0285aa5d775, IsotopesColumn as $d71d096cfe00860f$export$5d8aa8022c284748, MeasurementDataContext as $5dbb619f2c7bef60$export$c644ef985ce7a4c4, MeasurementDataProvider as $5dbb619f2c7bef60$export$5f01d5b342a89841, useMeasurementData as $5dbb619f2c7bef60$export$8a0335fd9ff72150} from "./column-views.86619334.js";
-import {SGPMeasurementsColumn as $6ff130029901daab$export$c49cf57576706bab} from "./column-views.97d542eb.js";
-
-
-
-
-
-
-
-export {$b9286605a04210d4$export$653e47a7a0da0f0d as TruncatedList, $b9286605a04210d4$export$554267114407ef68 as PBDBFossilsColumn, $b9286605a04210d4$export$ce5c4f2fdf4e644d as BaseMeasurementsColumn, $715dd5fedd79146a$export$1b3047373cd1c8c7 as DetritalGroup, $715dd5fedd79146a$export$f176396e104db8d5 as DetritalColumn, $d71d096cfe00860f$export$c69bd0285aa5d775 as IsotopesDataset, $d71d096cfe00860f$export$5d8aa8022c284748 as IsotopesColumn, $5dbb619f2c7bef60$export$c644ef985ce7a4c4 as MeasurementDataContext, $5dbb619f2c7bef60$export$5f01d5b342a89841 as MeasurementDataProvider, $5dbb619f2c7bef60$export$8a0335fd9ff72150 as useMeasurementData, $6ff130029901daab$export$c49cf57576706bab as SGPMeasurementsColumn};
-//# sourceMappingURL=column-views.38a305a0.js.map

package/dist/esm/column-views.39657bbf.js.map

@@ -1 +0,0 @@
-{"mappings":";;;;;AAQA,MAAM,2BAAK;AAiBJ,MAAM,2CAA6B,SACxC,CAAC,EACD,CAAC,EACD,WAA2B,CAAA,GAAA,qBAAa,EAAE,GAAG,EAC7C,YAAoB,KAAK;IAEzB,MAAM,MAAM,CAAA,GAAA,uBAAe,EACzB,yCAAmB,GAAG,WACtB,yCAAmB,GAAG,WACtB;IAEF,OAAO,OAAO,CAAA,GAAA,2BAAmB,EAAE,QAAQ;AAC7C;AAGO,SAAS,0CACd,CAAuB,EACvB,CAAuB,EACvB,YAAoB,wBAAE;IAEtB,OAAO,yCAAa,GAAG,GAAG,CAAA,GAAA,qBAAa,EAAE,GAAG,EAAE;AAChD;AAQO,SAAS,yCACd,IAAyB,EACzB,QAAwB;IAExB,OAAQ;QACN,KAAK,CAAA,GAAA,qBAAa,EAAE,GAAG;YACrB,OAAO;gBAAC,KAAK,UAAU,IAAI,KAAK,KAAK;gBAAE,KAAK,UAAU,IAAI,KAAK,KAAK;aAAC;QACvE,KAAK,CAAA,GAAA,qBAAa,EAAE,KAAK;QACzB,KAAK,CAAA,GAAA,qBAAa,EAAE,OAAO;QAC3B,KAAK,CAAA,GAAA,qBAAa,EAAE,MAAM;YACxB,OAAO;gBAAC,KAAK,UAAU,IAAI,KAAK,KAAK;gBAAE,KAAK,UAAU,IAAI,KAAK,KAAK;aAAC;QACvE;YACE,MAAM,IAAI,MAAM,CAAC,mBAAmB,EAAE,UAAU;IACpD;AACF;AAEO,MAAM,4CAAmB,CAAC;IAC/B,OAAO,CAAC,GAAa;QACnB,MAAM,QAAQ,yCAAmB,GAAG;QACpC,MAAM,QAAQ,yCAAmB,GAAG;QACpC,MAAM,QAAQ,KAAK,CAAC,EAAE,GAAG,KAAK,CAAC,EAAE;QACjC,IAAI,SAAS,GACX,OAAO;QAET,OAAO,KAAK,CAAC,EAAE,GAAG,KAAK,CAAC,EAAE;IAC5B;AACF;AAEO,SAAS,0CAAe,CAAU;IACvC,IAAI,MAAM,OAAO,CAAC,IAChB,OAAO;IAET,OAAO;QAAC;KAAE;AACZ;AAEO,SAAS,0CAAgB,CAAyB;IACvD,IAAI,OAAO,KAAK,UACd,IAAI,WAAW;IAEjB,IAAI,MAAM,IACR,OAAO;IAET,OAAO;AACT","sources":["packages/column-views/src/prepare-units/utils.ts"],"sourcesContent":["import type { BaseUnit } from \"@macrostrat/api-types\";\nimport {\n  AgeRangeRelationship,\n  compareAgeRanges,\n} from \"@macrostrat/stratigraphy-utils\";\nimport { ColumnAxisType } from \"@macrostrat/column-components\";\nimport { StratigraphicPackage } from \"./helpers\";\n\nconst dt = 0.001;\n\ninterface UnitsOverlap {\n  (\n    a: StratigraphicPackage,\n    b: StratigraphicPackage,\n    axisType?: ColumnAxisType.AGE,\n    tolerance?: number,\n  ): boolean;\n  (\n    a: BaseUnit,\n    b: BaseUnit,\n    axisType: ColumnAxisType,\n    tolerance?: number,\n  ): boolean;\n}\n\nexport const unitsOverlap: UnitsOverlap = function (\n  a,\n  b,\n  axisType: ColumnAxisType = ColumnAxisType.AGE,\n  tolerance: number = 0.001,\n): boolean {\n  const rel = compareAgeRanges(\n    getUnitHeightRange(a, axisType),\n    getUnitHeightRange(b, axisType),\n    tolerance,\n  );\n  return rel != AgeRangeRelationship.Disjoint;\n};\n\n/** A more permissive overlap function in the age space */\nexport function agesOverlap(\n  a: StratigraphicPackage,\n  b: StratigraphicPackage,\n  tolerance: number = dt,\n): boolean {\n  return unitsOverlap(a, b, ColumnAxisType.AGE, tolerance);\n}\n\nexport interface PossiblyClippedUnit extends BaseUnit {\n  // Internally created clipped positions\n  t_clip_pos?: number;\n  b_clip_pos?: number;\n}\n\nexport function getUnitHeightRange(\n  unit: PossiblyClippedUnit,\n  axisType: ColumnAxisType,\n): [number, number] {\n  switch (axisType) {\n    case ColumnAxisType.AGE:\n      return [unit.b_clip_pos ?? unit.b_age, unit.t_clip_pos ?? unit.t_age];\n    case ColumnAxisType.DEPTH:\n    case ColumnAxisType.ORDINAL:\n    case ColumnAxisType.HEIGHT:\n      return [unit.b_clip_pos ?? unit.b_pos, unit.t_clip_pos ?? unit.t_pos];\n    default:\n      throw new Error(`Unknown axis type: ${axisType}`);\n  }\n}\n\nexport const createUnitSorter = (axisType: ColumnAxisType) => {\n  return (a: BaseUnit, b: BaseUnit) => {\n    const a_pos = getUnitHeightRange(a, axisType);\n    const b_pos = getUnitHeightRange(b, axisType);\n    const d_top = a_pos[1] - b_pos[1];\n    if (d_top != 0) {\n      return d_top;\n    }\n    return a_pos[0] - b_pos[0];\n  };\n};\n\nexport function ensureArray<T>(x: T | T[]): T[] {\n  if (Array.isArray(x)) {\n    return x;\n  }\n  return [x];\n}\n\nexport function ensureRealFloat(x: number | string | null): number | null {\n  if (typeof x == \"string\") {\n    x = parseFloat(x);\n  }\n  if (isNaN(x)) {\n    return null;\n  }\n  return x;\n}\n"],"names":[],"version":3,"file":"column-views.39657bbf.js.map"}