@macrostrat/column-views 2.1.4 → 2.2.0

package/dist/esm/{column-views.ab0380ed.js → column-views.8d24b179.js}

@@ -1,7 +1,7 @@
 import {buildColumnsStyle as $1dbfddc9637b572c$export$d2995719c3a4ae17} from "./column-views.633c42a3.js";
 import {InsetMap as $5593f90ffec284da$export$1e8149fc0d15fed0} from "./column-views.3de4dc43.js";
-import {ColumnNavigationProvider as $09486427d129f589$export$8da3b11f62ebf019, useColumnNavigationStore as $09486427d129f589$export$642c2b57c47ea41} from "./column-views.e3b9a317.js";
-import {buildKeyboardNavigationStyle as $ab1043903d5406ef$export$c613fba0aabeee13, ColumnKeyboardNavigation as $ab1043903d5406ef$export$8c41dd563753848} from "./column-views.935ef6f7.js";
+import {ColumnNavigationProvider as $09486427d129f589$export$8da3b11f62ebf019, useColumnNavigationStore as $09486427d129f589$export$642c2b57c47ea41} from "./column-views.e4c26185.js";
+import {buildKeyboardNavigationStyle as $ab1043903d5406ef$export$c613fba0aabeee13, ColumnKeyboardNavigation as $ab1043903d5406ef$export$8c41dd563753848} from "./column-views.f46a0b36.js";
 import {useMapStyleOperator as $lRXWn$useMapStyleOperator} from "@macrostrat/mapbox-react";
 import $lRXWn$macrostrathyper from "@macrostrat/hyper";
 import {useMemo as $lRXWn$useMemo, useRef as $lRXWn$useRef} from "react";
