@macrostrat/column-views 2.4.3 → 3.0.0

package/dist/facets/detrital-zircon/provider.js

@@ -0,0 +1,22 @@
+import { useAPIResult } from "@macrostrat/ui-components";
+function useDetritalMeasurements(columnArgs) {
+  const params = {
+    ...columnArgs,
+    measure_phase: "zircon",
+    response: "long",
+    show_values: true,
+    // Other isotope systems are organized separately
+    measurement: "207Pb-206Pb"
+  };
+  const res = useAPIResult(
+    "/measurements",
+    params,
+    columnArgs
+  );
+  if (res == null) return null;
+  return res;
+}
+export {
+  useDetritalMeasurements
+};
+//# sourceMappingURL=provider.js.map

package/dist/facets/detrital-zircon/provider.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"provider.js","sources":["../../../src/facets/detrital-zircon/provider.ts"],"sourcesContent":["import { group } from \"d3-array\";\nimport { useAPIResult } from \"@macrostrat/ui-components\";\n\nexport interface MeasurementInfo {\n  measurement_id: number;\n  measuremeta_id: number;\n  measurement: string;\n  measure_units: string;\n  measure_phase: string;\n  method: string;\n  n: number;\n  ref_id: number;\n  sample_name: string;\n  geo_unit: string;\n  samp_lith: string;\n  samp_lith_id: number;\n  samp_desc: string;\n  samp_age: string;\n  lat: number;\n  lng: number;\n  unit_id: number;\n  unit_rel_pos?: any;\n  col_id: number;\n  strat_name_id: number;\n  match_basis: string;\n  ref: string;\n  measure_value: number[];\n  measure_error: number[];\n  measure_position: any[];\n  measure_n: number[];\n  sample_no: string[];\n  error_units: string;\n}\n\nexport function useDetritalMeasurements(columnArgs) {\n  const params = {\n    ...columnArgs,\n    measure_phase: \"zircon\",\n    response: \"long\",\n    show_values: true,\n    // Other isotope systems are organized separately\n    measurement: \"207Pb-206Pb\",\n  };\n  const res: MeasurementInfo[] = useAPIResult(\n    \"/measurements\",\n    params,\n    columnArgs,\n  );\n  if (res == null) return null;\n  return res;\n}\n"],"names":[],"mappings":";AAkCO,SAAS,wBAAwB,YAAY;AAClD,QAAM,SAAS;AAAA,IACb,GAAG;AAAA,IACH,eAAe;AAAA,IACf,UAAU;AAAA,IACV,aAAa;AAAA;AAAA,IAEb,aAAa;AAAA,EAAA;AAEf,QAAM,MAAyB;AAAA,IAC7B;AAAA,IACA;AAAA,IACA;AAAA,EAAA;AAEF,MAAI,OAAO,KAAM,QAAO;AACxB,SAAO;AACT;"}

package/dist/facets/fossils/index.cjs

@@ -0,0 +1,120 @@
+"use strict";
+Object.defineProperty(exports, Symbol.toStringTag, { value: "Module" });
+const h$1 = require("@macrostrat/hyper");
+const provider = require("./provider.cjs");
+const columnComponents = require("@macrostrat/column-components");
+const taxonRanges_module = require("./taxon-ranges.module.sass.cjs");
+const d3Scale = require("d3-scale");
+const base = require("../measurements/base.cjs");
+const store = require("../../data-provider/store.cjs");
+const utils = require("../../prepare-units/utils.cjs");
+const h = h$1.styled(taxonRanges_module.default);
+function PBDBFossilsColumn({
+  columnID,
+  type = provider.FossilDataType.Collections
+}) {
+  const data = provider.useFossilData(columnID, type);
+  const { axisType, units } = store.useMacrostratColumnData();
+  const scale = store.useCompositeScale();
+  if (data == null || units == null || scale == null) return null;
+  const data1 = preparePBDBData(data, units, scale, axisType);
+  return h(base.BaseMeasurementsColumn, {
+    data: data1,
+    noteComponent: FossilInfo,
+    focusedNoteComponent: FossilInfo,
+    className: "fossil-collections"
+  });
+}
+function FossilInfo(props) {
+  const { note, maxItems, focused = false } = props;
+  const { data } = note;
+  data.sort((a, b) => {
+    const nameA = a.best_name ?? a.cltn_name ?? "";
+    const nameB = b.best_name ?? b.cltn_name ?? "";
+    return nameA.localeCompare(nameB);
+  });
+  return h(base.TruncatedList, {
+    data,
+    className: "fossil-collections",
+    itemRenderer: PBDBCollectionLink,
+    maxItems: focused ? Infinity : maxItems ?? 5
+  });
+}
+function PBDBCollectionLink({
+  data
+}) {
+  return h(
+    "a.link-id",
+    {
+      href: `https://paleobiodb.org/app/collections#display=col:${data.cltn_id}`,
+      target: "_blank",
+      onClick(e) {
+        e.stopPropagation();
+      }
+    },
+    data.best_name ?? data.cltn_name
+  );
+}
+function preparePBDBData(data, units, scale, axisType, options) {
+  const { groupCloseNotes = true } = {};
+  const groupDistance = typeof groupCloseNotes === "number" ? groupCloseNotes : 10;
+  const dataMap = /* @__PURE__ */ new Map();
+  for (const d of data) {
+    const range = getHeightRangeForPBDBEntity(d, units, axisType);
+    if (range == null) continue;
+    const { height, top_height } = range;
+    let key = `${height}`;
+    if (top_height != null) {
+      key += `-${top_height}`;
+    }
+    if (!dataMap.has(key)) {
+      dataMap.set(key, {
+        height,
+        top_height: top_height ?? height,
+        data: [],
+        id: key
+      });
+    }
+    dataMap.get(key).data.push(d);
+  }
+  return base.groupNotesByPixelDistance(
+    Array.from(dataMap.values()),
+    scale,
+    axisType,
+    groupDistance
+  );
+}
+function getHeightRangeForPBDBEntity(d, units, axisType) {
+  let height = null;
+  if (d.slb != null && d.slu == "mbsf") {
+    height = Number(d.slb);
+    if (axisType === columnComponents.ColumnAxisType.DEPTH) {
+      return { height };
+    }
+  }
+  if (d.unit_id == null) return null;
+  if (height != null) {
+    const unit = units.find((u) => u.unit_id === d.unit_id);
+    if (unit == null) return null;
+    const relHeight = getRelativePositionInUnit(
+      height,
+      unit,
+      columnComponents.ColumnAxisType.DEPTH
+    );
+    if (relHeight == null) return null;
+    height = utils.getPositionWithinUnit(relHeight, unit, axisType);
+    return { height };
+  }
+  return base.standardizeMeasurementHeight({ unit_id: d.unit_id }, units, axisType);
+}
+function getRelativePositionInUnit(pos, unit, axisType) {
+  const heights = utils.getUnitHeightRange(unit, axisType, false);
+  const scale = d3Scale.scaleLinear(heights).domain([0, 1]);
+  const relPos = scale.invert(pos);
+  if (relPos < 0 || relPos > 1) return null;
+  return relPos;
+}
+exports.FossilDataType = provider.FossilDataType;
+exports.useFossilData = provider.useFossilData;
+exports.PBDBFossilsColumn = PBDBFossilsColumn;
+//# sourceMappingURL=index.cjs.map

