@macrostrat/column-views 2.4.3 → 3.0.0

package/dist/units/names.js

@@ -0,0 +1,72 @@
+import h from "@macrostrat/hyper";
+import React, { useCallback } from "react";
+import { NotesColumn } from "@macrostrat/column-components";
+import { useMacrostratColumnData, useCompositeScale } from "../data-provider/store.js";
+import { getUnitHeightRange } from "../prepare-units/utils.js";
+function noteForDivision(div, opts) {
+  const { axisType } = opts;
+  const [height, top_height] = getUnitHeightRange(div, axisType);
+  const nameForDivision = opts.nameForDivision ?? defaultNameFunction;
+  return {
+    height,
+    top_height,
+    data: div,
+    id: div.unit_id,
+    note: nameForDivision(div)
+  };
+}
+const defaultNameFunction = (div) => {
+  return div.unit_name.replace("Mbr", "Member").replace("Fm", "Formation").replace("Gp", "Group");
+};
+function UnitDataColumn_(props) {
+  const { axisType, units } = useMacrostratColumnData();
+  const scale = useCompositeScale();
+  const {
+    left = 0,
+    noteComponent,
+    shouldRenderNote = (note, i) => true,
+    nameForDivision,
+    minimumHeight = 0,
+    divisions = units,
+    ...rest
+  } = props;
+  const minimumHeightFilter = useCallback(
+    (d) => {
+      if (minimumHeight == 0) return true;
+      const dy = Math.abs(scale(d.top_height) - scale(d.height));
+      return dy > minimumHeight;
+    },
+    [scale, minimumHeight]
+  );
+  if (divisions == null) return null;
+  const notes = divisions.filter(shouldRenderNote).map((d) => noteForDivision(d, { axisType, nameForDivision })).filter(minimumHeightFilter);
+  return h(NotesColumn, {
+    transform: `translate(${left})`,
+    editable: false,
+    noteComponent,
+    notes,
+    forceOptions: {
+      nodeSpacing: 1
+    },
+    ...rest
+  });
+}
+const UnitDataColumn = React.memo(UnitDataColumn_);
+function UnitNameNote(props) {
+  const { note } = props;
+  return h("p.col-note-label", note.note);
+}
+function UnitNamesColumn(props) {
+  const { noteComponent = UnitNameNote, ...rest } = props;
+  return h(UnitDataColumn, {
+    noteComponent,
+    ...rest
+  });
+}
+export {
+  UnitDataColumn,
+  UnitNamesColumn,
+  defaultNameFunction,
+  noteForDivision
+};
+//# sourceMappingURL=names.js.map

package/dist/units/names.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"names.js","sources":["../../src/units/names.ts"],"sourcesContent":["import h from \"@macrostrat/hyper\";\nimport { useCallback } from \"react\";\nimport {\n  ColumnAxisType,\n  NotesColumn,\n  type ColumnDivision,\n  type NoteData,\n  type NotesColumnProps,\n} from \"@macrostrat/column-components\";\nimport type { IUnit } from \"./types\";\nimport React from \"react\";\nimport { useCompositeScale, useMacrostratColumnData } from \"../data-provider\";\nimport {\n  type CompositeColumnScale,\n  getUnitHeightRange,\n} from \"../prepare-units\";\n\ninterface UnitDataProps extends NotesColumnProps {\n  left?: number;\n  transform?: string;\n  nameForDivision?(obj: IUnit): string;\n  noteComponent?: React.ComponentType<any>;\n  shouldRenderNote?(div: ColumnDivision | IUnit, index: number): boolean;\n  divisions?: IUnit[];\n  minimumHeight?: number;\n  scale?: CompositeColumnScale;\n}\n\ninterface UnitNote extends NoteData {\n  height: number;\n  top_height: number;\n  data: IUnit;\n  id: number;\n}\n\nfunction noteForDivision(\n  div: IUnit,\n  opts: { axisType: ColumnAxisType; nameForDivision?: (obj: IUnit) => string },\n): UnitNote {\n  const { axisType } = opts;\n\n  const [height, top_height] = getUnitHeightRange(div, axisType);\n\n  const nameForDivision = opts.nameForDivision ?? defaultNameFunction;\n\n  return {\n    height,\n    top_height,\n    data: div,\n    id: div.unit_id,\n    note: nameForDivision(div),\n  };\n}\n\nconst defaultNameFunction = (div) => {\n  return div.unit_name\n    .replace(\"Mbr\", \"Member\")\n    .replace(\"Fm\", \"Formation\")\n    .replace(\"Gp\", \"Group\");\n};\n\nfunction UnitDataColumn_(props: UnitDataProps) {\n  const { axisType, units } = useMacrostratColumnData();\n  const scale = useCompositeScale();\n  const {\n    left = 0,\n    noteComponent,\n    shouldRenderNote = (note: ColumnDivision | IUnit, i: number) => true,\n    nameForDivision,\n    minimumHeight = 0,\n    divisions = units,\n    ...rest\n  } = props;\n\n  const minimumHeightFilter = useCallback(\n    (d) => {\n      if (minimumHeight == 0) return true;\n      const dy = Math.abs(scale(d.top_height) - scale(d.height));\n      return dy > minimumHeight;\n    },\n    [scale, minimumHeight],\n  );\n\n  if (divisions == null) return null;\n  const notes: UnitNote[] = divisions\n    .filter(shouldRenderNote)\n    .map((d: IUnit) => noteForDivision(d, { axisType, nameForDivision }))\n    .filter(minimumHeightFilter);\n\n  return h(NotesColumn, {\n    transform: `translate(${left})`,\n    editable: false,\n    noteComponent,\n    notes,\n    forceOptions: {\n      nodeSpacing: 1,\n    },\n    ...rest,\n  });\n}\n\nconst UnitDataColumn = React.memo(UnitDataColumn_);\n\nexport interface UnitNamesProps extends UnitDataProps {\n  paddingLeft?: number;\n  width: number;\n  onClickNote?: (note: any) => void;\n}\n\nfunction UnitNameNote(props: { note: UnitNote }) {\n  const { note } = props;\n  return h(\"p.col-note-label\", note.note);\n}\n\nexport function UnitNamesColumn(props: UnitNamesProps) {\n  const { noteComponent = UnitNameNote, ...rest } = props;\n  return h(UnitDataColumn, {\n    noteComponent,\n    ...rest,\n  });\n}\n\nexport { defaultNameFunction, noteForDivision, UnitDataColumn };\n"],"names":[],"mappings":";;;;;AAmCA,SAAS,gBACP,KACA,MACU;AACV,QAAM,EAAE,aAAa;AAErB,QAAM,CAAC,QAAQ,UAAU,IAAI,mBAAmB,KAAK,QAAQ;AAE7D,QAAM,kBAAkB,KAAK,mBAAmB;AAEhD,SAAO;AAAA,IACL;AAAA,IACA;AAAA,IACA,MAAM;AAAA,IACN,IAAI,IAAI;AAAA,IACR,MAAM,gBAAgB,GAAG;AAAA,EAAA;AAE7B;AAEA,MAAM,sBAAsB,CAAC,QAAQ;AACnC,SAAO,IAAI,UACR,QAAQ,OAAO,QAAQ,EACvB,QAAQ,MAAM,WAAW,EACzB,QAAQ,MAAM,OAAO;AAC1B;AAEA,SAAS,gBAAgB,OAAsB;AAC7C,QAAM,EAAE,UAAU,MAAA,IAAU,wBAAA;AAC5B,QAAM,QAAQ,kBAAA;AACd,QAAM;AAAA,IACJ,OAAO;AAAA,IACP;AAAA,IACA,mBAAmB,CAAC,MAA8B,MAAc;AAAA,IAChE;AAAA,IACA,gBAAgB;AAAA,IAChB,YAAY;AAAA,IACZ,GAAG;AAAA,EAAA,IACD;AAEJ,QAAM,sBAAsB;AAAA,IAC1B,CAAC,MAAM;AACL,UAAI,iBAAiB,EAAG,QAAO;AAC/B,YAAM,KAAK,KAAK,IAAI,MAAM,EAAE,UAAU,IAAI,MAAM,EAAE,MAAM,CAAC;AACzD,aAAO,KAAK;AAAA,IACd;AAAA,IACA,CAAC,OAAO,aAAa;AAAA,EAAA;AAGvB,MAAI,aAAa,KAAM,QAAO;AAC9B,QAAM,QAAoB,UACvB,OAAO,gBAAgB,EACvB,IAAI,CAAC,MAAa,gBAAgB,GAAG,EAAE,UAAU,gBAAA,CAAiB,CAAC,EACnE,OAAO,mBAAmB;AAE7B,SAAO,EAAE,aAAa;AAAA,IACpB,WAAW,aAAa,IAAI;AAAA,IAC5B,UAAU;AAAA,IACV;AAAA,IACA;AAAA,IACA,cAAc;AAAA,MACZ,aAAa;AAAA,IAAA;AAAA,IAEf,GAAG;AAAA,EAAA,CACJ;AACH;AAEA,MAAM,iBAAiB,MAAM,KAAK,eAAe;AAQjD,SAAS,aAAa,OAA2B;AAC/C,QAAM,EAAE,SAAS;AACjB,SAAO,EAAE,oBAAoB,KAAK,IAAI;AACxC;AAEO,SAAS,gBAAgB,OAAuB;AACrD,QAAM,EAAE,gBAAgB,cAAc,GAAG,SAAS;AAClD,SAAO,EAAE,gBAAgB;AAAA,IACvB;AAAA,IACA,GAAG;AAAA,EAAA,CACJ;AACH;"}

