@macrostrat/column-views 2.1.4 → 2.2.0

package/CHANGELOG.md

@@ -4,6 +4,13 @@ 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.2.0] - 2025-11-28
+
+- Update SGP and PBDB facets
+- Improve `UnitDetailsPanel` styling and information content
+- Improve use of discontinous scales
+- Create `hybridScale` options block to allow more dynamic scale generation
+
 ## [2.1.4] - 2025-10-29
 
 - Improve stories

package/dist/esm/{column-views.4ab0ec82.js → column-views.073c42da.js}

@@ -1,10 +1,14 @@
-import {ensureArray as $b6657fba8924a702$export$d0c8ecbd4ed8940c, getUnitHeightRange as $b6657fba8924a702$export$70e712e2ac0237a} from "./column-views.39657bbf.js";
+import {ensureArray as $b6657fba8924a702$export$d0c8ecbd4ed8940c, getUnitHeightRange as $b6657fba8924a702$export$70e712e2ac0237a} from "./column-views.54f8b909.js";
+import {buildHybridScale as $90d6b105908858a7$export$6b39f1b6356d94b6} from "./column-views.70164236.js";
+import {HybridScaleType as $1254c5929638d7f9$export$45e8e2d7a1794c23} from "./column-views.079119f4.js";
 import {ColumnAxisType as $egi9E$ColumnAxisType} from "@macrostrat/column-components";
 import {scaleLinear as $egi9E$scaleLinear} from "d3-scale";
 
 
 
 
+
+
 function $728f6cf6c12cd490$export$e7184dd8bb3302ed(inputScales, unconformityHeight) {
     /** Finalize the heights of sections, including the heights of unconformities
    * between them.
@@ -12,7 +16,7 @@ function $728f6cf6c12cd490$export$e7184dd8bb3302ed(inputScales, unconformityHeig
     let lastSectionTopHeight = 0;
     const packages2 = [];
     for (const group of inputScales){
-        const { domain: domain, pixelScale: pixelScale } = group;
+        const { domain: domain, scale: scale } = group;
         const [b_age, t_age] = domain;
         const key = `package-${b_age}-${t_age}`;
         packages2.push({
@@ -22,7 +26,7 @@ function $728f6cf6c12cd490$export$e7184dd8bb3302ed(inputScales, unconformityHeig
             // Unconformity height above this particular section
             paddingTop: totalHeight - lastSectionTopHeight
         });
-        const pixelHeight = pixelScale * Math.abs(b_age - t_age);
+        const pixelHeight = Math.abs(scale(b_age) - scale(t_age));
         lastSectionTopHeight = totalHeight + pixelHeight;
         totalHeight = lastSectionTopHeight + unconformityHeight;
     }
@@ -59,13 +63,17 @@ function $728f6cf6c12cd490$export$7d3f3129a1a4b84e(sections, opts) {
     });
 }
 function $728f6cf6c12cd490$var$addScaleToSection(group, opts) {
-    const { t_age: t_age, b_age: b_age, units: units } = group;
+    const { t_age: t_age, b_age: b_age, t_pos: t_pos, b_pos: b_pos, units: units } = group;
     let _range = null;
     // if t_age and b_age are set for a group, use them to define the range...
-    if (t_age != null && b_age != null && opts.axisType == (0, $egi9E$ColumnAxisType).AGE) _range = [
+    if (opts.axisType == (0, $egi9E$ColumnAxisType).AGE) _range = [
         b_age,
         t_age
     ];
+    else _range = [
+        b_pos,
+        t_pos
+    ];
     const scaleInfo = $728f6cf6c12cd490$var$buildSectionScale(units, {
         ...opts,
         domain: _range
@@ -76,45 +84,78 @@ function $728f6cf6c12cd490$var$addScaleToSection(group, opts) {
     };
 }
 function $728f6cf6c12cd490$var$buildSectionScale(data, opts) {
-    const { targetUnitHeight: targetUnitHeight = 20, minPixelScale: minPixelScale = 0.2, axisType: axisType, minSectionHeight: minSectionHeight } = opts;
+    const { targetUnitHeight: targetUnitHeight = 20, minPixelScale: minPixelScale = 0.2, axisType: axisType, minSectionHeight: minSectionHeight, scale: scale, hybridScale: hybridScale } = opts;
     const domain = opts.domain ?? $728f6cf6c12cd490$var$findSectionHeightRange(data, axisType);
     const dAge = Math.abs(domain[0] - domain[1]);
     let _pixelScale = opts.pixelScale;
-    if (_pixelScale == null) {
-        const avgAgeRange = $728f6cf6c12cd490$var$findAverageUnitHeight(data, axisType);
-        // Get pixel height necessary to render average unit at target height
-        _pixelScale = Math.max(targetUnitHeight / avgAgeRange, minPixelScale);
-    // OLD METHOD that cares about overall section height vs. individual unit height
-    // 0.2 pixel per myr is the floor scale
-    //const targetHeight = targetUnitHeight * data.length;
-    // 1 pixel per myr is the floor scale
-    //_pixelScale = Math.max(targetHeight / dAge, minPixelScale);
+    let pixelHeight;
+    if (hybridScale != null) {
+        /** In an equidistant surfaces scale, we want to determine the heights of surfaces
+     * and then distribute units evenly between them.
+     * This is somewhat like an ordinal scale
+     */ if (hybridScale.type === (0, $1254c5929638d7f9$export$45e8e2d7a1794c23).EquidistantSurfaces) _pixelScale ??= targetUnitHeight;
+        return (0, $90d6b105908858a7$export$6b39f1b6356d94b6)(hybridScale, data, domain, {
+            pixelOffset: 0,
+            pixelScale: _pixelScale
+        });
     }