package/dist/facets/fossils/index.cjs.map

@@ -0,0 +1 @@
+{"version":3,"file":"index.cjs","sources":["../../../src/facets/fossils/index.ts"],"sourcesContent":["import hyper from \"@macrostrat/hyper\";\nimport {\n  FossilDataType,\n  type PBDBCollection,\n  type PBDBEntity,\n  type PBDBOccurrence,\n  useFossilData,\n} from \"./provider\";\nimport type { IUnit } from \"../../units\";\nimport {\n  BaseMeasurementsColumn,\n  ColumnMeasurementData,\n  MeasurementHeightData,\n  standardizeMeasurementHeight,\n  groupNotesByPixelDistance,\n  TruncatedList,\n} from \"../measurements\";\nimport { ColumnAxisType } from \"@macrostrat/column-components\";\nimport {\n  useCompositeScale,\n  useMacrostratColumnData,\n} from \"../../data-provider\";\nimport { UnitLong } from \"@macrostrat/api-types\";\nimport styles from \"./taxon-ranges.module.sass\";\nimport {\n  CompositeColumnScale,\n  getPositionWithinUnit,\n  getUnitHeightRange,\n} from \"../../prepare-units\";\nimport { scaleLinear } from \"d3-scale\";\n\nexport {\n  FossilDataType,\n  type PBDBCollection,\n  type PBDBEntity,\n  type PBDBOccurrence,\n  useFossilData,\n};\nexport * from \"./taxon-ranges\";\n\nconst h = hyper.styled(styles);\n\nexport function PBDBFossilsColumn({\n  columnID,\n  type = FossilDataType.Collections,\n}: {\n  columnID: number;\n  type: FossilDataType;\n}) {\n  const data = useFossilData(columnID, type);\n  const { axisType, units } = useMacrostratColumnData();\n  const scale = useCompositeScale();\n\n  if (data == null || units == null || scale == null) return null;\n\n  const data1 = preparePBDBData(data, units, scale, axisType);\n\n  return h(BaseMeasurementsColumn, {\n    data: data1,\n    noteComponent: FossilInfo,\n    focusedNoteComponent: FossilInfo,\n    className: \"fossil-collections\",\n  });\n}\n\ninterface FossilItemProps {\n  note: {\n    data: PBDBCollection[];\n    unit?: IUnit;\n  };\n  spacing?: {\n    below?: number;\n    above?: number;\n  };\n  width?: number;\n  height?: number;\n  color?: string;\n  focused?: boolean;\n  maxItems?: number;\n}\n\nfunction FossilInfo(props: FossilItemProps) {\n  const { note, maxItems, focused = false } = props;\n  const { data } = note;\n  // Sort collections by name\n  data.sort((a, b) => {\n    const nameA = a.best_name ?? a.cltn_name ?? \"\";\n    const nameB = b.best_name ?? b.cltn_name ?? \"\";\n    return nameA.localeCompare(nameB);\n  });\n\n  return h(TruncatedList, {\n    data,\n    className: \"fossil-collections\",\n    itemRenderer: PBDBCollectionLink,\n    maxItems: focused ? Infinity : (maxItems ?? 5),\n  });\n}\n\nfunction PBDBCollectionLink({\n  data,\n}: {\n  data: PBDBCollection | PBDBOccurrence;\n}) {\n  /** A link to a PBDB collection that handles either an occurrence or collection object */\n  return h(\n    \"a.link-id\",\n    {\n      href: `https://paleobiodb.org/app/collections#display=col:${data.cltn_id}`,\n      target: \"_blank\",\n      onClick(e) {\n        e.stopPropagation();\n      },\n    },\n    data.best_name ?? data.cltn_name,\n  );\n}\n\ninterface PreparePBDBDataOptions {\n  /** If set, group close notes within this distance (in pixels in display space)\n   * into a single note. If a number is provided, that number is used as the distance,\n   * otherwise a default of 5 pixels is used.\n   */\n  groupCloseNotes?: boolean | number;\n}\n\nfunction preparePBDBData<T extends PBDBEntity>(\n  data: T[],\n  units: UnitLong[],\n  scale: CompositeColumnScale,\n  axisType: ColumnAxisType,\n  options?: PreparePBDBDataOptions,\n) {\n  /** Prepare PBDB fossil data for display in a measurements column */\n  const { groupCloseNotes = true } = options ?? {};\n  const groupDistance =\n    typeof groupCloseNotes === \"number\" ? groupCloseNotes : 10;\n\n  // Map of data to its defined height ranges\n  const dataMap = new Map<string, ColumnMeasurementData<T[]>>();\n\n  // Todo: if we wanted, we could add a step where we group notes that are too close together here...\n\n  for (const d of data) {\n    const range = getHeightRangeForPBDBEntity(d, units, axisType);\n\n    if (range == null) continue;\n    const { height, top_height } = range;\n    // compose the key based on height info\n    let key = `${height}`;\n    if (top_height != null) {\n      key += `-${top_height}`;\n    }\n\n    // Group by height key\n    if (!dataMap.has(key)) {\n      dataMap.set(key, {\n        height,\n        top_height: top_height ?? height,\n        data: [],\n        id: key,\n      });\n    }\n    dataMap.get(key)!.data.push(d);\n  }\n\n  return groupNotesByPixelDistance(\n    Array.from(dataMap.values()),\n    scale,\n    axisType,\n    groupDistance,\n  );\n}\n\nfunction getHeightRangeForPBDBEntity<T extends PBDBEntity>(\n  d: T,\n  units: UnitLong[],\n  axisType: ColumnAxisType,\n): MeasurementHeightData | null {\n  let height: number | null = null;\n  if (d.slb != null && d.slu == \"mbsf\") {\n    // Meters below sea floor - special case for eODP where we have\n    // specific depth data referenced\n    height = Number(d.slb);\n    if (axisType === ColumnAxisType.DEPTH) {\n      // Data is already in depth units\n      return { height };\n    }\n  }\n  if (d.unit_id == null) return null;\n  if (height != null) {\n    // If we have both height and unit info, we need to adjust the height\n    // to fit whatever scale type we're using.\n    // TODO: we could improve how this works by having concurrent age and\n    // height scales, which would allow us to do this without having to\n    // reference to a specific unit.\n    const unit = units.find((u) => u.unit_id === d.unit_id);\n    if (unit == null) return null;\n    const relHeight = getRelativePositionInUnit(\n      height,\n      unit,\n      ColumnAxisType.DEPTH,\n    );\n    if (relHeight == null) return null;\n    height = getPositionWithinUnit(relHeight, unit, axisType);\n    return { height };\n  }\n  // We can just get the height within the unit, clipped to the unit boundaries\n  return standardizeMeasurementHeight({ unit_id: d.unit_id }, units, axisType);\n}\n\nfunction getRelativePositionInUnit(\n  pos: number,\n  unit: UnitLong,\n  axisType: ColumnAxisType,\n): number | null {\n  // This is the inverse of getPositionWithinUnit\n  const heights = getUnitHeightRange(unit, axisType, false);\n  const scale = scaleLinear(heights).domain([0, 1]);\n  const relPos = scale.invert(pos);\n  if (relPos < 0 || relPos > 1) return null;\n  return relPos;\n}\n"],"names":["hyper","styles","FossilDataType","useFossilData","useMacrostratColumnData","useCompositeScale","BaseMeasurementsColumn","TruncatedList","groupNotesByPixelDistance","ColumnAxisType","getPositionWithinUnit","standardizeMeasurementHeight","getUnitHeightRange","scaleLinear"],"mappings":"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"}

