@macrostrat/column-views 1.0.3 → 2.0.1

package/CHANGELOG.md

@@ -4,6 +4,27 @@ All notable changes to this project will be documented in this file. The format
 is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/), and this
 project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
 
+## [2.0.1] - 2025-05-08
+
+Solve a problem with strict mode
+
+## [2.0.0] - 2025-04-09
+
+Major update for columns and correlation diagrams:
+
+- Add Mapbox-based column selection and correlation-line selection maps
+- Add `ColoredUnitComponent` based on mixing unit colors by lithology
+- Fully integrated management of composite column scales, allowing for much more
+  flexible column creation
+- Added the ability to have zig-zag cutoffs when units overflow the time bounds
+  of the column
+- Added a unified `MacrostratDataProvider` that allows frontend caching of data
+  dictionaries in the UI
+- Major improvements to columns and styling
+
+This release will support rendering of stratigraphic columns in Rockd and
+Macrostrat.
+
 ## [1.0.3] - 2025-03-08
 
 Export `UnitDetailsPanel`

package/dist/esm/{data-area.daff8da0.js → column-views.062d164a.js}

@@ -83,4 +83,4 @@ const $1dbd903fb3e2f029$export$919dbb10b6b5b75 = ()=>(0, $8epey$useContext)($1db
 
 
 export {$1dbd903fb3e2f029$export$309ef8546e07d921 as IsotopesDataArea, $1dbd903fb3e2f029$export$4cb5d059db4e2bd as IsotopeDataPoint, $1dbd903fb3e2f029$export$628a3ef6eb9c3a89 as IsotopeDataLine, $1dbd903fb3e2f029$export$919dbb10b6b5b75 as useDataLocator};
-//# sourceMappingURL=data-area.daff8da0.js.map
+//# sourceMappingURL=column-views.062d164a.js.map

package/dist/esm/{data-area.daff8da0.js.map → column-views.062d164a.js.map}

@@ -1 +1 @@
-{"mappings":";;;;;;;;;AAKA,MAAM,iCAAW,CAAC,OAAO;IACvB,MAAM,SAAS,MAAM,MAAM;IAC3B,OAAO,MAAM,CAAC,EAAE,GAAG,MAAM,MAAM,CAAC,EAAE;AACpC;AAEA,MAAM,2CAAqB,SAAU,IAAI;IACvC,MAAM,UAAE,MAAM,SAAE,KAAK,aAAE,SAAS,EAAE,GAAG,MAAM,GAAG;IAC9C,OAAO,SAAU,CAAC,EAAE,IAAI,CAAC;QACvB,MAAM,SAAS,UAAU;QACzB,IAAI,CAAC,+BAAS,OAAO,SAAS,OAAO;QACrC,OAAO;YAAC,OAAO,EAAE,KAAK;YAAG,MAAM;SAAQ;IACzC;AACF;AAEA,MAAM,4CAAsB,CAAA,GAAA,oBAAY,EAAE;AAW1C,MAAM,4CAAmB,SAAU,KAAoB;IACrD,MAAM,UAAE,MAAM,SAAE,KAAK,EAAE,GAAG,CAAA,GAAA,iBAAS,EAAE,CAAA,GAAA,0BAAkB,MAAM,CAAC;IAE9D,IAAI,aAAE,SAAS,UAAE,MAAM,YAAE,QAAQ,aAAE,SAAS,SAAE,KAAK,EAAE,GAAG;IACxD,IAAI,aAAa,MACf,YAAY,SAAU,CAAC;QACrB,IAAI,EAAE,MAAM,IAAI,MACd,QAAQ,GAAG,CAAC;QAEd,OAAO,EAAE,MAAM;IACjB;IAGF,yCAAyC;IACzC,MAAM,eAAe,yCAAmB;gBACtC;eACA;mBACA;gBACA;mBACA;IACF;IAEA,IAAI,SAAS,SAAS;IACtB,IAAI,WACF,UAAU;IAEZ,MAAM,cAAc,CAAA,GAAA,WAAG,IACpB,CAAC,CAAC,CAAC,IAAM,OAAO,CAAC,CAAC,OAAO,EAC1B,aAAa;KACZ,CAAC,CAAC,CAAC,IAAM,MAAM,EAAE,MAAM;IAE1B,MAAM,QAAQ;sBAAE;qBAAc;mBAAa;gBAAW;eAAQ;IAAM;IACpE,OAAO,CAAA,GAAA,sBAAA,EAAE,0CAAoB,QAAQ,EAAE;eAAE;IAAM,GAAG,CAAA,GAAA,sBAAA,EAAE,UAAU;AAChE;AAEA,0CAAiB,YAAY,GAAG;IAAE,OAAO;AAAM;AAE/C,MAAM,2CAAmB,SAAU,KAAK;IACtC,MAAM,gBAAE,YAAY,EAAE,GAAG,CAAA,GAAA,iBAAS,EAAE;IACpC,MAAM,SAAE,KAAK,eAAE,WAAW,EAAE,GAAG,MAAM,GAAG;IACxC,MAAM,MAAM,aAAa;IACzB,IAAI,OAAO,MAAM,OAAO;IACxB,MAAM,CAAC,IAAI,GAAG,GAAG;IAEjB,OAAO,CAAA,GAAA,sBAAA,EAAE,UAAU;QACjB,KAAK,MAAM,SAAS;YACpB;YACA;QACA,GAAG;QACH,GAAG,IAAI;IACT;AACF;AAEA,MAAM,4CAAkB,SAAU,KAAK;IACrC,MAAM,EAAE,QAAQ,UAAU,EAAE,GAAG,MAAM,GAAG;IACxC,MAAM,eAAE,WAAW,EAAE,GAAG,CAAA,GAAA,iBAAS,EAAE;IACnC,OAAO,CAAA,GAAA,sBAAA,EAAE,QAAQ;QACf,GAAG,YAAY;QACf,MAAM;QACN,GAAG,IAAI;IACT;AACF;AAEA,MAAM,2CAAiB,IAAM,CAAA,GAAA,iBAAS,EAAE","sources":["packages/column-views/src/carbon-isotopes/data-area.ts"],"sourcesContent":["import { line } from \"d3-shape\";\nimport { createContext, useContext } from \"react\";\nimport h from \"@macrostrat/hyper\";\nimport { ColumnLayoutContext } from \"@macrostrat/column-components\";\n\nconst inDomain = (scale, num) => {\n  const domain = scale.domain();\n  return domain[0] < num < domain[1];\n};\n\nconst createPointLocator = function (opts) {\n  const { xScale, scale, getHeight, ...rest } = opts;\n  return function (d, s = 0) {\n    const height = getHeight(d);\n    if (!inDomain(scale, height)) return null;\n    return [xScale(d.value), scale(height)];\n  };\n};\n\nconst IsotopesDataContext = createContext(null);\n\nexport interface DataAreaProps {\n  clipY: boolean;\n  parameter: string;\n  corrected: boolean;\n  system: string;\n  children: React.ReactNode;\n  getHeight?: Function;\n}\n\nconst IsotopesDataArea = function (props: DataAreaProps) {\n  const { xScale, scale } = useContext(ColumnLayoutContext) ?? {};\n\n  let { corrected, system, children, getHeight, clipY } = props;\n  if (getHeight == null) {\n    getHeight = function (d) {\n      if (d.height == null) {\n        console.log(d);\n      }\n      return d.height;\n    };\n  }\n\n  // Handlers for creating points and lines\n  const pointLocator = createPointLocator({\n    xScale,\n    scale,\n    corrected,\n    system,\n    getHeight,\n  });\n\n  let column = \"avg_\" + system;\n  if (corrected) {\n    column += \"_corr\";\n  }\n  const lineLocator = line()\n    .x((d) => xScale(d[column]))\n    // @ts-ignore\n    .y((d) => scale(d.height));\n\n  const value = { pointLocator, lineLocator, corrected, system, clipY };\n  return h(IsotopesDataContext.Provider, { value }, h(\"g.data\", children));\n};\n\nIsotopesDataArea.defaultProps = { clipY: false };\n\nconst IsotopeDataPoint = function (props) {\n  const { pointLocator } = useContext(IsotopesDataContext);\n  const { datum, strokeWidth, ...rest } = props;\n  const loc = pointLocator(datum);\n  if (loc == null) return null;\n  const [cx, cy] = loc;\n\n  return h(\"circle\", {\n    key: datum.sample_id,\n    cx,\n    cy,\n    r: 2,\n    ...rest,\n  });\n};\n\nconst IsotopeDataLine = function (props) {\n  const { values: lineValues, ...rest } = props;\n  const { lineLocator } = useContext(IsotopesDataContext);\n  return h(\"path\", {\n    d: lineLocator(lineValues),\n    fill: \"transparent\",\n    ...rest,\n  });\n};\n\nconst useDataLocator = () => useContext(IsotopesDataContext);\n\nexport { IsotopesDataArea, IsotopeDataPoint, IsotopeDataLine, useDataLocator };\n"],"names":[],"version":3,"file":"data-area.daff8da0.js.map"}
+{"mappings":";;;;;;;;;AAKA,MAAM,iCAAW,CAAC,OAAO;IACvB,MAAM,SAAS,MAAM,MAAM;IAC3B,OAAO,MAAM,CAAC,EAAE,GAAG,MAAM,MAAM,CAAC,EAAE;AACpC;AAEA,MAAM,2CAAqB,SAAU,IAAI;IACvC,MAAM,UAAE,MAAM,SAAE,KAAK,aAAE,SAAS,EAAE,GAAG,MAAM,GAAG;IAC9C,OAAO,SAAU,CAAC,EAAE,IAAI,CAAC;QACvB,MAAM,SAAS,UAAU;QACzB,IAAI,CAAC,+BAAS,OAAO,SAAS,OAAO;QACrC,OAAO;YAAC,OAAO,EAAE,KAAK;YAAG,MAAM;SAAQ;IACzC;AACF;AAEA,MAAM,4CAAsB,CAAA,GAAA,oBAAY,EAAE;AAW1C,MAAM,4CAAmB,SAAU,KAAoB;IACrD,MAAM,UAAE,MAAM,SAAE,KAAK,EAAE,GAAG,CAAA,GAAA,iBAAS,EAAE,CAAA,GAAA,0BAAkB,MAAM,CAAC;IAE9D,IAAI,aAAE,SAAS,UAAE,MAAM,YAAE,QAAQ,aAAE,SAAS,SAAE,KAAK,EAAE,GAAG;IACxD,IAAI,aAAa,MACf,YAAY,SAAU,CAAC;QACrB,IAAI,EAAE,MAAM,IAAI,MACd,QAAQ,GAAG,CAAC;QAEd,OAAO,EAAE,MAAM;IACjB;IAGF,yCAAyC;IACzC,MAAM,eAAe,yCAAmB;gBACtC;eACA;mBACA;gBACA;mBACA;IACF;IAEA,IAAI,SAAS,SAAS;IACtB,IAAI,WACF,UAAU;IAEZ,MAAM,cAAc,CAAA,GAAA,WAAG,IACpB,CAAC,CAAC,CAAC,IAAM,OAAO,CAAC,CAAC,OAAO,EAC1B,aAAa;KACZ,CAAC,CAAC,CAAC,IAAM,MAAM,EAAE,MAAM;IAE1B,MAAM,QAAQ;sBAAE;qBAAc;mBAAa;gBAAW;eAAQ;IAAM;IACpE,OAAO,CAAA,GAAA,sBAAA,EAAE,0CAAoB,QAAQ,EAAE;eAAE;IAAM,GAAG,CAAA,GAAA,sBAAA,EAAE,UAAU;AAChE;AAEA,0CAAiB,YAAY,GAAG;IAAE,OAAO;AAAM;AAE/C,MAAM,2CAAmB,SAAU,KAAK;IACtC,MAAM,gBAAE,YAAY,EAAE,GAAG,CAAA,GAAA,iBAAS,EAAE;IACpC,MAAM,SAAE,KAAK,eAAE,WAAW,EAAE,GAAG,MAAM,GAAG;IACxC,MAAM,MAAM,aAAa;IACzB,IAAI,OAAO,MAAM,OAAO;IACxB,MAAM,CAAC,IAAI,GAAG,GAAG;IAEjB,OAAO,CAAA,GAAA,sBAAA,EAAE,UAAU;QACjB,KAAK,MAAM,SAAS;YACpB;YACA;QACA,GAAG;QACH,GAAG,IAAI;IACT;AACF;AAEA,MAAM,4CAAkB,SAAU,KAAK;IACrC,MAAM,EAAE,QAAQ,UAAU,EAAE,GAAG,MAAM,GAAG;IACxC,MAAM,eAAE,WAAW,EAAE,GAAG,CAAA,GAAA,iBAAS,EAAE;IACnC,OAAO,CAAA,GAAA,sBAAA,EAAE,QAAQ;QACf,GAAG,YAAY;QACf,MAAM;QACN,GAAG,IAAI;IACT;AACF;AAEA,MAAM,2CAAiB,IAAM,CAAA,GAAA,iBAAS,EAAE","sources":["packages/column-views/src/carbon-isotopes/data-area.ts"],"sourcesContent":["import { line } from \"d3-shape\";\nimport { createContext, useContext } from \"react\";\nimport h from \"@macrostrat/hyper\";\nimport { ColumnLayoutContext } from \"@macrostrat/column-components\";\n\nconst inDomain = (scale, num) => {\n  const domain = scale.domain();\n  return domain[0] < num < domain[1];\n};\n\nconst createPointLocator = function (opts) {\n  const { xScale, scale, getHeight, ...rest } = opts;\n  return function (d, s = 0) {\n    const height = getHeight(d);\n    if (!inDomain(scale, height)) return null;\n    return [xScale(d.value), scale(height)];\n  };\n};\n\nconst IsotopesDataContext = createContext(null);\n\nexport interface DataAreaProps {\n  clipY: boolean;\n  parameter: string;\n  corrected: boolean;\n  system: string;\n  children: React.ReactNode;\n  getHeight?: Function;\n}\n\nconst IsotopesDataArea = function (props: DataAreaProps) {\n  const { xScale, scale } = useContext(ColumnLayoutContext) ?? {};\n\n  let { corrected, system, children, getHeight, clipY } = props;\n  if (getHeight == null) {\n    getHeight = function (d) {\n      if (d.height == null) {\n        console.log(d);\n      }\n      return d.height;\n    };\n  }\n\n  // Handlers for creating points and lines\n  const pointLocator = createPointLocator({\n    xScale,\n    scale,\n    corrected,\n    system,\n    getHeight,\n  });\n\n  let column = \"avg_\" + system;\n  if (corrected) {\n    column += \"_corr\";\n  }\n  const lineLocator = line()\n    .x((d) => xScale(d[column]))\n    // @ts-ignore\n    .y((d) => scale(d.height));\n\n  const value = { pointLocator, lineLocator, corrected, system, clipY };\n  return h(IsotopesDataContext.Provider, { value }, h(\"g.data\", children));\n};\n\nIsotopesDataArea.defaultProps = { clipY: false };\n\nconst IsotopeDataPoint = function (props) {\n  const { pointLocator } = useContext(IsotopesDataContext);\n  const { datum, strokeWidth, ...rest } = props;\n  const loc = pointLocator(datum);\n  if (loc == null) return null;\n  const [cx, cy] = loc;\n\n  return h(\"circle\", {\n    key: datum.sample_id,\n    cx,\n    cy,\n    r: 2,\n    ...rest,\n  });\n};\n\nconst IsotopeDataLine = function (props) {\n  const { values: lineValues, ...rest } = props;\n  const { lineLocator } = useContext(IsotopesDataContext);\n  return h(\"path\", {\n    d: lineLocator(lineValues),\n    fill: \"transparent\",\n    ...rest,\n  });\n};\n\nconst useDataLocator = () => useContext(IsotopesDataContext);\n\nexport { IsotopesDataArea, IsotopeDataPoint, IsotopeDataLine, useDataLocator };\n"],"names":[],"version":3,"file":"column-views.062d164a.js.map"}

package/dist/esm/{data-provider.1506eb64.js → column-views.07521ce6.js}

@@ -22,4 +22,4 @@ const $8adf39b8c41fe3cc$export$8a0335fd9ff72150 = ()=>(0, $hiXDY$useContext)($8a
 
 
 export {$8adf39b8c41fe3cc$export$c644ef985ce7a4c4 as MeasurementDataContext, $8adf39b8c41fe3cc$export$5f01d5b342a89841 as MeasurementDataProvider, $8adf39b8c41fe3cc$export$8a0335fd9ff72150 as useMeasurementData};
-//# sourceMappingURL=data-provider.1506eb64.js.map
+//# sourceMappingURL=column-views.07521ce6.js.map

package/dist/esm/column-views.07521ce6.js.map

@@ -0,0 +1 @@
+{"mappings":";;;;;;;AAIA,MAAM,4CAAyB,CAAA,GAAA,oBAAY,EAAE;AAEtC,SAAS,0CAAwB,KAAK;IAC3C,MAAM,YAAE,QAAQ,EAAE,GAAG,QAAQ,GAAG;IAChC,MAAM,MAAM,CAAA,GAAA,mBAAW,EAAE,iBAAiB;QACxC,GAAG,MAAM;QACT,aAAa;QACb,UAAU;IACZ;IACA,OAAO,CAAA,GAAA,sBAAA,EAAE,0CAAuB,QAAQ,EAAE;QAAE,OAAO;kBAAK;IAAS;AACnE;AAEA,MAAM,4CAAqB,IAAM,CAAA,GAAA,iBAAS,EAAE","sources":["packages/column-views/src/carbon-isotopes/data-provider.ts"],"sourcesContent":["import h from \"@macrostrat/hyper\";\nimport { useContext, createContext } from \"react\";\nimport { useAPIResult } from \"@macrostrat/ui-components\";\n\nconst MeasurementDataContext = createContext(null);\n\nexport function MeasurementDataProvider(props) {\n  const { children, ...params } = props;\n  const res = useAPIResult(\"/measurements\", {\n    ...params,\n    show_values: true,\n    response: \"long\",\n  });\n  return h(MeasurementDataContext.Provider, { value: res, children });\n}\n\nconst useMeasurementData = () => useContext(MeasurementDataContext);\n\nexport { useMeasurementData, MeasurementDataContext };\n"],"names":[],"version":3,"file":"column-views.07521ce6.js.map"}

package/dist/esm/column-views.134b2e2a.js

@@ -0,0 +1,9 @@
+import {CorrelationChart as $ed7dc56184962590$export$9ebf875c09445bec} from "./column-views.aa9fcdba.js";
+import {parseLineFromString as $c491b6231216b7f9$export$77c3cc7a57c6db5f, stringifyLine as $c491b6231216b7f9$export$8c53992169ff5301} from "./column-views.beb54e95.js";
+
+
+
+
+
+export {$ed7dc56184962590$export$9ebf875c09445bec as CorrelationChart, $c491b6231216b7f9$export$77c3cc7a57c6db5f as parseLineFromString, $c491b6231216b7f9$export$8c53992169ff5301 as stringifyLine};
+//# sourceMappingURL=column-views.134b2e2a.js.map

package/dist/esm/column-views.134b2e2a.js.map

@@ -0,0 +1 @@
+{"mappings":"","sources":["packages/column-views/src/correlation-chart/index.ts"],"sourcesContent":["export * from \"./main\";\nexport * from \"./hash-string\";\n"],"names":[],"version":3,"file":"column-views.134b2e2a.js.map"}

package/dist/esm/{selection-popover.module.0a701258.css → column-views.16cc7a58.css}

@@ -1,13 +1,13 @@
-.e_hMea_popover-main {
+.mMIlxW_popover-main {
   pointer-events: none;
   position: absolute;
 }
 
-.e_hMea_popover-main .bp5-overlay {
+.mMIlxW_popover-main .bp5-overlay {
   pointer-events: all;
 }
 
-.e_hMea_popover-main .bp5-popover-target {
+.mMIlxW_popover-main .bp5-popover-target {
   pointer-events: none;
   outline: 2px solid #f22;
   width: 100%;
@@ -16,19 +16,22 @@
   display: block;
 }
 
-.e_hMea_legend-panel-outer {
+.mMIlxW_popover-main .bp5-popover-content {
+  overflow: hidden;
+}
+
+.mMIlxW_legend-panel {
   background-color: var(--panel-background-color);
   width: 25em;
   max-height: 60vh;
-  overflow-y: scroll;
 }
 
-.e_hMea_legend-info-panel {
+.mMIlxW_legend-info-panel {
   padding: 1em;
 }
 
-.e_hMea_legend-json-view {
+.mMIlxW_legend-json-view {
   margin-left: -.5em;
   padding-left: 0;
 }
-/*# sourceMappingURL=selection-popover.module.0a701258.css.map */
+/*# sourceMappingURL=column-views.16cc7a58.css.map */

package/dist/esm/column-views.16cc7a58.css.map

@@ -0,0 +1 @@
+{"mappings":"AAAA;;;;;AAIE;;;;AAGA;;;;;;;;;AAQA;;;;AAGF;;;;;;AAKA;;;;AAGA","sources":["packages/column-views/src/unit-details/popover.module.sass"],"sourcesContent":[".popover-main\n  position: absolute\n  pointer-events: none\n\n  :global(.bp5-overlay)\n    pointer-events: all\n\n  :global(.bp5-popover-target)\n    height: 100%\n    width: 100%\n    display: block\n    line-height: 0\n    pointer-events: none\n    outline: 2px solid #f22\n\n  :global(.bp5-popover-content)\n    overflow: hidden\n\n.legend-panel\n  width: 25em\n  max-height: 60vh\n  background-color: var(--panel-background-color)\n\n.legend-info-panel\n  padding: 1em\n\n.legend-json-view\n  padding-left: 0\n  margin-left: -0.5em\n"],"names":[],"version":3,"file":"column-views.16cc7a58.css.map"}

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

@@ -0,0 +1,141 @@
+import {getUnitHeightRange as $b6657fba8924a702$export$70e712e2ac0237a, unitsOverlap as $b6657fba8924a702$export$f1a15f539858307, createUnitSorter as $b6657fba8924a702$export$ab14c04795685c55, ensureArray as $b6657fba8924a702$export$d0c8ecbd4ed8940c, ensureRealFloat as $b6657fba8924a702$export$97de5b0a6b4e4dac} from "./column-views.39657bbf.js";
+import {group as $ailTa$group} from "d3-array";
+import {ColumnAxisType as $ailTa$ColumnAxisType} from "@macrostrat/column-components";
+
+
+
+
+const $663a0cdd08b02256$var$dt = 0.001;
+function $663a0cdd08b02256$export$55543e159517d62d(section, axisType = (0, $ailTa$ColumnAxisType).AGE) {
+    /** Preprocess units to add overlapping units and columns. */ const units = section.units;
+    let divisions = units.map((...args)=>$663a0cdd08b02256$var$extendDivision(...args, axisType));
+    for (let d of divisions){
+        const overlappingUnits = divisions.filter((u)=>d.overlappingUnits.includes(u.unit_id));
+        // Overlapping columns
+        const columns = overlappingUnits.map((d)=>d.column);
+        if (columns.includes(d.column)) {
+            let col = 0;
+            // Go through columns to find a better index
+            while(columns.includes(col))col++;
+            d.column = col;
+        }
+        // If unit overlaps the edges of a section, set the clip positions
+        if (axisType == (0, $ailTa$ColumnAxisType).AGE) {
+            const [b_pos, t_pos] = (0, $b6657fba8924a702$export$70e712e2ac0237a)(d, axisType);
+            if (b_pos > section.b_age) d.b_clip_pos = section.b_age;
+            if (t_pos < section.t_age) d.t_clip_pos = section.t_age;
+        }
+    }
+    if (axisType != (0, $ailTa$ColumnAxisType).AGE) return $663a0cdd08b02256$var$preprocessSectionUnits(divisions, axisType);
+    return divisions;
+}
+function $663a0cdd08b02256$var$extendDivision(unit, i, divisions, axisType = (0, $ailTa$ColumnAxisType).AGE) {
+    const overlappingUnits = divisions.filter((d)=>d.unit_id != unit.unit_id && (0, $b6657fba8924a702$export$f1a15f539858307)(unit, d, axisType));
+    const u_pos = (0, $b6657fba8924a702$export$70e712e2ac0237a)(unit, axisType);
+    const bottomOverlap = overlappingUnits.some((d)=>{
+        const d_pos = (0, $b6657fba8924a702$export$70e712e2ac0237a)(d, axisType);
+        // Check if the unit is below the current unit
+        return d_pos[0] < u_pos[0] + $663a0cdd08b02256$var$dt;
+    });
+    let column = 0;
+    if (overlappingUnits.length == 1) column = 1;
+    return {
+        ...unit,
+        bottomOverlap: bottomOverlap,
+        column: column,
+        overlappingUnits: overlappingUnits.map((d)=>d.unit_id)
+    };
+}
+function $663a0cdd08b02256$export$dfbd00399d639b4c(units, axisType = (0, $ailTa$ColumnAxisType).AGE) {
+    let groups = Array.from((0, $ailTa$group)(units, (d)=>d.section_id));
+    const unitComparator = (0, $b6657fba8924a702$export$ab14c04795685c55)(axisType);
+    const groups1 = groups.map(([section_id, sectionUnits])=>{
+        const [b_age, t_age] = $663a0cdd08b02256$export$8093438ec3e4c6fd(sectionUnits);
+        // sort units by position
+        sectionUnits.sort(unitComparator);
+        return {
+            section_id: section_id,
+            t_age: t_age,
+            b_age: b_age,
+            units: sectionUnits
+        };
+    });
+    // Sort sections by increasing top age, then increasing bottom age.
+    // Sections have no relative ordinal position other than age...
+    const compareSections = (0, $b6657fba8924a702$export$ab14c04795685c55)((0, $ailTa$ColumnAxisType).AGE);
+    groups1.sort(compareSections);
+    return groups1;
+}
+function $663a0cdd08b02256$export$8093438ec3e4c6fd(units) {
+    /** Get the overall age range of a set of units. */ const t_ages = units.map((d)=>d.t_age);
+    const b_ages = units.map((d)=>d.b_age);
+    const t_age = Math.min(...t_ages);
+    const b_age = Math.max(...b_ages);
+    return [
+        b_age,
+        t_age
+    ];
+}
+function $663a0cdd08b02256$export$e7bb744b9be37f3d(sections) {
+    /** Columns can have sections that overlap in time. Here, we merge overlapping
+   * sections into a single section to correctly render gap-bound packages.
+   */ const [firstSection, ...rest] = sections;
+    const newSections = [
+        firstSection
+    ];
+    for (const section of rest){
+        const lastSection = newSections[newSections.length - 1];
+        if (lastSection.b_age < section.t_age || lastSection.t_age > section.b_age) {
+            // No overlap, add the section as normal
+            newSections.push(section);
+            continue;
+        }
+        // Overlap, merge the sections
+        lastSection.section_id = [
+            ...(0, $b6657fba8924a702$export$d0c8ecbd4ed8940c)(lastSection.section_id),
+            ...(0, $b6657fba8924a702$export$d0c8ecbd4ed8940c)(section.section_id)
+        ];
+        lastSection.units.push(...section.units);
+        lastSection.b_age = Math.max(lastSection.b_age, section.b_age);
+        lastSection.t_age = Math.min(lastSection.t_age, section.t_age);
+    }
+    return newSections;
+}
+function $663a0cdd08b02256$var$preprocessSectionUnits(units, axisType = (0, $ailTa$ColumnAxisType).DEPTH) {
+    /** Preprocess units for a "section" column type, which is guaranteed to be simpler. */ // We have to assume the units are ordered...
+    let thickness = 0;
+    return units.map((unit, i)=>{
+        let u1 = $663a0cdd08b02256$var$preprocessSectionUnit(unit, i, units, thickness, axisType);
+        thickness += Math.abs(u1.t_pos - u1.b_pos);
+        return u1;
+    });
+}
+function $663a0cdd08b02256$var$preprocessSectionUnit(unit, i, units, accumulatedThickness = 0, axisType = (0, $ailTa$ColumnAxisType).DEPTH) {
+    /** Preprocess a single unit for a "section" column type.
+   * No provision for overlapping units.
+   * */ let b_pos = unit.b_pos;
+    let t_pos = unit.t_pos;
+    if (b_pos == t_pos && axisType == (0, $ailTa$ColumnAxisType).ORDINAL) t_pos = t_pos - 1;
+    let unit_name = unit.unit_name;
+    // eODP columns sometimes have overlapping core sections, which are encoded in the name field
+    // Match eODP section names
+    const match = unit.unit_name.match(/^(\d+(\.\d+)?)-(\d+(\.\d+)?): (.+)/);
+    if (match) {
+        // These values should already be set if we've used the show_positions flag
+        t_pos ??= (0, $b6657fba8924a702$export$97de5b0a6b4e4dac)(match[1]);
+        b_pos ??= (0, $b6657fba8924a702$export$97de5b0a6b4e4dac)(match[3]);
+        unit_name = match[5];
+    }
+    return {
+        ...unit,
+        b_pos: (0, $b6657fba8924a702$export$97de5b0a6b4e4dac)(b_pos),
+        t_pos: (0, $b6657fba8924a702$export$97de5b0a6b4e4dac)(t_pos),
+        unit_name: unit_name,
+        bottomOverlap: false,
+        overlappingUnits: []
+    };
+}
+
+
+export {$663a0cdd08b02256$export$55543e159517d62d as preprocessUnits, $663a0cdd08b02256$export$dfbd00399d639b4c as groupUnitsIntoSections, $663a0cdd08b02256$export$8093438ec3e4c6fd as getSectionAgeRange, $663a0cdd08b02256$export$e7bb744b9be37f3d as mergeOverlappingSections};
+//# sourceMappingURL=column-views.1c589cc4.js.map

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

@@ -0,0 +1 @@
+{"mappings":"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","sources":["packages/column-views/src/prepare-units/helpers.ts"],"sourcesContent":["import type { BaseUnit, UnitLong } from \"@macrostrat/api-types\";\nimport { group } from \"d3-array\";\nimport { ColumnAxisType } from \"@macrostrat/column-components\";\nimport {\n  unitsOverlap,\n  getUnitHeightRange,\n  createUnitSorter,\n  ensureArray,\n  ensureRealFloat,\n} from \"./utils\";\n\nconst dt = 0.001;\n\nexport interface StratigraphicPackage {\n  /** A collection of stratigraphic information organized in time, corresponding\n   * to single or multiple columns. */\n  t_age: number;\n  b_age: number;\n}\n\nexport interface SectionInfo<T extends UnitLong = ExtUnit>\n  extends StratigraphicPackage {\n  /** A time-bounded part of a single stratigraphic column. */\n  section_id: number | number[];\n  units: T[];\n}\n\nexport interface ExtUnit extends UnitLong {\n  bottomOverlap: boolean;\n  overlappingUnits: number[];\n  column?: number;\n  /* Positions (ages or heights) where the unit is clipped to its containing section.\n   * This is relevant if we are filtering by age/height/depth range.\n   */\n  t_clip_pos?: number;\n  b_clip_pos?: number;\n}\n\nexport function preprocessUnits<T extends UnitLong = UnitLong>(\n  section: SectionInfo<T>,\n  axisType: ColumnAxisType = ColumnAxisType.AGE\n): ExtUnit[] {\n  /** Preprocess units to add overlapping units and columns. */\n  const units = section.units;\n  let divisions = units.map((...args) => extendDivision(...args, axisType));\n  for (let d of divisions) {\n    const overlappingUnits = divisions.filter((u) =>\n      d.overlappingUnits.includes(u.unit_id)\n    );\n\n    // Overlapping columns\n    const columns = overlappingUnits.map((d) => d.column);\n\n    if (columns.includes(d.column)) {\n      let col = 0;\n      // Go through columns to find a better index\n      while (columns.includes(col)) {\n        col++;\n      }\n      d.column = col;\n    }\n\n    // If unit overlaps the edges of a section, set the clip positions\n    if (axisType == ColumnAxisType.AGE) {\n      const [b_pos, t_pos] = getUnitHeightRange(d, axisType);\n      if (b_pos > section.b_age) {\n        d.b_clip_pos = section.b_age;\n      }\n      if (t_pos < section.t_age) {\n        d.t_clip_pos = section.t_age;\n      }\n    }\n  }\n\n  if (axisType != ColumnAxisType.AGE) {\n    return preprocessSectionUnits(divisions, axisType);\n  }\n\n  return divisions;\n}\n\nfunction extendDivision(\n  unit: UnitLong,\n  i: number,\n  divisions: UnitLong[],\n  axisType: ColumnAxisType = ColumnAxisType.AGE\n): ExtUnit {\n  const overlappingUnits = divisions.filter(\n    (d) => d.unit_id != unit.unit_id && unitsOverlap(unit, d, axisType)\n  );\n  const u_pos = getUnitHeightRange(unit, axisType);\n  const bottomOverlap = overlappingUnits.some((d) => {\n    const d_pos = getUnitHeightRange(d, axisType);\n    // Check if the unit is below the current unit\n    return d_pos[0] < u_pos[0] + dt;\n  });\n  let column = 0;\n  if (overlappingUnits.length == 1) {\n    column = 1;\n  }\n\n  return {\n    ...unit,\n    bottomOverlap,\n    column,\n    overlappingUnits: overlappingUnits.map((d) => d.unit_id),\n  };\n}\n\nexport function groupUnitsIntoSections<T extends UnitLong>(\n  units: T[],\n  axisType: ColumnAxisType = ColumnAxisType.AGE\n): SectionInfo<T>[] {\n  let groups = Array.from(group(units, (d) => d.section_id));\n  const unitComparator = createUnitSorter(axisType);\n\n  const groups1 = groups.map(([section_id, sectionUnits]) => {\n    const [b_age, t_age] = getSectionAgeRange(sectionUnits);\n    // sort units by position\n    sectionUnits.sort(unitComparator);\n    return { section_id, t_age, b_age, units: sectionUnits };\n  });\n  // Sort sections by increasing top age, then increasing bottom age.\n  // Sections have no relative ordinal position other than age...\n  const compareSections = createUnitSorter(ColumnAxisType.AGE) as (\n    a: StratigraphicPackage,\n    b: StratigraphicPackage\n  ) => number;\n  groups1.sort(compareSections);\n  return groups1;\n}\n\nexport function getSectionAgeRange(units: BaseUnit[]): [number, number] {\n  /** Get the overall age range of a set of units. */\n  const t_ages = units.map((d) => d.t_age);\n  const b_ages = units.map((d) => d.b_age);\n  const t_age = Math.min(...t_ages);\n  const b_age = Math.max(...b_ages);\n  return [b_age, t_age];\n}\n\nexport function mergeOverlappingSections<T extends UnitLong>(\n  sections: SectionInfo<T>[]\n): SectionInfo<T>[] {\n  /** Columns can have sections that overlap in time. Here, we merge overlapping\n   * sections into a single section to correctly render gap-bound packages.\n   */\n  const [firstSection, ...rest] = sections;\n  const newSections = [firstSection];\n  for (const section of rest) {\n    const lastSection = newSections[newSections.length - 1];\n    if (\n      lastSection.b_age < section.t_age ||\n      lastSection.t_age > section.b_age\n    ) {\n      // No overlap, add the section as normal\n      newSections.push(section);\n      continue;\n    }\n\n    // Overlap, merge the sections\n    lastSection.section_id = [\n      ...ensureArray(lastSection.section_id),\n      ...ensureArray(section.section_id),\n    ];\n    lastSection.units.push(...section.units);\n    lastSection.b_age = Math.max(lastSection.b_age, section.b_age);\n    lastSection.t_age = Math.min(lastSection.t_age, section.t_age);\n  }\n  return newSections;\n}\n\nfunction preprocessSectionUnits(\n  units: UnitLong[],\n  axisType: ColumnAxisType = ColumnAxisType.DEPTH\n): ExtUnit[] {\n  /** Preprocess units for a \"section\" column type, which is guaranteed to be simpler. */\n  // We have to assume the units are ordered...\n  let thickness = 0;\n  return units.map((unit, i) => {\n    let u1 = preprocessSectionUnit(unit, i, units, thickness, axisType);\n    thickness += Math.abs(u1.t_pos - u1.b_pos);\n    return u1;\n  });\n}\n\nfunction preprocessSectionUnit(\n  unit: UnitLong,\n  i: number,\n  units: UnitLong[],\n  accumulatedThickness: number = 0,\n  axisType: ColumnAxisType = ColumnAxisType.DEPTH\n): ExtUnit {\n  /** Preprocess a single unit for a \"section\" column type.\n   * No provision for overlapping units.\n   * */\n\n  let b_pos = unit.b_pos;\n  let t_pos = unit.t_pos;\n\n  if (b_pos == t_pos && axisType == ColumnAxisType.ORDINAL) {\n    t_pos = t_pos - 1;\n  }\n\n  let unit_name = unit.unit_name;\n\n  // eODP columns sometimes have overlapping core sections, which are encoded in the name field\n  // Match eODP section names\n  const match = unit.unit_name.match(/^(\\d+(\\.\\d+)?)-(\\d+(\\.\\d+)?): (.+)/);\n\n  if (match) {\n    // These values should already be set if we've used the show_positions flag\n    t_pos ??= ensureRealFloat(match[1]);\n    b_pos ??= ensureRealFloat(match[3]);\n    unit_name = match[5];\n  }\n\n  return {\n    ...unit,\n    b_pos: ensureRealFloat(b_pos),\n    t_pos: ensureRealFloat(t_pos),\n    unit_name,\n    bottomOverlap: false,\n    overlappingUnits: [],\n  };\n}\n"],"names":[],"version":3,"file":"column-views.1c589cc4.js.map"}