@macrostrat/column-views 3.4.0 → 3.4.1

package/CHANGELOG.md

@@ -1,5 +1,13 @@
 # Changelog
 
+## [3.4.1] - 2026-05-22 [_changes_](https://github.com/UW-Macrostrat/web-components/compare/@macrostrat/column-views-v3.4.0...@macrostrat/column-views-v3.4.1)
+
+### Patch Changes
+
+- Remove stray console log statements
+- Updated dependencies
+  - @macrostrat/data-components@1.1.11
+
 ## [3.4.0] - 2026-05-20 [_changes_](https://github.com/UW-Macrostrat/web-components/compare/@macrostrat/column-views-v3.3.5...@macrostrat/column-views-v3.4.0)
 
 ### Minor Changes

package/dist/facets/carbon-isotopes/data-area.cjs

@@ -26,9 +26,6 @@ const IsotopesDataArea = function(props) {
   let { corrected, system, children, getHeight, clipY = false } = props;
   if (getHeight == null) {
     getHeight = function(d) {
-      if (d.height == null) {
-        console.log(d);
-      }
       return d.height;
     };
   }

package/dist/facets/carbon-isotopes/data-area.cjs.map

@@ -1 +1 @@
-{"version":3,"file":"data-area.cjs","sources":["../../../src/facets/carbon-isotopes/data-area.ts"],"sourcesContent":["import { line } from \"d3-shape\";\nimport { createContext, useContext } from \"react\";\nimport h from \"@macrostrat/hyper\";\nimport { ColumnLayoutContext } from \"@macrostrat/column-components\";\nimport { useCompositeScale } from \"../../data-provider\";\n\nconst inDomain = (scale, num) => {\n  const domain = scale.domain();\n  return domain[0] < num < domain[1];\n};\n\nconst createPointLocator = function (opts) {\n  const { xScale, scale, getHeight, ...rest } = opts;\n  return function (d, s = 0) {\n    const height = getHeight(d);\n    if (!inDomain(scale, height)) return null;\n    return [xScale(d.value), scale(height)];\n  };\n};\n\nconst IsotopesDataContext = createContext(null);\n\nexport interface DataAreaProps {\n  clipY: boolean;\n  parameter: string;\n  corrected: boolean;\n  system: string;\n  children: React.ReactNode;\n  getHeight?: Function;\n}\n\nconst IsotopesDataArea = function (props: DataAreaProps) {\n  const xScale = useContext(ColumnLayoutContext)?.xScale;\n\n  const scale = useCompositeScale();\n\n  let { corrected, system, children, getHeight, clipY = false } = props;\n  if (getHeight == null) {\n    getHeight = function (d) {\n      if (d.height == null) {\n        console.log(d);\n      }\n      return d.height;\n    };\n  }\n\n  // Handlers for creating points and lines\n  const pointLocator = createPointLocator({\n    xScale,\n    scale,\n    corrected,\n    system,\n    getHeight,\n  });\n\n  let column = \"avg_\" + system;\n  if (corrected) {\n    column += \"_corr\";\n  }\n  const lineLocator = line()\n    .x((d) => xScale(d[column]))\n    // @ts-ignore\n    .y((d) => scale(d.height));\n\n  const value = { pointLocator, lineLocator, corrected, system, clipY };\n  return h(IsotopesDataContext.Provider, { value }, h(\"g.data\", children));\n};\n\nconst IsotopeDataPoint = function (props) {\n  const { pointLocator } = useContext(IsotopesDataContext);\n  const { datum, strokeWidth, ...rest } = props;\n  const loc = pointLocator(datum);\n  if (loc == null) return null;\n  const [cx, cy] = loc;\n\n  return h(\"circle\", {\n    key: datum.sample_id,\n    cx,\n    cy,\n    r: 2,\n    ...rest,\n  });\n};\n\nconst IsotopeDataLine = function (props) {\n  const { values: lineValues, ...rest } = props;\n  const { lineLocator } = useContext(IsotopesDataContext);\n  return h(\"path\", {\n    d: lineLocator(lineValues),\n    fill: \"transparent\",\n    ...rest,\n  });\n};\n\nconst useDataLocator = () => useContext(IsotopesDataContext);\n\nexport { IsotopesDataArea, IsotopeDataPoint, IsotopeDataLine, useDataLocator };\n"],"names":["createContext","useContext","ColumnLayoutContext","useCompositeScale","line","h"],"mappings":";;;;;;;;;AAMA,MAAM,WAAW,CAAC,OAAO,QAAQ;AAC/B,QAAM,SAAS,MAAM,OAAA;AACrB,SAAO,OAAO,CAAC,IAAI,MAAM,OAAO,CAAC;AACnC;AAEA,MAAM,qBAAqB,SAAU,MAAM;AACzC,QAAM,EAAE,QAAQ,OAAO,WAAW,GAAG,SAAS;AAC9C,SAAO,SAAU,GAAG,IAAI,GAAG;AACzB,UAAM,SAAS,UAAU,CAAC;AAC1B,QAAI,CAAC,SAAS,OAAO,MAAM,EAAG,QAAO;AACrC,WAAO,CAAC,OAAO,EAAE,KAAK,GAAG,MAAM,MAAM,CAAC;AAAA,EACxC;AACF;AAEA,MAAM,sBAAsBA,MAAAA,cAAc,IAAI;AAW9C,MAAM,mBAAmB,SAAU,OAAsB;AACvD,QAAM,SAASC,MAAAA,WAAWC,iBAAAA,mBAAmB,GAAG;AAEhD,QAAM,QAAQC,MAAAA,kBAAA;AAEd,MAAI,EAAE,WAAW,QAAQ,UAAU,WAAW,QAAQ,UAAU;AAChE,MAAI,aAAa,MAAM;AACrB,gBAAY,SAAU,GAAG;AACvB,UAAI,EAAE,UAAU,MAAM;AACpB,gBAAQ,IAAI,CAAC;AAAA,MACf;AACA,aAAO,EAAE;AAAA,IACX;AAAA,EACF;AAGA,QAAM,eAAe,mBAAmB;AAAA,IACtC;AAAA,IACA;AAAA,IACA;AAAA,IACA;AAAA,IACA;AAAA,EAAA,CACD;AAED,MAAI,SAAS,SAAS;AACtB,MAAI,WAAW;AACb,cAAU;AAAA,EACZ;AACA,QAAM,cAAcC,QAAAA,KAAA,EACjB,EAAE,CAAC,MAAM,OAAO,EAAE,MAAM,CAAC,CAAC,EAE1B,EAAE,CAAC,MAAM,MAAM,EAAE,MAAM,CAAC;AAE3B,QAAM,QAAQ,EAAE,cAAc,aAAa,WAAW,QAAQ,MAAA;AAC9D,SAAOC,WAAAA,QAAE,oBAAoB,UAAU,EAAE,SAASA,WAAAA,QAAE,UAAU,QAAQ,CAAC;AACzE;AAEA,MAAM,mBAAmB,SAAU,OAAO;AACxC,QAAM,EAAE,aAAA,IAAiBJ,MAAAA,WAAW,mBAAmB;AACvD,QAAM,EAAE,OAAO,aAAa,GAAG,SAAS;AACxC,QAAM,MAAM,aAAa,KAAK;AAC9B,MAAI,OAAO,KAAM,QAAO;AACxB,QAAM,CAAC,IAAI,EAAE,IAAI;AAEjB,SAAOI,WAAAA,QAAE,UAAU;AAAA,IACjB,KAAK,MAAM;AAAA,IACX;AAAA,IACA;AAAA,IACA,GAAG;AAAA,IACH,GAAG;AAAA,EAAA,CACJ;AACH;;;"}
+{"version":3,"file":"data-area.cjs","sources":["../../../src/facets/carbon-isotopes/data-area.ts"],"sourcesContent":["import { line } from \"d3-shape\";\nimport { createContext, useContext } from \"react\";\nimport h from \"@macrostrat/hyper\";\nimport { ColumnLayoutContext } from \"@macrostrat/column-components\";\nimport { useCompositeScale } from \"../../data-provider\";\n\nconst inDomain = (scale, num) => {\n  const domain = scale.domain();\n  return domain[0] < num < domain[1];\n};\n\nconst createPointLocator = function (opts) {\n  const { xScale, scale, getHeight, ...rest } = opts;\n  return function (d, s = 0) {\n    const height = getHeight(d);\n    if (!inDomain(scale, height)) return null;\n    return [xScale(d.value), scale(height)];\n  };\n};\n\nconst IsotopesDataContext = createContext(null);\n\nexport interface DataAreaProps {\n  clipY: boolean;\n  parameter: string;\n  corrected: boolean;\n  system: string;\n  children: React.ReactNode;\n  getHeight?: Function;\n}\n\nconst IsotopesDataArea = function (props: DataAreaProps) {\n  const xScale = useContext(ColumnLayoutContext)?.xScale;\n\n  const scale = useCompositeScale();\n\n  let { corrected, system, children, getHeight, clipY = false } = props;\n  if (getHeight == null) {\n    getHeight = function (d) {\n      return d.height;\n    };\n  }\n\n  // Handlers for creating points and lines\n  const pointLocator = createPointLocator({\n    xScale,\n    scale,\n    corrected,\n    system,\n    getHeight,\n  });\n\n  let column = \"avg_\" + system;\n  if (corrected) {\n    column += \"_corr\";\n  }\n  const lineLocator = line()\n    .x((d) => xScale(d[column]))\n    // @ts-ignore\n    .y((d) => scale(d.height));\n\n  const value = { pointLocator, lineLocator, corrected, system, clipY };\n  return h(IsotopesDataContext.Provider, { value }, h(\"g.data\", children));\n};\n\nconst IsotopeDataPoint = function (props) {\n  const { pointLocator } = useContext(IsotopesDataContext);\n  const { datum, strokeWidth, ...rest } = props;\n  const loc = pointLocator(datum);\n  if (loc == null) return null;\n  const [cx, cy] = loc;\n\n  return h(\"circle\", {\n    key: datum.sample_id,\n    cx,\n    cy,\n    r: 2,\n    ...rest,\n  });\n};\n\nconst IsotopeDataLine = function (props) {\n  const { values: lineValues, ...rest } = props;\n  const { lineLocator } = useContext(IsotopesDataContext);\n  return h(\"path\", {\n    d: lineLocator(lineValues),\n    fill: \"transparent\",\n    ...rest,\n  });\n};\n\nconst useDataLocator = () => useContext(IsotopesDataContext);\n\nexport { IsotopesDataArea, IsotopeDataPoint, IsotopeDataLine, useDataLocator };\n"],"names":["createContext","useContext","ColumnLayoutContext","useCompositeScale","line","h"],"mappings":";;;;;;;;;AAMA,MAAM,WAAW,CAAC,OAAO,QAAQ;AAC/B,QAAM,SAAS,MAAM,OAAA;AACrB,SAAO,OAAO,CAAC,IAAI,MAAM,OAAO,CAAC;AACnC;AAEA,MAAM,qBAAqB,SAAU,MAAM;AACzC,QAAM,EAAE,QAAQ,OAAO,WAAW,GAAG,SAAS;AAC9C,SAAO,SAAU,GAAG,IAAI,GAAG;AACzB,UAAM,SAAS,UAAU,CAAC;AAC1B,QAAI,CAAC,SAAS,OAAO,MAAM,EAAG,QAAO;AACrC,WAAO,CAAC,OAAO,EAAE,KAAK,GAAG,MAAM,MAAM,CAAC;AAAA,EACxC;AACF;AAEA,MAAM,sBAAsBA,MAAAA,cAAc,IAAI;AAW9C,MAAM,mBAAmB,SAAU,OAAsB;AACvD,QAAM,SAASC,MAAAA,WAAWC,iBAAAA,mBAAmB,GAAG;AAEhD,QAAM,QAAQC,MAAAA,kBAAA;AAEd,MAAI,EAAE,WAAW,QAAQ,UAAU,WAAW,QAAQ,UAAU;AAChE,MAAI,aAAa,MAAM;AACrB,gBAAY,SAAU,GAAG;AACvB,aAAO,EAAE;AAAA,IACX;AAAA,EACF;AAGA,QAAM,eAAe,mBAAmB;AAAA,IACtC;AAAA,IACA;AAAA,IACA;AAAA,IACA;AAAA,IACA;AAAA,EAAA,CACD;AAED,MAAI,SAAS,SAAS;AACtB,MAAI,WAAW;AACb,cAAU;AAAA,EACZ;AACA,QAAM,cAAcC,QAAAA,KAAA,EACjB,EAAE,CAAC,MAAM,OAAO,EAAE,MAAM,CAAC,CAAC,EAE1B,EAAE,CAAC,MAAM,MAAM,EAAE,MAAM,CAAC;AAE3B,QAAM,QAAQ,EAAE,cAAc,aAAa,WAAW,QAAQ,MAAA;AAC9D,SAAOC,WAAAA,QAAE,oBAAoB,UAAU,EAAE,SAASA,WAAAA,QAAE,UAAU,QAAQ,CAAC;AACzE;AAEA,MAAM,mBAAmB,SAAU,OAAO;AACxC,QAAM,EAAE,aAAA,IAAiBJ,MAAAA,WAAW,mBAAmB;AACvD,QAAM,EAAE,OAAO,aAAa,GAAG,SAAS;AACxC,QAAM,MAAM,aAAa,KAAK;AAC9B,MAAI,OAAO,KAAM,QAAO;AACxB,QAAM,CAAC,IAAI,EAAE,IAAI;AAEjB,SAAOI,WAAAA,QAAE,UAAU;AAAA,IACjB,KAAK,MAAM;AAAA,IACX;AAAA,IACA;AAAA,IACA,GAAG;AAAA,IACH,GAAG;AAAA,EAAA,CACJ;AACH;;;"}

package/dist/facets/carbon-isotopes/data-area.js

@@ -22,9 +22,6 @@ const IsotopesDataArea = function(props) {
   let { corrected, system, children, getHeight, clipY = false } = props;
   if (getHeight == null) {
     getHeight = function(d) {
-      if (d.height == null) {
-        console.log(d);
-      }
       return d.height;
     };
   }

package/dist/facets/carbon-isotopes/data-area.js.map

@@ -1 +1 @@
-{"version":3,"file":"data-area.js","sources":["../../../src/facets/carbon-isotopes/data-area.ts"],"sourcesContent":["import { line } from \"d3-shape\";\nimport { createContext, useContext } from \"react\";\nimport h from \"@macrostrat/hyper\";\nimport { ColumnLayoutContext } from \"@macrostrat/column-components\";\nimport { useCompositeScale } from \"../../data-provider\";\n\nconst inDomain = (scale, num) => {\n  const domain = scale.domain();\n  return domain[0] < num < domain[1];\n};\n\nconst createPointLocator = function (opts) {\n  const { xScale, scale, getHeight, ...rest } = opts;\n  return function (d, s = 0) {\n    const height = getHeight(d);\n    if (!inDomain(scale, height)) return null;\n    return [xScale(d.value), scale(height)];\n  };\n};\n\nconst IsotopesDataContext = createContext(null);\n\nexport interface DataAreaProps {\n  clipY: boolean;\n  parameter: string;\n  corrected: boolean;\n  system: string;\n  children: React.ReactNode;\n  getHeight?: Function;\n}\n\nconst IsotopesDataArea = function (props: DataAreaProps) {\n  const xScale = useContext(ColumnLayoutContext)?.xScale;\n\n  const scale = useCompositeScale();\n\n  let { corrected, system, children, getHeight, clipY = false } = props;\n  if (getHeight == null) {\n    getHeight = function (d) {\n      if (d.height == null) {\n        console.log(d);\n      }\n      return d.height;\n    };\n  }\n\n  // Handlers for creating points and lines\n  const pointLocator = createPointLocator({\n    xScale,\n    scale,\n    corrected,\n    system,\n    getHeight,\n  });\n\n  let column = \"avg_\" + system;\n  if (corrected) {\n    column += \"_corr\";\n  }\n  const lineLocator = line()\n    .x((d) => xScale(d[column]))\n    // @ts-ignore\n    .y((d) => scale(d.height));\n\n  const value = { pointLocator, lineLocator, corrected, system, clipY };\n  return h(IsotopesDataContext.Provider, { value }, h(\"g.data\", children));\n};\n\nconst IsotopeDataPoint = function (props) {\n  const { pointLocator } = useContext(IsotopesDataContext);\n  const { datum, strokeWidth, ...rest } = props;\n  const loc = pointLocator(datum);\n  if (loc == null) return null;\n  const [cx, cy] = loc;\n\n  return h(\"circle\", {\n    key: datum.sample_id,\n    cx,\n    cy,\n    r: 2,\n    ...rest,\n  });\n};\n\nconst IsotopeDataLine = function (props) {\n  const { values: lineValues, ...rest } = props;\n  const { lineLocator } = useContext(IsotopesDataContext);\n  return h(\"path\", {\n    d: lineLocator(lineValues),\n    fill: \"transparent\",\n    ...rest,\n  });\n};\n\nconst useDataLocator = () => useContext(IsotopesDataContext);\n\nexport { IsotopesDataArea, IsotopeDataPoint, IsotopeDataLine, useDataLocator };\n"],"names":[],"mappings":";;;;;AAMA,MAAM,WAAW,CAAC,OAAO,QAAQ;AAC/B,QAAM,SAAS,MAAM,OAAA;AACrB,SAAO,OAAO,CAAC,IAAI,MAAM,OAAO,CAAC;AACnC;AAEA,MAAM,qBAAqB,SAAU,MAAM;AACzC,QAAM,EAAE,QAAQ,OAAO,WAAW,GAAG,SAAS;AAC9C,SAAO,SAAU,GAAG,IAAI,GAAG;AACzB,UAAM,SAAS,UAAU,CAAC;AAC1B,QAAI,CAAC,SAAS,OAAO,MAAM,EAAG,QAAO;AACrC,WAAO,CAAC,OAAO,EAAE,KAAK,GAAG,MAAM,MAAM,CAAC;AAAA,EACxC;AACF;AAEA,MAAM,sBAAsB,cAAc,IAAI;AAW9C,MAAM,mBAAmB,SAAU,OAAsB;AACvD,QAAM,SAAS,WAAW,mBAAmB,GAAG;AAEhD,QAAM,QAAQ,kBAAA;AAEd,MAAI,EAAE,WAAW,QAAQ,UAAU,WAAW,QAAQ,UAAU;AAChE,MAAI,aAAa,MAAM;AACrB,gBAAY,SAAU,GAAG;AACvB,UAAI,EAAE,UAAU,MAAM;AACpB,gBAAQ,IAAI,CAAC;AAAA,MACf;AACA,aAAO,EAAE;AAAA,IACX;AAAA,EACF;AAGA,QAAM,eAAe,mBAAmB;AAAA,IACtC;AAAA,IACA;AAAA,IACA;AAAA,IACA;AAAA,IACA;AAAA,EAAA,CACD;AAED,MAAI,SAAS,SAAS;AACtB,MAAI,WAAW;AACb,cAAU;AAAA,EACZ;AACA,QAAM,cAAc,KAAA,EACjB,EAAE,CAAC,MAAM,OAAO,EAAE,MAAM,CAAC,CAAC,EAE1B,EAAE,CAAC,MAAM,MAAM,EAAE,MAAM,CAAC;AAE3B,QAAM,QAAQ,EAAE,cAAc,aAAa,WAAW,QAAQ,MAAA;AAC9D,SAAO,EAAE,oBAAoB,UAAU,EAAE,SAAS,EAAE,UAAU,QAAQ,CAAC;AACzE;AAEA,MAAM,mBAAmB,SAAU,OAAO;AACxC,QAAM,EAAE,aAAA,IAAiB,WAAW,mBAAmB;AACvD,QAAM,EAAE,OAAO,aAAa,GAAG,SAAS;AACxC,QAAM,MAAM,aAAa,KAAK;AAC9B,MAAI,OAAO,KAAM,QAAO;AACxB,QAAM,CAAC,IAAI,EAAE,IAAI;AAEjB,SAAO,EAAE,UAAU;AAAA,IACjB,KAAK,MAAM;AAAA,IACX;AAAA,IACA;AAAA,IACA,GAAG;AAAA,IACH,GAAG;AAAA,EAAA,CACJ;AACH;"}
+{"version":3,"file":"data-area.js","sources":["../../../src/facets/carbon-isotopes/data-area.ts"],"sourcesContent":["import { line } from \"d3-shape\";\nimport { createContext, useContext } from \"react\";\nimport h from \"@macrostrat/hyper\";\nimport { ColumnLayoutContext } from \"@macrostrat/column-components\";\nimport { useCompositeScale } from \"../../data-provider\";\n\nconst inDomain = (scale, num) => {\n  const domain = scale.domain();\n  return domain[0] < num < domain[1];\n};\n\nconst createPointLocator = function (opts) {\n  const { xScale, scale, getHeight, ...rest } = opts;\n  return function (d, s = 0) {\n    const height = getHeight(d);\n    if (!inDomain(scale, height)) return null;\n    return [xScale(d.value), scale(height)];\n  };\n};\n\nconst IsotopesDataContext = createContext(null);\n\nexport interface DataAreaProps {\n  clipY: boolean;\n  parameter: string;\n  corrected: boolean;\n  system: string;\n  children: React.ReactNode;\n  getHeight?: Function;\n}\n\nconst IsotopesDataArea = function (props: DataAreaProps) {\n  const xScale = useContext(ColumnLayoutContext)?.xScale;\n\n  const scale = useCompositeScale();\n\n  let { corrected, system, children, getHeight, clipY = false } = props;\n  if (getHeight == null) {\n    getHeight = function (d) {\n      return d.height;\n    };\n  }\n\n  // Handlers for creating points and lines\n  const pointLocator = createPointLocator({\n    xScale,\n    scale,\n    corrected,\n    system,\n    getHeight,\n  });\n\n  let column = \"avg_\" + system;\n  if (corrected) {\n    column += \"_corr\";\n  }\n  const lineLocator = line()\n    .x((d) => xScale(d[column]))\n    // @ts-ignore\n    .y((d) => scale(d.height));\n\n  const value = { pointLocator, lineLocator, corrected, system, clipY };\n  return h(IsotopesDataContext.Provider, { value }, h(\"g.data\", children));\n};\n\nconst IsotopeDataPoint = function (props) {\n  const { pointLocator } = useContext(IsotopesDataContext);\n  const { datum, strokeWidth, ...rest } = props;\n  const loc = pointLocator(datum);\n  if (loc == null) return null;\n  const [cx, cy] = loc;\n\n  return h(\"circle\", {\n    key: datum.sample_id,\n    cx,\n    cy,\n    r: 2,\n    ...rest,\n  });\n};\n\nconst IsotopeDataLine = function (props) {\n  const { values: lineValues, ...rest } = props;\n  const { lineLocator } = useContext(IsotopesDataContext);\n  return h(\"path\", {\n    d: lineLocator(lineValues),\n    fill: \"transparent\",\n    ...rest,\n  });\n};\n\nconst useDataLocator = () => useContext(IsotopesDataContext);\n\nexport { IsotopesDataArea, IsotopeDataPoint, IsotopeDataLine, useDataLocator };\n"],"names":[],"mappings":";;;;;AAMA,MAAM,WAAW,CAAC,OAAO,QAAQ;AAC/B,QAAM,SAAS,MAAM,OAAA;AACrB,SAAO,OAAO,CAAC,IAAI,MAAM,OAAO,CAAC;AACnC;AAEA,MAAM,qBAAqB,SAAU,MAAM;AACzC,QAAM,EAAE,QAAQ,OAAO,WAAW,GAAG,SAAS;AAC9C,SAAO,SAAU,GAAG,IAAI,GAAG;AACzB,UAAM,SAAS,UAAU,CAAC;AAC1B,QAAI,CAAC,SAAS,OAAO,MAAM,EAAG,QAAO;AACrC,WAAO,CAAC,OAAO,EAAE,KAAK,GAAG,MAAM,MAAM,CAAC;AAAA,EACxC;AACF;AAEA,MAAM,sBAAsB,cAAc,IAAI;AAW9C,MAAM,mBAAmB,SAAU,OAAsB;AACvD,QAAM,SAAS,WAAW,mBAAmB,GAAG;AAEhD,QAAM,QAAQ,kBAAA;AAEd,MAAI,EAAE,WAAW,QAAQ,UAAU,WAAW,QAAQ,UAAU;AAChE,MAAI,aAAa,MAAM;AACrB,gBAAY,SAAU,GAAG;AACvB,aAAO,EAAE;AAAA,IACX;AAAA,EACF;AAGA,QAAM,eAAe,mBAAmB;AAAA,IACtC;AAAA,IACA;AAAA,IACA;AAAA,IACA;AAAA,IACA;AAAA,EAAA,CACD;AAED,MAAI,SAAS,SAAS;AACtB,MAAI,WAAW;AACb,cAAU;AAAA,EACZ;AACA,QAAM,cAAc,KAAA,EACjB,EAAE,CAAC,MAAM,OAAO,EAAE,MAAM,CAAC,CAAC,EAE1B,EAAE,CAAC,MAAM,MAAM,EAAE,MAAM,CAAC;AAE3B,QAAM,QAAQ,EAAE,cAAc,aAAa,WAAW,QAAQ,MAAA;AAC9D,SAAO,EAAE,oBAAoB,UAAU,EAAE,SAAS,EAAE,UAAU,QAAQ,CAAC;AACzE;AAEA,MAAM,mBAAmB,SAAU,OAAO;AACxC,QAAM,EAAE,aAAA,IAAiB,WAAW,mBAAmB;AACvD,QAAM,EAAE,OAAO,aAAa,GAAG,SAAS;AACxC,QAAM,MAAM,aAAa,KAAK;AAC9B,MAAI,OAAO,KAAM,QAAO;AACxB,QAAM,CAAC,IAAI,EAAE,IAAI;AAEjB,SAAO,EAAE,UAAU;AAAA,IACjB,KAAK,MAAM;AAAA,IACX;AAAA,IACA;AAAA,IACA,GAAG;AAAA,IACH,GAAG;AAAA,EAAA,CACJ;AACH;"}

package/dist/prepare-units/composite-scale.cjs

@@ -207,7 +207,6 @@ function createCompositeScale(sections, interpolateUnconformities = false) {
     for (const scale2 of scales) {
       const range = scale2.range();
       if (pixelHeight > Math.min(...range) && pixelHeight <= Math.max(...range)) {
-        console.log("Inverting scale at pixel height", pixelHeight);
         return scale2.invert(pixelHeight);
       }
     }

package/dist/prepare-units/composite-scale.cjs.map

@@ -1 +1 @@
-{"version":3,"file":"composite-scale.cjs","sources":["../../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 (\n        domain[0] < domain[domain.length - 1] &&\n        age >= domain[0] &&\n        age <= domain[domain.length - 1]\n      ) {\n        // Age axes\n        return s(age);\n      } else if (age <= domain[0] && age >= domain[domain.length - 1]) {\n        // Normal axes like height\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":["ColumnAxisType","HybridScaleType","buildHybridScale","scaleLinear","getUnitHeightRange","scale","ensureArray"],"mappings":"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"}
+{"version":3,"file":"composite-scale.cjs","sources":["../../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 (\n        domain[0] < domain[domain.length - 1] &&\n        age >= domain[0] &&\n        age <= domain[domain.length - 1]\n      ) {\n        // Age axes\n        return s(age);\n      } else if (age <= domain[0] && age >= domain[domain.length - 1]) {\n        // Normal axes like height\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":["ColumnAxisType","HybridScaleType","buildHybridScale","scaleLinear","getUnitHeightRange","scale","ensureArray"],"mappings":"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"}

package/dist/prepare-units/composite-scale.js

@@ -205,7 +205,6 @@ function createCompositeScale(sections, interpolateUnconformities = false) {
     for (const scale2 of scales) {
       const range = scale2.range();
       if (pixelHeight > Math.min(...range) && pixelHeight <= Math.max(...range)) {
-        console.log("Inverting scale at pixel height", pixelHeight);
         return scale2.invert(pixelHeight);
       }
     }

package/dist/prepare-units/composite-scale.js.map

@@ -1 +1 @@
-{"version":3,"file":"composite-scale.js","sources":["../../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 (\n        domain[0] < domain[domain.length - 1] &&\n        age >= domain[0] &&\n        age <= domain[domain.length - 1]\n      ) {\n        // Age axes\n        return s(age);\n      } else if (age <= domain[0] && age >= domain[domain.length - 1]) {\n        // Normal axes like height\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":["scale"],"mappings":"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"}
+{"version":3,"file":"composite-scale.js","sources":["../../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 (\n        domain[0] < domain[domain.length - 1] &&\n        age >= domain[0] &&\n        age <= domain[domain.length - 1]\n      ) {\n        // Age axes\n        return s(age);\n      } else if (age <= domain[0] && age >= domain[domain.length - 1]) {\n        // Normal axes like height\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":["scale"],"mappings":"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"}

package/dist/units/index.cjs

@@ -48,7 +48,6 @@ function UnitComponent({
   }
   let columnIx = 0;
   let x = 0;
-  console.log(rest, _nColumns, width);
   let reducedWidth = _nColumns;
   if ("overlap" in division) {
     const overlap = division.overlap;

package/dist/units/index.cjs.map

@@ -1 +1 @@
-{"version":3,"file":"index.cjs","sources":["../../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 \"@macrostrat/data-provider\";\nimport { useMemo } from \"react\";\nimport { resolveID } from \"./resolvers\";\nimport { BaseUnit, Lithology } from \"@macrostrat/api-types\";\nimport { UnitWithDefinedOverlap } from \"../prepare-units/helpers.ts\";\n\nexport * from \"./composite\";\nexport * from \"./types\";\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\ninterface UnitComponentProps<T extends BaseUnit> {\n  division: UnitWithDefinedOverlap<T> | T;\n  nColumns: number;\n  width?: number;\n}\n\nexport function UnitComponent<T extends BaseUnit>({\n  division,\n  nColumns = 2,\n  ...rest\n}: UnitComponentProps<T>) {\n  const width = rest.width ?? useColumnLayout()?.width;\n\n  let _nColumns = nColumns;\n  if (isNaN(_nColumns)) {\n    _nColumns = 2;\n  }\n  let columnIx = 0;\n  let x = 0;\n\n  console.log(rest, _nColumns, width);\n\n  let reducedWidth = _nColumns;\n  //const nOverlappingUnits = division.overlappingUnits?.length ?? 0;\n  if (\"overlap\" in division) {\n    const overlap = division.overlap;\n    _nColumns = Math.min(_nColumns, overlap.nColumns);\n    columnIx = overlap.column;\n    reducedWidth = width / _nColumns;\n    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":["h","LithologyColumn","UnitBoxes","UnitNamesColumn","useColumnLayout","TrackedLabeledUnit","useLithologies","useInDarkMode","useMemo","getMixedUnitColor","resolveID","useGeologicPattern","useEnvironments"],"mappings":"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"}
+{"version":3,"file":"index.cjs","sources":["../../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 \"@macrostrat/data-provider\";\nimport { useMemo } from \"react\";\nimport { resolveID } from \"./resolvers\";\nimport { BaseUnit, Lithology } from \"@macrostrat/api-types\";\nimport { UnitWithDefinedOverlap } from \"../prepare-units/helpers.ts\";\n\nexport * from \"./composite\";\nexport * from \"./types\";\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\ninterface UnitComponentProps<T extends BaseUnit> {\n  division: UnitWithDefinedOverlap<T> | T;\n  nColumns: number;\n  width?: number;\n}\n\nexport function UnitComponent<T extends BaseUnit>({\n  division,\n  nColumns = 2,\n  ...rest\n}: UnitComponentProps<T>) {\n  const width = rest.width ?? useColumnLayout()?.width;\n\n  let _nColumns = nColumns;\n  if (isNaN(_nColumns)) {\n    _nColumns = 2;\n  }\n  let columnIx = 0;\n  let x = 0;\n\n  let reducedWidth = _nColumns;\n  if (\"overlap\" in division) {\n    const overlap = division.overlap;\n    _nColumns = Math.min(_nColumns, overlap.nColumns);\n    columnIx = overlap.column;\n    reducedWidth = width / _nColumns;\n    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":["h","LithologyColumn","UnitBoxes","UnitNamesColumn","useColumnLayout","TrackedLabeledUnit","useLithologies","useInDarkMode","useMemo","getMixedUnitColor","resolveID","useGeologicPattern","useEnvironments"],"mappings":"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"}

package/dist/units/index.js

@@ -46,7 +46,6 @@ function UnitComponent({
   }
   let columnIx = 0;
   let x = 0;
-  console.log(rest, _nColumns, width);
   let reducedWidth = _nColumns;
   if ("overlap" in division) {
     const overlap = division.overlap;

package/dist/units/index.js.map

@@ -1 +1 @@
-{"version":3,"file":"index.js","sources":["../../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 \"@macrostrat/data-provider\";\nimport { useMemo } from \"react\";\nimport { resolveID } from \"./resolvers\";\nimport { BaseUnit, Lithology } from \"@macrostrat/api-types\";\nimport { UnitWithDefinedOverlap } from \"../prepare-units/helpers.ts\";\n\nexport * from \"./composite\";\nexport * from \"./types\";\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\ninterface UnitComponentProps<T extends BaseUnit> {\n  division: UnitWithDefinedOverlap<T> | T;\n  nColumns: number;\n  width?: number;\n}\n\nexport function UnitComponent<T extends BaseUnit>({\n  division,\n  nColumns = 2,\n  ...rest\n}: UnitComponentProps<T>) {\n  const width = rest.width ?? useColumnLayout()?.width;\n\n  let _nColumns = nColumns;\n  if (isNaN(_nColumns)) {\n    _nColumns = 2;\n  }\n  let columnIx = 0;\n  let x = 0;\n\n  console.log(rest, _nColumns, width);\n\n  let reducedWidth = _nColumns;\n  //const nOverlappingUnits = division.overlappingUnits?.length ?? 0;\n  if (\"overlap\" in division) {\n    const overlap = division.overlap;\n    _nColumns = Math.min(_nColumns, overlap.nColumns);\n    columnIx = overlap.column;\n    reducedWidth = width / _nColumns;\n    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":[],"mappings":"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"}
+{"version":3,"file":"index.js","sources":["../../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 \"@macrostrat/data-provider\";\nimport { useMemo } from \"react\";\nimport { resolveID } from \"./resolvers\";\nimport { BaseUnit, Lithology } from \"@macrostrat/api-types\";\nimport { UnitWithDefinedOverlap } from \"../prepare-units/helpers.ts\";\n\nexport * from \"./composite\";\nexport * from \"./types\";\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\ninterface UnitComponentProps<T extends BaseUnit> {\n  division: UnitWithDefinedOverlap<T> | T;\n  nColumns: number;\n  width?: number;\n}\n\nexport function UnitComponent<T extends BaseUnit>({\n  division,\n  nColumns = 2,\n  ...rest\n}: UnitComponentProps<T>) {\n  const width = rest.width ?? useColumnLayout()?.width;\n\n  let _nColumns = nColumns;\n  if (isNaN(_nColumns)) {\n    _nColumns = 2;\n  }\n  let columnIx = 0;\n  let x = 0;\n\n  let reducedWidth = _nColumns;\n  if (\"overlap\" in division) {\n    const overlap = division.overlap;\n    _nColumns = Math.min(_nColumns, overlap.nColumns);\n    columnIx = overlap.column;\n    reducedWidth = width / _nColumns;\n    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":[],"mappings":"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"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@macrostrat/column-views",
-  "version": "3.4.0",
+  "version": "3.4.1",
   "description": "Data views for Macrostrat stratigraphic columns",
   "repository": {
     "type": "git",
@@ -49,7 +49,7 @@
     "@macrostrat/api-types": "^1.2.0",
     "@macrostrat/color-utils": "^1.2.2",
     "@macrostrat/column-components": "^2.0.8",
-    "@macrostrat/data-components": "^1.1.10",
+    "@macrostrat/data-components": "^1.1.11",
     "@macrostrat/data-provider": "^1.0.4",
     "@macrostrat/hyper": "^3.1.1",
     "@macrostrat/map-interface": "^2.2.6",

package/src/facets/carbon-isotopes/data-area.ts

@@ -37,9 +37,6 @@ const IsotopesDataArea = function (props: DataAreaProps) {
   let { corrected, system, children, getHeight, clipY = false } = props;
   if (getHeight == null) {
     getHeight = function (d) {
-      if (d.height == null) {
-        console.log(d);
-      }
       return d.height;
     };
   }

package/src/prepare-units/composite-scale.ts

@@ -346,7 +346,7 @@ export function createCompositeScale(
         pixelHeight > Math.min(...range) &&
         pixelHeight <= Math.max(...range)
       ) {
-        console.log("Inverting scale at pixel height", pixelHeight);
+        //console.log("Inverting scale at pixel height", pixelHeight);
         return scale.invert(pixelHeight);
       }
     }

package/src/units/index.ts

@@ -77,10 +77,7 @@ export function UnitComponent<T extends BaseUnit>({
   let columnIx = 0;
   let x = 0;
 
-  console.log(rest, _nColumns, width);
-
   let reducedWidth = _nColumns;
-  //const nOverlappingUnits = division.overlappingUnits?.length ?? 0;
   if ("overlap" in division) {
     const overlap = division.overlap;
     _nColumns = Math.min(_nColumns, overlap.nColumns);