-    let height = dAge * _pixelScale;
-    // If height is less than minSectionHeight, set it to minSectionHeight
-    const _minSectionHeight = minSectionHeight ?? targetUnitHeight ?? 0;
-    height = Math.max(height, _minSectionHeight);
-    _pixelScale = height / dAge;
+    if (scale == null) {
+        if (_pixelScale == null) {
+            const avgAgeRange = $728f6cf6c12cd490$var$findAverageUnitHeight(data, axisType);
+            // Get pixel height necessary to render average unit at target height
+            _pixelScale = Math.max(targetUnitHeight / avgAgeRange, minPixelScale);
+        // OLD METHOD that cares about overall section height vs. individual unit height
+        // 0.2 pixel per myr is the floor scale
+        //const targetHeight = targetUnitHeight * data.length;
+        // 1 pixel per myr is the floor scale
+        //_pixelScale = Math.max(targetHeight / dAge, minPixelScale);
+        }
+        let height = dAge * _pixelScale;
+        // If height is less than minSectionHeight, set it to minSectionHeight
+        const _minSectionHeight = minSectionHeight ?? targetUnitHeight ?? 0;
+        pixelHeight = Math.max(height, _minSectionHeight);
+        _pixelScale = pixelHeight / dAge;
+    } else // If a scale is provided, use it to compute pixel height
+    pixelHeight = Math.abs(scale(domain[0]) - scale(domain[1]));
     return $728f6cf6c12cd490$export$d6235b492bceb8c5({
+        scale: scale,
         domain: domain,
+        pixelHeight: pixelHeight,
         pixelScale: _pixelScale
     }, 0);
 }
 function $728f6cf6c12cd490$export$d6235b492bceb8c5(def, offset = 0) {
     /** Build a section scale */ // Domain should be oriented from bottom to top, but scale is oriented from top to bottom
-    const { domain: domain, pixelScale: pixelScale } = def;
-    const pixelHeight = pixelScale * Math.abs(domain[0] - domain[1]);
+    const { domain: domain, pixelScale: pixelScale, pixelHeight: pixelHeight, scale: scale, heightScale: heightScale } = def;
+    if (scale == null && pixelScale == null) throw new Error("Either scale or pixelScale must be provided");
+    let _scale;
+    if (scale == null) _scale = (0, $egi9E$scaleLinear)().domain([
+        domain[1],
+        domain[0]
+    ]).range([
+        offset,
+        pixelHeight + offset
+    ]);
+    else {
+        const domain0 = scale.domain();
+        const range0 = scale.range();
+        _scale = scale.copy().domain(domain0).range(range0.map((d)=>d + offset));
+    }
+    _scale.clamp();
+    let _heightScale = null;
+    if (heightScale != null) {
+        // Adjust height scale as well
+        const range0 = scale.range();
+        _heightScale = heightScale.copy().range(range0.map((d)=>d + offset));
+        _heightScale.clamp();
+    }
     return {
         domain: domain,
         pixelScale: pixelScale,
         pixelHeight: pixelHeight,
-        scale: (0, $egi9E$scaleLinear)().domain([
-            domain[1],
-            domain[0]
-        ]).range([
-            offset,
-            pixelHeight + offset
-        ])
+        scale: _scale,
+        // Internal details for hybrid scales. TODO: improve this
+        heightScale: _heightScale
     };
 }
 function $728f6cf6c12cd490$var$findSectionHeightRange(data, axisType) {
@@ -150,66 +191,65 @@ function $728f6cf6c12cd490$var$findAverageUnitHeight(data, axisType) {
     return unitHeights.reduce((a, b)=>a + b, 0) / unitHeights.length;
 }
 function $728f6cf6c12cd490$export$3ada7641926a616d(sections, interpolateUnconformities = false) {
-    /** Create a scale that works across multiple packages */ // Get surfaces at which scale breaks
-    let scaleBreaks = [];
+    /** Create a scale that works across multiple packages */ const scales = [];
+    let lastScale = null;
     for (const section of sections){
-        const { pixelHeight: pixelHeight, offset: offset, domain: domain } = section.scaleInfo;
-        scaleBreaks.push([
-            domain[1],
-            offset
-        ]);
-        scaleBreaks.push([
-            domain[0],
-            offset + pixelHeight
-        ]);
+        const _scale = section.scaleInfo.scale.copy().clamp(true);
+        scales.push(_scale);
+        if (lastScale != null && interpolateUnconformities) {
+            // Add a new scale that interpolates between lastScale and _scale
+            const lastDomain = lastScale.domain();
+            const lastRange = lastScale.range();
+            const currentDomain = _scale.domain();
+            const currentRange = _scale.range();
+            const interpScale = (0, $egi9E$scaleLinear)().domain([
+                lastDomain[lastDomain.length - 1],
+                currentDomain[0]
+            ]).range([
+                lastRange[lastRange.length - 1],
+                currentRange[0]
+            ]).clamp(true);
+            scales.push(interpScale);
+        }
+        lastScale = _scale;
     }
-    // Sort the scale breaks by age
-    scaleBreaks.sort((a, b)=>a[0] - b[0]);
     const scale = (age)=>{
-        // Accumulate scale breaks and pixel height
-        let lastHeight = 0;
-        let lastAge = null;
-        for (const [age1, height] of scaleBreaks){
-            if (age <= age1) {
-                let deltaAge = age1 - lastAge;
-                if (deltaAge === 0) // If the age is exactly at a scale break, return the height at that break
-                return height;
-                let pixelScale = (height - lastHeight) / deltaAge;
-                return lastHeight + (age - lastAge) * pixelScale;
-            }
-            lastAge = age1;
-            lastHeight = height;
+        for (const s of scales){
+            const domain = s.domain();
+            if (age >= domain[0] && age <= domain[domain.length - 1]) return s(age);
         }
+        return null;
     };
     scale.copy = ()=>{
         return $728f6cf6c12cd490$export$3ada7641926a616d(sections, interpolateUnconformities);
     };
     scale.domain = ()=>{
-        /** Return the domain of the scale */ const firstSection = sections[0].scaleInfo.domain;
-        const lastSection = sections[sections.length - 1].scaleInfo.domain;
-        if (firstSection[0] < lastSection[0]) return [
-            Math.min(...firstSection),
-            Math.max(...lastSection)
+        /** Return the domain of the scale */ const vals = sections.flatMap((d)=>d.scaleInfo.domain);
+        if (vals[0] < vals[vals.length - 1]) // age axes
+        return [
+            Math.min(...vals),
+            Math.max(...vals)
         ];
-        else // Catches "normal" axes like height
+        // Normal axes like height
         return [
-            Math.max(...firstSection),
-            Math.min(...lastSection)
+            Math.max(...vals),
+            Math.min(...vals)
         ];
     };
     scale.invert = (pixelHeight)=>{
         /** Invert the scale to get the age at a given pixel height */ // Iterate through the sections to find the correct one
-        let lastAge = null;
-        for (const section of sections){
-            const { pixelHeight: sectionHeight, pixelScale: pixelScale, offset: offset, domain: domain } = section.scaleInfo;
-            if (pixelHeight >= offset && pixelHeight <= offset + sectionHeight && pixelScale > 0) {
-                const age = domain[1] + (pixelHeight - offset) / pixelScale;
-                return age;
+        for (const scale of scales){
+            const range = scale.range();
+            if (pixelHeight > Math.min(...range) && pixelHeight <= Math.max(...range)) {
+                console.log("Inverting scale at pixel height", pixelHeight);
+                return scale.invert(pixelHeight);
             }
-            lastAge = domain[1];
         }
         return null;
     };
+    scale.clamp = (clamp)=>{
+        /** Clamp all constituent scales */ for (const s of scales)s.clamp(clamp);
+    };
     return scale;
 }
 function $728f6cf6c12cd490$export$edbf01b435c75274(sections, threshold, opts) {
@@ -220,9 +260,34 @@ function $728f6cf6c12cd490$export$edbf01b435c75274(sections, threshold, opts) {
             currentSection = nextSection;
             continue;
         }
-        const dAge = Math.abs(nextSection.t_age - currentSection.b_age);
-        const pxHeight = dAge * Math.max(currentSection.scaleInfo.pixelScale, nextSection.scaleInfo.pixelScale);
+        let heights;
+        let pxHeights;
+        if (opts.axisType !== (0, $egi9E$ColumnAxisType).AGE) heights = [
+            nextSection.t_pos,
+            currentSection.b_pos
+        ];
+        else heights = [
+            nextSection.t_age,
+            currentSection.b_age
+        ];
+        const _diff = (vals)=>{
+            return Math.abs(vals[0] - vals[1]);
+        };
+        pxHeights = [
+            _diff(heights.map(nextSection.scaleInfo.scale)),
+            _diff(heights.map(currentSection.scaleInfo.scale))
+        ];
+        const pxHeight = Math.min(...pxHeights);
         if (pxHeight < threshold) {
+            let t_pos;
+            let b_pos;
+            if (opts.axisType == (0, $egi9E$ColumnAxisType).AGE || opts.axisType == (0, $egi9E$ColumnAxisType).DEPTH) {
+                t_pos = Math.min(currentSection.t_pos, nextSection.t_pos);
+                b_pos = Math.max(currentSection.b_pos, nextSection.b_pos);
+            } else {
+                t_pos = Math.max(currentSection.t_pos, nextSection.t_pos);
+                b_pos = Math.min(currentSection.b_pos, nextSection.b_pos);
+            }
             // We need to merge the sections
             const compositeSection0 = {
                 units: [
@@ -234,10 +299,11 @@ function $728f6cf6c12cd490$export$edbf01b435c75274(sections, threshold, opts) {
                     ...(0, $b6657fba8924a702$export$d0c8ecbd4ed8940c)(nextSection.section_id)
                 ],
                 t_age: Math.min(currentSection.t_age, nextSection.t_age),
-                b_age: Math.max(currentSection.b_age, nextSection.b_age)
+                b_age: Math.max(currentSection.b_age, nextSection.b_age),
+                t_pos: t_pos,
+                b_pos: b_pos
             };
-            const compositeSection = $728f6cf6c12cd490$var$addScaleToSection(compositeSection0, opts);
-            currentSection = compositeSection;
+            currentSection = $728f6cf6c12cd490$var$addScaleToSection(compositeSection0, opts);
         } else {
             // We need to keep the section
             newSections.push(currentSection);
@@ -250,4 +316,4 @@ function $728f6cf6c12cd490$export$edbf01b435c75274(sections, threshold, opts) {
 
 
 export {$728f6cf6c12cd490$export$e7184dd8bb3302ed as buildCompositeScaleInfo, $728f6cf6c12cd490$export$d6235b492bceb8c5 as createPackageScale, $728f6cf6c12cd490$export$67442a0f5bef147b as finalizeSectionHeights, $728f6cf6c12cd490$export$7d3f3129a1a4b84e as computeSectionHeights, $728f6cf6c12cd490$export$3ada7641926a616d as createCompositeScale, $728f6cf6c12cd490$export$edbf01b435c75274 as collapseUnconformitiesByPixelHeight};
-//# sourceMappingURL=column-views.4ab0ec82.js.map
+//# sourceMappingURL=column-views.073c42da.js.map

package/dist/esm/column-views.073c42da.js.map

@@ -0,0 +1 @@
+{"mappings":"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","sources":["packages/column-views/src/prepare-units/composite-scale.ts"],"sourcesContent":["import { ColumnAxisType } from \"@macrostrat/column-components\";\nimport { ensureArray, getUnitHeightRange } from \"./utils\";\nimport { ScaleContinuousNumeric, scaleLinear } from \"d3-scale\";\nimport { UnitLong } from \"@macrostrat/api-types\";\nimport { buildHybridScale } from \"./dynamic-scales\";\nimport { ExtUnit, HybridScaleType, SectionInfo } from \"./types\";\nimport type {\n  ColumnScaleOptions,\n  CompositeColumnData,\n  CompositeScaleData,\n  PackageLayoutData,\n  PackageScaleInfo,\n  PackageScaleLayoutData,\n  SectionScaleOptions,\n} from \"./types\";\n\n// Composite scale information augmented with units in each package\n\nexport function buildCompositeScaleInfo(\n  inputScales: PackageScaleInfo[],\n  unconformityHeight: number,\n): CompositeScaleData {\n  /** Finalize the heights of sections, including the heights of unconformities\n   * between them.\n   */\n\n  let totalHeight = unconformityHeight / 2;\n  let lastSectionTopHeight = 0;\n\n  const packages2: PackageScaleLayoutData[] = [];\n  for (const group of inputScales) {\n    const { domain, scale } = group;\n    const [b_age, t_age] = domain;\n    const key = `package-${b_age}-${t_age}`;\n\n    packages2.push({\n      ...createPackageScale(group, totalHeight),\n      key,\n      offset: totalHeight,\n      // Unconformity height above this particular section\n      paddingTop: totalHeight - lastSectionTopHeight,\n    });\n\n    const pixelHeight = Math.abs(scale(b_age) - scale(t_age));\n    lastSectionTopHeight = totalHeight + pixelHeight;\n    totalHeight = lastSectionTopHeight + unconformityHeight;\n  }\n  totalHeight += unconformityHeight / 2;\n  return {\n    totalHeight,\n    sections: packages2,\n  };\n}\n\nexport function finalizeSectionHeights<T extends UnitLong>(\n  sections: SectionInfoWithScale<T>[],\n  unconformityHeight: number,\n): CompositeColumnData<T> {\n  /** Finalize the heights of sections, including the heights of unconformities\n   * between them.\n   */\n\n  const sectionScales = sections.map((d) => d.scaleInfo);\n\n  const { totalHeight, sections: packages } = buildCompositeScaleInfo(\n    sectionScales,\n    unconformityHeight,\n  );\n\n  // This could perhaps be simplified.\n  const sections1: PackageLayoutData<T>[] = [];\n  for (const i in sections) {\n    const group = sections[i];\n    const scaleInfo = packages[i];\n    sections1.push({\n      ...group,\n      key: scaleInfo.key,\n      scaleInfo,\n    });\n  }\n  return {\n    totalHeight,\n    sections: sections1,\n  };\n}\n\nexport interface SectionInfoWithScale<\n  T extends UnitLong = ExtUnit,\n> extends SectionInfo<T> {\n  scaleInfo: PackageScaleInfo;\n}\n\nexport function computeSectionHeights<T extends UnitLong>(\n  sections: SectionInfo<T>[],\n  opts: ColumnScaleOptions,\n): SectionInfoWithScale<T>[] {\n  return sections.map((group) => {\n    return addScaleToSection<T>(group, opts);\n  });\n}\n\nfunction addScaleToSection<T extends UnitLong = ExtUnit>(\n  group: SectionInfo<T>,\n  opts: ColumnScaleOptions,\n): SectionInfoWithScale<T> {\n  const { t_age, b_age, t_pos, b_pos, units } = group;\n  let _range = null;\n  // if t_age and b_age are set for a group, use them to define the range...\n  if (opts.axisType == ColumnAxisType.AGE) {\n    _range = [b_age, t_age];\n  } else {\n    _range = [b_pos, t_pos];\n  }\n\n  const scaleInfo = buildSectionScale<T>(units, {\n    ...opts,\n    domain: _range,\n  });\n\n  return {\n    ...group,\n    scaleInfo,\n  };\n}\n\nfunction buildSectionScale<T extends UnitLong>(\n  data: T[],\n  opts: SectionScaleOptions,\n): PackageScaleInfo {\n  const {\n    targetUnitHeight = 20,\n    minPixelScale = 0.2,\n    axisType,\n    minSectionHeight,\n    scale,\n    hybridScale,\n  } = opts;\n  const domain = opts.domain ?? findSectionHeightRange(data, axisType);\n\n  const dAge = Math.abs(domain[0] - domain[1]);\n\n  let _pixelScale = opts.pixelScale;\n  let pixelHeight: number;\n\n  if (hybridScale != null) {\n    /** In an equidistant surfaces scale, we want to determine the heights of surfaces\n     * and then distribute units evenly between them.\n     * This is somewhat like an ordinal scale\n     */\n    if (hybridScale.type === HybridScaleType.EquidistantSurfaces) {\n      _pixelScale ??= targetUnitHeight;\n    }\n\n    return buildHybridScale(hybridScale, data, domain, {\n      pixelOffset: 0,\n      pixelScale: _pixelScale,\n    });\n  }\n\n  if (scale == null) {\n    if (_pixelScale == null) {\n      const avgAgeRange = findAverageUnitHeight(data, axisType);\n      // Get pixel height necessary to render average unit at target height\n      _pixelScale = Math.max(targetUnitHeight / avgAgeRange, minPixelScale);\n\n      // OLD METHOD that cares about overall section height vs. individual unit height\n      // 0.2 pixel per myr is the floor scale\n      //const targetHeight = targetUnitHeight * data.length;\n      // 1 pixel per myr is the floor scale\n      //_pixelScale = Math.max(targetHeight / dAge, minPixelScale);\n    }\n\n    let height = dAge * _pixelScale;\n    // If height is less than minSectionHeight, set it to minSectionHeight\n    const _minSectionHeight = minSectionHeight ?? targetUnitHeight ?? 0;\n    pixelHeight = Math.max(height, _minSectionHeight);\n    _pixelScale = pixelHeight / dAge;\n  } else {\n    // If a scale is provided, use it to compute pixel height\n    pixelHeight = Math.abs(scale(domain[0]) - scale(domain[1]));\n  }\n\n  return createPackageScale(\n    { scale, domain, pixelHeight, pixelScale: _pixelScale },\n    0,\n  );\n}\n\nexport function createPackageScale(\n  def: PackageScaleInfo,\n  offset: number = 0,\n): PackageScaleInfo {\n  /** Build a section scale */\n  // Domain should be oriented from bottom to top, but scale is oriented from top to bottom\n  const { domain, pixelScale, pixelHeight, scale, heightScale } = def;\n\n  if (scale == null && pixelScale == null) {\n    throw new Error(\"Either scale or pixelScale must be provided\");\n  }\n\n  let _scale: ScaleContinuousNumeric<number, number>;\n  if (scale == null) {\n    _scale = scaleLinear()\n      .domain([domain[1], domain[0]])\n      .range([offset, pixelHeight + offset]);\n  } else {\n    const domain0 = scale.domain();\n    const range0 = scale.range();\n    _scale = scale\n      .copy()\n      .domain(domain0)\n      .range(range0.map((d) => d + offset));\n  }\n\n  _scale.clamp();\n\n  let _heightScale = null;\n  if (heightScale != null) {\n    // Adjust height scale as well\n    const range0 = scale.range();\n    _heightScale = heightScale.copy().range(range0.map((d) => d + offset));\n    _heightScale.clamp();\n  }\n\n  return {\n    domain,\n    pixelScale,\n    pixelHeight,\n    scale: _scale,\n    // Internal details for hybrid scales. TODO: improve this\n    heightScale: _heightScale,\n  };\n}\n\nfunction findSectionHeightRange(\n  data: UnitLong[],\n  axisType: ColumnAxisType,\n): [number, number] {\n  if (axisType == null) {\n    throw new Error(\"Axis type is not set\");\n  }\n  if (axisType === ColumnAxisType.AGE) {\n    const t_age = Math.min(...data.map((d) => d.t_age));\n    const b_age = Math.max(...data.map((d) => d.b_age));\n    return [b_age, t_age];\n  } else if (\n    axisType == ColumnAxisType.DEPTH ||\n    axisType == ColumnAxisType.ORDINAL\n  ) {\n    const t_pos = Math.min(...data.map((d) => d.t_pos));\n    const b_pos = Math.max(...data.map((d) => d.b_pos));\n    return [b_pos, t_pos];\n  } else if (axisType == ColumnAxisType.HEIGHT) {\n    const t_pos = Math.max(...data.map((d) => d.t_pos));\n    const b_pos = Math.min(...data.map((d) => d.b_pos));\n    return [b_pos, t_pos];\n  }\n}\n\nfunction findAverageUnitHeight(\n  data: UnitLong[],\n  axisType: ColumnAxisType,\n): number {\n  const unitHeights = data.map((d) => {\n    const [b_pos, t_pos] = getUnitHeightRange(d, axisType);\n    return Math.abs(b_pos - t_pos);\n  });\n  return unitHeights.reduce((a, b) => a + b, 0) / unitHeights.length;\n}\n\nexport interface CompositeColumnScale {\n  (age: number): number | null;\n  copy(): CompositeColumnScale;\n  domain(): [number, number];\n  invert(pixelHeight: number): number | null;\n  clamp(clamp: boolean): void;\n}\n\nexport function createCompositeScale(\n  sections: PackageLayoutData[],\n  interpolateUnconformities: boolean = false,\n): CompositeColumnScale {\n  /** Create a scale that works across multiple packages */\n\n  const scales: ScaleContinuousNumeric<number, number>[] = [];\n\n  let lastScale: ScaleContinuousNumeric<number, number> | null = null;\n  for (const section of sections) {\n    const _scale = section.scaleInfo.scale.copy().clamp(true);\n    scales.push(_scale);\n    if (lastScale != null && interpolateUnconformities) {\n      // Add a new scale that interpolates between lastScale and _scale\n      const lastDomain = lastScale.domain();\n      const lastRange = lastScale.range();\n      const currentDomain = _scale.domain();\n      const currentRange = _scale.range();\n\n      const interpScale = scaleLinear()\n        .domain([lastDomain[lastDomain.length - 1], currentDomain[0]])\n        .range([lastRange[lastRange.length - 1], currentRange[0]])\n        .clamp(true);\n      scales.push(interpScale);\n    }\n    lastScale = _scale;\n  }\n\n  const scale: CompositeColumnScale = (age) => {\n    for (const s of scales) {\n      const domain = s.domain();\n      if (age >= domain[0] && age <= domain[domain.length - 1]) {\n        return s(age);\n      }\n    }\n    return null;\n  };\n\n  scale.copy = () => {\n    return createCompositeScale(sections, interpolateUnconformities);\n  };\n\n  scale.domain = () => {\n    /** Return the domain of the scale */\n    const vals = sections.flatMap((d) => d.scaleInfo.domain);\n    if (vals[0] < vals[vals.length - 1]) {\n      // age axes\n      return [Math.min(...vals), Math.max(...vals)];\n    }\n    // Normal axes like height\n    return [Math.max(...vals), Math.min(...vals)];\n  };\n\n  scale.invert = (pixelHeight) => {\n    /** Invert the scale to get the age at a given pixel height */\n    // Iterate through the sections to find the correct one\n    for (const scale of scales) {\n      const range = scale.range();\n      if (\n        pixelHeight > Math.min(...range) &&\n        pixelHeight <= Math.max(...range)\n      ) {\n        console.log(\"Inverting scale at pixel height\", pixelHeight);\n        return scale.invert(pixelHeight);\n      }\n    }\n    return null;\n  };\n\n  scale.clamp = (clamp: boolean) => {\n    /** Clamp all constituent scales */\n    for (const s of scales) {\n      s.clamp(clamp);\n    }\n  };\n\n  return scale;\n}\n\n/** Collapse sections separated by unconformities that are smaller than a given pixel height. */\nexport function collapseUnconformitiesByPixelHeight<T extends UnitLong>(\n  sections: SectionInfoWithScale<T>[],\n  threshold: number,\n  opts: ColumnScaleOptions,\n): SectionInfoWithScale<T>[] {\n  const newSections = [];\n  let currentSection: SectionInfoWithScale<T> | null = null;\n  for (const nextSection of sections) {\n    if (currentSection == null) {\n      currentSection = nextSection;\n      continue;\n    }\n    let heights: [number, number];\n    let pxHeights: [number, number];\n    if (opts.axisType !== ColumnAxisType.AGE) {\n      heights = [nextSection.t_pos, currentSection.b_pos];\n    } else {\n      heights = [nextSection.t_age, currentSection.b_age];\n    }\n\n    const _diff = (vals: number[]) => {\n      return Math.abs(vals[0] - vals[1]);\n    };\n\n    pxHeights = [\n      _diff(heights.map(nextSection.scaleInfo.scale)),\n      _diff(heights.map(currentSection.scaleInfo.scale)),\n    ];\n\n    const pxHeight = Math.min(...pxHeights);\n\n    if (pxHeight < threshold) {\n      let t_pos: number;\n      let b_pos: number;\n      if (\n        opts.axisType == ColumnAxisType.AGE ||\n        opts.axisType == ColumnAxisType.DEPTH\n      ) {\n        t_pos = Math.min(currentSection.t_pos, nextSection.t_pos);\n        b_pos = Math.max(currentSection.b_pos, nextSection.b_pos);\n      } else {\n        t_pos = Math.max(currentSection.t_pos, nextSection.t_pos);\n        b_pos = Math.min(currentSection.b_pos, nextSection.b_pos);\n      }\n\n      // We need to merge the sections\n      const compositeSection0: SectionInfo<T> = {\n        units: [...currentSection.units, ...nextSection.units],\n        section_id: [\n          ...ensureArray(currentSection.section_id),\n          ...ensureArray(nextSection.section_id),\n        ],\n        t_age: Math.min(currentSection.t_age, nextSection.t_age),\n        b_age: Math.max(currentSection.b_age, nextSection.b_age),\n        t_pos,\n        b_pos,\n      };\n\n      currentSection = addScaleToSection(compositeSection0, opts);\n    } else {\n      // We need to keep the section\n      newSections.push(currentSection);\n      currentSection = nextSection;\n    }\n  }\n  if (currentSection != null) {\n    newSections.push(currentSection);\n  }\n\n  return newSections;\n}\n"],"names":[],"version":3,"file":"column-views.073c42da.js.map"}

package/dist/esm/column-views.079119f4.js

@@ -0,0 +1,17 @@
+var $1254c5929638d7f9$export$45e8e2d7a1794c23 = /*#__PURE__*/ function(HybridScaleType) {
+    // An age-domain scale that puts equal vertical space between surfaces
+    HybridScaleType["EquidistantSurfaces"] = "equidistant-surfaces";
+    // A height-domain scale that is based on the average height of units between surfaces
+    HybridScaleType["ApproximateHeight"] = "approximate-height";
+    return HybridScaleType;
+}({});
+var $1254c5929638d7f9$export$e40aae6f0de9bb95 = /*#__PURE__*/ function(HeightMethod) {
+    HeightMethod["Minimum"] = "minimum";
+    HeightMethod["Average"] = "average";
+    HeightMethod["Maximum"] = "maximum";
+    return HeightMethod;
+}({});
+
+
+export {$1254c5929638d7f9$export$45e8e2d7a1794c23 as HybridScaleType, $1254c5929638d7f9$export$e40aae6f0de9bb95 as HeightMethod};
+//# sourceMappingURL=column-views.079119f4.js.map

package/dist/esm/column-views.079119f4.js.map

@@ -0,0 +1 @@
+{"mappings":"AA8BO,IAAA,AAAK,mEAAA;IACV,sEAAsE;;IAEtE,sFAAsF;;WAH5E;;AAOL,IAAA,AAAK,mEAAA;;;;WAAA","sources":["packages/column-views/src/prepare-units/types.ts"],"sourcesContent":["import type { UnitLong } from \"@macrostrat/api-types\";\nimport type { ColumnAxisType } from \"@macrostrat/column-components\";\nimport type { ScaleContinuousNumeric } from \"d3-scale\";\n\nexport interface ColumnHeightScaleOptions {\n  /** A fixed pixel scale to use for the section (pixels per Myr) */\n  pixelScale?: number;\n  /** The target height of a constituent unit in pixels, for dynamic\n   * scale generation */\n  targetUnitHeight?: number;\n  /** Min height of a section in pixels. Will override minPixelScale in some cases. */\n  minSectionHeight?: number;\n  /** The minimum pixel scale to use for the section (pixels per Myr). This is mostly\n   * needed because small sections (<1-2 units) don't necessarily have space to comfortably\n   * render two axis labels */\n  minPixelScale?: number;\n  // Axis scale type\n  axisType?: ColumnAxisType;\n  // Unconformity height in pixels\n  unconformityHeight?: number;\n  // Whether to collapse unconformities that are less than a height threshold\n  collapseSmallUnconformities?: boolean | number;\n  // A continuous scale to use instead of generating one\n  // TODO: discontinuous scales are not yet supported\n  scale?: ScaleContinuousNumeric<number, number>;\n  // Hybrid scale type.\n  // This overrides parameters such as the axis type\n  hybridScale?: HybridScaleDefinition;\n}\n\nexport enum HybridScaleType {\n  // An age-domain scale that puts equal vertical space between surfaces\n  EquidistantSurfaces = \"equidistant-surfaces\",\n  // A height-domain scale that is based on the average height of units between surfaces\n  ApproximateHeight = \"approximate-height\",\n}\n\nexport enum HeightMethod {\n  Minimum = \"minimum\",\n  Average = \"average\",\n  Maximum = \"maximum\",\n}\n\nexport interface HybridScaleOptions {\n  pixelOffset?: number;\n  pixelScale?: number;\n}\n\nexport type ApproxHeightScaleOptions = {\n  minHeight?: number;\n  defaultHeight?: number;\n  heightMethod?: HeightMethod;\n};\n\nexport type HybridScaleDefinition =\n  | ({\n      type: HybridScaleType.ApproximateHeight;\n    } & ApproxHeightScaleOptions)\n  | {\n      type: HybridScaleType.EquidistantSurfaces;\n    };\n\nexport interface SectionScaleOptions extends ColumnHeightScaleOptions {\n  axisType: ColumnAxisType;\n  domain: [number, number];\n}\n\n/** Output of a section scale. For now, this assumes that the\n * mapping is linear, but it could be extended to support arbitrary\n * scale functions.\n */\nexport interface PackageScaleInfo {\n  domain: [number, number];\n  pixelHeight: number;\n  // TODO: add a function\n  scale: ScaleContinuousNumeric<number, number>;\n  pixelScale?: number; // if it's a linear scale, this could be defined\n  // Subsidiary scale for height mapping (for hybrid scales)\n  heightScale?: ScaleContinuousNumeric<number, number>;\n}\n\nexport type PackageScaleLayoutData = PackageScaleInfo & {\n  // A unique key for the section to use in React\n  key: string;\n  offset: number;\n  // How much to\n  paddingTop: number;\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<\n  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  b_pos?: number;\n  t_pos?: number;\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 type PackageLayoutData<T extends UnitLong = ExtUnit> = SectionInfo<T> & {\n  scaleInfo: PackageScaleLayoutData;\n  // A unique key for the section to use in React\n  key: string;\n};\n\nexport interface CompositeScaleData {\n  totalHeight: number;\n  sections: PackageScaleLayoutData[];\n}\n\nexport interface ColumnScaleOptions extends ColumnHeightScaleOptions {\n  axisType: ColumnAxisType;\n  unconformityHeight: number;\n}\n\nexport interface CompositeColumnData<T extends UnitLong = ExtUnit> extends Omit<\n  CompositeScaleData,\n  \"sections\"\n> {\n  sections: PackageLayoutData<T>[];\n}\n"],"names":[],"version":3,"file":"column-views.079119f4.js.map"}

package/dist/esm/{column-views.77b49a43.js → column-views.0859feb3.js}

@@ -1,13 +1,14 @@
-import {CompositeUnitsColumn as $8c8238faa5cde49c$export$a6684360fef0406e, LabelTrackerProvider as $8c8238faa5cde49c$export$e4e89ab6c86ac513, SectionLabelsColumn as $8c8238faa5cde49c$export$13984e34afdbb040} from "./column-views.775846c9.js";
-import $7zu8d$columnviewscdadc5c2js from "./column-views.cdadc5c2.js";
-import "./column-views.8d4ce558.css";
-import {MacrostratColumnProvider as $774a5efa27d1c77b$export$9e42f9b6e0d67c7d} from "./column-views.7ca9e1cd.js";
-import {useMacrostratColumnData as $d5074f164411387e$export$f8509b7cce386c7d, useMacrostratUnits as $d5074f164411387e$export$6fb40844db555b2} from "./column-views.1e055ed5.js";
-import {Duration as $448b24baeef3b229$export$3b11bc38611c5941} from "./column-views.cc5244c4.js";
+import {CompositeUnitsColumn as $8c8238faa5cde49c$export$a6684360fef0406e, LabelTrackerProvider as $8c8238faa5cde49c$export$e4e89ab6c86ac513, SectionLabelsColumn as $8c8238faa5cde49c$export$13984e34afdbb040} from "./column-views.5a49cd68.js";
+import $7zu8d$columnviewscc733361js from "./column-views.cc733361.js";
+import "./column-views.e33ac5c9.css";
+import {MacrostratColumnProvider as $774a5efa27d1c77b$export$9e42f9b6e0d67c7d, useMacrostratBaseURL as $774a5efa27d1c77b$export$33b1392d23dde04} from "./column-views.73b8ff16.js";
+import {useMacrostratColumnData as $d5074f164411387e$export$f8509b7cce386c7d, useMacrostratUnits as $d5074f164411387e$export$6fb40844db555b2} from "./column-views.4fd4ec92.js";
+import {Duration as $448b24baeef3b229$export$3b11bc38611c5941} from "./column-views.77561197.js";
 import {useMemo as $7zu8d$useMemo} from "react";
-import {Timescale as $7zu8d$Timescale, TimescaleOrientation as $7zu8d$TimescaleOrientation} from "@macrostrat/timescale";
-import {SVG as $7zu8d$SVG} from "@macrostrat/column-components";
+import {useMacrostratIntervals as $7zu8d$useMacrostratIntervals, Timescale as $7zu8d$Timescale, TimescaleOrientation as $7zu8d$TimescaleOrientation} from "@macrostrat/timescale";
+import {SVG as $7zu8d$SVG, ColumnAxisType as $7zu8d$ColumnAxisType} from "@macrostrat/column-components";
 import $7zu8d$macrostrathyper from "@macrostrat/hyper";
+import {Value as $7zu8d$Value} from "@macrostrat/data-components";
 
 
 function $parcel$interopDefault(a) {
@@ -21,7 +22,8 @@ function $parcel$interopDefault(a) {
 
 
 
-const $7d0f52717c0de7e1$var$h = (0, $7zu8d$macrostrathyper).styled((0, ($parcel$interopDefault($7zu8d$columnviewscdadc5c2js))));
+
+const $7d0f52717c0de7e1$var$h = (0, $7zu8d$macrostrathyper).styled((0, ($parcel$interopDefault($7zu8d$columnviewscc733361js))));
 function $7d0f52717c0de7e1$export$38cb0ab5af8f50d7(props) {
     const { unconformityLabels: unconformityLabels = true, unitComponent: unitComponent, unitComponentProps: unitComponentProps, showLabels: showLabels = true, width: width = 300, columnWidth: columnWidth = 150, showLabelColumn: showLabelColumn = true, clipUnits: clipUnits = true, maxInternalColumns: maxInternalColumns } = props;
     const units = (0, $d5074f164411387e$export$6fb40844db555b2)();
@@ -46,7 +48,7 @@ function $7d0f52717c0de7e1$export$38cb0ab5af8f50d7(props) {
     ]);
 }
 function $7d0f52717c0de7e1$var$SectionUnitsColumn(props) {
-    const { width: width, showLabels: showLabels, unitComponent: unitComponent, unitComponentProps: unitComponentProps, clipUnits: clipUnits, maxInternalColumns: maxInternalColumns, unconformityLabels: unconformityLabels = true } = props;
+    const { width: width, showLabels: showLabels, unitComponent: unitComponent, unitComponentProps: unitComponentProps, clipUnits: clipUnits, maxInternalColumns: maxInternalColumns, axisType: axisType, unconformityLabels: unconformityLabels = true } = props;
     const { sections: sections, totalHeight: totalHeight } = (0, $d5074f164411387e$export$f8509b7cce386c7d)();
     const scaleData = sections.map((section)=>{
         return section.scaleInfo;
@@ -79,14 +81,15 @@ function $7d0f52717c0de7e1$var$SectionUnitsColumn(props) {
         })),
         $7d0f52717c0de7e1$var$h.if(unconformityLabels)($7d0f52717c0de7e1$export$e12e53eeee198b99, {
             width: width,
-            sections: scaleData
+            sections: scaleData,
+            verbose: false
         })
     ]);
 }
 function $7d0f52717c0de7e1$var$SectionUnits(props) {
     // Section with "squishy" timescale
     const { units: units, scaleInfo: scaleInfo, unitComponent: unitComponent, showLabels: showLabels = true, width: width = 300, unitComponentProps: unitComponentProps, className: className, clipUnits: clipUnits = true, maxInternalColumns: maxInternalColumns } = props;
-    const { domain: domain, pixelScale: pixelScale, pixelHeight: pixelHeight } = scaleInfo;
+    const { domain: domain, pixelScale: pixelScale, pixelHeight: pixelHeight, scale: scale } = scaleInfo;
     /** Ensure that we can arrange units into the maximum number
    * of columns defined by unitComponentProps, but that we don't
    * use more than necessary.
@@ -112,7 +115,8 @@ function $7d0f52717c0de7e1$var$SectionUnits(props) {
     }, $7d0f52717c0de7e1$var$h((0, $774a5efa27d1c77b$export$9e42f9b6e0d67c7d), {
         units: units,
         domain: domain,
-        pixelScale: pixelScale
+        pixelScale: pixelScale,
+        scale: scale
     }, $7d0f52717c0de7e1$var$h((0, $8c8238faa5cde49c$export$a6684360fef0406e), {
         width: width,
         showLabels: showLabels,
@@ -133,6 +137,9 @@ function $7d0f52717c0de7e1$export$db2df5a73a6fbe10(props) {
 }
 function $7d0f52717c0de7e1$export$463f46772c64d403(props) {
     const { levels: levels = 3, packages: packages, unconformityLabels: unconformityLabels = false } = props;
+    // Use intervals from Macrostrat API
+    const baseURL = (0, $774a5efa27d1c77b$export$33b1392d23dde04)();
+    const intervals = (0, $7zu8d$useMacrostratIntervals)(baseURL);
     let _levels;
     if (typeof levels === "number") // If levels is a number, use the most common starting level
     _levels = [
@@ -143,7 +150,7 @@ function $7d0f52717c0de7e1$export$463f46772c64d403(props) {
     const nCols = _levels[1] - _levels[0] + 1;
     return $7d0f52717c0de7e1$var$h("div.timescale-column", [
         $7d0f52717c0de7e1$var$h("div.timescales", packages.map((group)=>{
-            const { domain: domain, pixelHeight: pixelHeight, paddingTop: paddingTop, key: key } = group;
+            const { pixelHeight: pixelHeight, paddingTop: paddingTop, key: key, scale: scale } = group;
             return $7d0f52717c0de7e1$var$h("div.timescale-container", {
                 style: {
                     paddingTop: paddingTop,
@@ -157,19 +164,21 @@ function $7d0f52717c0de7e1$export$463f46772c64d403(props) {
                     levels: _levels,
                     absoluteAgeScale: true,
                     showAgeAxis: false,
-                    ageRange: domain
+                    scale: scale,
+                    intervals: intervals
                 })
             ]);
         })),
         $7d0f52717c0de7e1$var$h.if(unconformityLabels)($7d0f52717c0de7e1$export$e12e53eeee198b99, {
             width: "100%",
             sections: packages,
-            className: "unconformity-labels"
+            className: "unconformity-labels",
+            axisType: (0, $7zu8d$ColumnAxisType).AGE
         })
     ]);
 }
 function $7d0f52717c0de7e1$export$e12e53eeee198b99(props) {
-    const { width: width, sections: sections, className: className } = props;
+    const { width: width, sections: sections, className: className, axisType: axisType, verbose: verbose } = props;
     return $7d0f52717c0de7e1$var$h("div.unconformity-labels", {
         style: {
             width: width
@@ -181,17 +190,19 @@ function $7d0f52717c0de7e1$export$e12e53eeee198b99(props) {
         const upperAge = lastGroup?.domain[0];
         const lowerAge = scaleInfo.domain[1];
         return $7d0f52717c0de7e1$var$h($7d0f52717c0de7e1$var$Unconformity, {
+            axisType: axisType,
             upperAge: upperAge,
             lowerAge: lowerAge,
             style: {
                 width: width,
                 height: scaleInfo.paddingTop,
                 top: top
-            }
+            },
+            verbose: verbose
         });
     }));
 }
-function $7d0f52717c0de7e1$var$Unconformity({ upperAge: upperAge, lowerAge: lowerAge, style: style }) {
+function $7d0f52717c0de7e1$var$Unconformity({ upperAge: upperAge, lowerAge: lowerAge, style: style, axisType: axisType, verbose: verbose = false }) {
     if (upperAge == null || lowerAge == null) return null;
     const ageGap = Math.abs(upperAge - lowerAge);
     let className = null;
@@ -199,16 +210,34 @@ function $7d0f52717c0de7e1$var$Unconformity({ upperAge: upperAge, lowerAge: lowe
     else if (ageGap > 100) className = "mega";
     else if (ageGap > 10) className = "large";
     else if (ageGap < 1) className = "small";
+    let val;
+    if (axisType === (0, $7zu8d$ColumnAxisType).DEPTH || axisType === (0, $7zu8d$ColumnAxisType).HEIGHT) {
+        const _txt = ageGap.toLocaleString("en-US", {
+            maximumFractionDigits: 2
+        });
+        val = $7d0f52717c0de7e1$var$h((0, $7zu8d$Value), {
+            value: _txt,
+            unit: "m"
+        });
+    } else val = $7d0f52717c0de7e1$var$h((0, $448b24baeef3b229$export$3b11bc38611c5941), {
+        value: ageGap
+    });
+    let prefix = null;
+    if (verbose) prefix = $7d0f52717c0de7e1$var$h([
+        " ",
+        $7d0f52717c0de7e1$var$h("span.prefix", " gap")
+    ]);
     return $7d0f52717c0de7e1$var$h("div.unconformity", {
         style: style,
         className: className
     }, [
-        $7d0f52717c0de7e1$var$h("div.unconformity-text", $7d0f52717c0de7e1$var$h((0, $448b24baeef3b229$export$3b11bc38611c5941), {
-            value: ageGap
-        }))
+        $7d0f52717c0de7e1$var$h("div.unconformity-inner", $7d0f52717c0de7e1$var$h("div.unconformity-text", [
+            val,
+            prefix
+        ]))
     ]);
 }
 
 
 export {$7d0f52717c0de7e1$export$38cb0ab5af8f50d7 as SectionsColumn, $7d0f52717c0de7e1$export$e12e53eeee198b99 as UnconformityLabels, $7d0f52717c0de7e1$export$db2df5a73a6fbe10 as CompositeTimescale, $7d0f52717c0de7e1$export$463f46772c64d403 as CompositeTimescaleCore};
-//# sourceMappingURL=column-views.77b49a43.js.map
+//# sourceMappingURL=column-views.0859feb3.js.map

package/dist/esm/column-views.0859feb3.js.map

@@ -0,0 +1 @@
+{"mappings":"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","sources":["packages/column-views/src/section.ts"],"sourcesContent":["import {\n  CompositeUnitsColumn,\n  LabelTrackerProvider,\n  SectionLabelsColumn,\n} from \"./units\";\nimport { ReactNode, FunctionComponent, useMemo } from \"react\";\nimport {\n  Timescale,\n  TimescaleOrientation,\n  useMacrostratIntervals,\n} from \"@macrostrat/timescale\";\nimport { ColumnAxisType, SVG } from \"@macrostrat/column-components\";\nimport hyper from \"@macrostrat/hyper\";\nimport styles from \"./column.module.sass\";\nimport {\n  useMacrostratColumnData,\n  useMacrostratUnits,\n  MacrostratColumnProvider,\n  useMacrostratBaseURL,\n} from \"./data-provider\";\nimport { Duration } from \"./unit-details\";\nimport { Value } from \"@macrostrat/data-components\";\nimport type { ExtUnit, PackageScaleLayoutData } from \"./prepare-units/types\";\n\nconst h = hyper.styled(styles);\n\nexport interface SectionSharedProps {\n  unitComponent?: FunctionComponent<any>;\n  unitComponentProps?: any;\n  showLabels?: boolean;\n  width?: number;\n  columnWidth?: number;\n  children?: ReactNode;\n  showLabelColumn?: boolean;\n  axisType?: ColumnAxisType;\n  className?: string;\n  clipUnits?: boolean;\n  maxInternalColumns?: number;\n  // Space between sections\n  verticalSpacing?: number;\n  // Whether to render unconformity labels\n  unconformityLabels?: boolean;\n}\n\nexport interface SectionProps extends SectionSharedProps {\n  units: ExtUnit[];\n  scaleInfo: PackageScaleLayoutData;\n}\n\nexport function SectionsColumn(props: SectionSharedProps) {\n  const {\n    unconformityLabels = true,\n    unitComponent,\n    unitComponentProps,\n    showLabels = true,\n    width = 300,\n    columnWidth = 150,\n    showLabelColumn = true,\n    clipUnits = true,\n    maxInternalColumns,\n  } = props;\n\n  const units = useMacrostratUnits();\n\n  // Get a unique key for the column\n  const key = units[0]?.unit_id;\n\n  return h(LabelTrackerProvider, { units, key }, [\n    h(SectionUnitsColumn, {\n      width: columnWidth,\n      unitComponent,\n      unitComponentProps,\n      showLabels,\n      clipUnits,\n      maxInternalColumns,\n      unconformityLabels,\n    }),\n    h.if(showLabelColumn)(SectionLabelsColumn, {\n      width: width - columnWidth,\n    }),\n  ]);\n}\n\nfunction SectionUnitsColumn(props: SectionSharedProps) {\n  const {\n    width,\n    showLabels,\n    unitComponent,\n    unitComponentProps,\n    clipUnits,\n    maxInternalColumns,\n    axisType,\n    unconformityLabels = true,\n  } = props;\n\n  const { sections, totalHeight } = useMacrostratColumnData();\n\n  const scaleData: PackageScaleLayoutData[] = sections.map((section) => {\n    return section.scaleInfo;\n  });\n\n  const innerWidth = width - 2;\n\n  return h(\"div.section-units-container\", { style: { width } }, [\n    h(\n      SVG,\n      {\n        className: \"sections\",\n        height: totalHeight,\n        innerWidth,\n        paddingH: 1,\n      },\n      sections.map((group) => {\n        const { units, scaleInfo, section_id } = group;\n\n        const key = `section-${section_id}`;\n        return h(\n          SectionUnits,\n          {\n            units,\n            scaleInfo,\n            key,\n            unitComponent,\n            unitComponentProps,\n            showLabels,\n            width: innerWidth,\n            clipUnits,\n            maxInternalColumns,\n          }, // This unconformity is with the section _above_\n        );\n      }),\n    ),\n    h.if(unconformityLabels)(UnconformityLabels, {\n      width,\n      sections: scaleData,\n      verbose: false,\n    }),\n  ]);\n}\n\nfunction SectionUnits(props: SectionProps) {\n  // Section with \"squishy\" timescale\n  const {\n    units,\n    scaleInfo,\n    unitComponent,\n    showLabels = true,\n    width = 300,\n    unitComponentProps,\n    className,\n    clipUnits = true,\n    maxInternalColumns,\n  } = props;\n\n  const { domain, pixelScale, pixelHeight, scale } = scaleInfo;\n\n  /** Ensure that we can arrange units into the maximum number\n   * of columns defined by unitComponentProps, but that we don't\n   * use more than necessary.\n   */\n  const _unitComponentProps = useMemo(() => {\n    return {\n      ...unitComponentProps,\n      nColumns: Math.min(\n        maxInternalColumns ?? Math.floor(width / 10),\n        unitComponentProps?.nColumns ?? Infinity,\n        Math.max(...units.map((d) => d.column)) + 1,\n      ),\n      //axisType,\n    };\n  }, [units, unitComponentProps, maxInternalColumns, width]);\n\n  const style = {\n    \"--section-height\": `${pixelHeight}px`,\n    \"--section-width\": `${width}px`,\n  };\n\n  return h(\n    \"g.section\",\n    { className, style, transform: `translate(0 ${scaleInfo.offset})` },\n    h(\n      MacrostratColumnProvider,\n      {\n        units,\n        domain,\n        pixelScale, // Actually pixels per myr,\n        scale,\n      },\n      h(CompositeUnitsColumn, {\n        width,\n        showLabels,\n        unitComponent,\n        unitComponentProps: _unitComponentProps,\n        clipToFrame: clipUnits,\n      }),\n    ),\n  );\n}\n\ninterface CompositeTimescaleProps {\n  levels?: [number, number] | number;\n}\n\nexport function CompositeTimescale(props: CompositeTimescaleProps) {\n  const { sections } = useMacrostratColumnData();\n  const sectionScales = sections.map((section) => {\n    return section.scaleInfo;\n  });\n\n  return h(CompositeTimescaleCore, {\n    packages: sectionScales,\n    ...props,\n  });\n}\n\ntype CompositeTimescaleCoreProps = CompositeTimescaleProps & {\n  packages: PackageScaleLayoutData[];\n  unconformityLabels?: boolean;\n};\n\nexport function CompositeTimescaleCore(props: CompositeTimescaleCoreProps) {\n  const { levels = 3, packages, unconformityLabels = false } = props;\n\n  // Use intervals from Macrostrat API\n  const baseURL = useMacrostratBaseURL();\n  const intervals = useMacrostratIntervals(baseURL);\n\n  let _levels: [number, number];\n  if (typeof levels === \"number\") {\n    // If levels is a number, use the most common starting level\n    _levels = [2, Math.max(2 + Math.min(levels, 5) - 1, 1)];\n  } else {\n    _levels = levels;\n  }\n\n  const nCols = _levels[1] - _levels[0] + 1;\n\n  return h(\"div.timescale-column\", [\n    h(\n      \"div.timescales\",\n      packages.map((group) => {\n        const { pixelHeight, paddingTop, key, scale } = group;\n        return h(\n          \"div.timescale-container\",\n          { style: { paddingTop, \"--timescale-level-count\": nCols }, key },\n          [\n            h(Timescale, {\n              orientation: TimescaleOrientation.VERTICAL,\n              length: pixelHeight,\n              levels: _levels,\n              absoluteAgeScale: true,\n              showAgeAxis: false,\n              scale,\n              intervals,\n            }),\n          ],\n        );\n      }),\n    ),\n    h.if(unconformityLabels)(UnconformityLabels, {\n      width: \"100%\",\n      sections: packages,\n      className: \"unconformity-labels\",\n      axisType: ColumnAxisType.AGE,\n    }),\n  ]);\n}\n\nexport function UnconformityLabels(props: {\n  width: string | number;\n  sections: PackageScaleLayoutData[];\n  axisType?: ColumnAxisType;\n  className?: string;\n  verbose?: boolean;\n}) {\n  const { width, sections, className, axisType, verbose } = props;\n\n  return h(\n    \"div.unconformity-labels\",\n    {\n      style: {\n        width,\n      },\n      className,\n    },\n    sections.map((scaleInfo, i) => {\n      const lastGroup = sections[i - 1];\n      const top = scaleInfo.offset - scaleInfo.paddingTop;\n      const upperAge = lastGroup?.domain[0];\n      const lowerAge = scaleInfo.domain[1];\n      return h(Unconformity, {\n        axisType,\n        upperAge,\n        lowerAge,\n        style: {\n          width,\n          height: scaleInfo.paddingTop,\n          top,\n        },\n        verbose,\n      });\n    }),\n  );\n}\n\nfunction Unconformity({\n  upperAge,\n  lowerAge,\n  style,\n  axisType,\n  verbose = false,\n}) {\n  if (upperAge == null || lowerAge == null) {\n    return null;\n  }\n\n  const ageGap = Math.abs(upperAge - lowerAge);\n\n  let className: string = null;\n  if (ageGap > 1000) {\n    className = \"giga\";\n  } else if (ageGap > 100) {\n    className = \"mega\";\n  } else if (ageGap > 10) {\n    className = \"large\";\n  } else if (ageGap < 1) {\n    className = \"small\";\n  }\n\n  let val: ReactNode;\n  if (axisType === ColumnAxisType.DEPTH || axisType === ColumnAxisType.HEIGHT) {\n    const _txt = ageGap.toLocaleString(\"en-US\", { maximumFractionDigits: 2 });\n    val = h(Value, { value: _txt, unit: \"m\" });\n  } else {\n    val = h(Duration, { value: ageGap });\n  }\n\n  let prefix: ReactNode = null;\n  if (verbose) {\n    prefix = h([\" \", h(\"span.prefix\", \" gap\")]);\n  }\n\n  return h(\"div.unconformity\", { style, className }, [\n    h(\"div.unconformity-inner\", h(\"div.unconformity-text\", [val, prefix])),\n  ]);\n}\n"],"names":[],"version":3,"file":"column-views.0859feb3.js.map"}