package/dist/facets/fossils/index.d.ts

@@ -0,0 +1,7 @@
+import { FossilDataType, PBDBCollection, PBDBEntity, PBDBOccurrence, useFossilData } from './provider';
+export { FossilDataType, type PBDBCollection, type PBDBEntity, type PBDBOccurrence, useFossilData, };
+export * from './taxon-ranges';
+export declare function PBDBFossilsColumn({ columnID, type, }: {
+    columnID: number;
+    type: FossilDataType;
+}): import('react').FunctionComponentElement<import('..').BaseMeasurementsColumnProps<any>>;

package/dist/facets/fossils/index.js

@@ -0,0 +1,120 @@
+import h$1 from "@macrostrat/hyper";
+import { useFossilData, FossilDataType } from "./provider.js";
+import { ColumnAxisType } from "@macrostrat/column-components";
+import styles from "./taxon-ranges.module.sass.js";
+import { scaleLinear } from "d3-scale";
+import { BaseMeasurementsColumn, groupNotesByPixelDistance, TruncatedList, standardizeMeasurementHeight } from "../measurements/base.js";
+import { useMacrostratColumnData, useCompositeScale } from "../../data-provider/store.js";
+import { getPositionWithinUnit, getUnitHeightRange } from "../../prepare-units/utils.js";
+const h = h$1.styled(styles);
+function PBDBFossilsColumn({
+  columnID,
+  type = FossilDataType.Collections
+}) {
+  const data = useFossilData(columnID, type);
+  const { axisType, units } = useMacrostratColumnData();
+  const scale = useCompositeScale();
+  if (data == null || units == null || scale == null) return null;
+  const data1 = preparePBDBData(data, units, scale, axisType);
+  return h(BaseMeasurementsColumn, {
+    data: data1,
+    noteComponent: FossilInfo,
+    focusedNoteComponent: FossilInfo,
+    className: "fossil-collections"
+  });
+}
+function FossilInfo(props) {
+  const { note, maxItems, focused = false } = props;
+  const { data } = note;
+  data.sort((a, b) => {
+    const nameA = a.best_name ?? a.cltn_name ?? "";
+    const nameB = b.best_name ?? b.cltn_name ?? "";
+    return nameA.localeCompare(nameB);
+  });
+  return h(TruncatedList, {
+    data,
+    className: "fossil-collections",
+    itemRenderer: PBDBCollectionLink,
+    maxItems: focused ? Infinity : maxItems ?? 5
+  });
+}
+function PBDBCollectionLink({
+  data
+}) {
+  return h(
+    "a.link-id",
+    {
+      href: `https://paleobiodb.org/app/collections#display=col:${data.cltn_id}`,
+      target: "_blank",
+      onClick(e) {
+        e.stopPropagation();
+      }
+    },
+    data.best_name ?? data.cltn_name
+  );
+}
+function preparePBDBData(data, units, scale, axisType, options) {
+  const { groupCloseNotes = true } = {};
+  const groupDistance = typeof groupCloseNotes === "number" ? groupCloseNotes : 10;
+  const dataMap = /* @__PURE__ */ new Map();
+  for (const d of data) {
+    const range = getHeightRangeForPBDBEntity(d, units, axisType);
+    if (range == null) continue;
+    const { height, top_height } = range;
+    let key = `${height}`;
+    if (top_height != null) {
+      key += `-${top_height}`;
+    }
+    if (!dataMap.has(key)) {
+      dataMap.set(key, {
+        height,
+        top_height: top_height ?? height,
+        data: [],
+        id: key
+      });
+    }
+    dataMap.get(key).data.push(d);
+  }
+  return groupNotesByPixelDistance(
+    Array.from(dataMap.values()),
+    scale,
+    axisType,
+    groupDistance
+  );
+}
+function getHeightRangeForPBDBEntity(d, units, axisType) {
+  let height = null;
+  if (d.slb != null && d.slu == "mbsf") {
+    height = Number(d.slb);
+    if (axisType === ColumnAxisType.DEPTH) {
+      return { height };
+    }
+  }
+  if (d.unit_id == null) return null;
+  if (height != null) {
+    const unit = units.find((u) => u.unit_id === d.unit_id);
+    if (unit == null) return null;
+    const relHeight = getRelativePositionInUnit(
+      height,
+      unit,
+      ColumnAxisType.DEPTH
+    );
+    if (relHeight == null) return null;
+    height = getPositionWithinUnit(relHeight, unit, axisType);
+    return { height };
+  }
+  return standardizeMeasurementHeight({ unit_id: d.unit_id }, units, axisType);
+}
+function getRelativePositionInUnit(pos, unit, axisType) {
+  const heights = getUnitHeightRange(unit, axisType, false);
+  const scale = scaleLinear(heights).domain([0, 1]);
+  const relPos = scale.invert(pos);
+  if (relPos < 0 || relPos > 1) return null;
+  return relPos;
+}
+export {
+  FossilDataType,
+  PBDBFossilsColumn,
+  useFossilData
+};
+//# sourceMappingURL=index.js.map