package/dist/units/resolvers.cjs

@@ -0,0 +1,114 @@
+"use strict";
+Object.defineProperty(exports, Symbol.toStringTag, { value: "Module" });
+const symbolIndex = {
+  "dolomite-limestone": 641,
+  lime_mudstone: 627,
+  sandstone: 607,
+  "quartz arenite": 607,
+  litharenite: 608,
+  sand: 608,
+  siltstone: 616,
+  silt: 616,
+  siliciclastic: 615,
+  mud: 620,
+  "dolomitic siltstone": 616,
+  shale: 620,
+  limestone: 627,
+  dolomite: 642,
+  conglomerate: 602,
+  carbonate: 627,
+  "dolomite-mudstone": 642,
+  dolostone: 642,
+  mudstone: 620,
+  slate: 703,
+  "sandy-dolomite": 645,
+  quartzite: 702,
+  halite: 668,
+  gypsum: 667,
+  evaporite: 667,
+  claystone: 620,
+  anhydrite: 667,
+  gabbro: 720,
+  basalt: 717,
+  diabase: 717,
+  rhyolite: 722,
+  andesite: 723,
+  till: 681,
+  loess: 684,
+  "calcareous ooze": 653,
+  "siliceous ooze": 653,
+  chalk: 626,
+  gravel: 601,
+  plutonic: 721,
+  granite: 719,
+  clay: 660,
+  syenite: 722,
+  tuff: 711,
+  volcanic: 725,
+  metamorphic: 707,
+  volcaniclastic: 714,
+  migmatite: 709,
+  gneiss: 708,
+  tonalite: 727,
+  granodiorite: 725,
+  monzonite: 723,
+  argillite: 624,
+  diamictite: 681
+};
+const resolveID = (d) => {
+  if (d.lith == null || d.lith.length == 0) {
+    return null;
+  }
+  let liths = [...d.lith];
+  let environs = d.environ.map((d2) => d2.name).join(" ");
+  liths.sort((a, b) => b.prop - a.prop);
+  let sym = null;
+  if (d.unit_name == "clay") {
+    return "650";
+  }
+  if (d.unit_name == "calcareous clay") {
+    return "651";
+  }
+  for (const k of liths) {
+    if (k.name == "sandstone") {
+      if (environs.includes("dune")) {
+        return "609";
+      }
+      if (environs.includes("marine")) {
+        return "608";
+      }
+      if (environs.includes("shore")) {
+        return "611";
+      }
+      if (environs.includes("loess")) {
+        return "686";
+      }
+    }
+    if (k.name == "conglomerate") {
+      if (environs.includes("fluvial")) {
+        return "603";
+      }
+    }
+    if (k.name.includes("tuff")) {
+      return "711";
+    }
+    sym = symbolIndex[k.name];
+    if (sym != null) {
+      return sym;
+    }
+    if (k.type == "volcanic") {
+      return "725";
+    }
+  }
+  return sym;
+};
+const patternScale = {
+  "609": 1.5,
+  "603": 1.5
+};
+const scalePattern = (id) => {
+  return patternScale[`${id}`] ?? 1;
+};
+exports.resolveID = resolveID;
+exports.scalePattern = scalePattern;
+//# sourceMappingURL=resolvers.cjs.map

