@macrostrat/column-views 3.9.0 → 3.10.0

package/dist/units/index.js

@@ -3,13 +3,11 @@ import { useGeologicPattern, useColumnLayout, LithologyColumn } from "@macrostra
 import { UnitNamesColumn } from "./names.js";
 import { UnitBoxes } from "./boxes.js";
 import { useInDarkMode } from "@macrostrat/ui-components";
-import { getMixedUnitColor } from "./colors.js";
-import { flattenLithologies, getMixedColorForData } from "./colors.js";
+import { getBestFGDCPatternForUnit, getMixedUnitColor } from "@macrostrat/stratigraphy-utils";
 import { TrackedLabeledUnit } from "./composite.js";
 import { AnnotatedUnitsColumn, ColumnNotesProvider, CompositeUnitComponent, CompositeUnitsColumn, LabelTrackerProvider, SectionLabelsColumn } from "./composite.js";
 import { useLithologies, useEnvironments } from "@macrostrat/data-provider";
 import { useMemo } from "react";
-import { resolveID } from "./resolvers.js";
 function UnitsColumn({ width = 100 }) {
   return h(LithologyColumn, { width }, h(UnitBoxes));
 }
@@ -49,7 +47,7 @@ function UnitComponent({
   let reducedWidth = _nColumns;
   if ("layout" in division) {
     const layout = division.layout;
-    _nColumns = Math.min(_nColumns, layout.totalColumns);
+    _nColumns = layout.totalColumns;
     columnIx = layout.column;
     reducedWidth = width / layout.totalColumns / layout.nColumns;
     x = columnIx * width / _nColumns;
@@ -73,7 +71,7 @@ function useUnitColor(unit, opts = {}) {
 function ColoredUnitComponent(props) {
   const backgroundColor = useUnitColor(props.division);
   const patternID = useMemo(() => {
-    return resolveID(props.division);
+    return getBestFGDCPatternForUnit(props.division);
   }, [props.division?.unit_id]);
   const fill = useGeologicPattern(patternID);
   return h(UnitComponent, {
@@ -102,7 +100,7 @@ function useUnitColorByEnvironment(unit, opts = {}) {
 function EnvironmentColoredUnitComponent(props) {
   const backgroundColor = useUnitColorByEnvironment(props.division);
   const patternID = useMemo(() => {
-    return resolveID(props.division);
+    return getBestFGDCPatternForUnit(props.division);
   }, [props.division?.unit_id]);
   const fill = useGeologicPattern(patternID);
   return h(UnitComponent, {
@@ -125,9 +123,6 @@ export {
   TrackedLabeledUnit,
   UnitComponent,
   UnitsColumn,
-  flattenLithologies,
-  getMixedColorForData,
-  getMixedUnitColor,
   useUnitColor,
   useUnitColorByEnvironment
 };

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 { UnitWithLayoutParameters } 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: UnitWithLayoutParameters<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 (\"layout\" in division) {\n    const layout = division.layout;\n    _nColumns = Math.min(_nColumns, layout.totalColumns);\n    columnIx = layout.column;\n    reducedWidth = width / layout.totalColumns / layout.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 } from \"./boxes\";\nimport { useColumnLayout } from \"@macrostrat/column-components\";\nimport { useInDarkMode } from \"@macrostrat/ui-components\";\nimport {\n  getBestFGDCPatternForUnit,\n  getMixedUnitColor,\n} from \"@macrostrat/stratigraphy-utils\";\nimport { TrackedLabeledUnit } from \"./composite\";\nimport { useEnvironments, useLithologies } from \"@macrostrat/data-provider\";\nimport { useMemo } from \"react\";\nimport { BaseUnit, Lithology } from \"@macrostrat/api-types\";\nimport { UnitWithLayoutParameters } from \"../prepare-units/helpers.ts\";\n\nexport * from \"./composite\";\nexport * from \"./types\";\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: UnitWithLayoutParameters<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 (\"layout\" in division) {\n    const layout = division.layout;\n    _nColumns = layout.totalColumns;\n    columnIx = layout.column;\n    reducedWidth = width / layout.totalColumns / layout.nColumns;\n    x = (columnIx * width) / _nColumns;\n  }\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 getBestFGDCPatternForUnit(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 getBestFGDCPatternForUnit(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"],"names":[],"mappings":"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"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@macrostrat/column-views",
-  "version": "3.9.0",
+  "version": "3.10.0",
   "description": "Data views for Macrostrat stratigraphic columns",
   "repository": {
     "type": "git",
@@ -46,50 +46,29 @@
   },
   "dependencies": {
     "@blueprintjs/core": "^6.14.0",
-    "@macrostrat/api-types": "^1.2.0",
+    "@macrostrat/api-types": "^1.3.0",
     "@macrostrat/color-utils": "^1.2.2",
     "@macrostrat/column-components": "^2.1.0",
     "@macrostrat/data-components": "^1.5.1",
     "@macrostrat/data-provider": "^1.2.0",
     "@macrostrat/hyper": "^3.1.1",
-    "@macrostrat/map-interface": "^2.3.1",
-    "@macrostrat/map-styles": "^2.2.7",
-    "@macrostrat/mapbox-react": "^3.3.3",
-    "@macrostrat/mapbox-utils": "^1.8.0",
-    "@macrostrat/scoped-store": "^1.0.1",
-    "@macrostrat/stratigraphy-utils": "^1.3.0",
-    "@macrostrat/svg-map-components": "^2.0.3",
+    "@macrostrat/map-views": "^1.0.0",
+    "@macrostrat/scoped-store": "^1.1.0",
+    "@macrostrat/stratigraphy-utils": "^1.4.0",
     "@macrostrat/timescale": "^3.2.0",
     "@macrostrat/ui-components": "^5.2.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.2.0",
     "classnames": "^2.5.1",
-    "cross-fetch": "^4.1.0",
     "d3-array": "^3.2.4",
     "d3-format": "^3.1.2",
-    "d3-geo": "^3.1.1",
-    "d3-geo-voronoi": "^2.1.0",
     "d3-path": "^3.1.0",
     "d3-scale": "^4.0.2",
     "d3-shape": "^3.2.0",
-    "jotai": "^2.20.0",
-    "mapbox-gl": "^3.0.0",
-    "p-map": "^7.0.4",
-    "react-spring": "^9.7.5",
-    "topojson-client": "^3.1.0",
-    "zustand": "^5.0.3",
-    "zustand-computed": "^2.0.2"
+    "jotai": "^2.20.0"
   },
   "devDependencies": {
     "@macrostrat/web-components-bundler": "1.0.1",

package/src/index.ts

@@ -5,8 +5,10 @@ export * from "./prepare-units";
 export * from "./animated-age-window";
 export * from "./column";
 export * from "./unit-details";
-export * from "./maps";
 export * from "./age-model-overlay";
 export * from "./correlation-chart";
 export * from "./notes";
 export * from "./facets";
+
+/** Legacy views */
+export * from "@macrostrat/map-views";

package/src/units/boxes.ts

@@ -11,15 +11,18 @@ import {
 import { SizeAwareLabel, Clickable } from "@macrostrat/ui-components";
 import hyper from "@macrostrat/hyper";
 import { ReactNode, useContext, useMemo } from "react";
-import { resolveID, scalePattern } from "./resolvers";
 import { useUnitSelectionTarget } from "../data-provider";
 import { useLithologies } from "@macrostrat/data-provider";
 import { IUnit } from "./types";
 import styles from "./boxes.module.sass";
 import classNames from "classnames";
 import { getUnitHeightRange } from "../prepare-units/utils";
-import { getMixedUnitColor } from "./colors";
 import type { RectBounds } from "./types";
+import {
+  getBestFGDCPatternForUnit,
+  scalePattern,
+  getMixedUnitColor,
+} from "@macrostrat/stratigraphy-utils";
 
 const h = hyper.styled(styles);
 
@@ -158,7 +161,7 @@ function Unit(props: UnitProps) {
     overflowTop: hasOverflowTop,
     overflowBottom: hasOverflowBottom,
   };
-  const _patternID = patternID ?? resolveID(d);
+  const _patternID = patternID ?? getBestFGDCPatternForUnit(d);
   let _fill = fill ?? useGeologicPattern(_patternID, defaultFill);
 
   const hasBackgroundColor = backgroundColor != null;
@@ -289,7 +292,7 @@ function UnitBoxes<T>(props: {
 
   return h(
     PatternDefsProvider,
-    { resolveID, scalePattern },
+    { resolveID: getBestFGDCPatternForUnit, scalePattern },
     h("g.divisions", children),
   );
 }

package/src/units/index.ts

@@ -5,20 +5,21 @@ import {
 } from "@macrostrat/column-components";
 import { UnitNamesColumn } from "./names";
 import { ICompositeUnitProps } from "./composite";
-import { UnitBoxes, UnitProps } from "./boxes";
+import { UnitBoxes } from "./boxes";
 import { useColumnLayout } from "@macrostrat/column-components";
 import { useInDarkMode } from "@macrostrat/ui-components";
-import { getMixedUnitColor } from "./colors";
+import {
+  getBestFGDCPatternForUnit,
+  getMixedUnitColor,
+} from "@macrostrat/stratigraphy-utils";
 import { TrackedLabeledUnit } from "./composite";
 import { useEnvironments, useLithologies } from "@macrostrat/data-provider";
 import { useMemo } from "react";
-import { resolveID } from "./resolvers";
 import { BaseUnit, Lithology } from "@macrostrat/api-types";
 import { UnitWithLayoutParameters } from "../prepare-units/helpers.ts";
 
 export * from "./composite";
 export * from "./types";
-export * from "./colors";
 
 export function UnitsColumn({ width = 100 }) {
   /*
@@ -80,11 +81,12 @@ export function UnitComponent<T extends BaseUnit>({
   let reducedWidth = _nColumns;
   if ("layout" in division) {
     const layout = division.layout;
-    _nColumns = Math.min(_nColumns, layout.totalColumns);
+    _nColumns = layout.totalColumns;
     columnIx = layout.column;
     reducedWidth = width / layout.totalColumns / layout.nColumns;
     x = (columnIx * width) / _nColumns;
   }
+
   return h(TrackedLabeledUnit, {
     division,
     ...rest,
@@ -115,7 +117,7 @@ export function ColoredUnitComponent(props) {
   const backgroundColor = useUnitColor(props.division);
 
   const patternID = useMemo(() => {
-    return resolveID(props.division); // ?? getPatternID(props.division.lith, lithMap);
+    return getBestFGDCPatternForUnit(props.division); // ?? getPatternID(props.division.lith, lithMap);
   }, [props.division?.unit_id]);
 
   const fill = useGeologicPattern(patternID);
@@ -157,7 +159,7 @@ export function EnvironmentColoredUnitComponent(props) {
   const backgroundColor = useUnitColorByEnvironment(props.division);
 
   const patternID = useMemo(() => {
-    return resolveID(props.division); // ?? getPatternID(props.division.lith, lithMap);
+    return getBestFGDCPatternForUnit(props.division); // ?? getPatternID(props.division.lith, lithMap);
   }, [props.division?.unit_id]);
 
   const fill = useGeologicPattern(patternID);
@@ -168,22 +170,3 @@ export function EnvironmentColoredUnitComponent(props) {
     ...props,
   });
 }
-
-function getPatternID(
-  liths: Array<Lithology>,
-  lithMap: Map<number, Lithology>,
-): string | null {
-  if (lithMap == null || liths == null || liths.length == 0) {
-    return null;
-  }
-  const patternIDs = new Set<string>();
-  for (const lith of liths) {
-    const lithData = lithMap.get(lith.lith_id);
-    if (lithData) {
-      patternIDs.add(`${lithData.fill}`);
-    }
-  }
-  let id = patternIDs.values()[0];
-  if (id == "0") return null;
-  return id;
-}

package/dist/maps/column-correlation/core.cjs

@@ -1,288 +0,0 @@
-"use strict";
-Object.defineProperty(exports, Symbol.toStringTag, { value: "Module" });
-const mapboxReact = require("@macrostrat/mapbox-react");
-const mapboxGl = require("mapbox-gl");
-const h = require("@macrostrat/hyper");
-const React = require("react");
-const mapboxUtils = require("@macrostrat/mapbox-utils");
-const state = require("./state.cjs");
-const index = require("../inset-map/index.cjs");
-const mapStyles = require("@macrostrat/map-styles");
-const columns = require("../layers/columns.cjs");
-const _interopDefault = (e) => e && e.__esModule ? e : { default: e };
-const h__default = /* @__PURE__ */ _interopDefault(h);
-function ColumnCorrelationMap(props) {
-  const { padding = 50, children, columnColor, projectID, ...rest } = props;
-  return h__default.default(
-    index.InsetMap,
-    {
-      ...rest,
-      boxZoom: false,
-      dragRotate: false
-    },
-    [
-      h__default.default(ColumnsLayer, { color: columnColor }),
-      h__default.default(SelectedColumnsLayer),
-      h__default.default(MapClickHandler),
-      h__default.default(ColumnInteractionHandler),
-      h__default.default(HoveredColumnHighlight),
-      h__default.default(ColumnZoomer, { padding }),
-      h__default.default(SectionLine, { padding }),
-      children
-    ]
-  );
-}
-function ColumnZoomer({ padding }) {
-  const zoomColumn = state.useCorrelationMapStore((state2) => state2.zoomColumn);
-  const zoomNonce = state.useCorrelationMapStore((state2) => state2.zoomNonce);
-  const columns2 = state.useCorrelationMapStore((state2) => state2.columns);
-  const bounds = React.useMemo(() => {
-    if (zoomColumn == null || columns2 == null) return null;
-    const col = columns2.find((c) => c.properties?.col_id === zoomColumn);
-    if (col?.geometry == null) return null;
-    const b = new mapboxGl.LngLatBounds();
-    forEachCoordinate(col.geometry, (coord) => b.extend(coord));
-    return b.isEmpty() ? null : b;
-  }, [zoomColumn, zoomNonce, columns2]);
-  mapboxReact.useMapEaseTo({ bounds, padding: padding * 2 });
-  return null;
-}
-function forEachCoordinate(geometry, fn) {
-  const walk = (coords) => {
-    if (typeof coords[0] === "number") {
-      fn(coords);
-    } else {
-      for (const c of coords) walk(c);
-    }
-  };
-  if (geometry?.coordinates != null) walk(geometry.coordinates);
-}
-const columnLayers = ["columns-fill", "columns-points"];
-function MapClickHandler() {
-  const onClickMap = state.useCorrelationMapStore((state2) => state2.onClickMap);
-  mapboxReact.useMapClickHandler(
-    (e) => {
-      onClickMap(e, { type: "Point", coordinates: e.lngLat.toArray() });
-    },
-    [onClickMap]
-  );
-  return null;
-}
-function ColumnInteractionHandler() {
-  const toggleColumn = state.useCorrelationMapStore((state2) => state2.toggleColumn);
-  const setHoveredColumn = state.useCorrelationMapStore(
-    (state2) => state2.setHoveredColumn
-  );
-  const isManual = state.useCorrelationMapStore(
-    (state2) => state2.selectionMode === "manual"
-  );
-  const hoveredRef = React.useRef(null);
-  mapboxReact.useMapStyleOperator(
-    (map) => {
-      if (!isManual) return;
-      const onClick = (e) => {
-        const colID = e.features?.[0]?.properties?.col_id;
-        if (colID != null) toggleColumn(colID);
-      };
-      map.on("click", columnLayers, onClick);
-      return () => map.off("click", columnLayers, onClick);
-    },
-    [isManual, toggleColumn]
-  );
-  mapboxReact.useMapStyleOperator(
-    (map) => {
-      const clearHover = () => {
-        if (hoveredRef.current != null) {
-          map.setFeatureState(
-            { source: "columns", id: hoveredRef.current },
-            { hover: false }
-          );
-          hoveredRef.current = null;
-        }
-      };
-      const onMove = (e) => {
-        const f = e.features?.[0];
-        if (f == null) return;
-        if (hoveredRef.current !== f.id) {
-          clearHover();
-          map.setFeatureState({ source: "columns", id: f.id }, { hover: true });
-          hoveredRef.current = f.id;
-        }
-        setHoveredColumn(f.properties?.col_id ?? null);
-        map.getCanvas().style.cursor = "pointer";
-      };
-      const onLeave = () => {
-        clearHover();
-        setHoveredColumn(null);
-        map.getCanvas().style.cursor = "";
-      };
-      map.on("mousemove", columnLayers, onMove);
-      map.on("mouseleave", columnLayers, onLeave);
-      return () => {
-        map.off("mousemove", columnLayers, onMove);
-        map.off("mouseleave", columnLayers, onLeave);
-        clearHover();
-      };
-    },
-    [setHoveredColumn]
-  );
-  return null;
-}
-function HoveredColumnHighlight() {
-  const hoveredColumn = state.useCorrelationMapStore((state2) => state2.hoveredColumn);
-  const columns2 = state.useCorrelationMapStore((state2) => state2.columns);
-  const appliedRef = React.useRef(null);
-  mapboxReact.useMapStyleOperator(
-    (map) => {
-      if (appliedRef.current != null) {
-        map.setFeatureState(
-          { source: "columns", id: appliedRef.current },
-          { highlighted: false }
-        );
-        appliedRef.current = null;
-      }
-      if (hoveredColumn == null || columns2 == null) return;
-      const col = columns2.find((c) => c.properties?.col_id === hoveredColumn);
-      const id = col?.id ?? col?.properties?.col_id;
-      if (id == null) return;
-      map.setFeatureState({ source: "columns", id }, { highlighted: true });
-      appliedRef.current = id;
-    },
-    [hoveredColumn, columns2]
-  );
-  return null;
-}
-function SelectedColumnsLayer() {
-  mapboxReact.useOverlayStyle(() => selectedColumnsStyle, []);
-  const focusedColumns = state.useCorrelationMapStore(
-    (state2) => state2.focusedColumns
-  );
-  mapboxReact.useMapStyleOperator(
-    (map) => {
-      let features = focusedColumns;
-      const data = {
-        type: "FeatureCollection",
-        features
-      };
-      const columnCentroidLine = {
-        type: "Feature",
-        geometry: {
-          type: "LineString",
-          coordinates: features.map(
-            (col) => col.properties.centroid.geometry.coordinates
-          )
-        },
-        properties: {}
-      };
-      mapboxUtils.setGeoJSON(map, "selected-columns", data);
-      mapboxUtils.setGeoJSON(map, "selected-column-centroids", {
-        type: "FeatureCollection",
-        features: [columnCentroidLine]
-      });
-    },
-    [focusedColumns]
-  );
-  return null;
-}
-function ColumnsLayer({ enabled = true, color }) {
-  const columns$1 = state.useCorrelationMapStore((state2) => state2.columns);
-  return h__default.default(columns.BaseColumnsLayer, { enabled, color, columns: columns$1 });
-}
-const selectedColumnsStyle = {
-  version: 8,
-  sources: {
-    "selected-columns": mapboxUtils.buildGeoJSONSource(),
-    "selected-column-centroids": mapboxUtils.buildGeoJSONSource()
-  },
-  layers: [
-    {
-      id: "selected-columns-fill",
-      type: "fill",
-      source: "selected-columns",
-      paint: {
-        "fill-color": "rgba(255, 0, 0, 0.1)"
-      }
-    },
-    {
-      id: "selected-column-centroids-line",
-      type: "line",
-      source: "selected-column-centroids",
-      paint: {
-        "line-color": "rgba(255, 0, 0, 0.8)",
-        "line-width": 2,
-        "line-dasharray": [2, 2]
-      }
-    },
-    {
-      id: "selected-column-centroids-points",
-      type: "circle",
-      source: "selected-column-centroids",
-      paint: {
-        "circle-radius": 4,
-        "circle-color": "rgba(255, 0, 0, 0.8)"
-      }
-    }
-  ]
-};
-const lineOfSectionStyle = {
-  version: 8,
-  sources: {
-    elevationMarker: mapboxUtils.buildGeoJSONSource(),
-    crossSectionLine: mapboxUtils.buildGeoJSONSource(),
-    crossSectionEndpoints: mapboxUtils.buildGeoJSONSource()
-  },
-  layers: mapStyles.buildCrossSectionLayers()
-};
-function SectionLine({ padding }) {
-  mapboxReact.useOverlayStyle(() => lineOfSectionStyle, []);
-  const focusedLine = state.useCorrelationMapStore((state2) => state2.focusedLine);
-  const focusedColumns = state.useCorrelationMapStore(
-    (state2) => state2.focusedColumns
-  );
-  mapboxReact.useMapStyleOperator(
-    (map) => {
-      if (focusedLine == null) {
-        mapboxUtils.setGeoJSON(map, "crossSectionLine", emptyFeatureCollection);
-        mapboxUtils.setGeoJSON(map, "crossSectionEndpoints", emptyFeatureCollection);
-        return;
-      }
-      const data = {
-        type: "FeatureCollection",
-        features: [
-          {
-            type: "Feature",
-            geometry: focusedLine,
-            properties: { id: "focusedLine" }
-          }
-        ]
-      };
-      mapboxUtils.setGeoJSON(map, "crossSectionLine", data);
-      mapboxUtils.setGeoJSON(map, "crossSectionEndpoints", {
-        type: "FeatureCollection",
-        features: focusedLine.coordinates.map((coord) => ({
-          type: "Feature",
-          geometry: { type: "Point", coordinates: coord },
-          properties: {}
-        }))
-      });
-    },
-    [focusedLine]
-  );
-  const bounds = React.useMemo(() => {
-    const coords = focusedLine != null && focusedLine.coordinates.length >= 2 ? focusedLine.coordinates : focusedColumns.map((c) => c.properties.centroid.geometry.coordinates);
-    if (coords.length < 2) return null;
-    const bounds2 = new mapboxGl.LngLatBounds();
-    for (const coord of coords) {
-      bounds2.extend(coord);
-    }
-    return bounds2;
-  }, [focusedLine, focusedColumns]);
-  mapboxReact.useMapEaseTo({ bounds, padding, trackResize: true });
-  return null;
-}
-const emptyFeatureCollection = {
-  type: "FeatureCollection",
-  features: []
-};
-exports.ColumnCorrelationMap = ColumnCorrelationMap;
-//# sourceMappingURL=core.cjs.map

package/dist/maps/column-correlation/core.cjs.map

@@ -1 +0,0 @@
-{"version":3,"file":"core.cjs","sources":["../../../src/maps/column-correlation/core.ts"],"sourcesContent":["import {\n  useMapClickHandler,\n  useMapEaseTo,\n  useMapStyleOperator,\n  useOverlayStyle,\n} from \"@macrostrat/mapbox-react\";\nimport { LngLatBounds, Style } from \"mapbox-gl\";\nimport h from \"@macrostrat/hyper\";\nimport { Feature, FeatureCollection } from \"geojson\";\nimport { ReactNode, useMemo, useRef } from \"react\";\nimport { setGeoJSON, buildGeoJSONSource } from \"@macrostrat/mapbox-utils\";\n\nimport { useCorrelationMapStore } from \"./state\";\nimport { InsetMap, type InsetMapProps } from \"../inset-map\";\nimport { BaseColumnsLayer } from \"../layers\";\nimport { buildCrossSectionLayers } from \"@macrostrat/map-styles\";\n\nexport interface CorrelationMapProps extends InsetMapProps {\n  padding?: number;\n  children?: ReactNode;\n  accessToken?: string;\n  columnColor?: string;\n}\n\nexport function ColumnCorrelationMap(props: CorrelationMapProps) {\n  const { padding = 50, children, columnColor, projectID, ...rest } = props;\n\n  return h(\n    InsetMap,\n    {\n      ...rest,\n      boxZoom: false,\n      dragRotate: false,\n    },\n    [\n      h(ColumnsLayer, { color: columnColor }),\n      h(SelectedColumnsLayer),\n      h(MapClickHandler),\n      h(ColumnInteractionHandler),\n      h(HoveredColumnHighlight),\n      h(ColumnZoomer, { padding }),\n      h(SectionLine, { padding }),\n      children,\n    ],\n  );\n}\n\nfunction ColumnZoomer({ padding }: { padding: number }) {\n  /** Frame a single column when `zoomColumn` is set (e.g. header click). */\n  const zoomColumn = useCorrelationMapStore((state) => state.zoomColumn);\n  const zoomNonce = useCorrelationMapStore((state) => state.zoomNonce);\n  const columns = useCorrelationMapStore((state) => state.columns);\n\n  const bounds = useMemo(() => {\n    if (zoomColumn == null || columns == null) return null;\n    const col = columns.find((c) => c.properties?.col_id === zoomColumn);\n    if (col?.geometry == null) return null;\n    const b = new LngLatBounds();\n    forEachCoordinate(col.geometry, (coord) => b.extend(coord as [number, number]));\n    return b.isEmpty() ? null : b;\n    // zoomNonce forces a fresh bounds object so repeat clicks re-frame\n  }, [zoomColumn, zoomNonce, columns]);\n\n  useMapEaseTo({ bounds, padding: padding * 2 });\n  return null;\n}\n\nfunction forEachCoordinate(geometry: any, fn: (coord: number[]) => void) {\n  const walk = (coords: any) => {\n    if (typeof coords[0] === \"number\") {\n      fn(coords);\n    } else {\n      for (const c of coords) walk(c);\n    }\n  };\n  if (geometry?.coordinates != null) walk(geometry.coordinates);\n}\n\nconst columnLayers = [\"columns-fill\", \"columns-points\"];\n\nfunction MapClickHandler() {\n  const onClickMap = useCorrelationMapStore((state) => state.onClickMap);\n\n  useMapClickHandler(\n    (e) => {\n      onClickMap(e, { type: \"Point\", coordinates: e.lngLat.toArray() });\n    },\n    [onClickMap],\n  );\n\n  return null;\n}\n\nfunction ColumnInteractionHandler() {\n  /** Per-column click (manual selection) and hover highlighting. */\n  const toggleColumn = useCorrelationMapStore((state) => state.toggleColumn);\n  const setHoveredColumn = useCorrelationMapStore(\n    (state) => state.setHoveredColumn,\n  );\n  const isManual = useCorrelationMapStore(\n    (state) => state.selectionMode === \"manual\",\n  );\n  const hoveredRef = useRef<number | string | null>(null);\n\n  // Click a column to toggle it in/out of the selection (manual mode only)\n  useMapStyleOperator(\n    (map) => {\n      if (!isManual) return;\n      const onClick = (e) => {\n        const colID = e.features?.[0]?.properties?.col_id;\n        if (colID != null) toggleColumn(colID);\n      };\n      map.on(\"click\", columnLayers, onClick);\n      return () => map.off(\"click\", columnLayers, onClick);\n    },\n    [isManual, toggleColumn],\n  );\n\n  // Hover highlighting (via the columns layer's `hover` feature-state)\n  useMapStyleOperator(\n    (map) => {\n      const clearHover = () => {\n        if (hoveredRef.current != null) {\n          map.setFeatureState(\n            { source: \"columns\", id: hoveredRef.current },\n            { hover: false },\n          );\n          hoveredRef.current = null;\n        }\n      };\n      const onMove = (e) => {\n        const f = e.features?.[0];\n        if (f == null) return;\n        if (hoveredRef.current !== f.id) {\n          clearHover();\n          map.setFeatureState({ source: \"columns\", id: f.id }, { hover: true });\n          hoveredRef.current = f.id;\n        }\n        setHoveredColumn(f.properties?.col_id ?? null);\n        map.getCanvas().style.cursor = \"pointer\";\n      };\n      const onLeave = () => {\n        clearHover();\n        setHoveredColumn(null);\n        map.getCanvas().style.cursor = \"\";\n      };\n      map.on(\"mousemove\", columnLayers, onMove);\n      map.on(\"mouseleave\", columnLayers, onLeave);\n      return () => {\n        map.off(\"mousemove\", columnLayers, onMove);\n        map.off(\"mouseleave\", columnLayers, onLeave);\n        clearHover();\n      };\n    },\n    [setHoveredColumn],\n  );\n\n  return null;\n}\n\nfunction HoveredColumnHighlight() {\n  /** Reflects the store's `hoveredColumn` on the map (e.g. when a column is\n   * hovered elsewhere in the UI) using the `highlighted` feature-state. */\n  const hoveredColumn = useCorrelationMapStore((state) => state.hoveredColumn);\n  const columns = useCorrelationMapStore((state) => state.columns);\n  const appliedRef = useRef<number | string | null>(null);\n\n  useMapStyleOperator(\n    (map) => {\n      if (appliedRef.current != null) {\n        map.setFeatureState(\n          { source: \"columns\", id: appliedRef.current },\n          { highlighted: false },\n        );\n        appliedRef.current = null;\n      }\n      if (hoveredColumn == null || columns == null) return;\n      const col = columns.find((c) => c.properties?.col_id === hoveredColumn);\n      const id = (col as any)?.id ?? col?.properties?.col_id;\n      if (id == null) return;\n      map.setFeatureState({ source: \"columns\", id }, { highlighted: true });\n      appliedRef.current = id;\n    },\n    [hoveredColumn, columns],\n  );\n\n  return null;\n}\n\nfunction SelectedColumnsLayer() {\n  useOverlayStyle(() => selectedColumnsStyle, []);\n\n  const focusedColumns = useCorrelationMapStore(\n    (state) => state.focusedColumns,\n  );\n\n  useMapStyleOperator(\n    (map) => {\n      let features = focusedColumns;\n\n      const data: FeatureCollection = {\n        type: \"FeatureCollection\",\n        features,\n      };\n\n      const columnCentroidLine: Feature = {\n        type: \"Feature\",\n        geometry: {\n          type: \"LineString\",\n          coordinates: features.map(\n            (col) => col.properties.centroid.geometry.coordinates,\n          ),\n        },\n        properties: {},\n      };\n\n      setGeoJSON(map, \"selected-columns\", data);\n      setGeoJSON(map, \"selected-column-centroids\", {\n        type: \"FeatureCollection\",\n        features: [columnCentroidLine],\n      });\n    },\n    [focusedColumns],\n  );\n  return null;\n}\n\nfunction ColumnsLayer({ enabled = true, color }) {\n  const columns = useCorrelationMapStore((state) => state.columns);\n  return h(BaseColumnsLayer, { enabled, color, columns });\n}\n\nconst selectedColumnsStyle: Style = {\n  version: 8,\n  sources: {\n    \"selected-columns\": buildGeoJSONSource(),\n    \"selected-column-centroids\": buildGeoJSONSource(),\n  },\n  layers: [\n    {\n      id: \"selected-columns-fill\",\n      type: \"fill\",\n      source: \"selected-columns\",\n      paint: {\n        \"fill-color\": \"rgba(255, 0, 0, 0.1)\",\n      },\n    },\n    {\n      id: \"selected-column-centroids-line\",\n      type: \"line\",\n      source: \"selected-column-centroids\",\n      paint: {\n        \"line-color\": \"rgba(255, 0, 0, 0.8)\",\n        \"line-width\": 2,\n        \"line-dasharray\": [2, 2],\n      },\n    },\n    {\n      id: \"selected-column-centroids-points\",\n      type: \"circle\",\n      source: \"selected-column-centroids\",\n      paint: {\n        \"circle-radius\": 4,\n        \"circle-color\": \"rgba(255, 0, 0, 0.8)\",\n      },\n    },\n  ],\n};\n\nconst lineOfSectionStyle: Style = {\n  version: 8,\n  sources: {\n    elevationMarker: buildGeoJSONSource(),\n    crossSectionLine: buildGeoJSONSource(),\n    crossSectionEndpoints: buildGeoJSONSource(),\n  },\n  layers: buildCrossSectionLayers(),\n};\n\nfunction SectionLine({ padding }: { padding: number }) {\n  useOverlayStyle(() => lineOfSectionStyle, []);\n  const focusedLine = useCorrelationMapStore((state) => state.focusedLine);\n  const focusedColumns = useCorrelationMapStore(\n    (state) => state.focusedColumns,\n  );\n\n  // Setup focused line (only drawn in line-of-section mode)\n  useMapStyleOperator(\n    (map) => {\n      if (focusedLine == null) {\n        // Clear any previously-drawn line (e.g. after switching to manual mode)\n        setGeoJSON(map, \"crossSectionLine\", emptyFeatureCollection);\n        setGeoJSON(map, \"crossSectionEndpoints\", emptyFeatureCollection);\n        return;\n      }\n      const data: FeatureCollection = {\n        type: \"FeatureCollection\",\n        features: [\n          {\n            type: \"Feature\",\n            geometry: focusedLine,\n            properties: { id: \"focusedLine\" },\n          },\n        ],\n      };\n\n      setGeoJSON(map, \"crossSectionLine\", data);\n      setGeoJSON(map, \"crossSectionEndpoints\", {\n        type: \"FeatureCollection\",\n        features: focusedLine.coordinates.map((coord) => ({\n          type: \"Feature\",\n          geometry: { type: \"Point\", coordinates: coord },\n          properties: {},\n        })),\n      });\n    },\n    [focusedLine],\n  );\n\n  const bounds = useMemo(() => {\n    // In line mode, frame the line; in manual mode, frame the selected columns\n    const coords: number[][] =\n      focusedLine != null && focusedLine.coordinates.length >= 2\n        ? focusedLine.coordinates\n        : focusedColumns.map((c) => c.properties.centroid.geometry.coordinates);\n    if (coords.length < 2) return null;\n    const bounds = new LngLatBounds();\n    for (const coord of coords) {\n      bounds.extend(coord as [number, number]);\n    }\n    return bounds;\n  }, [focusedLine, focusedColumns]);\n\n  useMapEaseTo({ bounds, padding, trackResize: true });\n\n  return null;\n}\n\nconst emptyFeatureCollection: FeatureCollection = {\n  type: \"FeatureCollection\",\n  features: [],\n};\n"],"names":["h","InsetMap","useCorrelationMapStore","state","columns","useMemo","LngLatBounds","useMapEaseTo","useMapClickHandler","useRef","useMapStyleOperator","useOverlayStyle","setGeoJSON","BaseColumnsLayer","buildGeoJSONSource","buildCrossSectionLayers","bounds"],"mappings":";;;;;;;;;;;;;AAwBO,SAAS,qBAAqB,OAA4B;AAC/D,QAAM,EAAE,UAAU,IAAI,UAAU,aAAa,WAAW,GAAG,SAAS;AAEpE,SAAOA,WAAAA;AAAAA,IACLC,MAAAA;AAAAA,IACA;AAAA,MACE,GAAG;AAAA,MACH,SAAS;AAAA,MACT,YAAY;AAAA,IAAA;AAAA,IAEd;AAAA,MACED,WAAAA,QAAE,cAAc,EAAE,OAAO,aAAa;AAAA,MACtCA,WAAAA,QAAE,oBAAoB;AAAA,MACtBA,WAAAA,QAAE,eAAe;AAAA,MACjBA,WAAAA,QAAE,wBAAwB;AAAA,MAC1BA,WAAAA,QAAE,sBAAsB;AAAA,MACxBA,mBAAE,cAAc,EAAE,SAAS;AAAA,MAC3BA,mBAAE,aAAa,EAAE,SAAS;AAAA,MAC1B;AAAA,IAAA;AAAA,EACF;AAEJ;AAEA,SAAS,aAAa,EAAE,WAAgC;AAEtD,QAAM,aAAaE,MAAAA,uBAAuB,CAACC,WAAUA,OAAM,UAAU;AACrE,QAAM,YAAYD,MAAAA,uBAAuB,CAACC,WAAUA,OAAM,SAAS;AACnE,QAAMC,WAAUF,MAAAA,uBAAuB,CAACC,WAAUA,OAAM,OAAO;AAE/D,QAAM,SAASE,MAAAA,QAAQ,MAAM;AAC3B,QAAI,cAAc,QAAQD,YAAW,KAAM,QAAO;AAClD,UAAM,MAAMA,SAAQ,KAAK,CAAC,MAAM,EAAE,YAAY,WAAW,UAAU;AACnE,QAAI,KAAK,YAAY,KAAM,QAAO;AAClC,UAAM,IAAI,IAAIE,sBAAA;AACd,sBAAkB,IAAI,UAAU,CAAC,UAAU,EAAE,OAAO,KAAyB,CAAC;AAC9E,WAAO,EAAE,YAAY,OAAO;AAAA,EAE9B,GAAG,CAAC,YAAY,WAAWF,QAAO,CAAC;AAEnCG,cAAAA,aAAa,EAAE,QAAQ,SAAS,UAAU,GAAG;AAC7C,SAAO;AACT;AAEA,SAAS,kBAAkB,UAAe,IAA+B;AACvE,QAAM,OAAO,CAAC,WAAgB;AAC5B,QAAI,OAAO,OAAO,CAAC,MAAM,UAAU;AACjC,SAAG,MAAM;AAAA,IACX,OAAO;AACL,iBAAW,KAAK,OAAQ,MAAK,CAAC;AAAA,IAChC;AAAA,EACF;AACA,MAAI,UAAU,eAAe,KAAM,MAAK,SAAS,WAAW;AAC9D;AAEA,MAAM,eAAe,CAAC,gBAAgB,gBAAgB;AAEtD,SAAS,kBAAkB;AACzB,QAAM,aAAaL,MAAAA,uBAAuB,CAACC,WAAUA,OAAM,UAAU;AAErEK,cAAAA;AAAAA,IACE,CAAC,MAAM;AACL,iBAAW,GAAG,EAAE,MAAM,SAAS,aAAa,EAAE,OAAO,QAAA,GAAW;AAAA,IAClE;AAAA,IACA,CAAC,UAAU;AAAA,EAAA;AAGb,SAAO;AACT;AAEA,SAAS,2BAA2B;AAElC,QAAM,eAAeN,MAAAA,uBAAuB,CAACC,WAAUA,OAAM,YAAY;AACzE,QAAM,mBAAmBD,MAAAA;AAAAA,IACvB,CAACC,WAAUA,OAAM;AAAA,EAAA;AAEnB,QAAM,WAAWD,MAAAA;AAAAA,IACf,CAACC,WAAUA,OAAM,kBAAkB;AAAA,EAAA;AAErC,QAAM,aAAaM,MAAAA,OAA+B,IAAI;AAGtDC,cAAAA;AAAAA,IACE,CAAC,QAAQ;AACP,UAAI,CAAC,SAAU;AACf,YAAM,UAAU,CAAC,MAAM;AACrB,cAAM,QAAQ,EAAE,WAAW,CAAC,GAAG,YAAY;AAC3C,YAAI,SAAS,KAAM,cAAa,KAAK;AAAA,MACvC;AACA,UAAI,GAAG,SAAS,cAAc,OAAO;AACrC,aAAO,MAAM,IAAI,IAAI,SAAS,cAAc,OAAO;AAAA,IACrD;AAAA,IACA,CAAC,UAAU,YAAY;AAAA,EAAA;AAIzBA,cAAAA;AAAAA,IACE,CAAC,QAAQ;AACP,YAAM,aAAa,MAAM;AACvB,YAAI,WAAW,WAAW,MAAM;AAC9B,cAAI;AAAA,YACF,EAAE,QAAQ,WAAW,IAAI,WAAW,QAAA;AAAA,YACpC,EAAE,OAAO,MAAA;AAAA,UAAM;AAEjB,qBAAW,UAAU;AAAA,QACvB;AAAA,MACF;AACA,YAAM,SAAS,CAAC,MAAM;AACpB,cAAM,IAAI,EAAE,WAAW,CAAC;AACxB,YAAI,KAAK,KAAM;AACf,YAAI,WAAW,YAAY,EAAE,IAAI;AAC/B,qBAAA;AACA,cAAI,gBAAgB,EAAE,QAAQ,WAAW,IAAI,EAAE,GAAA,GAAM,EAAE,OAAO,KAAA,CAAM;AACpE,qBAAW,UAAU,EAAE;AAAA,QACzB;AACA,yBAAiB,EAAE,YAAY,UAAU,IAAI;AAC7C,YAAI,UAAA,EAAY,MAAM,SAAS;AAAA,MACjC;AACA,YAAM,UAAU,MAAM;AACpB,mBAAA;AACA,yBAAiB,IAAI;AACrB,YAAI,UAAA,EAAY,MAAM,SAAS;AAAA,MACjC;AACA,UAAI,GAAG,aAAa,cAAc,MAAM;AACxC,UAAI,GAAG,cAAc,cAAc,OAAO;AAC1C,aAAO,MAAM;AACX,YAAI,IAAI,aAAa,cAAc,MAAM;AACzC,YAAI,IAAI,cAAc,cAAc,OAAO;AAC3C,mBAAA;AAAA,MACF;AAAA,IACF;AAAA,IACA,CAAC,gBAAgB;AAAA,EAAA;AAGnB,SAAO;AACT;AAEA,SAAS,yBAAyB;AAGhC,QAAM,gBAAgBR,MAAAA,uBAAuB,CAACC,WAAUA,OAAM,aAAa;AAC3E,QAAMC,WAAUF,MAAAA,uBAAuB,CAACC,WAAUA,OAAM,OAAO;AAC/D,QAAM,aAAaM,MAAAA,OAA+B,IAAI;AAEtDC,cAAAA;AAAAA,IACE,CAAC,QAAQ;AACP,UAAI,WAAW,WAAW,MAAM;AAC9B,YAAI;AAAA,UACF,EAAE,QAAQ,WAAW,IAAI,WAAW,QAAA;AAAA,UACpC,EAAE,aAAa,MAAA;AAAA,QAAM;AAEvB,mBAAW,UAAU;AAAA,MACvB;AACA,UAAI,iBAAiB,QAAQN,YAAW,KAAM;AAC9C,YAAM,MAAMA,SAAQ,KAAK,CAAC,MAAM,EAAE,YAAY,WAAW,aAAa;AACtE,YAAM,KAAM,KAAa,MAAM,KAAK,YAAY;AAChD,UAAI,MAAM,KAAM;AAChB,UAAI,gBAAgB,EAAE,QAAQ,WAAW,MAAM,EAAE,aAAa,MAAM;AACpE,iBAAW,UAAU;AAAA,IACvB;AAAA,IACA,CAAC,eAAeA,QAAO;AAAA,EAAA;AAGzB,SAAO;AACT;AAEA,SAAS,uBAAuB;AAC9BO,8BAAgB,MAAM,sBAAsB,EAAE;AAE9C,QAAM,iBAAiBT,MAAAA;AAAAA,IACrB,CAACC,WAAUA,OAAM;AAAA,EAAA;AAGnBO,cAAAA;AAAAA,IACE,CAAC,QAAQ;AACP,UAAI,WAAW;AAEf,YAAM,OAA0B;AAAA,QAC9B,MAAM;AAAA,QACN;AAAA,MAAA;AAGF,YAAM,qBAA8B;AAAA,QAClC,MAAM;AAAA,QACN,UAAU;AAAA,UACR,MAAM;AAAA,UACN,aAAa,SAAS;AAAA,YACpB,CAAC,QAAQ,IAAI,WAAW,SAAS,SAAS;AAAA,UAAA;AAAA,QAC5C;AAAA,QAEF,YAAY,CAAA;AAAA,MAAC;AAGfE,6BAAW,KAAK,oBAAoB,IAAI;AACxCA,kBAAAA,WAAW,KAAK,6BAA6B;AAAA,QAC3C,MAAM;AAAA,QACN,UAAU,CAAC,kBAAkB;AAAA,MAAA,CAC9B;AAAA,IACH;AAAA,IACA,CAAC,cAAc;AAAA,EAAA;AAEjB,SAAO;AACT;AAEA,SAAS,aAAa,EAAE,UAAU,MAAM,SAAS;AAC/C,QAAMR,YAAUF,MAAAA,uBAAuB,CAACC,WAAUA,OAAM,OAAO;AAC/D,SAAOH,WAAAA,QAAEa,QAAAA,kBAAkB,EAAE,SAAS,OAAA,SAAOT,WAAS;AACxD;AAEA,MAAM,uBAA8B;AAAA,EAClC,SAAS;AAAA,EACT,SAAS;AAAA,IACP,oBAAoBU,YAAAA,mBAAA;AAAA,IACpB,6BAA6BA,YAAAA,mBAAA;AAAA,EAAmB;AAAA,EAElD,QAAQ;AAAA,IACN;AAAA,MACE,IAAI;AAAA,MACJ,MAAM;AAAA,MACN,QAAQ;AAAA,MACR,OAAO;AAAA,QACL,cAAc;AAAA,MAAA;AAAA,IAChB;AAAA,IAEF;AAAA,MACE,IAAI;AAAA,MACJ,MAAM;AAAA,MACN,QAAQ;AAAA,MACR,OAAO;AAAA,QACL,cAAc;AAAA,QACd,cAAc;AAAA,QACd,kBAAkB,CAAC,GAAG,CAAC;AAAA,MAAA;AAAA,IACzB;AAAA,IAEF;AAAA,MACE,IAAI;AAAA,MACJ,MAAM;AAAA,MACN,QAAQ;AAAA,MACR,OAAO;AAAA,QACL,iBAAiB;AAAA,QACjB,gBAAgB;AAAA,MAAA;AAAA,IAClB;AAAA,EACF;AAEJ;AAEA,MAAM,qBAA4B;AAAA,EAChC,SAAS;AAAA,EACT,SAAS;AAAA,IACP,iBAAiBA,YAAAA,mBAAA;AAAA,IACjB,kBAAkBA,YAAAA,mBAAA;AAAA,IAClB,uBAAuBA,YAAAA,mBAAA;AAAA,EAAmB;AAAA,EAE5C,QAAQC,UAAAA,wBAAA;AACV;AAEA,SAAS,YAAY,EAAE,WAAgC;AACrDJ,8BAAgB,MAAM,oBAAoB,EAAE;AAC5C,QAAM,cAAcT,MAAAA,uBAAuB,CAACC,WAAUA,OAAM,WAAW;AACvE,QAAM,iBAAiBD,MAAAA;AAAAA,IACrB,CAACC,WAAUA,OAAM;AAAA,EAAA;AAInBO,cAAAA;AAAAA,IACE,CAAC,QAAQ;AACP,UAAI,eAAe,MAAM;AAEvBE,+BAAW,KAAK,oBAAoB,sBAAsB;AAC1DA,+BAAW,KAAK,yBAAyB,sBAAsB;AAC/D;AAAA,MACF;AACA,YAAM,OAA0B;AAAA,QAC9B,MAAM;AAAA,QACN,UAAU;AAAA,UACR;AAAA,YACE,MAAM;AAAA,YACN,UAAU;AAAA,YACV,YAAY,EAAE,IAAI,cAAA;AAAA,UAAc;AAAA,QAClC;AAAA,MACF;AAGFA,6BAAW,KAAK,oBAAoB,IAAI;AACxCA,kBAAAA,WAAW,KAAK,yBAAyB;AAAA,QACvC,MAAM;AAAA,QACN,UAAU,YAAY,YAAY,IAAI,CAAC,WAAW;AAAA,UAChD,MAAM;AAAA,UACN,UAAU,EAAE,MAAM,SAAS,aAAa,MAAA;AAAA,UACxC,YAAY,CAAA;AAAA,QAAC,EACb;AAAA,MAAA,CACH;AAAA,IACH;AAAA,IACA,CAAC,WAAW;AAAA,EAAA;AAGd,QAAM,SAASP,MAAAA,QAAQ,MAAM;AAE3B,UAAM,SACJ,eAAe,QAAQ,YAAY,YAAY,UAAU,IACrD,YAAY,cACZ,eAAe,IAAI,CAAC,MAAM,EAAE,WAAW,SAAS,SAAS,WAAW;AAC1E,QAAI,OAAO,SAAS,EAAG,QAAO;AAC9B,UAAMW,UAAS,IAAIV,sBAAA;AACnB,eAAW,SAAS,QAAQ;AAC1BU,cAAO,OAAO,KAAyB;AAAA,IACzC;AACA,WAAOA;AAAAA,EACT,GAAG,CAAC,aAAa,cAAc,CAAC;AAEhCT,cAAAA,aAAa,EAAE,QAAQ,SAAS,aAAa,MAAM;AAEnD,SAAO;AACT;AAEA,MAAM,yBAA4C;AAAA,EAChD,MAAM;AAAA,EACN,UAAU,CAAA;AACZ;;"}

package/dist/maps/column-correlation/core.d.ts

@@ -1,9 +0,0 @@
-import { ReactNode } from 'react';
-import { InsetMapProps } from '../inset-map';
-export interface CorrelationMapProps extends InsetMapProps {
-    padding?: number;
-    children?: ReactNode;
-    accessToken?: string;
-    columnColor?: string;
-}
-export declare function ColumnCorrelationMap(props: CorrelationMapProps): import('react').FunctionComponentElement<InsetMapProps>;