package/dist/facets/fossils/index.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"index.js","sources":["../../../src/facets/fossils/index.ts"],"sourcesContent":["import hyper from \"@macrostrat/hyper\";\nimport {\n  FossilDataType,\n  type PBDBCollection,\n  type PBDBEntity,\n  type PBDBOccurrence,\n  useFossilData,\n} from \"./provider\";\nimport type { IUnit } from \"../../units\";\nimport {\n  BaseMeasurementsColumn,\n  ColumnMeasurementData,\n  MeasurementHeightData,\n  standardizeMeasurementHeight,\n  groupNotesByPixelDistance,\n  TruncatedList,\n} from \"../measurements\";\nimport { ColumnAxisType } from \"@macrostrat/column-components\";\nimport {\n  useCompositeScale,\n  useMacrostratColumnData,\n} from \"../../data-provider\";\nimport { UnitLong } from \"@macrostrat/api-types\";\nimport styles from \"./taxon-ranges.module.sass\";\nimport {\n  CompositeColumnScale,\n  getPositionWithinUnit,\n  getUnitHeightRange,\n} from \"../../prepare-units\";\nimport { scaleLinear } from \"d3-scale\";\n\nexport {\n  FossilDataType,\n  type PBDBCollection,\n  type PBDBEntity,\n  type PBDBOccurrence,\n  useFossilData,\n};\nexport * from \"./taxon-ranges\";\n\nconst h = hyper.styled(styles);\n\nexport function PBDBFossilsColumn({\n  columnID,\n  type = FossilDataType.Collections,\n}: {\n  columnID: number;\n  type: FossilDataType;\n}) {\n  const data = useFossilData(columnID, type);\n  const { axisType, units } = useMacrostratColumnData();\n  const scale = useCompositeScale();\n\n  if (data == null || units == null || scale == null) return null;\n\n  const data1 = preparePBDBData(data, units, scale, axisType);\n\n  return h(BaseMeasurementsColumn, {\n    data: data1,\n    noteComponent: FossilInfo,\n    focusedNoteComponent: FossilInfo,\n    className: \"fossil-collections\",\n  });\n}\n\ninterface FossilItemProps {\n  note: {\n    data: PBDBCollection[];\n    unit?: IUnit;\n  };\n  spacing?: {\n    below?: number;\n    above?: number;\n  };\n  width?: number;\n  height?: number;\n  color?: string;\n  focused?: boolean;\n  maxItems?: number;\n}\n\nfunction FossilInfo(props: FossilItemProps) {\n  const { note, maxItems, focused = false } = props;\n  const { data } = note;\n  // Sort collections by name\n  data.sort((a, b) => {\n    const nameA = a.best_name ?? a.cltn_name ?? \"\";\n    const nameB = b.best_name ?? b.cltn_name ?? \"\";\n    return nameA.localeCompare(nameB);\n  });\n\n  return h(TruncatedList, {\n    data,\n    className: \"fossil-collections\",\n    itemRenderer: PBDBCollectionLink,\n    maxItems: focused ? Infinity : (maxItems ?? 5),\n  });\n}\n\nfunction PBDBCollectionLink({\n  data,\n}: {\n  data: PBDBCollection | PBDBOccurrence;\n}) {\n  /** A link to a PBDB collection that handles either an occurrence or collection object */\n  return h(\n    \"a.link-id\",\n    {\n      href: `https://paleobiodb.org/app/collections#display=col:${data.cltn_id}`,\n      target: \"_blank\",\n      onClick(e) {\n        e.stopPropagation();\n      },\n    },\n    data.best_name ?? data.cltn_name,\n  );\n}\n\ninterface PreparePBDBDataOptions {\n  /** If set, group close notes within this distance (in pixels in display space)\n   * into a single note. If a number is provided, that number is used as the distance,\n   * otherwise a default of 5 pixels is used.\n   */\n  groupCloseNotes?: boolean | number;\n}\n\nfunction preparePBDBData<T extends PBDBEntity>(\n  data: T[],\n  units: UnitLong[],\n  scale: CompositeColumnScale,\n  axisType: ColumnAxisType,\n  options?: PreparePBDBDataOptions,\n) {\n  /** Prepare PBDB fossil data for display in a measurements column */\n  const { groupCloseNotes = true } = options ?? {};\n  const groupDistance =\n    typeof groupCloseNotes === \"number\" ? groupCloseNotes : 10;\n\n  // Map of data to its defined height ranges\n  const dataMap = new Map<string, ColumnMeasurementData<T[]>>();\n\n  // Todo: if we wanted, we could add a step where we group notes that are too close together here...\n\n  for (const d of data) {\n    const range = getHeightRangeForPBDBEntity(d, units, axisType);\n\n    if (range == null) continue;\n    const { height, top_height } = range;\n    // compose the key based on height info\n    let key = `${height}`;\n    if (top_height != null) {\n      key += `-${top_height}`;\n    }\n\n    // Group by height key\n    if (!dataMap.has(key)) {\n      dataMap.set(key, {\n        height,\n        top_height: top_height ?? height,\n        data: [],\n        id: key,\n      });\n    }\n    dataMap.get(key)!.data.push(d);\n  }\n\n  return groupNotesByPixelDistance(\n    Array.from(dataMap.values()),\n    scale,\n    axisType,\n    groupDistance,\n  );\n}\n\nfunction getHeightRangeForPBDBEntity<T extends PBDBEntity>(\n  d: T,\n  units: UnitLong[],\n  axisType: ColumnAxisType,\n): MeasurementHeightData | null {\n  let height: number | null = null;\n  if (d.slb != null && d.slu == \"mbsf\") {\n    // Meters below sea floor - special case for eODP where we have\n    // specific depth data referenced\n    height = Number(d.slb);\n    if (axisType === ColumnAxisType.DEPTH) {\n      // Data is already in depth units\n      return { height };\n    }\n  }\n  if (d.unit_id == null) return null;\n  if (height != null) {\n    // If we have both height and unit info, we need to adjust the height\n    // to fit whatever scale type we're using.\n    // TODO: we could improve how this works by having concurrent age and\n    // height scales, which would allow us to do this without having to\n    // reference to a specific unit.\n    const unit = units.find((u) => u.unit_id === d.unit_id);\n    if (unit == null) return null;\n    const relHeight = getRelativePositionInUnit(\n      height,\n      unit,\n      ColumnAxisType.DEPTH,\n    );\n    if (relHeight == null) return null;\n    height = getPositionWithinUnit(relHeight, unit, axisType);\n    return { height };\n  }\n  // We can just get the height within the unit, clipped to the unit boundaries\n  return standardizeMeasurementHeight({ unit_id: d.unit_id }, units, axisType);\n}\n\nfunction getRelativePositionInUnit(\n  pos: number,\n  unit: UnitLong,\n  axisType: ColumnAxisType,\n): number | null {\n  // This is the inverse of getPositionWithinUnit\n  const heights = getUnitHeightRange(unit, axisType, false);\n  const scale = scaleLinear(heights).domain([0, 1]);\n  const relPos = scale.invert(pos);\n  if (relPos < 0 || relPos > 1) return null;\n  return relPos;\n}\n"],"names":["hyper"],"mappings":"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"}