package/dist/units/resolvers.cjs.map

@@ -0,0 +1 @@
+{"version":3,"file":"resolvers.cjs","sources":["../../src/units/resolvers.ts"],"sourcesContent":["const symbolIndex = {\n  \"dolomite-limestone\": 641,\n  lime_mudstone: 627,\n  sandstone: 607,\n  \"quartz arenite\": 607,\n  litharenite: 608,\n  sand: 608,\n  siltstone: 616,\n  silt: 616,\n  siliciclastic: 615,\n  mud: 620,\n  \"dolomitic siltstone\": 616,\n  shale: 620,\n  limestone: 627,\n  dolomite: 642,\n  conglomerate: 602,\n  carbonate: 627,\n  \"dolomite-mudstone\": 642,\n  dolostone: 642,\n  mudstone: 620,\n  slate: 703,\n  \"sandy-dolomite\": 645,\n  quartzite: 702,\n  halite: 668,\n  gypsum: 667,\n  evaporite: 667,\n  claystone: 620,\n  anhydrite: 667,\n  gabbro: 720,\n  basalt: 717,\n  diabase: 717,\n  rhyolite: 722,\n  andesite: 723,\n  till: 681,\n  loess: 684,\n  \"calcareous ooze\": 653,\n  \"siliceous ooze\": 653,\n  chalk: 626,\n  gravel: 601,\n  plutonic: 721,\n  granite: 719,\n  clay: 660,\n  syenite: 722,\n  tuff: 711,\n  volcanic: 725,\n  metamorphic: 707,\n  volcaniclastic: 714,\n  migmatite: 709,\n  gneiss: 708,\n  tonalite: 727,\n  granodiorite: 725,\n  monzonite: 723,\n  argillite: 624,\n  diamictite: 681,\n};\n\nconst resolveID = (d: any) => {\n  if (d.lith == null || d.lith.length == 0) {\n    return null;\n  }\n  let liths = [...d.lith];\n  let environs = d.environ.map((d) => d.name).join(\" \");\n  liths.sort((a, b) => b.prop - a.prop);\n\n  //console.log(d, d.unit_name, liths.map(d => d.name), environs)\n\n  let sym = null;\n\n  // overrides for IODP columns\n  if (d.unit_name == \"clay\") {\n    return \"650\";\n  }\n  if (d.unit_name == \"calcareous clay\") {\n    return \"651\";\n  }\n\n  for (const k of liths) {\n    if (k.name == \"sandstone\") {\n      // Special cases for sandstone\n      if (environs.includes(\"dune\")) {\n        return \"609\";\n      }\n      if (environs.includes(\"marine\")) {\n        return \"608\";\n      }\n      if (environs.includes(\"shore\")) {\n        return \"611\";\n      }\n      if (environs.includes(\"loess\")) {\n        return \"686\";\n      }\n    }\n\n    if (k.name == \"conglomerate\") {\n      // Special cases for sandstone\n      if (environs.includes(\"fluvial\")) {\n        return \"603\";\n      }\n    }\n\n    if (k.name.includes(\"tuff\")) {\n      return \"711\";\n    }\n    sym = symbolIndex[k.name];\n    if (sym != null) {\n      return sym;\n    }\n\n    if (k.type == \"volcanic\") {\n      return \"725\";\n    }\n  }\n  return sym;\n};\n\nconst patternScale = {\n  \"609\": 1.5,\n  \"603\": 1.5,\n};\n\nconst scalePattern = (id) => {\n  return patternScale[`${id}`] ?? 1;\n};\n\nexport { resolveID, scalePattern };\n"],"names":["d"],"mappings":";;AAAA,MAAM,cAAc;AAAA,EAClB,sBAAsB;AAAA,EACtB,eAAe;AAAA,EACf,WAAW;AAAA,EACX,kBAAkB;AAAA,EAClB,aAAa;AAAA,EACb,MAAM;AAAA,EACN,WAAW;AAAA,EACX,MAAM;AAAA,EACN,eAAe;AAAA,EACf,KAAK;AAAA,EACL,uBAAuB;AAAA,EACvB,OAAO;AAAA,EACP,WAAW;AAAA,EACX,UAAU;AAAA,EACV,cAAc;AAAA,EACd,WAAW;AAAA,EACX,qBAAqB;AAAA,EACrB,WAAW;AAAA,EACX,UAAU;AAAA,EACV,OAAO;AAAA,EACP,kBAAkB;AAAA,EAClB,WAAW;AAAA,EACX,QAAQ;AAAA,EACR,QAAQ;AAAA,EACR,WAAW;AAAA,EACX,WAAW;AAAA,EACX,WAAW;AAAA,EACX,QAAQ;AAAA,EACR,QAAQ;AAAA,EACR,SAAS;AAAA,EACT,UAAU;AAAA,EACV,UAAU;AAAA,EACV,MAAM;AAAA,EACN,OAAO;AAAA,EACP,mBAAmB;AAAA,EACnB,kBAAkB;AAAA,EAClB,OAAO;AAAA,EACP,QAAQ;AAAA,EACR,UAAU;AAAA,EACV,SAAS;AAAA,EACT,MAAM;AAAA,EACN,SAAS;AAAA,EACT,MAAM;AAAA,EACN,UAAU;AAAA,EACV,aAAa;AAAA,EACb,gBAAgB;AAAA,EAChB,WAAW;AAAA,EACX,QAAQ;AAAA,EACR,UAAU;AAAA,EACV,cAAc;AAAA,EACd,WAAW;AAAA,EACX,WAAW;AAAA,EACX,YAAY;AACd;AAEA,MAAM,YAAY,CAAC,MAAW;AAC5B,MAAI,EAAE,QAAQ,QAAQ,EAAE,KAAK,UAAU,GAAG;AACxC,WAAO;AAAA,EACT;AACA,MAAI,QAAQ,CAAC,GAAG,EAAE,IAAI;AACtB,MAAI,WAAW,EAAE,QAAQ,IAAI,CAACA,OAAMA,GAAE,IAAI,EAAE,KAAK,GAAG;AACpD,QAAM,KAAK,CAAC,GAAG,MAAM,EAAE,OAAO,EAAE,IAAI;AAIpC,MAAI,MAAM;AAGV,MAAI,EAAE,aAAa,QAAQ;AACzB,WAAO;AAAA,EACT;AACA,MAAI,EAAE,aAAa,mBAAmB;AACpC,WAAO;AAAA,EACT;AAEA,aAAW,KAAK,OAAO;AACrB,QAAI,EAAE,QAAQ,aAAa;AAEzB,UAAI,SAAS,SAAS,MAAM,GAAG;AAC7B,eAAO;AAAA,MACT;AACA,UAAI,SAAS,SAAS,QAAQ,GAAG;AAC/B,eAAO;AAAA,MACT;AACA,UAAI,SAAS,SAAS,OAAO,GAAG;AAC9B,eAAO;AAAA,MACT;AACA,UAAI,SAAS,SAAS,OAAO,GAAG;AAC9B,eAAO;AAAA,MACT;AAAA,IACF;AAEA,QAAI,EAAE,QAAQ,gBAAgB;AAE5B,UAAI,SAAS,SAAS,SAAS,GAAG;AAChC,eAAO;AAAA,MACT;AAAA,IACF;AAEA,QAAI,EAAE,KAAK,SAAS,MAAM,GAAG;AAC3B,aAAO;AAAA,IACT;AACA,UAAM,YAAY,EAAE,IAAI;AACxB,QAAI,OAAO,MAAM;AACf,aAAO;AAAA,IACT;AAEA,QAAI,EAAE,QAAQ,YAAY;AACxB,aAAO;AAAA,IACT;AAAA,EACF;AACA,SAAO;AACT;AAEA,MAAM,eAAe;AAAA,EACnB,OAAO;AAAA,EACP,OAAO;AACT;AAEA,MAAM,eAAe,CAAC,OAAO;AAC3B,SAAO,aAAa,GAAG,EAAE,EAAE,KAAK;AAClC;;;"}

