@macrostrat/column-views 3.11.0 → 3.12.1

package/CHANGELOG.md

@@ -1,5 +1,189 @@
 # Changelog
 
+## [3.12.1] - 2026-09-25 [_changes_](https://github.com/UW-Macrostrat/web-components/compare/@macrostrat/column-views-v3.12.0...@macrostrat/column-views-v3.12.1)
+
+### Patch Changes
+
+- - `Proportion`, `AgeLabel` and `getAge` are re-exported from
+    `@macrostrat/data-components`; surface calibration tags use `IntervalTag`'s
+    `proportion`
+    [5be3d4c9](https://github.com/UW-Macrostrat/web-components/commit/5be3d4c9f3fcf4442720a7ed3bdb72abca4db4ab)
+- Updated dependencies
+  [5be3d4c9](https://github.com/UW-Macrostrat/web-components/commit/5be3d4c9f3fcf4442720a7ed3bdb72abca4db4ab)
+- Updated dependencies
+  [dc1feb79](https://github.com/UW-Macrostrat/web-components/commit/dc1feb7961e6f901fe6a3dbb2d3f3bdba03cc32c)
+  - @macrostrat/data-provider@1.4.0
+  - @macrostrat/data-components@1.7.0
+
+## [3.12.0] - 2026-09-21 [_changes_](https://github.com/UW-Macrostrat/web-components/compare/@macrostrat/column-views-v3.11.0...@macrostrat/column-views-v3.12.0)
+
+### Minor Changes
+
+- Reduce the options that set how tall a column draws to the few that say
+  [0614432f](https://github.com/UW-Macrostrat/web-components/commit/0614432fe94bfd2c222375b9add8f7ac100e33c3)
+  different things. They all resolve to one quantity — density, the pixels given
+  to one unit of the axis.
+
+  `targetUnitHeight` is the usual knob: room for a typical unit, now the
+  geometric mean of the visible units' extents rather than their arithmetic
+  mean, which a few long units skew far above anything on screen.
+  `minSectionHeight` and `minPixelScale` floor it for legibility. `pixelScale`
+  is the alternative: a density stated outright, which is then the density — the
+  floors no longer apply to it, since they would undo the scale you stated, and
+  `Column` no longer adjusts them behind the scenes. It is quoted in whatever
+  the axis measures, so `pixelsPerMyr` and `pixelsPerMeter` spell it per axis,
+  the way `t_age` and `t_pos` already do for the window: both can be held at
+  once and the axis picks, since useful values for the two differ by orders of
+  magnitude. `sectionOptions` decides any of these per section, given what the
+  section holds.
+
+  `heightMultiplier` is gone — asking for more room per unit is the same
+  control, and leaves the legibility floors where they belong — as is the
+  internal `visibleWindow`, which only restated `t_age`/`b_age`.
+
+- Add a surfaces view for a column's age model. `ColumnSurfaces`, dropped into a
+  [ea700ff1](https://github.com/UW-Macrostrat/web-components/commit/ea700ff1e7725703d971e3cac440fad0f7540a65)
+  `Column` as a child, draws the column's calibration surfaces from the
+  `/age_model` route as lines across the units (`ColumnSurfaceLines`) and as a
+  collision-avoiding notes column of labels beside them (`ColumnSurfaceLabels`),
+  styled by `boundary_status` and `boundary_type`, with hover and selection.
+  Labels use the standard `IntervalTag` for the calibration interval (with the
+  position within it) over the modeled age, are drawn by default only for the
+  tie points where the age model was constrained (absolute, relative, spike,
+  imposed — `labelStatuses` widens this), and take the label column over from
+  the unit labels while mounted (`useClaimLabelColumn`, a new way for a column's
+  children to claim that space). `SurfaceDetailsPanel` inspects a selected
+  surface — model age, calibration interval and position within it, the units it
+  separates, provenance — and `SurfaceStatusLegend` explains the line styles.
+
+  The view is data-agnostic: `useColumnAgeModel` fetches boundaries through the
+  `MacrostratDataProvider` base URL (the old overlay hardcoded the dev server),
+  `surfacesFromBoundaries` maps them to `ColumnSurface` records, and
+  `surfacesFromUnits` derives surfaces from unit tops and bottoms as the
+  fallback for columns without `unit_boundaries` (or for an editor's own state).
+  `BoundaryAgeModelOverlay` and `ComputedSurfacesOverlay` remain as deprecated
+  wrappers. `ColumnNotes` gains `onClickNote` and `className` passthroughs.
+
+  `@macrostrat/api-types` gains `AgeModelBoundary` and the `BoundaryStatus` /
+  `BoundaryType` vocabularies, mirroring the database enums.
+
+- Draw several timescales beside a column. A new `timescales` prop takes them in
+  [1b694ccf](https://github.com/UW-Macrostrat/web-components/commit/1b694ccfcc40321a6edc609b8c07106a87164a3b)
+  order, each a Macrostrat timescale ID or a timescale carrying its own
+  intervals, levels and label — the international timescale is one of these
+  rather than a special case. Clicks and per-interval styles report which
+  timescale they came from, so the same interval drawn in two of them can be
+  told apart, and `useTimescaleZoom` treats a click in another timescale as
+  moving the selection rather than zooming out. Timescales are fetched in one
+  place rather than once per section.
+- Suppress unit labels below a pixel height, rather than labeling units too thin
+  [0614432f](https://github.com/UW-Macrostrat/web-components/commit/0614432fe94bfd2c222375b9add8f7ac100e33c3)
+  to see: `labelSuppressHeight` on `Column`, 2px by default. A gap between
+  sections is also labeled in the units of the axis, so a drill core reads
+  metres rather than Myr.
+- One selection color across a column: `--column-selection-color` (the accent
+  [1b694ccf](https://github.com/UW-Macrostrat/web-components/commit/1b694ccfcc40321a6edc609b8c07106a87164a3b)
+  color, purple) drives both the unit selection overlay — now a box with an
+  outline and a light wash, rather than a heavy red fill — and the surface
+  selection.
+
+  Surface lines are drawn at a constant weight; status shows in the dash pattern
+  and color. A selected surface is outlined as a box, keeping its interval color
+  inside, and a selected label bolds its interval tag rather than sitting in a
+  card.
+
+  `useTimescaleZoom`: shift-clicking a timescale interval widens the window to
+  take it in, instead of moving the window to it. `selectedIntervals` reports
+  everything in the selection; all of them are styled as selected.
+
+  `CompositeTimescale` takes a `timescaleID` (which timescale the leveled column
+  draws) and `additionalTimescales` (further timescales drawn as extra level
+  columns beside it, against the same section scales), and is exported. `Column`
+  passes `additionalTimescales` through: narrow `timescaleLevels` by as many to
+  swap the finest international level for a regional one rather than widen the
+  timescale.
+
+  `heightMultiplier` on `Column` multiplies the heights the layout works out by
+  a fixed factor. The scaling approach is unchanged — density still comes from
+  `targetUnitHeight` and the section floors — so sections keep their proportions
+  and only the size changes; unconformity gaps and `windowPadding`, being chrome
+  rather than scale, stay put.
+
+- Infer `relative` status for age-model surfaces that cannot have been
+  [c17e6379](https://github.com/UW-Macrostrat/web-components/commit/c17e637909bbff76f7bbf4366134b0ba5c5f59ef)
+  interpolated: those sitting on the base or top of their calibration interval,
+  and the edges of gap-bound packages (the youngest surface in a section with no
+  unit above, or the oldest with none below). `boundary_status` records many of
+  these as `modeled`, so filtering to the tie-point statuses was hiding real tie
+  points. `inferTiePointStatuses` promotes them client-side and marks the result
+  `statusInferred`, which `SurfaceStatusTag` shows. On by default;
+  `inferTiePoints: false` on `ColumnSurfaces`, `useColumnSurfaces` or
+  `surfacesFromBoundaries` takes the data as recorded.
+
+  Fix surface lines drifting out of alignment with the units column: the overlay
+  measured its position once and only re-measured on its own resize, so a
+  sibling changing width — the timescale, once its intervals load — left it
+  stale.
+
+- Color age-model surfaces by the interval they are calibrated against: the
+  [acc9f478](https://github.com/UW-Macrostrat/web-components/commit/acc9f4782cbae65bfe017aa195e1b51456871822)
+  surface line and its label's leader line both take the interval's color, and
+  the lines are drawn a little heavier. The label's endpoint marker is gone —
+  the leader now runs into the surface line itself.
+
+  `SurfaceDetailsPanel` accepts a `null` surface and renders an empty state, so
+  a panel bound to a selection doesn't have to be guarded by its caller.
+
+- Add `useTimescaleZoom`: click-to-zoom navigation over geologic time, extracted
+  [af6d14e1](https://github.com/UW-Macrostrat/web-components/commit/af6d14e1da59af8d09712ed5cb750b1b6bca7cc8)
+  from the Interval zoom story. Clicking a timescale interval animates the
+  rendered age window to it, clicking the interval you are in zooms back out a
+  level, and the timescale's level window slides with the selection so finer
+  intervals come into reach as you drill. `columnProps` spreads the window, the
+  levels, the click handler and the selected-interval styling onto a `Column`.
+  `unitsAgeExtent` derives the full extent from a set of units.
+
+### Patch Changes
+
+- Notes columns re-run their force layout once the notes' rendered heights have
+  [7252f222](https://github.com/UW-Macrostrat/web-components/commit/7252f22207f63d57ef91172cf898f6b27c38725a)
+  been measured. The first layout ran on a 10px guess per note and was never
+  revisited, so notes taller than that (interval tags, two-line labels)
+  overlapped their neighbors. `ColumnNotes` also passes `forceOptions` through
+  to the layout.
+- Treat an unset age or depth bound as unbounded rather than as a real one. A
+  [0614432f](https://github.com/UW-Macrostrat/web-components/commit/0614432fe94bfd2c222375b9add8f7ac100e33c3)
+  `null` `t_age` is the ordinary way to say "no window" — it is what clearing a
+  window leaves behind — and columns laid out with a hybrid scale, which clip
+  before laying out, were dropping every unit when they saw one.
+- Judge an unconformity against the finer of the two scales it falls between,
+  [aa4fda55](https://github.com/UW-Macrostrat/web-components/commit/aa4fda557137cdb652cb3ddce98d1b5dae8109ef)
+  rather than the coarser one. A gap has no density of its own, and taking the
+  smaller estimate let a sparse neighbor speak for one the other neighbor would
+  have drawn many times larger — a 16 Myr hiatus read as 26px against one
+  section and 166px against the other, and collapsed.
+- Updated dependencies
+  [ea700ff1](https://github.com/UW-Macrostrat/web-components/commit/ea700ff1e7725703d971e3cac440fad0f7540a65)
+- Updated dependencies
+  [1b694ccf](https://github.com/UW-Macrostrat/web-components/commit/1b694ccfcc40321a6edc609b8c07106a87164a3b)
+- Updated dependencies
+  [1b694ccf](https://github.com/UW-Macrostrat/web-components/commit/1b694ccfcc40321a6edc609b8c07106a87164a3b)
+- Updated dependencies
+  [acc9f478](https://github.com/UW-Macrostrat/web-components/commit/acc9f4782cbae65bfe017aa195e1b51456871822)
+- Updated dependencies
+  [aa4fda55](https://github.com/UW-Macrostrat/web-components/commit/aa4fda557137cdb652cb3ddce98d1b5dae8109ef)
+- Updated dependencies
+  [af6d14e1](https://github.com/UW-Macrostrat/web-components/commit/af6d14e1da59af8d09712ed5cb750b1b6bca7cc8)
+- Updated dependencies
+  [7252f222](https://github.com/UW-Macrostrat/web-components/commit/7252f22207f63d57ef91172cf898f6b27c38725a)
+- Updated dependencies
+  [1b694ccf](https://github.com/UW-Macrostrat/web-components/commit/1b694ccfcc40321a6edc609b8c07106a87164a3b)
+  - @macrostrat/api-types@1.4.0
+  - @macrostrat/data-provider@1.3.1
+  - @macrostrat/timescale@3.3.0
+  - @macrostrat/column-components@2.2.0
+  - @macrostrat/stratigraphy-utils@1.4.2
+
 ## [3.11.0] - 2026-09-04 [_changes_](https://github.com/UW-Macrostrat/web-components/compare/@macrostrat/column-views-v3.10.0...@macrostrat/column-views-v3.11.0)
 
 ### Minor Changes

package/dist/age-axis.cjs

@@ -5,7 +5,6 @@ const columnComponents = require("@macrostrat/column-components");
 require("react");
 const ageAxis_module = require("./age-axis.module.sass.cjs");
 const dataComponents = require("@macrostrat/data-components");
-const ageRange = require("./unit-details/age-range.cjs");
 const store = require("./data-provider/store.cjs");
 const _interopDefault = (e) => e && e.__esModule ? e : { default: e };
 const h__default = /* @__PURE__ */ _interopDefault(h$1);
@@ -114,7 +113,7 @@ function AgeCursor({ age }) {
         top: heightPx
       }
     },
-    [h("div.line"), h(ageRange.AgeLabel, { age, className: "label" })]
+    [h("div.line"), h(dataComponents.AgeLabel, { age, className: "label" })]
   );
 }
 exports.AgeCursor = AgeCursor;

package/dist/age-axis.cjs.map

@@ -1 +1 @@
-{"version":3,"file":"age-axis.cjs","sources":["../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 { AgeLabel } from \"./unit-details\";\nimport { PackageScaleLayoutData } from \"./prepare-units\";\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\ninterface CompositeAgeAxisProps {\n  className?: string;\n  style?: React.CSSProperties;\n}\n\nexport function CompositeAgeAxis(rest: CompositeAgeAxisProps) {\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    ...rest,\n  });\n}\n\nexport function ApproximateHeightAxis(rest: CompositeAgeAxisProps) {\n  /** Axis to show approximate height based on dynamic column scales */\n  const { axisType, sections, totalHeight } = useMacrostratColumnData();\n\n  const packages = sections.map((section) => {\n    const { scaleInfo } = section;\n    if (scaleInfo.heightScale == null) {\n      throw new Error(\"No height scale available for section\");\n    }\n    return {\n      key: `section-${section.section_id}`,\n      ...scaleInfo,\n      scale: scaleInfo.heightScale, // Use height scale instead of age scale\n      // This only works with dynamic columns\n    };\n  });\n\n  return h(CompositeAgeAxisCore, {\n    axisType,\n    axisLabel: \"Approx. height\",\n    axisUnit: \"m\",\n    packages,\n    totalHeight,\n    ...rest,\n  });\n}\n\nexport interface CompositeStratigraphicScaleInfo extends CompositeAgeAxisProps {\n  axisType: ColumnAxisType;\n  axisLabel?: string;\n  axisUnit?: string;\n  totalHeight: number;\n  packages: PackageScaleLayoutData[];\n}\n\nexport function CompositeAgeAxisCore(props: CompositeStratigraphicScaleInfo) {\n  const { axisType, axisLabel, axisUnit, totalHeight, packages, ...rest } =\n    props;\n\n  if (axisType == ColumnAxisType.ORDINAL) {\n    return null;\n  }\n\n  let _axisLabel: string = axisLabel ?? \"Age\";\n  let _axisUnit = 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(\"div.composite-age-axis\", rest, [\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  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":["hyper","styles","Parenthetical","useMacrostratColumnData","ColumnAxisType","SVG","AgeAxis","useCompositeScale","AgeLabel"],"mappings":"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"}
+{"version":3,"file":"age-axis.cjs","sources":["../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 { AgeLabel } from \"./unit-details\";\nimport { PackageScaleLayoutData } from \"./prepare-units\";\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\ninterface CompositeAgeAxisProps {\n  className?: string;\n  style?: React.CSSProperties;\n}\n\nexport function CompositeAgeAxis(rest: CompositeAgeAxisProps) {\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    ...rest,\n  });\n}\n\nexport function ApproximateHeightAxis(rest: CompositeAgeAxisProps) {\n  /** Axis to show approximate height based on dynamic column scales */\n  const { axisType, sections, totalHeight } = useMacrostratColumnData();\n\n  const packages = sections.map((section) => {\n    const { scaleInfo } = section;\n    if (scaleInfo.heightScale == null) {\n      throw new Error(\"No height scale available for section\");\n    }\n    return {\n      key: `section-${section.section_id}`,\n      ...scaleInfo,\n      scale: scaleInfo.heightScale, // Use height scale instead of age scale\n      // This only works with dynamic columns\n    };\n  });\n\n  return h(CompositeAgeAxisCore, {\n    axisType,\n    axisLabel: \"Approx. height\",\n    axisUnit: \"m\",\n    packages,\n    totalHeight,\n    ...rest,\n  });\n}\n\nexport interface CompositeStratigraphicScaleInfo extends CompositeAgeAxisProps {\n  axisType: ColumnAxisType;\n  axisLabel?: string;\n  axisUnit?: string;\n  totalHeight: number;\n  packages: PackageScaleLayoutData[];\n}\n\nexport function CompositeAgeAxisCore(props: CompositeStratigraphicScaleInfo) {\n  const { axisType, axisLabel, axisUnit, totalHeight, packages, ...rest } =\n    props;\n\n  if (axisType == ColumnAxisType.ORDINAL) {\n    return null;\n  }\n\n  let _axisLabel: string = axisLabel ?? \"Age\";\n  let _axisUnit = 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(\"div.composite-age-axis\", rest, [\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  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":["hyper","styles","Parenthetical","useMacrostratColumnData","ColumnAxisType","SVG","AgeAxis","useCompositeScale","AgeLabel"],"mappings":"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"}

package/dist/age-axis.js

@@ -2,8 +2,7 @@ import h$1 from "@macrostrat/hyper";
 import { ColumnAxisType, SVG, AgeAxis } from "@macrostrat/column-components";
 import "react";
 import h$2 from "./age-axis.module.sass.js";
-import { Parenthetical } from "@macrostrat/data-components";
-import { AgeLabel } from "./unit-details/age-range.js";
+import { AgeLabel, Parenthetical } from "@macrostrat/data-components";
 import { useCompositeScale, useMacrostratColumnData } from "./data-provider/store.js";
 const h = h$1.styled(h$2);
 function VerticalAxisLabel(props) {

package/dist/age-axis.js.map

@@ -1 +1 @@
-{"version":3,"file":"age-axis.js","sources":["../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 { AgeLabel } from \"./unit-details\";\nimport { PackageScaleLayoutData } from \"./prepare-units\";\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\ninterface CompositeAgeAxisProps {\n  className?: string;\n  style?: React.CSSProperties;\n}\n\nexport function CompositeAgeAxis(rest: CompositeAgeAxisProps) {\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    ...rest,\n  });\n}\n\nexport function ApproximateHeightAxis(rest: CompositeAgeAxisProps) {\n  /** Axis to show approximate height based on dynamic column scales */\n  const { axisType, sections, totalHeight } = useMacrostratColumnData();\n\n  const packages = sections.map((section) => {\n    const { scaleInfo } = section;\n    if (scaleInfo.heightScale == null) {\n      throw new Error(\"No height scale available for section\");\n    }\n    return {\n      key: `section-${section.section_id}`,\n      ...scaleInfo,\n      scale: scaleInfo.heightScale, // Use height scale instead of age scale\n      // This only works with dynamic columns\n    };\n  });\n\n  return h(CompositeAgeAxisCore, {\n    axisType,\n    axisLabel: \"Approx. height\",\n    axisUnit: \"m\",\n    packages,\n    totalHeight,\n    ...rest,\n  });\n}\n\nexport interface CompositeStratigraphicScaleInfo extends CompositeAgeAxisProps {\n  axisType: ColumnAxisType;\n  axisLabel?: string;\n  axisUnit?: string;\n  totalHeight: number;\n  packages: PackageScaleLayoutData[];\n}\n\nexport function CompositeAgeAxisCore(props: CompositeStratigraphicScaleInfo) {\n  const { axisType, axisLabel, axisUnit, totalHeight, packages, ...rest } =\n    props;\n\n  if (axisType == ColumnAxisType.ORDINAL) {\n    return null;\n  }\n\n  let _axisLabel: string = axisLabel ?? \"Age\";\n  let _axisUnit = 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(\"div.composite-age-axis\", rest, [\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  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":["hyper","styles"],"mappings":";;;;;;;AAeA,MAAM,IAAIA,IAAM,OAAOC,GAAM;AAetB,SAAS,kBAAkB,OAAO;AACvC,QAAM,EAAE,QAAQ,OAAO,OAAO,MAAM,WAAW,WAAW;AAC1D,SAAO;AAAA,IACL;AAAA,IACA,EAAE,WAAW,OAAO,EAAE,SAAO;AAAA,IAC7B;AAAA,MACE;AAAA,MACA;AAAA,MACA,EAAE,GAAG,IAAI,EAAE,eAAe,EAAE,WAAW,gBAAA,GAAmB,IAAI;AAAA,IAAA;AAAA,EAChE;AAEJ;AAOO,SAAS,iBAAiB,MAA6B;AAC5D,QAAM,EAAE,UAAU,UAAU,YAAA,IAAgB,wBAAA;AAE5C,QAAM,WAAW,SAAS,IAAI,CAAC,YAAY;AACzC,WAAO;AAAA,MACL,KAAK,WAAW,QAAQ,UAAU;AAAA,MAClC,GAAG,QAAQ;AAAA,IAAA;AAAA,EAEf,CAAC;AAED,SAAO,EAAE,sBAAsB;AAAA,IAC7B;AAAA,IACA;AAAA,IACA;AAAA,IACA,GAAG;AAAA,EAAA,CACJ;AACH;AAEO,SAAS,sBAAsB,MAA6B;AAEjE,QAAM,EAAE,UAAU,UAAU,YAAA,IAAgB,wBAAA;AAE5C,QAAM,WAAW,SAAS,IAAI,CAAC,YAAY;AACzC,UAAM,EAAE,cAAc;AACtB,QAAI,UAAU,eAAe,MAAM;AACjC,YAAM,IAAI,MAAM,uCAAuC;AAAA,IACzD;AACA,WAAO;AAAA,MACL,KAAK,WAAW,QAAQ,UAAU;AAAA,MAClC,GAAG;AAAA,MACH,OAAO,UAAU;AAAA;AAAA;AAAA,IAAA;AAAA,EAGrB,CAAC;AAED,SAAO,EAAE,sBAAsB;AAAA,IAC7B;AAAA,IACA,WAAW;AAAA,IACX,UAAU;AAAA,IACV;AAAA,IACA;AAAA,IACA,GAAG;AAAA,EAAA,CACJ;AACH;AAUO,SAAS,qBAAqB,OAAwC;AAC3E,QAAM,EAAE,UAAU,WAAW,UAAU,aAAa,UAAU,GAAG,SAC/D;AAEF,MAAI,YAAY,eAAe,SAAS;AACtC,WAAO;AAAA,EACT;AAEA,MAAI,aAAqB,aAAa;AACtC,MAAI,YAAY,YAAY;AAC5B,MAAI,YAAY,eAAe,OAAO;AACpC,iBAAa;AACb,gBAAY;AAAA,EACd,WAAW,YAAY,eAAe,QAAQ;AAC5C,iBAAa;AACb,gBAAY;AAAA,EACd;AAEA,SAAO,EAAE,0BAA0B,MAAM;AAAA,IACvC,EAAE,mBAAmB;AAAA,MACnB,OAAO;AAAA,MACP,MAAM;AAAA,MACN,QAAQ;AAAA,IAAA,CACT;AAAA,IACD;AAAA,MACE;AAAA,MACA;AAAA,QACE,WAAW;AAAA,QACX,OAAO,EAAE,OAAO,QAAQ,QAAQ,GAAG,WAAW,KAAA;AAAA,QAC9C,OAAO;AAAA,QACP,QAAQ;AAAA,MAAA;AAAA,MAEV,SAAS,IAAI,CAAC,OAAO,MAAM;AACzB,cAAM,EAAE,KAAK,MAAA,IAAU;AAEvB,eAAO,EAAE,SAAS;AAAA,UAChB;AAAA,UACA,WAAW;AAAA,UACX;AAAA,UACA,eAAe;AAAA,QAAA,CAChB;AAAA,MACH,CAAC;AAAA,IAAA;AAAA,EACH,CACD;AACH;AAEO,SAAS,UAAU,EAAE,OAAO;AAEjC,QAAM,QAAQ,kBAAA;AACd,QAAM,WAAW,MAAM,GAAG;AAE1B,MAAI,OAAO,QAAQ,YAAY,MAAM;AACnC,WAAO;AAAA,EACT;AAEA,SAAO;AAAA,IACL;AAAA,IACA;AAAA,MACE,OAAO;AAAA,QACL,KAAK;AAAA,MAAA;AAAA,IACP;AAAA,IAEF,CAAC,EAAE,UAAU,GAAG,EAAE,UAAU,EAAE,KAAK,WAAW,SAAS,CAAC;AAAA,EAAA;AAE5D;"}
+{"version":3,"file":"age-axis.js","sources":["../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 { AgeLabel } from \"./unit-details\";\nimport { PackageScaleLayoutData } from \"./prepare-units\";\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\ninterface CompositeAgeAxisProps {\n  className?: string;\n  style?: React.CSSProperties;\n}\n\nexport function CompositeAgeAxis(rest: CompositeAgeAxisProps) {\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    ...rest,\n  });\n}\n\nexport function ApproximateHeightAxis(rest: CompositeAgeAxisProps) {\n  /** Axis to show approximate height based on dynamic column scales */\n  const { axisType, sections, totalHeight } = useMacrostratColumnData();\n\n  const packages = sections.map((section) => {\n    const { scaleInfo } = section;\n    if (scaleInfo.heightScale == null) {\n      throw new Error(\"No height scale available for section\");\n    }\n    return {\n      key: `section-${section.section_id}`,\n      ...scaleInfo,\n      scale: scaleInfo.heightScale, // Use height scale instead of age scale\n      // This only works with dynamic columns\n    };\n  });\n\n  return h(CompositeAgeAxisCore, {\n    axisType,\n    axisLabel: \"Approx. height\",\n    axisUnit: \"m\",\n    packages,\n    totalHeight,\n    ...rest,\n  });\n}\n\nexport interface CompositeStratigraphicScaleInfo extends CompositeAgeAxisProps {\n  axisType: ColumnAxisType;\n  axisLabel?: string;\n  axisUnit?: string;\n  totalHeight: number;\n  packages: PackageScaleLayoutData[];\n}\n\nexport function CompositeAgeAxisCore(props: CompositeStratigraphicScaleInfo) {\n  const { axisType, axisLabel, axisUnit, totalHeight, packages, ...rest } =\n    props;\n\n  if (axisType == ColumnAxisType.ORDINAL) {\n    return null;\n  }\n\n  let _axisLabel: string = axisLabel ?? \"Age\";\n  let _axisUnit = 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(\"div.composite-age-axis\", rest, [\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  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":["hyper","styles"],"mappings":";;;;;;AAeA,MAAM,IAAIA,IAAM,OAAOC,GAAM;AAetB,SAAS,kBAAkB,OAAO;AACvC,QAAM,EAAE,QAAQ,OAAO,OAAO,MAAM,WAAW,WAAW;AAC1D,SAAO;AAAA,IACL;AAAA,IACA,EAAE,WAAW,OAAO,EAAE,SAAO;AAAA,IAC7B;AAAA,MACE;AAAA,MACA;AAAA,MACA,EAAE,GAAG,IAAI,EAAE,eAAe,EAAE,WAAW,gBAAA,GAAmB,IAAI;AAAA,IAAA;AAAA,EAChE;AAEJ;AAOO,SAAS,iBAAiB,MAA6B;AAC5D,QAAM,EAAE,UAAU,UAAU,YAAA,IAAgB,wBAAA;AAE5C,QAAM,WAAW,SAAS,IAAI,CAAC,YAAY;AACzC,WAAO;AAAA,MACL,KAAK,WAAW,QAAQ,UAAU;AAAA,MAClC,GAAG,QAAQ;AAAA,IAAA;AAAA,EAEf,CAAC;AAED,SAAO,EAAE,sBAAsB;AAAA,IAC7B;AAAA,IACA;AAAA,IACA;AAAA,IACA,GAAG;AAAA,EAAA,CACJ;AACH;AAEO,SAAS,sBAAsB,MAA6B;AAEjE,QAAM,EAAE,UAAU,UAAU,YAAA,IAAgB,wBAAA;AAE5C,QAAM,WAAW,SAAS,IAAI,CAAC,YAAY;AACzC,UAAM,EAAE,cAAc;AACtB,QAAI,UAAU,eAAe,MAAM;AACjC,YAAM,IAAI,MAAM,uCAAuC;AAAA,IACzD;AACA,WAAO;AAAA,MACL,KAAK,WAAW,QAAQ,UAAU;AAAA,MAClC,GAAG;AAAA,MACH,OAAO,UAAU;AAAA;AAAA;AAAA,IAAA;AAAA,EAGrB,CAAC;AAED,SAAO,EAAE,sBAAsB;AAAA,IAC7B;AAAA,IACA,WAAW;AAAA,IACX,UAAU;AAAA,IACV;AAAA,IACA;AAAA,IACA,GAAG;AAAA,EAAA,CACJ;AACH;AAUO,SAAS,qBAAqB,OAAwC;AAC3E,QAAM,EAAE,UAAU,WAAW,UAAU,aAAa,UAAU,GAAG,SAC/D;AAEF,MAAI,YAAY,eAAe,SAAS;AACtC,WAAO;AAAA,EACT;AAEA,MAAI,aAAqB,aAAa;AACtC,MAAI,YAAY,YAAY;AAC5B,MAAI,YAAY,eAAe,OAAO;AACpC,iBAAa;AACb,gBAAY;AAAA,EACd,WAAW,YAAY,eAAe,QAAQ;AAC5C,iBAAa;AACb,gBAAY;AAAA,EACd;AAEA,SAAO,EAAE,0BAA0B,MAAM;AAAA,IACvC,EAAE,mBAAmB;AAAA,MACnB,OAAO;AAAA,MACP,MAAM;AAAA,MACN,QAAQ;AAAA,IAAA,CACT;AAAA,IACD;AAAA,MACE;AAAA,MACA;AAAA,QACE,WAAW;AAAA,QACX,OAAO,EAAE,OAAO,QAAQ,QAAQ,GAAG,WAAW,KAAA;AAAA,QAC9C,OAAO;AAAA,QACP,QAAQ;AAAA,MAAA;AAAA,MAEV,SAAS,IAAI,CAAC,OAAO,MAAM;AACzB,cAAM,EAAE,KAAK,MAAA,IAAU;AAEvB,eAAO,EAAE,SAAS;AAAA,UAChB;AAAA,UACA,WAAW;AAAA,UACX;AAAA,UACA,eAAe;AAAA,QAAA,CAChB;AAAA,MACH,CAAC;AAAA,IAAA;AAAA,EACH,CACD;AACH;AAEO,SAAS,UAAU,EAAE,OAAO;AAEjC,QAAM,QAAQ,kBAAA;AACd,QAAM,WAAW,MAAM,GAAG;AAE1B,MAAI,OAAO,QAAQ,YAAY,MAAM;AACnC,WAAO;AAAA,EACT;AAEA,SAAO;AAAA,IACL;AAAA,IACA;AAAA,MACE,OAAO;AAAA,QACL,KAAK;AAAA,MAAA;AAAA,IACP;AAAA,IAEF,CAAC,EAAE,UAAU,GAAG,EAAE,UAAU,EAAE,KAAK,WAAW,SAAS,CAAC;AAAA,EAAA;AAE5D;"}

package/dist/age-model/data.cjs

@@ -0,0 +1,57 @@
+"use strict";
+Object.defineProperty(exports, Symbol.toStringTag, { value: "Module" });
+const React = require("react");
+const uiComponents = require("@macrostrat/ui-components");
+const dataProvider = require("@macrostrat/data-provider");
+const types = require("./types.cjs");
+const store = require("../data-provider/store.cjs");
+const AGE_MODEL_ROUTE = "/age_model";
+function useColumnAgeModel(col_id) {
+  const baseURL = dataProvider.useMacrostratBaseURL();
+  const params = React.useMemo(() => ({ col_id }), [col_id]);
+  let route = null;
+  if (col_id != null) {
+    route = baseURL + AGE_MODEL_ROUTE;
+  }
+  return uiComponents.useAPIResult(route, params, unwrapAgeModel) ?? null;
+}
+function unwrapAgeModel(res) {
+  return res?.success?.data ?? [];
+}
+function useColumnSurfaces(options = {}) {
+  const {
+    surfaces: provided,
+    col_id,
+    fallbackToUnits = true,
+    inferTiePoints = true
+  } = options;
+  const units = store.useMacrostratUnits();
+  const { axisType } = store.useMacrostratColumnData();
+  let fetchID = null;
+  if (provided == null) {
+    fetchID = col_id ?? units?.[0]?.col_id ?? null;
+  }
+  const boundaries = useColumnAgeModel(fetchID);
+  const fromAgeModel = React.useMemo(
+    () => types.surfacesFromBoundaries(boundaries, { inferTiePoints }),
+    [boundaries, inferTiePoints]
+  );
+  const derived = React.useMemo(() => {
+    if (!fallbackToUnits) return [];
+    return types.surfacesFromUnits(units, { axisType });
+  }, [units, axisType, fallbackToUnits]);
+  if (provided != null) {
+    return { surfaces: provided, source: "provided" };
+  }
+  if (fetchID != null && boundaries == null) {
+    return { surfaces: [], source: "loading" };
+  }
+  if (fromAgeModel.length > 0) {
+    return { surfaces: fromAgeModel, source: "age-model" };
+  }
+  return { surfaces: derived, source: "derived" };
+}
+exports.AGE_MODEL_ROUTE = AGE_MODEL_ROUTE;
+exports.useColumnAgeModel = useColumnAgeModel;
+exports.useColumnSurfaces = useColumnSurfaces;
+//# sourceMappingURL=data.cjs.map

package/dist/age-model/data.cjs.map

@@ -0,0 +1 @@
+{"version":3,"file":"data.cjs","sources":["../../src/age-model/data.ts"],"sourcesContent":["/** Data hooks for a column's age model. */\nimport { useMemo } from \"react\";\nimport { useAPIResult } from \"@macrostrat/ui-components\";\nimport { useMacrostratBaseURL } from \"@macrostrat/data-provider\";\nimport type { UnitLong } from \"@macrostrat/api-types\";\nimport { useMacrostratColumnData, useMacrostratUnits } from \"../data-provider\";\nimport {\n  type AgeModelBoundary,\n  type ColumnSurface,\n  surfacesFromBoundaries,\n  surfacesFromUnits,\n} from \"./types\";\n\nexport const AGE_MODEL_ROUTE = \"/age_model\";\n\n/** The age-model boundaries of a column, from `/age_model?col_id=` on the\n * API the enclosing `MacrostratDataProvider` points at (production when there\n * is none). `null` while loading or when `col_id` is not set. */\nexport function useColumnAgeModel(\n  col_id: number | null | undefined,\n): AgeModelBoundary[] | null {\n  const baseURL = useMacrostratBaseURL();\n  const params = useMemo(() => ({ col_id }), [col_id]);\n  let route: string | null = null;\n  if (col_id != null) {\n    route = baseURL + AGE_MODEL_ROUTE;\n  }\n  return useAPIResult(route, params, unwrapAgeModel) ?? null;\n}\n\nfunction unwrapAgeModel(res: any): AgeModelBoundary[] {\n  return res?.success?.data ?? [];\n}\n\n/** Where a column's surfaces came from */\nexport type SurfacesSource = \"provided\" | \"age-model\" | \"derived\" | \"loading\";\n\nexport interface UseColumnSurfacesOptions {\n  /** Surfaces to show. When given, nothing is fetched. */\n  surfaces?: ColumnSurface[] | null;\n  /** The column whose age model to fetch. Defaults to the column being\n   * rendered (read from its units). */\n  col_id?: number | null;\n  /** When the age model has no boundaries, derive surfaces from the units\n   * instead (default `true`). */\n  fallbackToUnits?: boolean;\n  /** Promote `modeled` surfaces that must in fact constrain the age model to\n   * `relative` (default `true`) — see `inferTiePointStatuses`. */\n  inferTiePoints?: boolean;\n}\n\nexport interface ColumnSurfacesData {\n  surfaces: ColumnSurface[];\n  source: SurfacesSource;\n}\n\n/** Resolve the surfaces to show for the enclosing `Column`: the ones passed\n * in, else the column's age model, else (optionally) surfaces derived from\n * its units. Must be used inside a `Column`. */\nexport function useColumnSurfaces(\n  options: UseColumnSurfacesOptions = {},\n): ColumnSurfacesData {\n  const {\n    surfaces: provided,\n    col_id,\n    fallbackToUnits = true,\n    inferTiePoints = true,\n  } = options;\n  const units = useMacrostratUnits() as UnitLong[] | undefined;\n  const { axisType } = useMacrostratColumnData();\n\n  let fetchID: number | null = null;\n  if (provided == null) {\n    fetchID = col_id ?? units?.[0]?.col_id ?? null;\n  }\n  const boundaries = useColumnAgeModel(fetchID);\n\n  const fromAgeModel = useMemo(\n    () => surfacesFromBoundaries(boundaries, { inferTiePoints }),\n    [boundaries, inferTiePoints],\n  );\n\n  const derived = useMemo(() => {\n    if (!fallbackToUnits) return [];\n    return surfacesFromUnits(units, { axisType });\n  }, [units, axisType, fallbackToUnits]);\n\n  if (provided != null) {\n    return { surfaces: provided, source: \"provided\" };\n  }\n  if (fetchID != null && boundaries == null) {\n    return { surfaces: [], source: \"loading\" };\n  }\n  if (fromAgeModel.length > 0) {\n    return { surfaces: fromAgeModel, source: \"age-model\" };\n  }\n  return { surfaces: derived, source: \"derived\" };\n}\n"],"names":["useMacrostratBaseURL","useMemo","useAPIResult","useMacrostratUnits","useMacrostratColumnData","surfacesFromBoundaries","surfacesFromUnits"],"mappings":";;;;;;;AAaO,MAAM,kBAAkB;AAKxB,SAAS,kBACd,QAC2B;AAC3B,QAAM,UAAUA,aAAAA,qBAAA;AAChB,QAAM,SAASC,MAAAA,QAAQ,OAAO,EAAE,WAAW,CAAC,MAAM,CAAC;AACnD,MAAI,QAAuB;AAC3B,MAAI,UAAU,MAAM;AAClB,YAAQ,UAAU;AAAA,EACpB;AACA,SAAOC,aAAAA,aAAa,OAAO,QAAQ,cAAc,KAAK;AACxD;AAEA,SAAS,eAAe,KAA8B;AACpD,SAAO,KAAK,SAAS,QAAQ,CAAA;AAC/B;AA2BO,SAAS,kBACd,UAAoC,IAChB;AACpB,QAAM;AAAA,IACJ,UAAU;AAAA,IACV;AAAA,IACA,kBAAkB;AAAA,IAClB,iBAAiB;AAAA,EAAA,IACf;AACJ,QAAM,QAAQC,MAAAA,mBAAA;AACd,QAAM,EAAE,SAAA,IAAaC,8BAAA;AAErB,MAAI,UAAyB;AAC7B,MAAI,YAAY,MAAM;AACpB,cAAU,UAAU,QAAQ,CAAC,GAAG,UAAU;AAAA,EAC5C;AACA,QAAM,aAAa,kBAAkB,OAAO;AAE5C,QAAM,eAAeH,MAAAA;AAAAA,IACnB,MAAMI,6BAAuB,YAAY,EAAE,gBAAgB;AAAA,IAC3D,CAAC,YAAY,cAAc;AAAA,EAAA;AAG7B,QAAM,UAAUJ,MAAAA,QAAQ,MAAM;AAC5B,QAAI,CAAC,gBAAiB,QAAO,CAAA;AAC7B,WAAOK,wBAAkB,OAAO,EAAE,UAAU;AAAA,EAC9C,GAAG,CAAC,OAAO,UAAU,eAAe,CAAC;AAErC,MAAI,YAAY,MAAM;AACpB,WAAO,EAAE,UAAU,UAAU,QAAQ,WAAA;AAAA,EACvC;AACA,MAAI,WAAW,QAAQ,cAAc,MAAM;AACzC,WAAO,EAAE,UAAU,IAAI,QAAQ,UAAA;AAAA,EACjC;AACA,MAAI,aAAa,SAAS,GAAG;AAC3B,WAAO,EAAE,UAAU,cAAc,QAAQ,YAAA;AAAA,EAC3C;AACA,SAAO,EAAE,UAAU,SAAS,QAAQ,UAAA;AACtC;;;;"}

package/dist/age-model/data.d.ts

@@ -0,0 +1,29 @@
+import { AgeModelBoundary, ColumnSurface } from './types';
+export declare const AGE_MODEL_ROUTE = "/age_model";
+/** The age-model boundaries of a column, from `/age_model?col_id=` on the
+ * API the enclosing `MacrostratDataProvider` points at (production when there
+ * is none). `null` while loading or when `col_id` is not set. */
+export declare function useColumnAgeModel(col_id: number | null | undefined): AgeModelBoundary[] | null;
+/** Where a column's surfaces came from */
+export type SurfacesSource = "provided" | "age-model" | "derived" | "loading";
+export interface UseColumnSurfacesOptions {
+    /** Surfaces to show. When given, nothing is fetched. */
+    surfaces?: ColumnSurface[] | null;
+    /** The column whose age model to fetch. Defaults to the column being
+     * rendered (read from its units). */
+    col_id?: number | null;
+    /** When the age model has no boundaries, derive surfaces from the units
+     * instead (default `true`). */
+    fallbackToUnits?: boolean;
+    /** Promote `modeled` surfaces that must in fact constrain the age model to
+     * `relative` (default `true`) — see `inferTiePointStatuses`. */
+    inferTiePoints?: boolean;
+}
+export interface ColumnSurfacesData {
+    surfaces: ColumnSurface[];
+    source: SurfacesSource;
+}
+/** Resolve the surfaces to show for the enclosing `Column`: the ones passed
+ * in, else the column's age model, else (optionally) surfaces derived from
+ * its units. Must be used inside a `Column`. */
+export declare function useColumnSurfaces(options?: UseColumnSurfacesOptions): ColumnSurfacesData;

package/dist/age-model/data.js

@@ -0,0 +1,57 @@
+import { useMemo } from "react";
+import { useAPIResult } from "@macrostrat/ui-components";
+import { useMacrostratBaseURL } from "@macrostrat/data-provider";
+import { surfacesFromBoundaries, surfacesFromUnits } from "./types.js";
+import { useMacrostratUnits, useMacrostratColumnData } from "../data-provider/store.js";
+const AGE_MODEL_ROUTE = "/age_model";
+function useColumnAgeModel(col_id) {
+  const baseURL = useMacrostratBaseURL();
+  const params = useMemo(() => ({ col_id }), [col_id]);
+  let route = null;
+  if (col_id != null) {
+    route = baseURL + AGE_MODEL_ROUTE;
+  }
+  return useAPIResult(route, params, unwrapAgeModel) ?? null;
+}
+function unwrapAgeModel(res) {
+  return res?.success?.data ?? [];
+}
+function useColumnSurfaces(options = {}) {
+  const {
+    surfaces: provided,
+    col_id,
+    fallbackToUnits = true,
+    inferTiePoints = true
+  } = options;
+  const units = useMacrostratUnits();
+  const { axisType } = useMacrostratColumnData();
+  let fetchID = null;
+  if (provided == null) {
+    fetchID = col_id ?? units?.[0]?.col_id ?? null;
+  }
+  const boundaries = useColumnAgeModel(fetchID);
+  const fromAgeModel = useMemo(
+    () => surfacesFromBoundaries(boundaries, { inferTiePoints }),
+    [boundaries, inferTiePoints]
+  );
+  const derived = useMemo(() => {
+    if (!fallbackToUnits) return [];
+    return surfacesFromUnits(units, { axisType });
+  }, [units, axisType, fallbackToUnits]);
+  if (provided != null) {
+    return { surfaces: provided, source: "provided" };
+  }
+  if (fetchID != null && boundaries == null) {
+    return { surfaces: [], source: "loading" };
+  }
+  if (fromAgeModel.length > 0) {
+    return { surfaces: fromAgeModel, source: "age-model" };
+  }
+  return { surfaces: derived, source: "derived" };
+}
+export {
+  AGE_MODEL_ROUTE,
+  useColumnAgeModel,
+  useColumnSurfaces
+};
+//# sourceMappingURL=data.js.map

package/dist/age-model/data.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"data.js","sources":["../../src/age-model/data.ts"],"sourcesContent":["/** Data hooks for a column's age model. */\nimport { useMemo } from \"react\";\nimport { useAPIResult } from \"@macrostrat/ui-components\";\nimport { useMacrostratBaseURL } from \"@macrostrat/data-provider\";\nimport type { UnitLong } from \"@macrostrat/api-types\";\nimport { useMacrostratColumnData, useMacrostratUnits } from \"../data-provider\";\nimport {\n  type AgeModelBoundary,\n  type ColumnSurface,\n  surfacesFromBoundaries,\n  surfacesFromUnits,\n} from \"./types\";\n\nexport const AGE_MODEL_ROUTE = \"/age_model\";\n\n/** The age-model boundaries of a column, from `/age_model?col_id=` on the\n * API the enclosing `MacrostratDataProvider` points at (production when there\n * is none). `null` while loading or when `col_id` is not set. */\nexport function useColumnAgeModel(\n  col_id: number | null | undefined,\n): AgeModelBoundary[] | null {\n  const baseURL = useMacrostratBaseURL();\n  const params = useMemo(() => ({ col_id }), [col_id]);\n  let route: string | null = null;\n  if (col_id != null) {\n    route = baseURL + AGE_MODEL_ROUTE;\n  }\n  return useAPIResult(route, params, unwrapAgeModel) ?? null;\n}\n\nfunction unwrapAgeModel(res: any): AgeModelBoundary[] {\n  return res?.success?.data ?? [];\n}\n\n/** Where a column's surfaces came from */\nexport type SurfacesSource = \"provided\" | \"age-model\" | \"derived\" | \"loading\";\n\nexport interface UseColumnSurfacesOptions {\n  /** Surfaces to show. When given, nothing is fetched. */\n  surfaces?: ColumnSurface[] | null;\n  /** The column whose age model to fetch. Defaults to the column being\n   * rendered (read from its units). */\n  col_id?: number | null;\n  /** When the age model has no boundaries, derive surfaces from the units\n   * instead (default `true`). */\n  fallbackToUnits?: boolean;\n  /** Promote `modeled` surfaces that must in fact constrain the age model to\n   * `relative` (default `true`) — see `inferTiePointStatuses`. */\n  inferTiePoints?: boolean;\n}\n\nexport interface ColumnSurfacesData {\n  surfaces: ColumnSurface[];\n  source: SurfacesSource;\n}\n\n/** Resolve the surfaces to show for the enclosing `Column`: the ones passed\n * in, else the column's age model, else (optionally) surfaces derived from\n * its units. Must be used inside a `Column`. */\nexport function useColumnSurfaces(\n  options: UseColumnSurfacesOptions = {},\n): ColumnSurfacesData {\n  const {\n    surfaces: provided,\n    col_id,\n    fallbackToUnits = true,\n    inferTiePoints = true,\n  } = options;\n  const units = useMacrostratUnits() as UnitLong[] | undefined;\n  const { axisType } = useMacrostratColumnData();\n\n  let fetchID: number | null = null;\n  if (provided == null) {\n    fetchID = col_id ?? units?.[0]?.col_id ?? null;\n  }\n  const boundaries = useColumnAgeModel(fetchID);\n\n  const fromAgeModel = useMemo(\n    () => surfacesFromBoundaries(boundaries, { inferTiePoints }),\n    [boundaries, inferTiePoints],\n  );\n\n  const derived = useMemo(() => {\n    if (!fallbackToUnits) return [];\n    return surfacesFromUnits(units, { axisType });\n  }, [units, axisType, fallbackToUnits]);\n\n  if (provided != null) {\n    return { surfaces: provided, source: \"provided\" };\n  }\n  if (fetchID != null && boundaries == null) {\n    return { surfaces: [], source: \"loading\" };\n  }\n  if (fromAgeModel.length > 0) {\n    return { surfaces: fromAgeModel, source: \"age-model\" };\n  }\n  return { surfaces: derived, source: \"derived\" };\n}\n"],"names":[],"mappings":";;;;;AAaO,MAAM,kBAAkB;AAKxB,SAAS,kBACd,QAC2B;AAC3B,QAAM,UAAU,qBAAA;AAChB,QAAM,SAAS,QAAQ,OAAO,EAAE,WAAW,CAAC,MAAM,CAAC;AACnD,MAAI,QAAuB;AAC3B,MAAI,UAAU,MAAM;AAClB,YAAQ,UAAU;AAAA,EACpB;AACA,SAAO,aAAa,OAAO,QAAQ,cAAc,KAAK;AACxD;AAEA,SAAS,eAAe,KAA8B;AACpD,SAAO,KAAK,SAAS,QAAQ,CAAA;AAC/B;AA2BO,SAAS,kBACd,UAAoC,IAChB;AACpB,QAAM;AAAA,IACJ,UAAU;AAAA,IACV;AAAA,IACA,kBAAkB;AAAA,IAClB,iBAAiB;AAAA,EAAA,IACf;AACJ,QAAM,QAAQ,mBAAA;AACd,QAAM,EAAE,SAAA,IAAa,wBAAA;AAErB,MAAI,UAAyB;AAC7B,MAAI,YAAY,MAAM;AACpB,cAAU,UAAU,QAAQ,CAAC,GAAG,UAAU;AAAA,EAC5C;AACA,QAAM,aAAa,kBAAkB,OAAO;AAE5C,QAAM,eAAe;AAAA,IACnB,MAAM,uBAAuB,YAAY,EAAE,gBAAgB;AAAA,IAC3D,CAAC,YAAY,cAAc;AAAA,EAAA;AAG7B,QAAM,UAAU,QAAQ,MAAM;AAC5B,QAAI,CAAC,gBAAiB,QAAO,CAAA;AAC7B,WAAO,kBAAkB,OAAO,EAAE,UAAU;AAAA,EAC9C,GAAG,CAAC,OAAO,UAAU,eAAe,CAAC;AAErC,MAAI,YAAY,MAAM;AACpB,WAAO,EAAE,UAAU,UAAU,QAAQ,WAAA;AAAA,EACvC;AACA,MAAI,WAAW,QAAQ,cAAc,MAAM;AACzC,WAAO,EAAE,UAAU,IAAI,QAAQ,UAAA;AAAA,EACjC;AACA,MAAI,aAAa,SAAS,GAAG;AAC3B,WAAO,EAAE,UAAU,cAAc,QAAQ,YAAA;AAAA,EAC3C;AACA,SAAO,EAAE,UAAU,SAAS,QAAQ,UAAA;AACtC;"}