package/dist/facets/fossils/provider.cjs

@@ -0,0 +1,99 @@
+"use strict";
+Object.defineProperty(exports, Symbol.toStringTag, { value: "Module" });
+const uiComponents = require("@macrostrat/ui-components");
+const pbdbAPIBase = "https://paleobiodb.org/data1.2";
+var FossilDataType = /* @__PURE__ */ ((FossilDataType2) => {
+  FossilDataType2["Occurrences"] = "occs";
+  FossilDataType2["Collections"] = "colls";
+  return FossilDataType2;
+})(FossilDataType || {});
+function useFossilData(col_id, type = "colls") {
+  return uiComponents.useAsyncMemo(async () => {
+    if (col_id == null) return null;
+    return await fetchFossilData(col_id, type);
+  }, [col_id, type]);
+}
+async function fetchMacrostratFossilData(col_id, type) {
+  if (type !== "colls") {
+    return [];
+  }
+  const resp = await fetch(
+    `https://macrostrat.org/api/fossils?col_id=${col_id}`
+  );
+  const res = await resp.json();
+  return res.success.data;
+}
+async function fetchPDBDFossilData(col_id, type) {
+  const resp = await fetch(
+    pbdbAPIBase + `/${type}/list.json?ms_column=${col_id}&show=mslink,stratext`
+  );
+  const res = await resp.json();
+  return res.records.map(
+    type == "colls" ? createMacrostratCollection : preprocessOccurrence
+  );
+}
+async function fetchFossilData(colID, type) {
+  const [macrostratData, pbdbData] = await Promise.all([
+    fetchMacrostratFossilData(colID, type),
+    fetchPDBDFossilData(colID, type)
+  ]);
+  return [...macrostratData, ...pbdbData];
+}
+function preprocessOccurrence(d) {
+  if (d.msu == null || d.msc == null) {
+    return d;
+  }
+  const unit_id = parseInt(d.msu.replace(/^\w+:/, ""));
+  const col_id = parseInt(d.msc.replace(/^\w+:/, ""));
+  const occ_id = parseInt(d.oid.replace(/^occ:/, ""));
+  const cltn_id = parseInt(d.cid.replace(/^col:/, ""));
+  return {
+    ...d,
+    unit_id,
+    col_id,
+    taxon_name: d.tna,
+    best_name: d.idn ?? d.tna,
+    occ_id,
+    cltn_id,
+    cltn_name: d.nam
+  };
+}
+function createMacrostratCollection(d) {
+  let unit_id = null;
+  let col_id = null;
+  if (d.msu != null) {
+    unit_id = parseInt(d.msu.replace(/^\w+:/, ""));
+  }
+  if (d.msc != null) {
+    col_id = parseInt(d.msc.replace(/^\w+:/, ""));
+  }
+  let taxon_name = d.tna;
+  let occ_id = null;
+  if (d.oid != null && d.oid.startsWith("occ:")) {
+    occ_id = parseInt(d.oid.replace(/^occ:/, ""));
+  }
+  if (d.idn != null) {
+    taxon_name = d.idn;
+  }
+  let cltn_id = d.cltn_id;
+  if (d.oid != null && d.oid.startsWith("col:")) {
+    cltn_id = parseInt(d.oid.replace(/^col:/, ""));
+  } else if (d.cid != null && d.cid.startsWith("col:")) {
+    cltn_id = parseInt(d.cid.replace(/^col:/, ""));
+  }
+  return {
+    ...d,
+    unit_id,
+    col_id,
+    taxon_name,
+    occ_id,
+    cltn_id,
+    cltn_name: d.nam,
+    t_age: d.t_age,
+    b_age: d.b_age
+  };
+}
+exports.FossilDataType = FossilDataType;
+exports.fetchFossilData = fetchFossilData;
+exports.useFossilData = useFossilData;
+//# sourceMappingURL=provider.cjs.map