package/dist/units/resolvers.d.ts

@@ -0,0 +1,3 @@
+declare const resolveID: (d: any) => any;
+declare const scalePattern: (id: any) => any;
+export { resolveID, scalePattern };

package/dist/units/resolvers.js

@@ -0,0 +1,114 @@
+const symbolIndex = {
+  "dolomite-limestone": 641,
+  lime_mudstone: 627,
+  sandstone: 607,
+  "quartz arenite": 607,
+  litharenite: 608,
+  sand: 608,
+  siltstone: 616,
+  silt: 616,
+  siliciclastic: 615,
+  mud: 620,
+  "dolomitic siltstone": 616,
+  shale: 620,
+  limestone: 627,
+  dolomite: 642,
+  conglomerate: 602,
+  carbonate: 627,
+  "dolomite-mudstone": 642,
+  dolostone: 642,
+  mudstone: 620,
+  slate: 703,
+  "sandy-dolomite": 645,
+  quartzite: 702,
+  halite: 668,
+  gypsum: 667,
+  evaporite: 667,
+  claystone: 620,
+  anhydrite: 667,
+  gabbro: 720,
+  basalt: 717,
+  diabase: 717,
+  rhyolite: 722,
+  andesite: 723,
+  till: 681,
+  loess: 684,
+  "calcareous ooze": 653,
+  "siliceous ooze": 653,
+  chalk: 626,
+  gravel: 601,
+  plutonic: 721,
+  granite: 719,
+  clay: 660,
+  syenite: 722,
+  tuff: 711,
+  volcanic: 725,
+  metamorphic: 707,
+  volcaniclastic: 714,
+  migmatite: 709,
+  gneiss: 708,
+  tonalite: 727,
+  granodiorite: 725,
+  monzonite: 723,
+  argillite: 624,
+  diamictite: 681
+};
+const resolveID = (d) => {
+  if (d.lith == null || d.lith.length == 0) {
+    return null;
+  }
+  let liths = [...d.lith];
+  let environs = d.environ.map((d2) => d2.name).join(" ");
+  liths.sort((a, b) => b.prop - a.prop);
+  let sym = null;
+  if (d.unit_name == "clay") {
+    return "650";
+  }
+  if (d.unit_name == "calcareous clay") {
+    return "651";
+  }
+  for (const k of liths) {
+    if (k.name == "sandstone") {
+      if (environs.includes("dune")) {
+        return "609";
+      }
+      if (environs.includes("marine")) {
+        return "608";
+      }
+      if (environs.includes("shore")) {
+        return "611";
+      }
+      if (environs.includes("loess")) {
+        return "686";
+      }
+    }
+    if (k.name == "conglomerate") {
+      if (environs.includes("fluvial")) {
+        return "603";
+      }
+    }
+    if (k.name.includes("tuff")) {
+      return "711";
+    }
+    sym = symbolIndex[k.name];
+    if (sym != null) {
+      return sym;
+    }
+    if (k.type == "volcanic") {
+      return "725";
+    }
+  }
+  return sym;
+};
+const patternScale = {
+  "609": 1.5,
+  "603": 1.5
+};
+const scalePattern = (id) => {
+  return patternScale[`${id}`] ?? 1;
+};
+export {
+  resolveID,
+  scalePattern
+};
+//# sourceMappingURL=resolvers.js.map