@@ -165,4 +165,4 @@ function $9d5d216fa2057b5b$var$ColumnsLayer({ enabled: enabled = true }) {
 
 
 export {$9d5d216fa2057b5b$export$821baedf611249f3 as ColumnNavigationMap};
-//# sourceMappingURL=column-views.ab0380ed.js.map
+//# sourceMappingURL=column-views.8d24b179.js.map

package/dist/esm/{column-views.ab0380ed.js.map → column-views.8d24b179.js.map}

@@ -1 +1 @@
-{"mappings":"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","sources":["packages/column-views/src/maps/column-navigation/mapbox/index.ts"],"sourcesContent":["import { useMapStyleOperator } from \"@macrostrat/mapbox-react\";\nimport h from \"@macrostrat/hyper\";\nimport { FeatureCollection } from \"geojson\";\nimport { ReactNode, useMemo, useRef } from \"react\";\nimport { buildColumnsStyle, InsetMapProps } from \"../../_shared\";\nimport { setGeoJSON } from \"@macrostrat/mapbox-utils\";\n\nimport {\n  ColumnNavigationProvider,\n  NavigationProviderProps,\n  useColumnNavigationStore,\n} from \"./state\";\nimport { InsetMap } from \"../../_shared\";\nimport { geoCentroid } from \"d3-geo\";\nimport {\n  ColumnKeyboardNavigation,\n  buildKeyboardNavigationStyle,\n} from \"./keyboard-navigation\";\n\nexport interface ColumnNavigationMapProps extends InsetMapProps {\n  padding?: number;\n  children?: ReactNode;\n  accessToken?: string;\n  selectedColumn?: number;\n  hoveredColumn?: number;\n  onSelectColumn?: (colID: number | null) => void;\n  onHoverColumn?: (colID: number | null) => void;\n  showTriangulation?: boolean;\n  columnColor?: string;\n  triangulationColor?: string;\n  keyboardNavigation?: boolean;\n}\n\nexport function ColumnNavigationMap(\n  props: ColumnNavigationMapProps & NavigationProviderProps,\n) {\n  const {\n    columns,\n    columnIDs,\n    onSelectColumn,\n    onHoverColumn,\n    selectedColumn,\n    hoveredColumn,\n    projectID,\n    children,\n    inProcess,\n    ...rest\n  } = props;\n\n  return h(\n    ColumnNavigationProvider,\n    {\n      columns,\n      columnIDs,\n      onSelectColumn,\n      onHoverColumn,\n      selectedColumn,\n      hoveredColumn,\n      projectID,\n      inProcess,\n    },\n    h(_ColumnNavigationMap, props),\n  );\n}\n\nfunction _ColumnNavigationMap(props: ColumnNavigationMapProps) {\n  const {\n    padding = 50,\n    children,\n    columnColor,\n    showTriangulation,\n    triangulationColor,\n    keyboardNavigation = true,\n    ...rest\n  } = props;\n\n  const overlayStyles = useMemo(() => {\n    let styles: any[] = [buildColumnsStyle(columnColor)];\n    if (showTriangulation) {\n      styles.push(buildKeyboardNavigationStyle(triangulationColor));\n    }\n    return styles;\n  }, [columnColor, showTriangulation, triangulationColor]);\n\n  return h(\n    InsetMap,\n    {\n      ...rest,\n      boxZoom: false,\n      dragRotate: false,\n      overlayStyles,\n    },\n    [\n      h(ColumnsLayer),\n      children,\n      h.if(keyboardNavigation)(ColumnKeyboardNavigation, { showTriangulation }),\n    ],\n  );\n}\n\nfunction ColumnsLayer({ enabled = true }) {\n  const columns = useColumnNavigationStore((state) => state.columns);\n  const selectedColumn = useColumnNavigationStore(\n    (state) => state.selectedColumn,\n  );\n  const hoveredColumn = useColumnNavigationStore(\n    (state) => state.hoveredColumn,\n  );\n  const selectColumn = useColumnNavigationStore((state) => state.selectColumn);\n  const setHoveredColumn = useColumnNavigationStore(\n    (state) => state.setHoveredColumn,\n  );\n\n  useMapStyleOperator(\n    (map) => {\n      if (columns == null) {\n        return;\n      }\n      const data: FeatureCollection = {\n        type: \"FeatureCollection\",\n        features: columns,\n      };\n\n      setGeoJSON(map, \"columns\", data);\n\n      const mouseMove = (event) => {\n        if (event.features.length == 0) return;\n        const hoveredFeature = event.features[0];\n        setHoveredColumn(hoveredFeature.id);\n        map.getCanvas().style.cursor = \"pointer\";\n      };\n      const mouseLeave = () => {\n        setHoveredColumn(null);\n        map.getCanvas().style.cursor = \"\";\n      };\n\n      const clickHandler = (event) => {\n        if (event.features.length == 0) return;\n        const selectedColumn = event.features[0];\n        const id = selectedColumn.id;\n        selectColumn(id);\n      };\n\n      // Setup hover styles on map\n      const layers = [\"columns-points\", \"columns-fill\"];\n      map.on(\"mousemove\", layers, mouseMove);\n      map.on(\"mouseleave\", layers, mouseLeave);\n      map.on(\"click\", layers, clickHandler);\n\n      return () => {\n        map.off(\"mouseenter\", layers, mouseMove);\n        map.off(\"mouseleave\", layers, mouseLeave);\n        map.off(\"click\", layers, clickHandler);\n      };\n    },\n    [columns, enabled],\n  );\n\n  const hoveredColumnRef = useRef(null);\n  useMapStyleOperator(\n    (map) => {\n      const prevHoveredColumn = hoveredColumnRef.current;\n      if (hoveredColumn == prevHoveredColumn) return;\n      if (prevHoveredColumn != null) {\n        // Deselect previous column\n        map.setFeatureState(\n          { source: \"columns\", id: prevHoveredColumn },\n          { hover: false },\n        );\n      }\n      hoveredColumnRef.current = hoveredColumn;\n      // Select the current column\n      map.setFeatureState(\n        { source: \"columns\", id: hoveredColumn },\n        { hover: true },\n      );\n    },\n    [hoveredColumn, columns],\n  );\n\n  /** Set feature state for selected columns */\n  const selectedColumnRef = useRef(null);\n  const initialRenderRef = useRef(true);\n  useMapStyleOperator(\n    (map) => {\n      if (columns == null) return;\n      const prevSelectedColumn = selectedColumnRef.current;\n      if (selectedColumn == prevSelectedColumn) return;\n      if (prevSelectedColumn != null) {\n        // Deselect previous column\n        map.setFeatureState(\n          { source: \"columns\", id: prevSelectedColumn },\n          { selected: false },\n        );\n      }\n\n      selectedColumnRef.current = selectedColumn;\n\n      // Select the current column\n      map.setFeatureState(\n        { source: \"columns\", id: selectedColumn },\n        { selected: true },\n      );\n\n      // Center the selected column\n      const columnGeometry = columns.find(\n        (d) => d.id == selectedColumn,\n      )?.geometry;\n      if (columnGeometry == null) return;\n      const center = geoCentroid(columnGeometry);\n\n      const isInitialRender = initialRenderRef.current;\n      map.easeTo({ center }, { duration: isInitialRender ? 0 : 500 });\n      if (isInitialRender) {\n        initialRenderRef.current = false;\n      }\n    },\n    [selectedColumn, columns],\n  );\n\n  return null;\n}\n"],"names":[],"version":3,"file":"column-views.ab0380ed.js.map"}
+{"mappings":"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","sources":["packages/column-views/src/maps/column-navigation/mapbox/index.ts"],"sourcesContent":["import { useMapStyleOperator } from \"@macrostrat/mapbox-react\";\nimport h from \"@macrostrat/hyper\";\nimport { FeatureCollection } from \"geojson\";\nimport { ReactNode, useMemo, useRef } from \"react\";\nimport { buildColumnsStyle, InsetMapProps } from \"../../_shared\";\nimport { setGeoJSON } from \"@macrostrat/mapbox-utils\";\n\nimport {\n  ColumnNavigationProvider,\n  NavigationProviderProps,\n  useColumnNavigationStore,\n} from \"./state\";\nimport { InsetMap } from \"../../_shared\";\nimport { geoCentroid } from \"d3-geo\";\nimport {\n  ColumnKeyboardNavigation,\n  buildKeyboardNavigationStyle,\n} from \"./keyboard-navigation\";\n\nexport interface ColumnNavigationMapProps extends InsetMapProps {\n  padding?: number;\n  children?: ReactNode;\n  accessToken?: string;\n  selectedColumn?: number;\n  hoveredColumn?: number;\n  onSelectColumn?: (colID: number | null) => void;\n  onHoverColumn?: (colID: number | null) => void;\n  showTriangulation?: boolean;\n  columnColor?: string;\n  triangulationColor?: string;\n  keyboardNavigation?: boolean;\n}\n\nexport function ColumnNavigationMap(\n  props: ColumnNavigationMapProps & NavigationProviderProps,\n) {\n  const {\n    columns,\n    columnIDs,\n    onSelectColumn,\n    onHoverColumn,\n    selectedColumn,\n    hoveredColumn,\n    projectID,\n    children,\n    inProcess,\n    ...rest\n  } = props;\n\n  return h(\n    ColumnNavigationProvider,\n    {\n      columns,\n      columnIDs,\n      onSelectColumn,\n      onHoverColumn,\n      selectedColumn,\n      hoveredColumn,\n      projectID,\n      inProcess,\n    },\n    h(_ColumnNavigationMap, props),\n  );\n}\n\nfunction _ColumnNavigationMap(props: ColumnNavigationMapProps) {\n  const {\n    padding = 50,\n    children,\n    columnColor,\n    showTriangulation,\n    triangulationColor,\n    keyboardNavigation = true,\n    ...rest\n  } = props;\n\n  const overlayStyles = useMemo(() => {\n    let styles: any[] = [buildColumnsStyle(columnColor)];\n    if (showTriangulation) {\n      styles.push(buildKeyboardNavigationStyle(triangulationColor));\n    }\n    return styles;\n  }, [columnColor, showTriangulation, triangulationColor]);\n\n  return h(\n    InsetMap,\n    {\n      ...rest,\n      boxZoom: false,\n      dragRotate: false,\n      overlayStyles,\n    },\n    [\n      h(ColumnsLayer),\n      children,\n      h.if(keyboardNavigation)(ColumnKeyboardNavigation, { showTriangulation }),\n    ],\n  );\n}\n\nfunction ColumnsLayer({ enabled = true }) {\n  const columns = useColumnNavigationStore((state) => state.columns);\n  const selectedColumn = useColumnNavigationStore(\n    (state) => state.selectedColumn,\n  );\n  const hoveredColumn = useColumnNavigationStore(\n    (state) => state.hoveredColumn,\n  );\n  const selectColumn = useColumnNavigationStore((state) => state.selectColumn);\n  const setHoveredColumn = useColumnNavigationStore(\n    (state) => state.setHoveredColumn,\n  );\n\n  useMapStyleOperator(\n    (map) => {\n      if (columns == null) {\n        return;\n      }\n      const data: FeatureCollection = {\n        type: \"FeatureCollection\",\n        features: columns,\n      };\n\n      setGeoJSON(map, \"columns\", data);\n\n      const mouseMove = (event) => {\n        if (event.features.length == 0) return;\n        const hoveredFeature = event.features[0];\n        setHoveredColumn(hoveredFeature.id);\n        map.getCanvas().style.cursor = \"pointer\";\n      };\n      const mouseLeave = () => {\n        setHoveredColumn(null);\n        map.getCanvas().style.cursor = \"\";\n      };\n\n      const clickHandler = (event) => {\n        if (event.features.length == 0) return;\n        const selectedColumn = event.features[0];\n        const id = selectedColumn.id;\n        selectColumn(id);\n      };\n\n      // Setup hover styles on map\n      const layers = [\"columns-points\", \"columns-fill\"];\n      map.on(\"mousemove\", layers, mouseMove);\n      map.on(\"mouseleave\", layers, mouseLeave);\n      map.on(\"click\", layers, clickHandler);\n\n      return () => {\n        map.off(\"mouseenter\", layers, mouseMove);\n        map.off(\"mouseleave\", layers, mouseLeave);\n        map.off(\"click\", layers, clickHandler);\n      };\n    },\n    [columns, enabled],\n  );\n\n  const hoveredColumnRef = useRef(null);\n  useMapStyleOperator(\n    (map) => {\n      const prevHoveredColumn = hoveredColumnRef.current;\n      if (hoveredColumn == prevHoveredColumn) return;\n      if (prevHoveredColumn != null) {\n        // Deselect previous column\n        map.setFeatureState(\n          { source: \"columns\", id: prevHoveredColumn },\n          { hover: false },\n        );\n      }\n      hoveredColumnRef.current = hoveredColumn;\n      // Select the current column\n      map.setFeatureState(\n        { source: \"columns\", id: hoveredColumn },\n        { hover: true },\n      );\n    },\n    [hoveredColumn, columns],\n  );\n\n  /** Set feature state for selected columns */\n  const selectedColumnRef = useRef(null);\n  const initialRenderRef = useRef(true);\n  useMapStyleOperator(\n    (map) => {\n      if (columns == null) return;\n      const prevSelectedColumn = selectedColumnRef.current;\n      if (selectedColumn == prevSelectedColumn) return;\n      if (prevSelectedColumn != null) {\n        // Deselect previous column\n        map.setFeatureState(\n          { source: \"columns\", id: prevSelectedColumn },\n          { selected: false },\n        );\n      }\n\n      selectedColumnRef.current = selectedColumn;\n\n      // Select the current column\n      map.setFeatureState(\n        { source: \"columns\", id: selectedColumn },\n        { selected: true },\n      );\n\n      // Center the selected column\n      const columnGeometry = columns.find(\n        (d) => d.id == selectedColumn,\n      )?.geometry;\n      if (columnGeometry == null) return;\n      const center = geoCentroid(columnGeometry);\n\n      const isInitialRender = initialRenderRef.current;\n      map.easeTo({ center }, { duration: isInitialRender ? 0 : 500 });\n      if (isInitialRender) {\n        initialRenderRef.current = false;\n      }\n    },\n    [selectedColumn, columns],\n  );\n\n  return null;\n}\n"],"names":[],"version":3,"file":"column-views.8d24b179.js.map"}

package/dist/esm/{column-views.a6301a41.js → column-views.986e7566.js}

@@ -1,11 +1,11 @@
-import {UnitNamesColumn as $bc17276da4abb183$export$594d19cdd88f8c16} from "./column-views.7715e35e.js";
-import {UnitBoxes as $d254716a820e9c85$export$5d1cdfabe8dc8085} from "./column-views.f20eb583.js";
+import {UnitNamesColumn as $bc17276da4abb183$export$594d19cdd88f8c16} from "./column-views.d69c4a9f.js";
+import {UnitBoxes as $d254716a820e9c85$export$5d1cdfabe8dc8085} from "./column-views.5d969bc5.js";
 import {getMixedUnitColor as $6698edd2a743bf07$export$175d3e927f1a9860} from "./column-views.9b77388d.js";
-import {TrackedLabeledUnit as $8c8238faa5cde49c$export$f613830566442374, LabelTrackerProvider as $8c8238faa5cde49c$export$e4e89ab6c86ac513, CompositeUnitComponent as $8c8238faa5cde49c$export$1dfa200d57964eee, CompositeUnitsColumn as $8c8238faa5cde49c$export$a6684360fef0406e, AnnotatedUnitsColumn as $8c8238faa5cde49c$export$d8c3f2fdd653a082, SectionLabelsColumn as $8c8238faa5cde49c$export$13984e34afdbb040, compositeScale as $8c8238faa5cde49c$export$723b790ebe9cdff8, ColumnNotesProvider as $8c8238faa5cde49c$export$6cc7a9df4edde18} from "./column-views.775846c9.js";
-import {useEnvironments as $774a5efa27d1c77b$export$c6b216bf4c71b61f, useLithologies as $774a5efa27d1c77b$export$4d18a90c945d129f} from "./column-views.7ca9e1cd.js";
+import {TrackedLabeledUnit as $8c8238faa5cde49c$export$f613830566442374, LabelTrackerProvider as $8c8238faa5cde49c$export$e4e89ab6c86ac513, CompositeUnitComponent as $8c8238faa5cde49c$export$1dfa200d57964eee, CompositeUnitsColumn as $8c8238faa5cde49c$export$a6684360fef0406e, AnnotatedUnitsColumn as $8c8238faa5cde49c$export$d8c3f2fdd653a082, SectionLabelsColumn as $8c8238faa5cde49c$export$13984e34afdbb040, ColumnNotesProvider as $8c8238faa5cde49c$export$6cc7a9df4edde18} from "./column-views.5a49cd68.js";
+import {useEnvironments as $774a5efa27d1c77b$export$c6b216bf4c71b61f, useLithologies as $774a5efa27d1c77b$export$4d18a90c945d129f} from "./column-views.73b8ff16.js";
 import {resolveID as $d3e69bd163d41f63$export$7be7d732f3de9464} from "./column-views.006d5180.js";
 import "./column-views.f9dab157.js";
-import {useUnitSelectionDispatch as $4d5d1c15f39f6a14$export$77a278d5ca56e309, useUnitSelectionStore as $4d5d1c15f39f6a14$export$b220b1d3591dc9e5, useSelectedUnit as $4d5d1c15f39f6a14$export$f0dd93f90aa8e5da, UnitSelectionProvider as $4d5d1c15f39f6a14$export$f19d75b1d4b676a4, useUnitSelectionTarget as $4d5d1c15f39f6a14$export$cbbec12b1451fe7d, UnitKeyboardNavigation as $4d5d1c15f39f6a14$export$70f5ee19650fc7d1} from "./column-views.64a84c43.js";
+import {useUnitSelectionDispatch as $4d5d1c15f39f6a14$export$77a278d5ca56e309, useUnitSelectionStore as $4d5d1c15f39f6a14$export$b220b1d3591dc9e5, useSelectedUnit as $4d5d1c15f39f6a14$export$f0dd93f90aa8e5da, UnitSelectionProvider as $4d5d1c15f39f6a14$export$f19d75b1d4b676a4, useUnitSelectionTarget as $4d5d1c15f39f6a14$export$cbbec12b1451fe7d, UnitKeyboardNavigation as $4d5d1c15f39f6a14$export$70f5ee19650fc7d1} from "./column-views.f2fd0e4a.js";
 import $7H3th$macrostrathyper from "@macrostrat/hyper";
 import {LithologyColumn as $7H3th$LithologyColumn, useColumnLayout as $7H3th$useColumnLayout, useGeologicPattern as $7H3th$useGeologicPattern} from "@macrostrat/column-components";
 import {useInDarkMode as $7H3th$useInDarkMode} from "@macrostrat/ui-components";
@@ -147,5 +147,5 @@ function $4c8184c4a7317749$var$getPatternID(liths, lithMap) {
 }
 
 
-export {$4c8184c4a7317749$export$3750278673318c9a as UnitsColumn, $4c8184c4a7317749$export$2006342ddaa547c6 as SimpleUnitsColumn, $4c8184c4a7317749$export$600691a8e9d13a7 as BasicUnitComponent, $4c8184c4a7317749$export$48a4cacf2b7a4441 as UnitComponent, $4c8184c4a7317749$export$62c7735c72801c19 as useUnitColor, $4c8184c4a7317749$export$6012fd1584b5d0c0 as ColoredUnitComponent, $4c8184c4a7317749$export$4830e703a903113 as useUnitColorByEnvironment, $4c8184c4a7317749$export$c2fe8a14da82d570 as EnvironmentColoredUnitComponent, $6698edd2a743bf07$export$175d3e927f1a9860 as getMixedUnitColor, $8c8238faa5cde49c$export$e4e89ab6c86ac513 as LabelTrackerProvider, $8c8238faa5cde49c$export$f613830566442374 as TrackedLabeledUnit, $8c8238faa5cde49c$export$1dfa200d57964eee as CompositeUnitComponent, $8c8238faa5cde49c$export$a6684360fef0406e as CompositeUnitsColumn, $8c8238faa5cde49c$export$d8c3f2fdd653a082 as AnnotatedUnitsColumn, $8c8238faa5cde49c$export$13984e34afdbb040 as SectionLabelsColumn, $8c8238faa5cde49c$export$723b790ebe9cdff8 as compositeScale, $8c8238faa5cde49c$export$6cc7a9df4edde18 as ColumnNotesProvider, $4d5d1c15f39f6a14$export$77a278d5ca56e309 as useUnitSelectionDispatch, $4d5d1c15f39f6a14$export$b220b1d3591dc9e5 as useUnitSelectionStore, $4d5d1c15f39f6a14$export$f0dd93f90aa8e5da as useSelectedUnit, $4d5d1c15f39f6a14$export$f19d75b1d4b676a4 as UnitSelectionProvider, $4d5d1c15f39f6a14$export$cbbec12b1451fe7d as useUnitSelectionTarget, $4d5d1c15f39f6a14$export$70f5ee19650fc7d1 as UnitKeyboardNavigation};
-//# sourceMappingURL=column-views.a6301a41.js.map
+export {$4c8184c4a7317749$export$3750278673318c9a as UnitsColumn, $4c8184c4a7317749$export$2006342ddaa547c6 as SimpleUnitsColumn, $4c8184c4a7317749$export$600691a8e9d13a7 as BasicUnitComponent, $4c8184c4a7317749$export$48a4cacf2b7a4441 as UnitComponent, $4c8184c4a7317749$export$62c7735c72801c19 as useUnitColor, $4c8184c4a7317749$export$6012fd1584b5d0c0 as ColoredUnitComponent, $4c8184c4a7317749$export$4830e703a903113 as useUnitColorByEnvironment, $4c8184c4a7317749$export$c2fe8a14da82d570 as EnvironmentColoredUnitComponent, $6698edd2a743bf07$export$175d3e927f1a9860 as getMixedUnitColor, $8c8238faa5cde49c$export$e4e89ab6c86ac513 as LabelTrackerProvider, $8c8238faa5cde49c$export$f613830566442374 as TrackedLabeledUnit, $8c8238faa5cde49c$export$1dfa200d57964eee as CompositeUnitComponent, $8c8238faa5cde49c$export$a6684360fef0406e as CompositeUnitsColumn, $8c8238faa5cde49c$export$d8c3f2fdd653a082 as AnnotatedUnitsColumn, $8c8238faa5cde49c$export$13984e34afdbb040 as SectionLabelsColumn, $8c8238faa5cde49c$export$6cc7a9df4edde18 as ColumnNotesProvider, $4d5d1c15f39f6a14$export$77a278d5ca56e309 as useUnitSelectionDispatch, $4d5d1c15f39f6a14$export$b220b1d3591dc9e5 as useUnitSelectionStore, $4d5d1c15f39f6a14$export$f0dd93f90aa8e5da as useSelectedUnit, $4d5d1c15f39f6a14$export$f19d75b1d4b676a4 as UnitSelectionProvider, $4d5d1c15f39f6a14$export$cbbec12b1451fe7d as useUnitSelectionTarget, $4d5d1c15f39f6a14$export$70f5ee19650fc7d1 as UnitKeyboardNavigation};
+//# sourceMappingURL=column-views.986e7566.js.map

package/dist/esm/{column-views.a6301a41.js.map → column-views.986e7566.js.map}

@@ -1 +1 @@
-{"mappings":"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","sources":["packages/column-views/src/units/index.ts"],"sourcesContent":["import h from \"@macrostrat/hyper\";\nimport {\n  LithologyColumn,\n  useGeologicPattern,\n} from \"@macrostrat/column-components\";\nimport { UnitNamesColumn } from \"./names\";\nimport { ICompositeUnitProps } from \"./composite\";\nimport { UnitBoxes, UnitProps } from \"./boxes\";\nimport { useColumnLayout } from \"@macrostrat/column-components\";\nimport { useInDarkMode } from \"@macrostrat/ui-components\";\nimport { getMixedUnitColor } from \"./colors\";\nimport { TrackedLabeledUnit } from \"./composite\";\nimport { useEnvironments, useLithologies } from \"../data-provider\";\nimport { useMemo } from \"react\";\nimport { resolveID } from \"./resolvers\";\nimport { Lithology } from \"@macrostrat/api-types\";\n\nexport * from \"./composite\";\nexport * from \"./types\";\nexport * from \"./selection\";\nexport * from \"./colors\";\n\nexport function UnitsColumn({ width = 100 }) {\n  /*\n  A column showing units with USGS color fill\n  */\n  return h(LithologyColumn, { width }, h(UnitBoxes));\n}\n\nexport function SimpleUnitsColumn(props: ICompositeUnitProps) {\n  /*\n  A column with units and names either\n  overlapping or offset to the right\n  */\n  const { columnWidth, width, gutterWidth = 0, labelOffset = 30 } = props;\n\n  return h([\n    h(UnitsColumn, {\n      width: columnWidth,\n    }),\n    h(UnitNamesColumn, {\n      transform: `translate(${columnWidth + gutterWidth})`,\n      paddingLeft: labelOffset,\n      width: width - columnWidth - gutterWidth,\n    }),\n  ]);\n}\n\nexport function BasicUnitComponent({ division, ...rest }) {\n  /** A unit that allows directly setting colors and patterns. */\n\n  return h(UnitComponent, {\n    division,\n    ...rest,\n    backgroundColor: division.color,\n    patternID: division.patternID,\n  });\n}\n\nexport function UnitComponent({ division, nColumns = 2, ...rest }) {\n  const width = rest.width ?? useColumnLayout()?.width;\n\n  const nOverlappingUnits = division.overlappingUnits?.length ?? 0;\n  const _nColumns = nOverlappingUnits == 0 ? 1 : nColumns;\n  const columnIx = (division.column ?? 0) % _nColumns;\n  const reducedWidth = width / _nColumns;\n  const x = (columnIx * width) / _nColumns;\n\n  return h(TrackedLabeledUnit, {\n    division,\n    ...rest,\n    width: reducedWidth,\n    x,\n  });\n}\n\ninterface UnitColorOptions {\n  asBackground?: boolean;\n}\n\nexport function useUnitColor(unit, opts: UnitColorOptions = {}): string | null {\n  /** Get the color for a unit based on its lithology */\n  const lithMap = useLithologies();\n  const inDarkMode = useInDarkMode();\n  const { asBackground = true } = opts;\n\n  return useMemo(() => {\n    if (unit == null || lithMap == null) return null;\n    return getMixedUnitColor(unit, lithMap, inDarkMode, asBackground);\n  }, [unit?.unit_id, lithMap, inDarkMode, asBackground]);\n}\n\nexport function ColoredUnitComponent(props) {\n  /** A unit component that is colored using a mixture of lithologies.\n   * This is a separate component because it depends on more providers/contexts to determine coloring. */\n  const backgroundColor = useUnitColor(props.division);\n\n  const patternID = useMemo(() => {\n    return resolveID(props.division); // ?? getPatternID(props.division.lith, lithMap);\n  }, [props.division?.unit_id]);\n\n  const fill = useGeologicPattern(patternID);\n\n  return h(UnitComponent, {\n    fill,\n    backgroundColor,\n    ...props,\n  });\n}\n\nexport function useUnitColorByEnvironment(\n  unit,\n  opts: UnitColorOptions = {},\n): string | null {\n  /** Get the color for a unit based on its lithology */\n  const environmentMap = useEnvironments();\n  const lithMap = useLithologies();\n  const inDarkMode = useInDarkMode();\n  const { asBackground = true } = opts;\n\n  return useMemo(() => {\n    if (unit == null || environmentMap == null) return null;\n    let c = getMixedUnitColor(unit, environmentMap, inDarkMode, asBackground, {\n      key: \"environ\",\n      id_key: \"environ_id\",\n    });\n    if (c != null) {\n      return c;\n    }\n    // Fallback to lithology color if no environment color is found\n    return getMixedUnitColor(unit, lithMap, inDarkMode, asBackground);\n  }, [unit?.unit_id, environmentMap, lithMap, inDarkMode, asBackground]);\n}\n\nexport function EnvironmentColoredUnitComponent(props) {\n  /** A unit component that is colored using a mixture of lithologies.\n   * This is a separate component because it depends on more providers/contexts to determine coloring. */\n  const backgroundColor = useUnitColorByEnvironment(props.division);\n\n  const patternID = useMemo(() => {\n    return resolveID(props.division); // ?? getPatternID(props.division.lith, lithMap);\n  }, [props.division?.unit_id]);\n\n  const fill = useGeologicPattern(patternID);\n\n  return h(UnitComponent, {\n    fill,\n    backgroundColor,\n    ...props,\n  });\n}\n\nfunction getPatternID(\n  liths: Array<Lithology>,\n  lithMap: Map<number, Lithology>,\n): string | null {\n  if (lithMap == null || liths == null || liths.length == 0) {\n    return null;\n  }\n  const patternIDs = new Set<string>();\n  for (const lith of liths) {\n    const lithData = lithMap.get(lith.lith_id);\n    if (lithData) {\n      patternIDs.add(`${lithData.fill}`);\n    }\n  }\n  let id = patternIDs.values()[0];\n  if (id == \"0\") return null;\n  return id;\n}\n"],"names":[],"version":3,"file":"column-views.a6301a41.js.map"}
+{"mappings":"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","sources":["packages/column-views/src/units/index.ts"],"sourcesContent":["import h from \"@macrostrat/hyper\";\nimport {\n  LithologyColumn,\n  useGeologicPattern,\n} from \"@macrostrat/column-components\";\nimport { UnitNamesColumn } from \"./names\";\nimport { ICompositeUnitProps } from \"./composite\";\nimport { UnitBoxes, UnitProps } from \"./boxes\";\nimport { useColumnLayout } from \"@macrostrat/column-components\";\nimport { useInDarkMode } from \"@macrostrat/ui-components\";\nimport { getMixedUnitColor } from \"./colors\";\nimport { TrackedLabeledUnit } from \"./composite\";\nimport { useEnvironments, useLithologies } from \"../data-provider\";\nimport { useMemo } from \"react\";\nimport { resolveID } from \"./resolvers\";\nimport { Lithology } from \"@macrostrat/api-types\";\n\nexport * from \"./composite\";\nexport * from \"./types\";\nexport * from \"./selection\";\nexport * from \"./colors\";\n\nexport function UnitsColumn({ width = 100 }) {\n  /*\n  A column showing units with USGS color fill\n  */\n  return h(LithologyColumn, { width }, h(UnitBoxes));\n}\n\nexport function SimpleUnitsColumn(props: ICompositeUnitProps) {\n  /*\n  A column with units and names either\n  overlapping or offset to the right\n  */\n  const { columnWidth, width, gutterWidth = 0, labelOffset = 30 } = props;\n\n  return h([\n    h(UnitsColumn, {\n      width: columnWidth,\n    }),\n    h(UnitNamesColumn, {\n      transform: `translate(${columnWidth + gutterWidth})`,\n      paddingLeft: labelOffset,\n      width: width - columnWidth - gutterWidth,\n    }),\n  ]);\n}\n\nexport function BasicUnitComponent({ division, ...rest }) {\n  /** A unit that allows directly setting colors and patterns. */\n\n  return h(UnitComponent, {\n    division,\n    ...rest,\n    backgroundColor: division.color,\n    patternID: division.patternID,\n  });\n}\n\nexport function UnitComponent({ division, nColumns = 2, ...rest }) {\n  const width = rest.width ?? useColumnLayout()?.width;\n\n  const nOverlappingUnits = division.overlappingUnits?.length ?? 0;\n  const _nColumns = nOverlappingUnits == 0 ? 1 : nColumns;\n  const columnIx = (division.column ?? 0) % _nColumns;\n  const reducedWidth = width / _nColumns;\n  const x = (columnIx * width) / _nColumns;\n\n  return h(TrackedLabeledUnit, {\n    division,\n    ...rest,\n    width: reducedWidth,\n    x,\n  });\n}\n\ninterface UnitColorOptions {\n  asBackground?: boolean;\n}\n\nexport function useUnitColor(unit, opts: UnitColorOptions = {}): string | null {\n  /** Get the color for a unit based on its lithology */\n  const lithMap = useLithologies();\n  const inDarkMode = useInDarkMode();\n  const { asBackground = true } = opts;\n\n  return useMemo(() => {\n    if (unit == null || lithMap == null) return null;\n    return getMixedUnitColor(unit, lithMap, inDarkMode, asBackground);\n  }, [unit?.unit_id, lithMap, inDarkMode, asBackground]);\n}\n\nexport function ColoredUnitComponent(props) {\n  /** A unit component that is colored using a mixture of lithologies.\n   * This is a separate component because it depends on more providers/contexts to determine coloring. */\n  const backgroundColor = useUnitColor(props.division);\n\n  const patternID = useMemo(() => {\n    return resolveID(props.division); // ?? getPatternID(props.division.lith, lithMap);\n  }, [props.division?.unit_id]);\n\n  const fill = useGeologicPattern(patternID);\n\n  return h(UnitComponent, {\n    fill,\n    backgroundColor,\n    ...props,\n  });\n}\n\nexport function useUnitColorByEnvironment(\n  unit,\n  opts: UnitColorOptions = {},\n): string | null {\n  /** Get the color for a unit based on its lithology */\n  const environmentMap = useEnvironments();\n  const lithMap = useLithologies();\n  const inDarkMode = useInDarkMode();\n  const { asBackground = true } = opts;\n\n  return useMemo(() => {\n    if (unit == null || environmentMap == null) return null;\n    let c = getMixedUnitColor(unit, environmentMap, inDarkMode, asBackground, {\n      key: \"environ\",\n      id_key: \"environ_id\",\n    });\n    if (c != null) {\n      return c;\n    }\n    // Fallback to lithology color if no environment color is found\n    return getMixedUnitColor(unit, lithMap, inDarkMode, asBackground);\n  }, [unit?.unit_id, environmentMap, lithMap, inDarkMode, asBackground]);\n}\n\nexport function EnvironmentColoredUnitComponent(props) {\n  /** A unit component that is colored using a mixture of lithologies.\n   * This is a separate component because it depends on more providers/contexts to determine coloring. */\n  const backgroundColor = useUnitColorByEnvironment(props.division);\n\n  const patternID = useMemo(() => {\n    return resolveID(props.division); // ?? getPatternID(props.division.lith, lithMap);\n  }, [props.division?.unit_id]);\n\n  const fill = useGeologicPattern(patternID);\n\n  return h(UnitComponent, {\n    fill,\n    backgroundColor,\n    ...props,\n  });\n}\n\nfunction getPatternID(\n  liths: Array<Lithology>,\n  lithMap: Map<number, Lithology>,\n): string | null {\n  if (lithMap == null || liths == null || liths.length == 0) {\n    return null;\n  }\n  const patternIDs = new Set<string>();\n  for (const lith of liths) {\n    const lithData = lithMap.get(lith.lith_id);\n    if (lithData) {\n      patternIDs.add(`${lithData.fill}`);\n    }\n  }\n  let id = patternIDs.values()[0];\n  if (id == \"0\") return null;\n  return id;\n}\n"],"names":[],"version":3,"file":"column-views.986e7566.js.map"}

package/dist/esm/{column-views.86619334.js → column-views.9ddbe7df.js}

@@ -1,4 +1,4 @@
-import {IsotopesDataset as $d71d096cfe00860f$export$c69bd0285aa5d775, IsotopesColumn as $d71d096cfe00860f$export$5d8aa8022c284748} from "./column-views.5e2dc19d.js";
+import {IsotopesDataset as $d71d096cfe00860f$export$c69bd0285aa5d775, IsotopesColumn as $d71d096cfe00860f$export$5d8aa8022c284748} from "./column-views.d261b02d.js";
 import {MeasurementDataContext as $5dbb619f2c7bef60$export$c644ef985ce7a4c4, MeasurementDataProvider as $5dbb619f2c7bef60$export$5f01d5b342a89841, useMeasurementData as $5dbb619f2c7bef60$export$8a0335fd9ff72150} from "./column-views.a7c5ae16.js";
 
 
@@ -6,4 +6,4 @@ import {MeasurementDataContext as $5dbb619f2c7bef60$export$c644ef985ce7a4c4, Mea
 
 
 export {$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};
-//# sourceMappingURL=column-views.86619334.js.map
+//# sourceMappingURL=column-views.9ddbe7df.js.map

package/dist/esm/{column-views.86619334.js.map → column-views.9ddbe7df.js.map}

@@ -1 +1 @@
-{"mappings":"","sources":["packages/column-views/src/facets/carbon-isotopes/index.ts"],"sourcesContent":["export * from \"./isotopes-column\";\nexport * from \"./data-provider\";\n"],"names":[],"version":3,"file":"column-views.86619334.js.map"}
+{"mappings":"","sources":["packages/column-views/src/facets/carbon-isotopes/index.ts"],"sourcesContent":["export * from \"./isotopes-column\";\nexport * from \"./data-provider\";\n"],"names":[],"version":3,"file":"column-views.9ddbe7df.js.map"}

package/dist/esm/{column-views.2ff3dd8b.js → column-views.ae7c0a2b.js}

@@ -1,8 +1,7 @@
 import {useDetritalMeasurements as $9f310bd6e88a58bc$export$1b0cf9c36f060135} from "./column-views.05586d1f.js";
-import {useMacrostratUnits as $d5074f164411387e$export$6fb40844db555b2} from "./column-views.1e055ed5.js";
-import {ColumnNotes as $9e52fe4012c88296$export$fc5babae10f3f77d} from "./column-views.e7ab5af0.js";
 import $d4hxx$columnviews2c45a7b5js from "./column-views.2c45a7b5.js";
 import "./column-views.403a7b48.css";
+import {BaseMeasurementsColumn as $c6d9d48b3424a44c$export$ce5c4f2fdf4e644d} from "./column-views.e84bd756.js";
 import {usePlotArea as $d4hxx$usePlotArea, DetritalSpectrumPlot as $d4hxx$DetritalSpectrumPlot, DetritalSeries as $d4hxx$DetritalSeries} from "@macrostrat/data-components";
 import $d4hxx$macrostrathyper from "@macrostrat/hyper";
 import {useMemo as $d4hxx$useMemo} from "react";
@@ -19,8 +18,35 @@ function $parcel$interopDefault(a) {
 
 
 
-
 const $715dd5fedd79146a$var$h = (0, $d4hxx$macrostrathyper).styled((0, ($parcel$interopDefault($d4hxx$columnviews2c45a7b5js))));
+const $715dd5fedd79146a$var$matchingUnit = (dz)=>(d)=>d.unit_id == dz[0].unit_id;
+function $715dd5fedd79146a$export$f176396e104db8d5({ columnID: columnID, color: color = "magenta" }) {
+    const data = (0, $9f310bd6e88a58bc$export$1b0cf9c36f060135)({
+        col_id: columnID
+    });
+    const width = 400;
+    const paddingLeft = 40;
+    const spectrumWidth = width - paddingLeft;
+    const noteComponent = (0, $d4hxx$useMemo)(()=>{
+        return (props)=>{
+            return $715dd5fedd79146a$var$h($715dd5fedd79146a$export$1b3047373cd1c8c7, {
+                width: spectrumWidth,
+                height: 40,
+                color: color,
+                ...props
+            });
+        };
+    }, [
+        width,
+        color
+    ]);
+    return $715dd5fedd79146a$var$h((0, $c6d9d48b3424a44c$export$ce5c4f2fdf4e644d), {
+        data: data,
+        noteComponent: noteComponent,
+        getUnitID: (d)=>d[0].unit_id,
+        matchingUnit: $715dd5fedd79146a$var$matchingUnit
+    });
+}
 function $715dd5fedd79146a$var$DepositionalAge({ unit: unit }) {
     const { xScale: xScale, height: height } = (0, $d4hxx$usePlotArea)();
     const { t_age: t_age, b_age: b_age } = unit;
@@ -36,7 +62,6 @@ function $715dd5fedd79146a$var$DepositionalAge({ unit: unit }) {
 function $715dd5fedd79146a$export$1b3047373cd1c8c7(props) {
     const { note: note, width: width, height: height, color: color, spacing: spacing } = props;
     const { data: data, unit: unit } = note;
-    const { geo_unit: geo_unit } = data[0];
     const _color = color;
     const spaceBelow = spacing?.below ?? 100;
     const hideAxisLabels = spaceBelow < 60;
@@ -64,61 +89,7 @@ function $715dd5fedd79146a$export$1b3047373cd1c8c7(props) {
         ])
     ]);
 }
-const $715dd5fedd79146a$var$matchingUnit = (dz)=>(d)=>d.unit_id == dz[0].unit_id;
-function $715dd5fedd79146a$export$f176396e104db8d5({ columnID: columnID, color: color = "magenta" }) {
-    const data = (0, $9f310bd6e88a58bc$export$1b0cf9c36f060135)({
-        col_id: columnID
-    });
-    const units = (0, $d5074f164411387e$export$6fb40844db555b2)();
-    const notes = (0, $d4hxx$useMemo)(()=>{
-        if (data == null || units == null) return [];
-        let dzUnitData = Array.from(data.values());
-        dzUnitData.sort((a, b)=>{
-            const v1 = units.findIndex($715dd5fedd79146a$var$matchingUnit(a));
-            const v2 = units.findIndex($715dd5fedd79146a$var$matchingUnit(b));
-            return v1 - v2;
-        });
-        const data1 = dzUnitData.map((d)=>{
-            const unit = units.find($715dd5fedd79146a$var$matchingUnit(d));
-            return {
-                top_height: unit?.t_age,
-                height: unit?.b_age,
-                data: d,
-                unit: unit,
-                id: unit?.unit_id
-            };
-        });
-        return data1.filter((d)=>d.unit != null);
-    }, [
-        data,
-        units
-    ]);
-    const width = 400;
-    const paddingLeft = 40;
-    const spectrumWidth = width - paddingLeft;
-    const noteComponent = (0, $d4hxx$useMemo)(()=>{
-        return (props)=>{
-            return $715dd5fedd79146a$var$h($715dd5fedd79146a$export$1b3047373cd1c8c7, {
-                width: spectrumWidth,
-                height: 40,
-                color: color,
-                ...props
-            });
-        };
-    }, [
-        width,
-        color
-    ]);
-    if (data == null || units == null) return null;
-    return $715dd5fedd79146a$var$h("div.dz-spectra", $715dd5fedd79146a$var$h((0, $9e52fe4012c88296$export$fc5babae10f3f77d), {
-        width: width,
-        paddingLeft: paddingLeft,
-        notes: notes,
-        noteComponent: noteComponent,
-        deltaConnectorAttachment: 20
-    }));
-}
 
 
-export {$715dd5fedd79146a$export$1b3047373cd1c8c7 as DetritalGroup, $715dd5fedd79146a$export$f176396e104db8d5 as DetritalColumn};
-//# sourceMappingURL=column-views.2ff3dd8b.js.map
+export {$715dd5fedd79146a$export$f176396e104db8d5 as DetritalColumn, $715dd5fedd79146a$export$1b3047373cd1c8c7 as DetritalGroup};
+//# sourceMappingURL=column-views.ae7c0a2b.js.map

package/dist/esm/column-views.ae7c0a2b.js.map

@@ -0,0 +1 @@
+{"mappings":";;;;;;;;;;;;;;;;;;;;AAaA,MAAM,0BAAI,CAAA,GAAA,sBAAI,EAAE,MAAM,CAAC,CAAA,GAAA,uEAAK;AAgB5B,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;IAExD,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,OAAO,wBAAE,CAAA,GAAA,yCAAqB,GAAG;cAC/B;uBACA;QACA,WAAW,CAAC,IAAM,CAAC,CAAC,EAAE,CAAC,OAAO;sBAC9B;IACF;AACF;AAEA,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;IAEvB,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","sources":["packages/column-views/src/facets/detrital-zircon/index.ts"],"sourcesContent":["import {\n  DetritalSpectrumPlot,\n  DetritalSeries,\n  usePlotArea,\n} from \"@macrostrat/data-components\";\nimport type { IUnit } from \"../../units/types\";\nimport hyper from \"@macrostrat/hyper\";\nimport { useDetritalMeasurements, MeasurementInfo } from \"./provider\";\nimport { useMemo } from \"react\";\nimport styles from \"./index.module.sass\";\nimport classNames from \"classnames\";\nimport { BaseMeasurementsColumn } from \"../base-sample-column\";\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\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\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  return h(BaseMeasurementsColumn, {\n    data,\n    noteComponent,\n    getUnitID: (d) => d[0].unit_id,\n    matchingUnit,\n  });\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\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\nexport { DetritalColumn, DetritalGroup };\n"],"names":[],"version":3,"file":"column-views.ae7c0a2b.js.map"}

package/dist/esm/{column-views.9892f825.js → column-views.aecf25bc.js}

@@ -1,7 +1,7 @@
-import {createUnitSorter as $b6657fba8924a702$export$ab14c04795685c55, ensureArray as $b6657fba8924a702$export$d0c8ecbd4ed8940c, ensureRealFloat as $b6657fba8924a702$export$97de5b0a6b4e4dac, getUnitHeightRange as $b6657fba8924a702$export$70e712e2ac0237a, unitsOverlap as $b6657fba8924a702$export$f1a15f539858307} from "./column-views.39657bbf.js";
+import {createUnitSorter as $b6657fba8924a702$export$ab14c04795685c55, ensureArray as $b6657fba8924a702$export$d0c8ecbd4ed8940c, ensureRealFloat as $b6657fba8924a702$export$97de5b0a6b4e4dac, getUnitHeightRange as $b6657fba8924a702$export$70e712e2ac0237a, unitsOverlap as $b6657fba8924a702$export$f1a15f539858307} from "./column-views.54f8b909.js";
 import {group as $ailTa$group} from "d3-array";
 import {ColumnAxisType as $ailTa$ColumnAxisType} from "@macrostrat/column-components";
-import {compareAgeRanges as $ailTa$compareAgeRanges} from "@macrostrat/stratigraphy-utils";
+import {compareAgeRanges as $ailTa$compareAgeRanges, AgeRangeRelationship as $ailTa$AgeRangeRelationship} from "@macrostrat/stratigraphy-utils";
 
 
 
@@ -9,7 +9,7 @@ import {compareAgeRanges as $ailTa$compareAgeRanges} from "@macrostrat/stratigra
 
 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;
+    /** Preprocess units to add overlapping units and columns. */ let 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));
@@ -22,22 +22,31 @@ function $663a0cdd08b02256$export$55543e159517d62d(section, axisType = (0, $ailT
             d.column = col;
         }
         // If unit overlaps the edges of a section, set the clip positions
+        const [b_pos, t_pos] = (0, $b6657fba8924a702$export$70e712e2ac0237a)(d, axisType);
         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;
         }