package/dist/facets/fossils/provider.cjs.map

@@ -0,0 +1 @@
+{"version":3,"file":"provider.cjs","sources":["../../../src/facets/fossils/provider.ts"],"sourcesContent":["import { useAsyncMemo } from \"@macrostrat/ui-components\";\n\nconst pbdbAPIBase = \"https://paleobiodb.org/data1.2\";\n\nexport enum FossilDataType {\n  Occurrences = \"occs\",\n  Collections = \"colls\",\n}\n\nexport interface PBDBEntity {\n  unit_id: number;\n  col_id: number;\n  cltn_id: number;\n  // For eODP, slb/slu are used to store the heights of fossil locations found in measured sections.\n  // They may have a more general set of uses as well but these are not currently explored.\n  slb?: string; // The local bed in which the fossil was found\n  slu?: string; // The unit of measurement used to designate the local bed\n}\n\nexport interface PBDBCollection extends PBDBEntity {\n  cltn_name: string;\n  pbdb_occs: number;\n  t_age: number;\n  b_age: number;\n  [key: string]: any; // Allow for additional properties\n}\n\nexport interface PBDBOccurrence extends PBDBEntity {\n  occ_id: number;\n  cltn_id: number;\n  taxon_name: string;\n  best_name: string;\n  [key: string]: any; // Allow for additional properties\n}\n\nexport function useFossilData<T extends PBDBEntity>(\n  col_id: number,\n  type = FossilDataType.Collections,\n): T[] {\n  // Fossil links are stored in both Macrostrat and PBDB, depending on how the link was assembled. Here\n  // we create a unified view of data over both sources.\n  return useAsyncMemo(async () => {\n    if (col_id == null) return null;\n    return await fetchFossilData(col_id, type);\n  }, [col_id, type]);\n}\n\nasync function fetchMacrostratFossilData(\n  col_id: number,\n  type: FossilDataType,\n): Promise<PBDBCollection[]> {\n  if (type !== FossilDataType.Collections) {\n    // Macrostrat API only supports collections\n    return [];\n  }\n\n  // Fetch fossil collections linked to columns from the Macrostrat API\n  const resp = await fetch(\n    `https://macrostrat.org/api/fossils?col_id=${col_id}`,\n  );\n  const res = await resp.json();\n  // Create collections from Macrostrat data\n  return res.success.data;\n}\n\nasync function fetchPDBDFossilData(\n  col_id: number,\n  type: FossilDataType.Collections,\n): Promise<PBDBCollection[]>;\nasync function fetchPDBDFossilData(\n  col_id: number,\n  type: FossilDataType.Occurrences,\n): Promise<PBDBOccurrence[]>;\nasync function fetchPDBDFossilData<T extends PBDBEntity>(\n  col_id: number,\n  type: FossilDataType,\n): Promise<T[]>;\nasync function fetchPDBDFossilData(\n  col_id: number,\n  type: FossilDataType,\n): Promise<PBDBEntity[]> {\n  // Note: show=rank does not work on training PBDB server\n  const resp = await fetch(\n    pbdbAPIBase + `/${type}/list.json?ms_column=${col_id}&show=mslink,stratext`,\n  );\n  const res = await resp.json();\n  return res.records.map(\n    type == FossilDataType.Collections\n      ? createMacrostratCollection\n      : preprocessOccurrence,\n  );\n}\n\nexport async function fetchFossilData(\n  colID: number,\n  type: FossilDataType.Collections,\n): Promise<PBDBCollection[]>;\nexport async function fetchFossilData(\n  colID: number,\n  type: FossilDataType.Occurrences,\n): Promise<PBDBOccurrence[]>;\nexport async function fetchFossilData<T extends PBDBEntity>(\n  colID: number,\n  type: FossilDataType,\n): Promise<T[]>;\nexport async function fetchFossilData(\n  colID: number,\n  type: FossilDataType,\n): Promise<PBDBEntity[]> {\n  const [macrostratData, pbdbData] = await Promise.all([\n    fetchMacrostratFossilData(colID, type),\n    fetchPDBDFossilData(colID, type),\n  ]);\n  return [...macrostratData, ...pbdbData];\n}\n\nfunction preprocessOccurrence(d): PBDBOccurrence {\n  if (d.msu == null || d.msc == null) {\n    return d;\n  }\n  /* Preprocess data for an occurrence into a Macrostrat-like format */\n  // Standardize names of Macrostrat units and columns\n  const unit_id = parseInt(d.msu.replace(/^\\w+:/, \"\"));\n  const col_id = parseInt(d.msc.replace(/^\\w+:/, \"\"));\n\n  // taxon names may be stored in different fields\n  const occ_id = parseInt(d.oid.replace(/^occ:/, \"\"));\n  const cltn_id = parseInt(d.cid.replace(/^col:/, \"\"));\n\n  return {\n    ...d,\n    unit_id,\n    col_id,\n    taxon_name: d.tna,\n    best_name: d.idn ?? d.tna,\n    occ_id,\n    cltn_id,\n    cltn_name: d.nam,\n  };\n}\n\nfunction createMacrostratCollection(d): PBDBCollection {\n  /* Preprocess data for a collection into a Macrostrat-like format */\n  let unit_id = null;\n  let col_id = null;\n  // Standardize names of Macrostrat units and columns\n  if (d.msu != null) {\n    unit_id = parseInt(d.msu.replace(/^\\w+:/, \"\"));\n  }\n  if (d.msc != null) {\n    col_id = parseInt(d.msc.replace(/^\\w+:/, \"\"));\n  }\n\n  // taxon names may be stored in different fields\n  let taxon_name = d.tna;\n  let occ_id = null;\n  if (d.oid != null && d.oid.startsWith(\"occ:\")) {\n    occ_id = parseInt(d.oid.replace(/^occ:/, \"\"));\n  }\n  if (d.idn != null) {\n    taxon_name = d.idn;\n  }\n\n  let cltn_id = d.cltn_id;\n  if (d.oid != null && d.oid.startsWith(\"col:\")) {\n    cltn_id = parseInt(d.oid.replace(/^col:/, \"\"));\n  } else if (d.cid != null && d.cid.startsWith(\"col:\")) {\n    cltn_id = parseInt(d.cid.replace(/^col:/, \"\"));\n  }\n\n  return {\n    ...d,\n    unit_id,\n    col_id,\n    taxon_name,\n    occ_id,\n    cltn_id,\n    cltn_name: d.nam,\n    t_age: d.t_age,\n    b_age: d.b_age,\n  };\n}\n"],"names":["FossilDataType","useAsyncMemo"],"mappings":"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"}