package/dist/units/resolvers.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"resolvers.js","sources":["../../src/units/resolvers.ts"],"sourcesContent":["const symbolIndex = {\n  \"dolomite-limestone\": 641,\n  lime_mudstone: 627,\n  sandstone: 607,\n  \"quartz arenite\": 607,\n  litharenite: 608,\n  sand: 608,\n  siltstone: 616,\n  silt: 616,\n  siliciclastic: 615,\n  mud: 620,\n  \"dolomitic siltstone\": 616,\n  shale: 620,\n  limestone: 627,\n  dolomite: 642,\n  conglomerate: 602,\n  carbonate: 627,\n  \"dolomite-mudstone\": 642,\n  dolostone: 642,\n  mudstone: 620,\n  slate: 703,\n  \"sandy-dolomite\": 645,\n  quartzite: 702,\n  halite: 668,\n  gypsum: 667,\n  evaporite: 667,\n  claystone: 620,\n  anhydrite: 667,\n  gabbro: 720,\n  basalt: 717,\n  diabase: 717,\n  rhyolite: 722,\n  andesite: 723,\n  till: 681,\n  loess: 684,\n  \"calcareous ooze\": 653,\n  \"siliceous ooze\": 653,\n  chalk: 626,\n  gravel: 601,\n  plutonic: 721,\n  granite: 719,\n  clay: 660,\n  syenite: 722,\n  tuff: 711,\n  volcanic: 725,\n  metamorphic: 707,\n  volcaniclastic: 714,\n  migmatite: 709,\n  gneiss: 708,\n  tonalite: 727,\n  granodiorite: 725,\n  monzonite: 723,\n  argillite: 624,\n  diamictite: 681,\n};\n\nconst resolveID = (d: any) => {\n  if (d.lith == null || d.lith.length == 0) {\n    return null;\n  }\n  let liths = [...d.lith];\n  let environs = d.environ.map((d) => d.name).join(\" \");\n  liths.sort((a, b) => b.prop - a.prop);\n\n  //console.log(d, d.unit_name, liths.map(d => d.name), environs)\n\n  let sym = null;\n\n  // overrides for IODP columns\n  if (d.unit_name == \"clay\") {\n    return \"650\";\n  }\n  if (d.unit_name == \"calcareous clay\") {\n    return \"651\";\n  }\n\n  for (const k of liths) {\n    if (k.name == \"sandstone\") {\n      // Special cases for sandstone\n      if (environs.includes(\"dune\")) {\n        return \"609\";\n      }\n      if (environs.includes(\"marine\")) {\n        return \"608\";\n      }\n      if (environs.includes(\"shore\")) {\n        return \"611\";\n      }\n      if (environs.includes(\"loess\")) {\n        return \"686\";\n      }\n    }\n\n    if (k.name == \"conglomerate\") {\n      // Special cases for sandstone\n      if (environs.includes(\"fluvial\")) {\n        return \"603\";\n      }\n    }\n\n    if (k.name.includes(\"tuff\")) {\n      return \"711\";\n    }\n    sym = symbolIndex[k.name];\n    if (sym != null) {\n      return sym;\n    }\n\n    if (k.type == \"volcanic\") {\n      return \"725\";\n    }\n  }\n  return sym;\n};\n\nconst patternScale = {\n  \"609\": 1.5,\n  \"603\": 1.5,\n};\n\nconst scalePattern = (id) => {\n  return patternScale[`${id}`] ?? 1;\n};\n\nexport { resolveID, scalePattern };\n"],"names":["d"],"mappings":"AAAA,MAAM,cAAc;AAAA,EAClB,sBAAsB;AAAA,EACtB,eAAe;AAAA,EACf,WAAW;AAAA,EACX,kBAAkB;AAAA,EAClB,aAAa;AAAA,EACb,MAAM;AAAA,EACN,WAAW;AAAA,EACX,MAAM;AAAA,EACN,eAAe;AAAA,EACf,KAAK;AAAA,EACL,uBAAuB;AAAA,EACvB,OAAO;AAAA,EACP,WAAW;AAAA,EACX,UAAU;AAAA,EACV,cAAc;AAAA,EACd,WAAW;AAAA,EACX,qBAAqB;AAAA,EACrB,WAAW;AAAA,EACX,UAAU;AAAA,EACV,OAAO;AAAA,EACP,kBAAkB;AAAA,EAClB,WAAW;AAAA,EACX,QAAQ;AAAA,EACR,QAAQ;AAAA,EACR,WAAW;AAAA,EACX,WAAW;AAAA,EACX,WAAW;AAAA,EACX,QAAQ;AAAA,EACR,QAAQ;AAAA,EACR,SAAS;AAAA,EACT,UAAU;AAAA,EACV,UAAU;AAAA,EACV,MAAM;AAAA,EACN,OAAO;AAAA,EACP,mBAAmB;AAAA,EACnB,kBAAkB;AAAA,EAClB,OAAO;AAAA,EACP,QAAQ;AAAA,EACR,UAAU;AAAA,EACV,SAAS;AAAA,EACT,MAAM;AAAA,EACN,SAAS;AAAA,EACT,MAAM;AAAA,EACN,UAAU;AAAA,EACV,aAAa;AAAA,EACb,gBAAgB;AAAA,EAChB,WAAW;AAAA,EACX,QAAQ;AAAA,EACR,UAAU;AAAA,EACV,cAAc;AAAA,EACd,WAAW;AAAA,EACX,WAAW;AAAA,EACX,YAAY;AACd;AAEA,MAAM,YAAY,CAAC,MAAW;AAC5B,MAAI,EAAE,QAAQ,QAAQ,EAAE,KAAK,UAAU,GAAG;AACxC,WAAO;AAAA,EACT;AACA,MAAI,QAAQ,CAAC,GAAG,EAAE,IAAI;AACtB,MAAI,WAAW,EAAE,QAAQ,IAAI,CAACA,OAAMA,GAAE,IAAI,EAAE,KAAK,GAAG;AACpD,QAAM,KAAK,CAAC,GAAG,MAAM,EAAE,OAAO,EAAE,IAAI;AAIpC,MAAI,MAAM;AAGV,MAAI,EAAE,aAAa,QAAQ;AACzB,WAAO;AAAA,EACT;AACA,MAAI,EAAE,aAAa,mBAAmB;AACpC,WAAO;AAAA,EACT;AAEA,aAAW,KAAK,OAAO;AACrB,QAAI,EAAE,QAAQ,aAAa;AAEzB,UAAI,SAAS,SAAS,MAAM,GAAG;AAC7B,eAAO;AAAA,MACT;AACA,UAAI,SAAS,SAAS,QAAQ,GAAG;AAC/B,eAAO;AAAA,MACT;AACA,UAAI,SAAS,SAAS,OAAO,GAAG;AAC9B,eAAO;AAAA,MACT;AACA,UAAI,SAAS,SAAS,OAAO,GAAG;AAC9B,eAAO;AAAA,MACT;AAAA,IACF;AAEA,QAAI,EAAE,QAAQ,gBAAgB;AAE5B,UAAI,SAAS,SAAS,SAAS,GAAG;AAChC,eAAO;AAAA,MACT;AAAA,IACF;AAEA,QAAI,EAAE,KAAK,SAAS,MAAM,GAAG;AAC3B,aAAO;AAAA,IACT;AACA,UAAM,YAAY,EAAE,IAAI;AACxB,QAAI,OAAO,MAAM;AACf,aAAO;AAAA,IACT;AAEA,QAAI,EAAE,QAAQ,YAAY;AACxB,aAAO;AAAA,IACT;AAAA,EACF;AACA,SAAO;AACT;AAEA,MAAM,eAAe;AAAA,EACnB,OAAO;AAAA,EACP,OAAO;AACT;AAEA,MAAM,eAAe,CAAC,OAAO;AAC3B,SAAO,aAAa,GAAG,EAAE,EAAE,KAAK;AAClC;"}