-    }
-    // TODO: we may want to re-enable this simpler processing for sections,
-    // but we want it to be less universally applied.
-    // if (axisType != ColumnAxisType.AGE) {
-    //   return preprocessSectionUnits(divisions, axisType);
+        if (axisType == (0, $ailTa$ColumnAxisType).DEPTH) {
+            if (b_pos > section.b_pos) d.b_clip_pos = section.b_pos;
+            if (t_pos < section.t_pos) d.t_clip_pos = section.t_pos;
+        }
+    // if (axisType == ColumnAxisType.HEIGHT) {
+    //   if (b_pos < section.b_pos) {
+    //     d.b_clip_pos = section.b_pos;
+    //   }
+    //   if (t_pos > section.t_pos) {
+    //     d.t_clip_pos = section.t_pos;
+    //   }
     // }
-    //
+    }
     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));
+    // TODO: make this configurable
+    let tolerance = 0.001; // 1 kyr tolerance for age columns
+    if (axisType != (0, $ailTa$ColumnAxisType).AGE) tolerance = 0.01; // 1cm tolerance for height/depth columns
+    const overlappingUnits = divisions.filter((d)=>d.unit_id != unit.unit_id && (0, $b6657fba8924a702$export$f1a15f539858307)(unit, d, axisType, tolerance));
     const u_pos = (0, $b6657fba8924a702$export$70e712e2ac0237a)(unit, axisType);
     const bottomOverlap = overlappingUnits.some((d)=>{
         const d_pos = (0, $b6657fba8924a702$export$70e712e2ac0237a)(d, axisType);
@@ -53,30 +62,32 @@ function $663a0cdd08b02256$var$extendDivision(unit, i, divisions, axisType = (0,
         overlappingUnits: overlappingUnits.map((d)=>d.unit_id)
     };
 }
-function $663a0cdd08b02256$export$dfbd00399d639b4c(units, axisType = (0, $ailTa$ColumnAxisType).AGE) {
-    if (axisType != (0, $ailTa$ColumnAxisType).AGE) return $663a0cdd08b02256$var$groupUnitsIntoSectionByOverlap(units, axisType);
+function $663a0cdd08b02256$export$eeade20e3eee4638(units, axisType = (0, $ailTa$ColumnAxisType).AGE) {
     /** Group units into sections by section_id.
    * This works for large-scale Macrostrat columns, where units are grouped by section_id.
    * */ 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);
+        const [b_pos, t_pos] = $663a0cdd08b02256$export$483b05c497fd70c6(sectionUnits, axisType);
         // sort units by position
         sectionUnits.sort(unitComparator);
         return {
             section_id: section_id,
             t_age: t_age,
             b_age: b_age,
+            b_pos: b_pos,
+            t_pos: t_pos,
             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);
+    const compareSections = (0, $b6657fba8924a702$export$ab14c04795685c55)(axisType);
     groups1.sort(compareSections);
     return groups1;
 }
-function $663a0cdd08b02256$var$groupUnitsIntoSectionByOverlap(units, axisType = (0, $ailTa$ColumnAxisType).AGE) {
+function $663a0cdd08b02256$export$bb26cdbde9c8c08b(units, axisType = (0, $ailTa$ColumnAxisType).AGE) {
     /** Group units into sections by overlap.
    * This creates "synthetic" sections that correspond to packages bound by scale gaps.
    * This is most useful in the height and depth domains, where gaps (e.g., missing core) are
@@ -86,7 +97,7 @@ function $663a0cdd08b02256$var$groupUnitsIntoSectionByOverlap(units, axisType =
     for (const unit of units){
         // Check if the unit overlaps with any existing section
         const heightRange = (0, $b6657fba8924a702$export$70e712e2ac0237a)(unit, axisType);
-        let section = sectionList.find((s)=>(0, $ailTa$compareAgeRanges)(heightRange, s.heightRange));
+        let section = sectionList.find((s)=>(0, $ailTa$compareAgeRanges)(heightRange, s.heightRange) !== (0, $ailTa$AgeRangeRelationship).Disjoint);
         if (section == null) // No overlap, create a new section
         sectionList.push({
             heightRange: heightRange,
@@ -98,35 +109,69 @@ function $663a0cdd08b02256$var$groupUnitsIntoSectionByOverlap(units, axisType =
             // Overlap, merge the unit into the section
             section.units.push(unit);
             // Update the height range
-            section.heightRange = [
+            if (axisType == (0, $ailTa$ColumnAxisType).DEPTH || axisType == (0, $ailTa$ColumnAxisType).AGE) section.heightRange = [
                 Math.max(section.heightRange[0], heightRange[0]),
                 Math.min(section.heightRange[1], heightRange[1])
             ];
+            else section.heightRange = [
+                Math.min(section.heightRange[0], heightRange[0]),
+                Math.max(section.heightRange[1], heightRange[1])
+            ];
         }
     }
     // We should have a section for each unit, now we can convert to SectionInfo
     // Ages have to be really actually ages, not heights
     return sectionList.map((section, i)=>{
         const [b_age, t_age] = $663a0cdd08b02256$export$8093438ec3e4c6fd(section.units);
+        const [b_pos, t_pos] = $663a0cdd08b02256$export$483b05c497fd70c6(section.units, axisType);
         return {
             // Negative section IDs are used to indicate that these are synthetic sections
             section_id: -i,
             t_age: t_age,
             b_age: b_age,
+            t_pos: t_pos,
+            b_pos: b_pos,
             units: section.units
         };
     });
 }
-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$483b05c497fd70c6(units, axisType) {
+    /** Get the overall position range of a set of units. */ const t_positions = units.map((d)=>{
+        switch(axisType){
+            case (0, $ailTa$ColumnAxisType).AGE:
+                return d.t_age;
+            case (0, $ailTa$ColumnAxisType).DEPTH:
+            case (0, $ailTa$ColumnAxisType).HEIGHT:
+            case (0, $ailTa$ColumnAxisType).ORDINAL:
+                return d.t_pos;
+            default:
+                throw new Error(`Unknown axis type: ${axisType}`);
+        }
+    });
+    const b_positions = units.map((d)=>{
+        switch(axisType){
+            case (0, $ailTa$ColumnAxisType).AGE:
+                return d.b_age;
+            case (0, $ailTa$ColumnAxisType).DEPTH:
+            case (0, $ailTa$ColumnAxisType).HEIGHT:
+            case (0, $ailTa$ColumnAxisType).ORDINAL:
+                return d.b_pos;
+            default:
+                throw new Error(`Unknown axis type: ${axisType}`);
+        }
+    });
+    if (axisType == (0, $ailTa$ColumnAxisType).AGE || axisType == (0, $ailTa$ColumnAxisType).DEPTH) return [
+        Math.max(...b_positions),
+        Math.min(...t_positions)
+    ];
+    else return [
+        Math.min(...b_positions),
+        Math.max(...t_positions)
     ];
 }
+function $663a0cdd08b02256$export$8093438ec3e4c6fd(units) {
+    /** Get the overall age range of a set of units. */ return $663a0cdd08b02256$export$483b05c497fd70c6(units, (0, $ailTa$ColumnAxisType).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.
@@ -152,21 +197,11 @@ function $663a0cdd08b02256$export$e7bb744b9be37f3d(sections) {
     }
     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) {
+function $663a0cdd08b02256$export$47e05aac3f0b77d4(unit) {
     /** Preprocess a single unit for a "section" column type.
-   * No provision for overlapping units.
+   * This mostly handles vagaries of eODP-style columns.
    * */ 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
@@ -181,12 +216,10 @@ function $663a0cdd08b02256$var$preprocessSectionUnit(unit, i, units, accumulated
         ...unit,
         b_pos: (0, $b6657fba8924a702$export$97de5b0a6b4e4dac)(b_pos),
         t_pos: (0, $b6657fba8924a702$export$97de5b0a6b4e4dac)(t_pos),
-        unit_name: unit_name,
-        bottomOverlap: false,
-        overlappingUnits: []
+        unit_name: unit_name
     };
 }
 
 
-export {$663a0cdd08b02256$export$55543e159517d62d as preprocessUnits, $663a0cdd08b02256$export$dfbd00399d639b4c as groupUnitsIntoSections, $663a0cdd08b02256$export$8093438ec3e4c6fd as getSectionAgeRange, $663a0cdd08b02256$export$e7bb744b9be37f3d as mergeOverlappingSections};
-//# sourceMappingURL=column-views.9892f825.js.map
+export {$663a0cdd08b02256$export$55543e159517d62d as preprocessUnits, $663a0cdd08b02256$export$eeade20e3eee4638 as groupUnitsIntoSectionsBySectionID, $663a0cdd08b02256$export$8093438ec3e4c6fd as getSectionAgeRange, $663a0cdd08b02256$export$483b05c497fd70c6 as getSectionPosRange, $663a0cdd08b02256$export$bb26cdbde9c8c08b as groupUnitsIntoSectionsByOverlap, $663a0cdd08b02256$export$e7bb744b9be37f3d as mergeOverlappingSections, $663a0cdd08b02256$export$47e05aac3f0b77d4 as preprocessSectionUnit};
+//# sourceMappingURL=column-views.aecf25bc.js.map

package/dist/esm/column-views.aecf25bc.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  createUnitSorter,\n  ensureArray,\n  ensureRealFloat,\n  getUnitHeightRange,\n  unitsOverlap,\n} from \"./utils\";\nimport {\n  AgeRangeRelationship,\n  compareAgeRanges,\n} from \"@macrostrat/stratigraphy-utils\";\nimport type { ExtUnit, SectionInfo, StratigraphicPackage } from \"./types\";\n\nconst dt = 0.001;\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  let units = section.units;\n\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    const [b_pos, t_pos] = getUnitHeightRange(d, axisType);\n    if (axisType == ColumnAxisType.AGE) {\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    if (axisType == ColumnAxisType.DEPTH) {\n      if (b_pos > section.b_pos) {\n        d.b_clip_pos = section.b_pos;\n      }\n      if (t_pos < section.t_pos) {\n        d.t_clip_pos = section.t_pos;\n      }\n    }\n    // if (axisType == ColumnAxisType.HEIGHT) {\n    //   if (b_pos < section.b_pos) {\n    //     d.b_clip_pos = section.b_pos;\n    //   }\n    //   if (t_pos > section.t_pos) {\n    //     d.t_clip_pos = section.t_pos;\n    //   }\n    // }\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  // TODO: make this configurable\n  let tolerance = 0.001; // 1 kyr tolerance for age columns\n  if (axisType != ColumnAxisType.AGE) {\n    tolerance = 0.01; // 1cm tolerance for height/depth columns\n  }\n\n  const overlappingUnits = divisions.filter(\n    (d) =>\n      d.unit_id != unit.unit_id && unitsOverlap(unit, d, axisType, tolerance),\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 groupUnitsIntoSectionsBySectionID<T extends UnitLong>(\n  units: T[],\n  axisType: ColumnAxisType = ColumnAxisType.AGE,\n): SectionInfo<T>[] {\n  /** Group units into sections by section_id.\n   * This works for large-scale Macrostrat columns, where units are grouped by section_id.\n   * */\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    const [b_pos, t_pos] = getSectionPosRange(sectionUnits, axisType);\n\n    // sort units by position\n    sectionUnits.sort(unitComparator);\n    return { section_id, t_age, b_age, b_pos, t_pos, 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(axisType) as (\n    a: StratigraphicPackage,\n    b: StratigraphicPackage,\n  ) => number;\n  groups1.sort(compareSections);\n  return groups1;\n}\n\ninterface WorkingSection {\n  units: UnitLong[];\n  // Position or age\n  heightRange?: [number, number];\n}\n\nexport function groupUnitsIntoSectionsByOverlap<T extends UnitLong>(\n  units: T[],\n  axisType: ColumnAxisType = ColumnAxisType.AGE,\n): SectionInfo<T>[] {\n  /** Group units into sections by overlap.\n   * This creates \"synthetic\" sections that correspond to packages bound by scale gaps.\n   * This is most useful in the height and depth domains, where gaps (e.g., missing core) are\n   * common.\n   * */\n  // Start with each unit as its own \"section\", and progressively merge...\n  const sectionList: WorkingSection[] = [];\n  for (const unit of units) {\n    // Check if the unit overlaps with any existing section\n    const heightRange = getUnitHeightRange(unit, axisType);\n    let section: WorkingSection | undefined = sectionList.find(\n      (s) =>\n        compareAgeRanges(heightRange, s.heightRange) !==\n        AgeRangeRelationship.Disjoint,\n    );\n    if (section == null) {\n      // No overlap, create a new section\n      sectionList.push({\n        heightRange,\n        units: [unit],\n      });\n    } else {\n      // Overlap, merge the unit into the section\n      section.units.push(unit);\n      // Update the height range\n      if (axisType == ColumnAxisType.DEPTH || axisType == ColumnAxisType.AGE) {\n        section.heightRange = [\n          Math.max(section.heightRange[0], heightRange[0]),\n          Math.min(section.heightRange[1], heightRange[1]),\n        ];\n      } else {\n        section.heightRange = [\n          Math.min(section.heightRange[0], heightRange[0]),\n          Math.max(section.heightRange[1], heightRange[1]),\n        ];\n      }\n    }\n  }\n  // We should have a section for each unit, now we can convert to SectionInfo\n  // Ages have to be really actually ages, not heights\n\n  return sectionList.map((section, i) => {\n    const [b_age, t_age] = getSectionAgeRange(section.units);\n    const [b_pos, t_pos] = getSectionPosRange(section.units, axisType);\n    return {\n      // Negative section IDs are used to indicate that these are synthetic sections\n      section_id: -i,\n      t_age,\n      b_age,\n      t_pos,\n      b_pos,\n      units: section.units as T[],\n    };\n  });\n}\n\nexport function getSectionPosRange(\n  units: BaseUnit[],\n  axisType: ColumnAxisType,\n): [number, number] {\n  /** Get the overall position range of a set of units. */\n  const t_positions = units.map((d) => {\n    switch (axisType) {\n      case ColumnAxisType.AGE:\n        return d.t_age;\n      case ColumnAxisType.DEPTH:\n      case ColumnAxisType.HEIGHT:\n      case ColumnAxisType.ORDINAL:\n        return d.t_pos;\n      default:\n        throw new Error(`Unknown axis type: ${axisType}`);\n    }\n  });\n  const b_positions = units.map((d) => {\n    switch (axisType) {\n      case ColumnAxisType.AGE:\n        return d.b_age;\n      case ColumnAxisType.DEPTH:\n      case ColumnAxisType.HEIGHT:\n      case ColumnAxisType.ORDINAL:\n        return d.b_pos;\n      default:\n        throw new Error(`Unknown axis type: ${axisType}`);\n    }\n  });\n  if (axisType == ColumnAxisType.AGE || axisType == ColumnAxisType.DEPTH) {\n    return [Math.max(...b_positions), Math.min(...t_positions)];\n  } else {\n    return [Math.min(...b_positions), Math.max(...t_positions)];\n  }\n}\n\nexport function getSectionAgeRange(units: BaseUnit[]): [number, number] {\n  /** Get the overall age range of a set of units. */\n  return getSectionPosRange(units, ColumnAxisType.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\nexport function preprocessSectionUnit(unit: UnitLong): UnitLong {\n  /** Preprocess a single unit for a \"section\" column type.\n   * This mostly handles vagaries of eODP-style columns.\n   * */\n\n  let b_pos = unit.b_pos;\n  let t_pos = unit.t_pos;\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  };\n}\n"],"names":[],"version":3,"file":"column-views.aecf25bc.js.map"}

package/dist/esm/column-views.b7016f82.css

@@ -0,0 +1,54 @@
+.VC2fja_taxa-occurrences-matrix {
+  color: var(--column-text-color);
+}
+
+.VC2fja_taxa-occurrences-matrix line {
+  stroke: var(--column-stroke-color);
+  stroke-width: 2px;
+}
+
+.VC2fja_taxa-occurrences-matrix text.VC2fja_taxon-name {
+  fill: var(--column-text-color);
+  text-anchor: end;
+  position: sticky;
+  top: 0;
+  transform: rotate(90deg)translate(0, 4px);
+}
+
+.VC2fja_taxon-ranges {
+  position: relative;
+}
+
+.VC2fja_taxon-ranges > svg {
+  height: 100%;
+  position: absolute;
+}
+
+.VC2fja_taxon-labels {
+  z-index: 10;
+  pointer-events: none;
+  width: 100%;
+  height: 100%;
+  position: absolute;
+}
+
+.VC2fja_taxon-labels .VC2fja_taxon-label {
+  height: 100%;
+  position: absolute;
+}
+
+.VC2fja_taxon-labels .VC2fja_taxon-label-inner {
+  top: calc(var(--label-width, 200px)  - 10px);
+  transform-origin: 0 100%;
+  background-color: var(--column-background-color);
+  position: sticky;
+  transform: rotate(-90deg)translate(10px, 8px);
+}
+
+.VC2fja_taxon-labels .VC2fja_taxon-label-text {
+  text-align: left;
+  max-width: 300px;
+  padding: 0 8px;
+  font-style: italic;
+}
+/*# sourceMappingURL=column-views.b7016f82.css.map */

package/dist/esm/column-views.b7016f82.css.map

@@ -0,0 +1 @@
+{"mappings":"AAAA;;;;AAEE;;;;;AAGA;;;;;;;;AAOF;;;;AAEE;;;;;AAIF;;;;;;;;AAOE;;;;;AAIA;;;;;;;;AAOA","sources":["packages/column-views/src/facets/fossils/index.module.sass"],"sourcesContent":[".taxa-occurrences-matrix\n  color: var(--column-text-color)\n  line\n    stroke: var(--column-stroke-color)\n    stroke-width: 2px\n  text.taxon-name\n    fill: var(--column-text-color)\n    transform: rotate(90deg) translate(0, 4px)\n    text-anchor: end\n    position: sticky\n    top: 0\n\n.taxon-ranges\n  position: relative\n  &>svg\n    position: absolute\n    height: 100%\n\n.taxon-labels\n  z-index: 10\n  position: absolute\n  width: 100%\n  height: 100%\n  pointer-events: none\n\n  .taxon-label\n    position: absolute\n    height: 100%\n\n  .taxon-label-inner\n    position: sticky\n    top: calc(var(--label-width, 200px) - 10px)\n    transform: rotate(-90deg) translate(10px, 8px)\n    transform-origin: bottom left\n    background-color: var(--column-background-color)\n\n  .taxon-label-text\n\n    font-style: italic\n    text-align: left\n    padding: 0 8px\n    max-width: 300px\n    //position: sticky\n    //top: 200px\n"],"names":[],"version":3,"file":"column-views.b7016f82.css.map"}

package/dist/esm/{column-views.a195109e.js → column-views.ba0381cc.js}

@@ -1,4 +1,4 @@
-import {UnitDetailsPanel as $448b24baeef3b229$export$fbd245232df17557} from "./column-views.cc5244c4.js";
+import {UnitDetailsPanel as $448b24baeef3b229$export$fbd245232df17557} from "./column-views.77561197.js";
 import {Button as $fodo6$Button} from "@blueprintjs/core";
 import {useKeyHandler as $fodo6$useKeyHandler} from "@macrostrat/ui-components";
 import $fodo6$macrostrathyper from "@macrostrat/hyper";
@@ -57,4 +57,4 @@ function $d418ca9cbe9b0f3c$export$cfdbe8496aa51962(props) {
 
 
 export {$d418ca9cbe9b0f3c$export$cfdbe8496aa51962 as UnitDetailsPanelWithNavigation};
-//# sourceMappingURL=column-views.a195109e.js.map
+//# sourceMappingURL=column-views.ba0381cc.js.map