package/dist/facets/fossils/provider.d.ts

@@ -0,0 +1,29 @@
+export declare enum FossilDataType {
+    Occurrences = "occs",
+    Collections = "colls"
+}
+export interface PBDBEntity {
+    unit_id: number;
+    col_id: number;
+    cltn_id: number;
+    slb?: string;
+    slu?: string;
+}
+export interface PBDBCollection extends PBDBEntity {
+    cltn_name: string;
+    pbdb_occs: number;
+    t_age: number;
+    b_age: number;
+    [key: string]: any;
+}
+export interface PBDBOccurrence extends PBDBEntity {
+    occ_id: number;
+    cltn_id: number;
+    taxon_name: string;
+    best_name: string;
+    [key: string]: any;
+}
+export declare function useFossilData<T extends PBDBEntity>(col_id: number, type?: FossilDataType): T[];
+export declare function fetchFossilData(colID: number, type: FossilDataType.Collections): Promise<PBDBCollection[]>;
+export declare function fetchFossilData(colID: number, type: FossilDataType.Occurrences): Promise<PBDBOccurrence[]>;
+export declare function fetchFossilData<T extends PBDBEntity>(colID: number, type: FossilDataType): Promise<T[]>;

package/dist/facets/fossils/provider.js

@@ -0,0 +1,99 @@
+import { useAsyncMemo } from "@macrostrat/ui-components";
+const pbdbAPIBase = "https://paleobiodb.org/data1.2";
+var FossilDataType = /* @__PURE__ */ ((FossilDataType2) => {
+  FossilDataType2["Occurrences"] = "occs";
+  FossilDataType2["Collections"] = "colls";
+  return FossilDataType2;
+})(FossilDataType || {});
+function useFossilData(col_id, type = "colls") {
+  return useAsyncMemo(async () => {
+    if (col_id == null) return null;
+    return await fetchFossilData(col_id, type);
+  }, [col_id, type]);
+}
+async function fetchMacrostratFossilData(col_id, type) {
+  if (type !== "colls") {
+    return [];
+  }
+  const resp = await fetch(
+    `https://macrostrat.org/api/fossils?col_id=${col_id}`
+  );
+  const res = await resp.json();
+  return res.success.data;
+}
+async function fetchPDBDFossilData(col_id, type) {
+  const resp = await fetch(
+    pbdbAPIBase + `/${type}/list.json?ms_column=${col_id}&show=mslink,stratext`
+  );
+  const res = await resp.json();
+  return res.records.map(
+    type == "colls" ? createMacrostratCollection : preprocessOccurrence
+  );
+}
+async function fetchFossilData(colID, type) {
+  const [macrostratData, pbdbData] = await Promise.all([
+    fetchMacrostratFossilData(colID, type),
+    fetchPDBDFossilData(colID, type)
+  ]);
+  return [...macrostratData, ...pbdbData];
+}
+function preprocessOccurrence(d) {
+  if (d.msu == null || d.msc == null) {
+    return d;
+  }
+  const unit_id = parseInt(d.msu.replace(/^\w+:/, ""));
+  const col_id = parseInt(d.msc.replace(/^\w+:/, ""));
+  const occ_id = parseInt(d.oid.replace(/^occ:/, ""));
+  const cltn_id = parseInt(d.cid.replace(/^col:/, ""));
+  return {
+    ...d,
+    unit_id,
+    col_id,
+    taxon_name: d.tna,
+    best_name: d.idn ?? d.tna,
+    occ_id,
+    cltn_id,
+    cltn_name: d.nam
+  };
+}
+function createMacrostratCollection(d) {
+  let unit_id = null;
+  let col_id = null;
+  if (d.msu != null) {
+    unit_id = parseInt(d.msu.replace(/^\w+:/, ""));
+  }
+  if (d.msc != null) {
+    col_id = parseInt(d.msc.replace(/^\w+:/, ""));
+  }
+  let taxon_name = d.tna;
+  let occ_id = null;
+  if (d.oid != null && d.oid.startsWith("occ:")) {
+    occ_id = parseInt(d.oid.replace(/^occ:/, ""));
+  }
+  if (d.idn != null) {
+    taxon_name = d.idn;
+  }
+  let cltn_id = d.cltn_id;
+  if (d.oid != null && d.oid.startsWith("col:")) {
+    cltn_id = parseInt(d.oid.replace(/^col:/, ""));
+  } else if (d.cid != null && d.cid.startsWith("col:")) {
+    cltn_id = parseInt(d.cid.replace(/^col:/, ""));
+  }
+  return {
+    ...d,
+    unit_id,
+    col_id,
+    taxon_name,
+    occ_id,
+    cltn_id,
+    cltn_name: d.nam,
+    t_age: d.t_age,
+    b_age: d.b_age
+  };
+}
+export {
+  FossilDataType,
+  fetchFossilData,
+  useFossilData
+};
+//# sourceMappingURL=provider.js.map