package/dist/units/types.d.ts

@@ -0,0 +1,16 @@
+export interface IUnit {
+    unit_id: number;
+    col_id: number;
+    section_id: number;
+    t_age: number;
+    b_age: number;
+    [x: string]: any;
+    patternID?: string | number;
+    color?: string;
+}
+export interface RectBounds {
+    x: number;
+    y: number;
+    width: number;
+    height: number;
+}

package/package.json

@@ -1,64 +1,76 @@
 {
   "name": "@macrostrat/column-views",
-  "version": "2.4.3",
+  "version": "3.0.0",
   "description": "Data views for Macrostrat stratigraphic columns",
+  "repository": {
+    "type": "git",
+    "url": "https://github.com/UW-Macrostrat/web-components.git",
+    "directory": "packages/column-views"
+  },
+  "license": "MIT",
   "type": "module",
   "source": "src/index.ts",
-  "main": "dist/esm/index.js",
-  "types": "dist/esm/index.d.ts",
-  "node": "dist/node/index.js",
+  "main": "dist/index.js",
+  "node": "dist/index.cjs",
+  "types": "dist/index.d.ts",
+  "style": "dist/column-views.css",
+  "files": [
+    "src",
+    "dist"
+  ],
   "sideEffects": [
     "**/*.css"
   ],
   "exports": {
     ".": {
       "source": "./src/index.ts",
-      "import": "./dist/esm/index.js",
-      "types": "./dist/esm/index.d.ts",
-      "node": "./dist/node/index.js"
-    }
-  },
-  "targets": {
-    "node": {
-      "engines": {
-        "node": ">=14"
-      }
-    }
+      "import": "./dist/index.js",
+      "require": "./dist/index.cjs",
+      "types": "./dist/index.d.ts",
+      "style": "./dist/column-views.css"
+    },
+    "./package.json": "./package.json",
+    "./style.css": "./dist/column-views.css",
+    "./dist/column-views.css": "./dist/column-views.css"
   },
   "scripts": {
-    "build": "rm -rf dist && parcel build"
+    "build": "bundle-library ."
+  },
+  "peerDependencies": {
+    "react": "^18.0.0||^19.0.0"
   },
   "dependencies": {
-    "@macrostrat/api-types": "^1.1.4",
-    "@macrostrat/color-utils": "^1.1.2",
-    "@macrostrat/column-components": "^1.4.2",
-    "@macrostrat/data-components": "^0.2.2",
+    "@blueprintjs/core": "^6.0.0",
+    "@macrostrat/api-types": "^1.1.5",
+    "@macrostrat/color-utils": "^1.2.0",
+    "@macrostrat/column-components": "^2.0.0",
+    "@macrostrat/data-components": "^1.0.0",
     "@macrostrat/hyper": "^3.0.6",
-    "@macrostrat/map-interface": "^1.6.0",
-    "@macrostrat/map-styles": "^1.2.4",
-    "@macrostrat/mapbox-react": "^2.6.4",
-    "@macrostrat/mapbox-utils": "^1.6.1",
-    "@macrostrat/stratigraphy-utils": "^1.1.0",
-    "@macrostrat/svg-map-components": "^1.0.7",
-    "@macrostrat/timescale": "^2.3.2",
-    "@macrostrat/ui-components": "^4.5.3",
-    "@turf/boolean-point-in-polygon": "^7.3.1",
-    "@turf/buffer": "^7.2.0",
-    "@turf/centroid": "^7.2.0",
-    "@turf/distance": "^7.2.0",
-    "@turf/line-intersect": "^7.2.0",
-    "@turf/nearest-point-on-line": "^7.2.0",
+    "@macrostrat/map-interface": "^2.0.0",
+    "@macrostrat/map-styles": "^2.0.0",
+    "@macrostrat/mapbox-react": "^3.0.0",
+    "@macrostrat/mapbox-utils": "^1.7.0",
+    "@macrostrat/stratigraphy-utils": "^1.2.0",
+    "@macrostrat/svg-map-components": "^2.0.0",
+    "@macrostrat/timescale": "^3.0.0",
+    "@macrostrat/ui-components": "^5.0.0",
+    "@turf/boolean-point-in-polygon": "^7.3.2",
+    "@turf/buffer": "^7.3.2",
+    "@turf/centroid": "^7.3.2",
+    "@turf/distance": "^7.3.2",
+    "@turf/line-intersect": "^7.3.2",
+    "@turf/nearest-point-on-line": "^7.3.2",
     "@types/chroma-js": "^3.1.1",
     "@types/d3-format": "^3.0.4",
     "@types/d3-geo": "^3.1.0",
     "@types/d3-shape": "^3.1.7",
     "@types/topojson-client": "^3.1.5",
     "@visx/axis": "^3.12.0",
-    "chroma-js": "^3.1.2",
+    "chroma-js": "^3.2.0",
     "classnames": "^2.5.1",
     "cross-fetch": "^4.1.0",
     "d3-array": "^3.2.4",
-    "d3-format": "^3.1.0",
+    "d3-format": "^3.1.2",
     "d3-geo": "^3.1.1",
     "d3-geo-voronoi": "^2.1.0",
     "d3-path": "^3.1.0",
@@ -72,25 +84,10 @@
     "zustand": "^5.0.3",
     "zustand-computed": "^2.0.2"
   },
-  "peerDependencies": {
-    "@blueprintjs/core": "^5.0.0",
-    "react": "^16.13.1||^17||^18||^19"
-  },
-  "repository": {
-    "type": "git",
-    "url": "https://github.com/UW-Macrostrat/web-components.git",
-    "directory": "packages/column-views"
-  },
   "devDependencies": {
-    "@types/d3-path": "^3.1.1",
-    "@types/d3-scale": "^4.0.9",
-    "parcel": "^2.16.0",
-    "postcss": "^8.0.0",
-    "postcss-modules": "^6.0.0",
-    "vite": "^7.3.0"
+    "@macrostrat/web-components-bundler": "1.0.0"
   },