package/dist/facets/fossils/provider.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"provider.js","sources":["../../../src/facets/fossils/provider.ts"],"sourcesContent":["import { useAsyncMemo } from \"@macrostrat/ui-components\";\n\nconst pbdbAPIBase = \"https://paleobiodb.org/data1.2\";\n\nexport enum FossilDataType {\n  Occurrences = \"occs\",\n  Collections = \"colls\",\n}\n\nexport interface PBDBEntity {\n  unit_id: number;\n  col_id: number;\n  cltn_id: number;\n  // For eODP, slb/slu are used to store the heights of fossil locations found in measured sections.\n  // They may have a more general set of uses as well but these are not currently explored.\n  slb?: string; // The local bed in which the fossil was found\n  slu?: string; // The unit of measurement used to designate the local bed\n}\n\nexport interface PBDBCollection extends PBDBEntity {\n  cltn_name: string;\n  pbdb_occs: number;\n  t_age: number;\n  b_age: number;\n  [key: string]: any; // Allow for additional properties\n}\n\nexport interface PBDBOccurrence extends PBDBEntity {\n  occ_id: number;\n  cltn_id: number;\n  taxon_name: string;\n  best_name: string;\n  [key: string]: any; // Allow for additional properties\n}\n\nexport function useFossilData<T extends PBDBEntity>(\n  col_id: number,\n  type = FossilDataType.Collections,\n): T[] {\n  // Fossil links are stored in both Macrostrat and PBDB, depending on how the link was assembled. Here\n  // we create a unified view of data over both sources.\n  return useAsyncMemo(async () => {\n    if (col_id == null) return null;\n    return await fetchFossilData(col_id, type);\n  }, [col_id, type]);\n}\n\nasync function fetchMacrostratFossilData(\n  col_id: number,\n  type: FossilDataType,\n): Promise<PBDBCollection[]> {\n  if (type !== FossilDataType.Collections) {\n    // Macrostrat API only supports collections\n    return [];\n  }\n\n  // Fetch fossil collections linked to columns from the Macrostrat API\n  const resp = await fetch(\n    `https://macrostrat.org/api/fossils?col_id=${col_id}`,\n  );\n  const res = await resp.json();\n  // Create collections from Macrostrat data\n  return res.success.data;\n}\n\nasync function fetchPDBDFossilData(\n  col_id: number,\n  type: FossilDataType.Collections,\n): Promise<PBDBCollection[]>;\nasync function fetchPDBDFossilData(\n  col_id: number,\n  type: FossilDataType.Occurrences,\n): Promise<PBDBOccurrence[]>;\nasync function fetchPDBDFossilData<T extends PBDBEntity>(\n  col_id: number,\n  type: FossilDataType,\n): Promise<T[]>;\nasync function fetchPDBDFossilData(\n  col_id: number,\n  type: FossilDataType,\n): Promise<PBDBEntity[]> {\n  // Note: show=rank does not work on training PBDB server\n  const resp = await fetch(\n    pbdbAPIBase + `/${type}/list.json?ms_column=${col_id}&show=mslink,stratext`,\n  );\n  const res = await resp.json();\n  return res.records.map(\n    type == FossilDataType.Collections\n      ? createMacrostratCollection\n      : preprocessOccurrence,\n  );\n}\n\nexport async function fetchFossilData(\n  colID: number,\n  type: FossilDataType.Collections,\n): Promise<PBDBCollection[]>;\nexport async function fetchFossilData(\n  colID: number,\n  type: FossilDataType.Occurrences,\n): Promise<PBDBOccurrence[]>;\nexport async function fetchFossilData<T extends PBDBEntity>(\n  colID: number,\n  type: FossilDataType,\n): Promise<T[]>;\nexport async function fetchFossilData(\n  colID: number,\n  type: FossilDataType,\n): Promise<PBDBEntity[]> {\n  const [macrostratData, pbdbData] = await Promise.all([\n    fetchMacrostratFossilData(colID, type),\n    fetchPDBDFossilData(colID, type),\n  ]);\n  return [...macrostratData, ...pbdbData];\n}\n\nfunction preprocessOccurrence(d): PBDBOccurrence {\n  if (d.msu == null || d.msc == null) {\n    return d;\n  }\n  /* Preprocess data for an occurrence into a Macrostrat-like format */\n  // Standardize names of Macrostrat units and columns\n  const unit_id = parseInt(d.msu.replace(/^\\w+:/, \"\"));\n  const col_id = parseInt(d.msc.replace(/^\\w+:/, \"\"));\n\n  // taxon names may be stored in different fields\n  const occ_id = parseInt(d.oid.replace(/^occ:/, \"\"));\n  const cltn_id = parseInt(d.cid.replace(/^col:/, \"\"));\n\n  return {\n    ...d,\n    unit_id,\n    col_id,\n    taxon_name: d.tna,\n    best_name: d.idn ?? d.tna,\n    occ_id,\n    cltn_id,\n    cltn_name: d.nam,\n  };\n}\n\nfunction createMacrostratCollection(d): PBDBCollection {\n  /* Preprocess data for a collection into a Macrostrat-like format */\n  let unit_id = null;\n  let col_id = null;\n  // Standardize names of Macrostrat units and columns\n  if (d.msu != null) {\n    unit_id = parseInt(d.msu.replace(/^\\w+:/, \"\"));\n  }\n  if (d.msc != null) {\n    col_id = parseInt(d.msc.replace(/^\\w+:/, \"\"));\n  }\n\n  // taxon names may be stored in different fields\n  let taxon_name = d.tna;\n  let occ_id = null;\n  if (d.oid != null && d.oid.startsWith(\"occ:\")) {\n    occ_id = parseInt(d.oid.replace(/^occ:/, \"\"));\n  }\n  if (d.idn != null) {\n    taxon_name = d.idn;\n  }\n\n  let cltn_id = d.cltn_id;\n  if (d.oid != null && d.oid.startsWith(\"col:\")) {\n    cltn_id = parseInt(d.oid.replace(/^col:/, \"\"));\n  } else if (d.cid != null && d.cid.startsWith(\"col:\")) {\n    cltn_id = parseInt(d.cid.replace(/^col:/, \"\"));\n  }\n\n  return {\n    ...d,\n    unit_id,\n    col_id,\n    taxon_name,\n    occ_id,\n    cltn_id,\n    cltn_name: d.nam,\n    t_age: d.t_age,\n    b_age: d.b_age,\n  };\n}\n"],"names":["FossilDataType"],"mappings":"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"}