-  "files": [
-    "dist",
-    "src"
-  ]
+  "publishConfig": {
+    "access": "public"
+  }
 }

package/src/facets/measurements/sgp.ts

@@ -46,8 +46,12 @@ export function SGPMeasurementsColumn({ columnID }) {
   });
 }
 
-function SGPSamplesNote(props: { note: any; focused: boolean }) {
-  const { note, focused } = props;
+function SGPSamplesNote(props: {
+  note: any;
+  focused: boolean;
+  sgpBaseURL?: string;
+}) {
+  const { note, focused, sgpBaseURL = "https://sgp-search.io" } = props;
   const sgp_samples = note?.data;
 
   if (sgp_samples == null || sgp_samples.length === 0) return null;
@@ -55,7 +59,10 @@ function SGPSamplesNote(props: { note: any; focused: boolean }) {
   return h(TruncatedList, {
     className: "sgp-samples",
     data: sgp_samples,
-    itemRenderer: (p) => h("span", p.data.name),
+    itemRenderer: (p) => {
+      const sgpLink = sgpBaseURL + `/samples/${p.data.id}`;
+      return h("a", { href: sgpLink, target: "_blank" }, p.data.name);
+    },
     maxItems: focused ? Infinity : 5,
   });
 }

package/src/unit-details/popover.module.sass

@@ -2,10 +2,10 @@
   position: absolute
   pointer-events: none
 
-  :global(.bp5-overlay)
+  :global(.bp6-overlay)
     pointer-events: all
 
-  :global(.bp5-popover-target)
+  :global(.bp6-popover-target)
     height: 100%
     width: 100%
     display: block
@@ -13,7 +13,7 @@
     pointer-events: none
     outline: 2px solid #f22
 
-  :global(.bp5-popover-content)
+  :global(.bp6-popover-content)
     overflow: hidden
 
 .legend-panel

package/dist/esm/column-views.006d5180.js

@@ -1,97 +0,0 @@
-const $d3e69bd163d41f63$var$symbolIndex = {
-    "dolomite-limestone": 641,
-    lime_mudstone: 627,
-    sandstone: 607,
-    "quartz arenite": 607,
-    litharenite: 608,
-    sand: 608,
-    siltstone: 616,
-    silt: 616,
-    siliciclastic: 615,
-    mud: 620,
-    "dolomitic siltstone": 616,
-    shale: 620,
-    limestone: 627,
-    dolomite: 642,
-    conglomerate: 602,
-    carbonate: 627,
-    "dolomite-mudstone": 642,
-    dolostone: 642,
-    mudstone: 620,
-    slate: 703,
-    "sandy-dolomite": 645,
-    quartzite: 702,
-    halite: 668,
-    gypsum: 667,
-    evaporite: 667,
-    claystone: 620,
-    anhydrite: 667,
-    gabbro: 720,
-    basalt: 717,
-    diabase: 717,
-    rhyolite: 722,
-    andesite: 723,
-    till: 681,
-    loess: 684,
-    "calcareous ooze": 653,
-    "siliceous ooze": 653,
-    chalk: 626,
-    gravel: 601,
-    plutonic: 721,
-    granite: 719,
-    clay: 660,
-    syenite: 722,
-    tuff: 711,
-    volcanic: 725,
-    metamorphic: 707,
-    volcaniclastic: 714,
-    migmatite: 709,
-    gneiss: 708,
-    tonalite: 727,
-    granodiorite: 725,
-    monzonite: 723,
-    argillite: 624,
-    diamictite: 681
-};
-const $d3e69bd163d41f63$export$7be7d732f3de9464 = (d)=>{
-    if (d.lith == null || d.lith.length == 0) return null;
-    let liths = [
-        ...d.lith
-    ];
-    let environs = d.environ.map((d)=>d.name).join(" ");
-    liths.sort((a, b)=>b.prop - a.prop);
-    //console.log(d, d.unit_name, liths.map(d => d.name), environs)
-    let sym = null;
-    // overrides for IODP columns
-    if (d.unit_name == "clay") return "650";
-    if (d.unit_name == "calcareous clay") return "651";
-    for (const k of liths){
-        if (k.name == "sandstone") {
-            // Special cases for sandstone
-            if (environs.includes("dune")) return "609";
-            if (environs.includes("marine")) return "608";
-            if (environs.includes("shore")) return "611";
-            if (environs.includes("loess")) return "686";
-        }
-        if (k.name == "conglomerate") {
-            // Special cases for sandstone
-            if (environs.includes("fluvial")) return "603";
-        }
-        if (k.name.includes("tuff")) return "711";
-        sym = $d3e69bd163d41f63$var$symbolIndex[k.name];
-        if (sym != null) return sym;
-        if (k.type == "volcanic") return "725";
-    }
-    return sym;
-};
-const $d3e69bd163d41f63$var$patternScale = {
-    "609": 1.5,
-    "603": 1.5
-};
-const $d3e69bd163d41f63$export$e8deec7b02ce51eb = (id)=>{
-    return $d3e69bd163d41f63$var$patternScale[`${id}`] ?? 1;
-};
-
-
-export {$d3e69bd163d41f63$export$7be7d732f3de9464 as resolveID, $d3e69bd163d41f63$export$e8deec7b02ce51eb as scalePattern};
-//# sourceMappingURL=column-views.006d5180.js.map

package/dist/esm/column-views.006d5180.js.map

@@ -1 +0,0 @@
-{"mappings":"AAAA,MAAM,oCAAc;IAClB,sBAAsB;IACtB,eAAe;IACf,WAAW;IACX,kBAAkB;IAClB,aAAa;IACb,MAAM;IACN,WAAW;IACX,MAAM;IACN,eAAe;IACf,KAAK;IACL,uBAAuB;IACvB,OAAO;IACP,WAAW;IACX,UAAU;IACV,cAAc;IACd,WAAW;IACX,qBAAqB;IACrB,WAAW;IACX,UAAU;IACV,OAAO;IACP,kBAAkB;IAClB,WAAW;IACX,QAAQ;IACR,QAAQ;IACR,WAAW;IACX,WAAW;IACX,WAAW;IACX,QAAQ;IACR,QAAQ;IACR,SAAS;IACT,UAAU;IACV,UAAU;IACV,MAAM;IACN,OAAO;IACP,mBAAmB;IACnB,kBAAkB;IAClB,OAAO;IACP,QAAQ;IACR,UAAU;IACV,SAAS;IACT,MAAM;IACN,SAAS;IACT,MAAM;IACN,UAAU;IACV,aAAa;IACb,gBAAgB;IAChB,WAAW;IACX,QAAQ;IACR,UAAU;IACV,cAAc;IACd,WAAW;IACX,WAAW;IACX,YAAY;AACd;AAEA,MAAM,4CAAY,CAAC;IACjB,IAAI,EAAE,IAAI,IAAI,QAAQ,EAAE,IAAI,CAAC,MAAM,IAAI,GACrC,OAAO;IAET,IAAI,QAAQ;WAAI,EAAE,IAAI;KAAC;IACvB,IAAI,WAAW,EAAE,OAAO,CAAC,GAAG,CAAC,CAAC,IAAM,EAAE,IAAI,EAAE,IAAI,CAAC;IACjD,MAAM,IAAI,CAAC,CAAC,GAAG,IAAM,EAAE,IAAI,GAAG,EAAE,IAAI;IAEpC,+DAA+D;IAE/D,IAAI,MAAM;IAEV,6BAA6B;IAC7B,IAAI,EAAE,SAAS,IAAI,QACjB,OAAO;IAET,IAAI,EAAE,SAAS,IAAI,mBACjB,OAAO;IAGT,KAAK,MAAM,KAAK,MAAO;QACrB,IAAI,EAAE,IAAI,IAAI,aAAa;YACzB,8BAA8B;YAC9B,IAAI,SAAS,QAAQ,CAAC,SACpB,OAAO;YAET,IAAI,SAAS,QAAQ,CAAC,WACpB,OAAO;YAET,IAAI,SAAS,QAAQ,CAAC,UACpB,OAAO;YAET,IAAI,SAAS,QAAQ,CAAC,UACpB,OAAO;QAEX;QAEA,IAAI,EAAE,IAAI,IAAI,gBAAgB;YAC5B,8BAA8B;YAC9B,IAAI,SAAS,QAAQ,CAAC,YACpB,OAAO;QAEX;QAEA,IAAI,EAAE,IAAI,CAAC,QAAQ,CAAC,SAClB,OAAO;QAET,MAAM,iCAAW,CAAC,EAAE,IAAI,CAAC;QACzB,IAAI,OAAO,MACT,OAAO;QAGT,IAAI,EAAE,IAAI,IAAI,YACZ,OAAO;IAEX;IACA,OAAO;AACT;AAEA,MAAM,qCAAe;IACnB,OAAO;IACP,OAAO;AACT;AAEA,MAAM,4CAAe,CAAC;IACpB,OAAO,kCAAY,CAAC,GAAG,IAAI,CAAC,IAAI;AAClC","sources":["packages/column-views/src/units/resolvers.ts"],"sourcesContent":["const symbolIndex = {\n  \"dolomite-limestone\": 641,\n  lime_mudstone: 627,\n  sandstone: 607,\n  \"quartz arenite\": 607,\n  litharenite: 608,\n  sand: 608,\n  siltstone: 616,\n  silt: 616,\n  siliciclastic: 615,\n  mud: 620,\n  \"dolomitic siltstone\": 616,\n  shale: 620,\n  limestone: 627,\n  dolomite: 642,\n  conglomerate: 602,\n  carbonate: 627,\n  \"dolomite-mudstone\": 642,\n  dolostone: 642,\n  mudstone: 620,\n  slate: 703,\n  \"sandy-dolomite\": 645,\n  quartzite: 702,\n  halite: 668,\n  gypsum: 667,\n  evaporite: 667,\n  claystone: 620,\n  anhydrite: 667,\n  gabbro: 720,\n  basalt: 717,\n  diabase: 717,\n  rhyolite: 722,\n  andesite: 723,\n  till: 681,\n  loess: 684,\n  \"calcareous ooze\": 653,\n  \"siliceous ooze\": 653,\n  chalk: 626,\n  gravel: 601,\n  plutonic: 721,\n  granite: 719,\n  clay: 660,\n  syenite: 722,\n  tuff: 711,\n  volcanic: 725,\n  metamorphic: 707,\n  volcaniclastic: 714,\n  migmatite: 709,\n  gneiss: 708,\n  tonalite: 727,\n  granodiorite: 725,\n  monzonite: 723,\n  argillite: 624,\n  diamictite: 681,\n};\n\nconst resolveID = (d: any) => {\n  if (d.lith == null || d.lith.length == 0) {\n    return null;\n  }\n  let liths = [...d.lith];\n  let environs = d.environ.map((d) => d.name).join(\" \");\n  liths.sort((a, b) => b.prop - a.prop);\n\n  //console.log(d, d.unit_name, liths.map(d => d.name), environs)\n\n  let sym = null;\n\n  // overrides for IODP columns\n  if (d.unit_name == \"clay\") {\n    return \"650\";\n  }\n  if (d.unit_name == \"calcareous clay\") {\n    return \"651\";\n  }\n\n  for (const k of liths) {\n    if (k.name == \"sandstone\") {\n      // Special cases for sandstone\n      if (environs.includes(\"dune\")) {\n        return \"609\";\n      }\n      if (environs.includes(\"marine\")) {\n        return \"608\";\n      }\n      if (environs.includes(\"shore\")) {\n        return \"611\";\n      }\n      if (environs.includes(\"loess\")) {\n        return \"686\";\n      }\n    }\n\n    if (k.name == \"conglomerate\") {\n      // Special cases for sandstone\n      if (environs.includes(\"fluvial\")) {\n        return \"603\";\n      }\n    }\n\n    if (k.name.includes(\"tuff\")) {\n      return \"711\";\n    }\n    sym = symbolIndex[k.name];\n    if (sym != null) {\n      return sym;\n    }\n\n    if (k.type == \"volcanic\") {\n      return \"725\";\n    }\n  }\n  return sym;\n};\n\nconst patternScale = {\n  \"609\": 1.5,\n  \"603\": 1.5,\n};\n\nconst scalePattern = (id) => {\n  return patternScale[`${id}`] ?? 1;\n};\n\nexport { resolveID, scalePattern };\n"],"names":[],"version":3,"file":"column-views.006d5180.js.map"}