@macrostrat/column-views 3.6.1 → 3.9.0

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

@@ -1 +1 @@
-{"version":3,"file":"state.cjs","sources":["../../../src/maps/column-correlation/state.ts"],"sourcesContent":["import { LineString, Point } from \"geojson\";\nimport { create, StoreApi, useStore } from \"zustand\";\nimport type { ColumnGeoJSONRecord } from \"@macrostrat/api-types\";\n// Turf intersection\nimport { lineIntersect } from \"@turf/line-intersect\";\nimport distance from \"@turf/distance\";\nimport { nearestPointOnLine } from \"@turf/nearest-point-on-line\";\nimport { centroid } from \"@turf/centroid\";\nimport {\n  createContext,\n  useState,\n  useContext,\n  ReactNode,\n  useEffect,\n} from \"react\";\nimport h from \"@macrostrat/hyper\";\nimport { createComputed } from \"zustand-computed\";\nimport { useMacrostratColumns } from \"@macrostrat/data-provider\";\nimport { buffer } from \"@turf/buffer\";\nimport { booleanPointInPolygon } from \"@turf/boolean-point-in-polygon\";\n\nexport interface CorrelationMapInput {\n  columns: ColumnGeoJSONRecord[];\n  focusedLine: LineString | null;\n}\n\nexport interface CorrelationMapStore extends CorrelationMapInput {\n  onClickMap: (event: mapboxgl.MapMouseEvent, point: Point) => void;\n  projectID?: number;\n}\n\nexport interface CorrelationProviderProps extends CorrelationMapInput {\n  projectID?: number;\n  inProcess?: boolean;\n  columns: ColumnGeoJSONRecord[] | null;\n  children: ReactNode;\n  onSelectColumns?: (\n    columns: FocusedColumnGeoJSONRecord[],\n    line: LineString | null,\n  ) => void;\n}\n\nconst CorrelationStoreContext =\n  createContext<StoreApi<CorrelationMapStore> | null>(null);\n\ntype ComputedStore = {\n  focusedColumns: FocusedColumnGeoJSONRecord[];\n};\n\n/** A computed store that will automatically update when the state changes */\nconst computed = createComputed((state: CorrelationMapStore): ComputedStore => {\n  return {\n    // We compute the focused columns based on columns and focusedLine\n    focusedColumns: buildCorrelationColumns(state.columns, state.focusedLine),\n  };\n}) as any;\n\nexport function ColumnCorrelationProvider({\n  children,\n  columns,\n  projectID,\n  inProcess,\n  focusedLine,\n  onSelectColumns,\n}: CorrelationProviderProps) {\n  const [store] = useState(() => {\n    return create<CorrelationMapStore & ComputedStore>(\n      computed((set, get): CorrelationMapStore => {\n        return {\n          focusedLine,\n          projectID,\n          columns: null,\n          onClickMap(event: mapboxgl.MapMouseEvent, point: Point) {\n            const state = get();\n            // Check if shift key is pressed\n            const shiftKeyPressed = event.originalEvent.shiftKey;\n            let existingCoords = state.focusedLine?.coordinates ?? [];\n\n            if (existingCoords.length >= 2 && !shiftKeyPressed) {\n              // Reset the line to zero length\n              existingCoords = [];\n            }\n            set({\n              focusedLine: {\n                type: \"LineString\",\n                coordinates: [...existingCoords, point.coordinates],\n              },\n            });\n          },\n        };\n      }),\n    );\n  });\n\n  // Set up the store\n  /** TODO: move the fetching of all columns to within the map */\n  const _columns = useMacrostratColumns(projectID, inProcess);\n  useEffect(() => {\n    if (_columns != null) {\n      store.setState({ columns: _columns });\n    }\n  }, [_columns]);\n\n  // Kind of an awkward way to do this but we need to allow the selector to run\n  const focusedColumns = useStore(store, (state) => state.focusedColumns);\n  const _focusedLine = useStore(store, (state) => state.focusedLine);\n\n  useEffect(() => {\n    onSelectColumns?.(focusedColumns, _focusedLine);\n  }, [focusedColumns, _focusedLine]);\n\n  return h(CorrelationStoreContext.Provider, { value: store }, children);\n}\n\nexport function useCorrelationMapStore(\n  selector: (state: CorrelationMapStore & ComputedStore) => any,\n) {\n  const storeApi = useContext(CorrelationStoreContext);\n  if (storeApi == null) {\n    throw new Error(\"Missing CorrelationMapProvider\");\n  }\n  return useStore(storeApi, selector);\n}\n\nfunction buildCorrelationColumns(\n  columns: ColumnGeoJSONRecord[],\n  line: LineString,\n): FocusedColumnGeoJSONRecord[] {\n  if (columns == null || line == null || line.coordinates.length < 2) {\n    return [];\n  }\n  return orderColumnsByDistance(\n    computeIntersectingColumns(columns, line),\n    line,\n  );\n}\n\nfunction computeIntersectingColumns(\n  columns: ColumnGeoJSONRecord[],\n  line: LineString,\n): ColumnGeoJSONRecord[] {\n  if (columns == null || line == null) {\n    return [];\n  }\n\n  /** eODP-focused process. Find buffers around line and then find columns intersecting that buffer */\n  const bufferedLine = buffer(line, 1, { units: \"degrees\" });\n\n  const nearbyPoints = columns.filter((col) => {\n    if (col.geometry?.type != \"Point\") {\n      return false;\n    }\n    return booleanPointInPolygon(col.geometry, bufferedLine);\n  });\n\n  const intersectingPolygons = columns.filter((col) => {\n    const poly = col.geometry;\n\n    // Some in-process datasets seem to have null geometries\n    if (poly == null) return false;\n    if (poly.type != \"Polygon\" && poly.type != \"MultiPolygon\") return false;\n\n    const intersection = lineIntersect(line, poly);\n    return intersection.features.length > 0;\n  });\n\n  return [...intersectingPolygons, ...nearbyPoints];\n}\n\ninterface FocusedColumnGeoJSONRecord extends ColumnGeoJSONRecord {\n  properties: {\n    centroid: Point;\n    nearestPointOnLine: Point;\n    distanceAlongLine: number;\n  } & ColumnGeoJSONRecord[\"properties\"];\n}\n\nfunction orderColumnsByDistance(\n  columns: ColumnGeoJSONRecord[],\n  line: LineString,\n): FocusedColumnGeoJSONRecord[] {\n  const centroids = columns.map((col) => centroid(col.geometry));\n  const projectedPoints = centroids.map((point) =>\n    nearestPointOnLine(line, point),\n  );\n  const distances = projectedPoints.map((point) =>\n    distance(point.geometry.coordinates, line.coordinates[0]),\n  );\n\n  let newColumns = columns.map((col, i) => {\n    return {\n      ...col,\n      properties: {\n        ...col.properties,\n        centroid: centroids[i],\n        nearestPointOnLine: projectedPoints[i],\n        distanceAlongLine: distances[i],\n      },\n    };\n  });\n\n  return sorted(newColumns, (d) => d.properties.distanceAlongLine);\n}\n\nfunction sorted(data, accessor: (d) => number) {\n  return data.sort((a, b) => accessor(a) - accessor(b));\n}\n"],"names":["createContext","createComputed","useState","create","useMacrostratColumns","useEffect","useStore","h","useContext","buffer","booleanPointInPolygon","lineIntersect","centroid","nearestPointOnLine","distance"],"mappings":"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"}
+{"version":3,"file":"state.cjs","sources":["../../../src/maps/column-correlation/state.ts"],"sourcesContent":["import { LineString, Point } from \"geojson\";\nimport { create, StoreApi, useStore } from \"zustand\";\nimport type { ColumnGeoJSONRecord } from \"@macrostrat/api-types\";\n// Turf intersection\nimport { lineIntersect } from \"@turf/line-intersect\";\nimport distance from \"@turf/distance\";\nimport { nearestPointOnLine } from \"@turf/nearest-point-on-line\";\nimport { centroid } from \"@turf/centroid\";\nimport {\n  createContext,\n  useState,\n  useContext,\n  ReactNode,\n  useEffect,\n} from \"react\";\nimport h from \"@macrostrat/hyper\";\nimport { createComputed } from \"zustand-computed\";\nimport { useMacrostratColumns } from \"@macrostrat/data-provider\";\nimport { buffer } from \"@turf/buffer\";\nimport { booleanPointInPolygon } from \"@turf/boolean-point-in-polygon\";\n\nexport type CorrelationSelectionMode = \"line\" | \"manual\";\n\nexport interface CorrelationMapInput {\n  columns: ColumnGeoJSONRecord[];\n  focusedLine: LineString | null;\n  /** When set, columns are selected manually (by clicking) in this order,\n   * rather than derived from a line of section. */\n  manualColumns?: number[] | null;\n}\n\nexport interface CorrelationMapStore extends CorrelationMapInput {\n  onClickMap: (event: mapboxgl.MapMouseEvent, point: Point) => void;\n  /** Toggle a column in/out of the manual selection (used in \"manual\" mode) */\n  toggleColumn: (colID: number) => void;\n  /** Remove a column from the selection. In \"line\" mode this converts the\n   * current selection to a manual one (a line can't represent an arbitrary\n   * subset), so removing a column switches modes. */\n  removeColumn: (colID: number) => void;\n  /** Replace the manual column selection with an explicit ordered list (used\n   * e.g. for drag-and-drop reordering). Switches to manual mode. */\n  setManualColumns: (colIDs: number[]) => void;\n  setHoveredColumn: (colID: number | null) => void;\n  hoveredColumn: number | null;\n  /** Request the map to frame a particular column (e.g. on header click). */\n  zoomToColumn: (colID: number | null) => void;\n  zoomColumn: number | null;\n  /** Incremented on each zoom request so repeat clicks re-frame the column. */\n  zoomNonce: number;\n  projectID?: number;\n}\n\nexport interface CorrelationProviderProps extends CorrelationMapInput {\n  projectID?: number;\n  inProcess?: boolean;\n  columns: ColumnGeoJSONRecord[] | null;\n  children: ReactNode;\n  onSelectColumns?: (\n    columns: FocusedColumnGeoJSONRecord[],\n    line: LineString | null,\n  ) => void;\n}\n\nconst CorrelationStoreContext =\n  createContext<StoreApi<CorrelationMapStore> | null>(null);\n\ntype ComputedStore = {\n  focusedColumns: FocusedColumnGeoJSONRecord[];\n  selectionMode: CorrelationSelectionMode;\n};\n\n/** A computed store that will automatically update when the state changes */\nconst computed = createComputed((state: CorrelationMapStore): ComputedStore => {\n  const manual = state.manualColumns != null;\n  return {\n    selectionMode: manual ? \"manual\" : \"line\",\n    // Focused columns are derived either from an explicit manual selection or\n    // from the columns intersecting the line of section.\n    focusedColumns: manual\n      ? buildManualColumns(state.columns, state.manualColumns)\n      : buildCorrelationColumns(state.columns, state.focusedLine),\n  };\n}) as any;\n\nexport function ColumnCorrelationProvider({\n  children,\n  columns,\n  projectID,\n  inProcess,\n  focusedLine,\n  manualColumns = null,\n  onSelectColumns,\n}: CorrelationProviderProps) {\n  const [store] = useState(() => {\n    return create<CorrelationMapStore & ComputedStore>(\n      computed((set, get): CorrelationMapStore => {\n        return {\n          focusedLine,\n          manualColumns,\n          hoveredColumn: null,\n          zoomColumn: null,\n          zoomNonce: 0,\n          projectID,\n          columns: null,\n          onClickMap(event: mapboxgl.MapMouseEvent, point: Point) {\n            const state = get();\n            // In manual-selection mode the map click is handled per-column\n            if (state.manualColumns != null) return;\n            // Check if shift key is pressed\n            const shiftKeyPressed = event.originalEvent.shiftKey;\n            let existingCoords = state.focusedLine?.coordinates ?? [];\n\n            if (existingCoords.length >= 2 && !shiftKeyPressed) {\n              // Reset the line to zero length\n              existingCoords = [];\n            }\n            set({\n              focusedLine: {\n                type: \"LineString\",\n                coordinates: [...existingCoords, point.coordinates],\n              },\n            });\n          },\n          toggleColumn(colID: number) {\n            const state = get();\n            const current =\n              state.manualColumns ??\n              state.focusedColumns.map((d) => d.properties.col_id);\n            const next = current.includes(colID)\n              ? current.filter((d) => d !== colID)\n              : [...current, colID];\n            set({ manualColumns: next, focusedLine: null });\n          },\n          removeColumn(colID: number) {\n            const state = get();\n            // Seed from the current selection (line-derived or manual)\n            const current =\n              state.manualColumns ??\n              state.focusedColumns.map((d) => d.properties.col_id);\n            set({\n              manualColumns: current.filter((d) => d !== colID),\n              focusedLine: null,\n            });\n          },\n          setManualColumns(colIDs: number[]) {\n            set({ manualColumns: colIDs, focusedLine: null });\n          },\n          setHoveredColumn(colID: number | null) {\n            set({ hoveredColumn: colID });\n          },\n          zoomToColumn(colID: number | null) {\n            set({ zoomColumn: colID, zoomNonce: get().zoomNonce + 1 });\n          },\n        };\n      }),\n    );\n  });\n\n  // Set up the store\n  /** TODO: move the fetching of all columns to within the map */\n  const _columns = useMacrostratColumns(projectID, inProcess);\n  useEffect(() => {\n    if (_columns != null) {\n      store.setState({ columns: _columns });\n    }\n  }, [_columns]);\n\n  // Kind of an awkward way to do this but we need to allow the selector to run\n  const focusedColumns = useStore(store, (state) => state.focusedColumns);\n  const _focusedLine = useStore(store, (state) => state.focusedLine);\n\n  useEffect(() => {\n    onSelectColumns?.(focusedColumns, _focusedLine);\n  }, [focusedColumns, _focusedLine]);\n\n  return h(CorrelationStoreContext.Provider, { value: store }, children);\n}\n\nexport function useCorrelationMapStore(\n  selector: (state: CorrelationMapStore & ComputedStore) => any,\n) {\n  const storeApi = useContext(CorrelationStoreContext);\n  if (storeApi == null) {\n    throw new Error(\"Missing CorrelationMapProvider\");\n  }\n  return useStore(storeApi, selector);\n}\n\nexport interface ColumnMapLink {\n  onColumnMouseOver: (colID: number | null) => void;\n  onColumnClick: (colID: number) => void;\n}\n\n/** Wire a correlation chart's column-level events to the correlation map:\n * hovering a column highlights it on the map, and clicking a column header\n * frames it. Spread the result into `CorrelationChart`. Must be used within a\n * `ColumnCorrelationProvider`. */\nexport function useColumnMapLink(): ColumnMapLink {\n  const setHoveredColumn = useCorrelationMapStore((s) => s.setHoveredColumn);\n  const zoomToColumn = useCorrelationMapStore((s) => s.zoomToColumn);\n  return {\n    onColumnMouseOver: setHoveredColumn,\n    onColumnClick: zoomToColumn,\n  };\n}\n\nfunction buildCorrelationColumns(\n  columns: ColumnGeoJSONRecord[],\n  line: LineString,\n): FocusedColumnGeoJSONRecord[] {\n  if (columns == null || line == null || line.coordinates.length < 2) {\n    return [];\n  }\n  return orderColumnsByDistance(\n    computeIntersectingColumns(columns, line),\n    line,\n  );\n}\n\nfunction buildManualColumns(\n  columns: ColumnGeoJSONRecord[],\n  ids: number[],\n): FocusedColumnGeoJSONRecord[] {\n  /** Build focused columns from an explicit, ordered list of column IDs. The\n   * ordering line simply connects them in the order they were selected. */\n  if (columns == null || ids == null) return [];\n  const byID = new Map(columns.map((c) => [c.properties.col_id, c]));\n  const result: FocusedColumnGeoJSONRecord[] = [];\n  ids.forEach((id, i) => {\n    const col = byID.get(id);\n    if (col == null) return;\n    const c = centroid(col.geometry);\n    result.push({\n      ...col,\n      properties: {\n        ...col.properties,\n        centroid: c,\n        nearestPointOnLine: c,\n        distanceAlongLine: i,\n      },\n    });\n  });\n  return result;\n}\n\nfunction computeIntersectingColumns(\n  columns: ColumnGeoJSONRecord[],\n  line: LineString,\n): ColumnGeoJSONRecord[] {\n  if (columns == null || line == null) {\n    return [];\n  }\n\n  /** eODP-focused process. Find buffers around line and then find columns intersecting that buffer */\n  const bufferedLine = buffer(line, 1, { units: \"degrees\" });\n\n  const nearbyPoints = columns.filter((col) => {\n    if (col.geometry?.type != \"Point\") {\n      return false;\n    }\n    return booleanPointInPolygon(col.geometry, bufferedLine);\n  });\n\n  const intersectingPolygons = columns.filter((col) => {\n    const poly = col.geometry;\n\n    // Some in-process datasets seem to have null geometries\n    if (poly == null) return false;\n    if (poly.type != \"Polygon\" && poly.type != \"MultiPolygon\") return false;\n\n    const intersection = lineIntersect(line, poly);\n    return intersection.features.length > 0;\n  });\n\n  return [...intersectingPolygons, ...nearbyPoints];\n}\n\ninterface FocusedColumnGeoJSONRecord extends ColumnGeoJSONRecord {\n  properties: {\n    centroid: Point;\n    nearestPointOnLine: Point;\n    distanceAlongLine: number;\n  } & ColumnGeoJSONRecord[\"properties\"];\n}\n\nfunction orderColumnsByDistance(\n  columns: ColumnGeoJSONRecord[],\n  line: LineString,\n): FocusedColumnGeoJSONRecord[] {\n  const centroids = columns.map((col) => centroid(col.geometry));\n  const projectedPoints = centroids.map((point) =>\n    nearestPointOnLine(line, point),\n  );\n  const distances = projectedPoints.map((point) =>\n    distance(point.geometry.coordinates, line.coordinates[0]),\n  );\n\n  let newColumns = columns.map((col, i) => {\n    return {\n      ...col,\n      properties: {\n        ...col.properties,\n        centroid: centroids[i],\n        nearestPointOnLine: projectedPoints[i],\n        distanceAlongLine: distances[i],\n      },\n    };\n  });\n\n  return sorted(newColumns, (d) => d.properties.distanceAlongLine);\n}\n\nfunction sorted(data, accessor: (d) => number) {\n  return data.sort((a, b) => accessor(a) - accessor(b));\n}\n"],"names":["createContext","createComputed","useState","create","useMacrostratColumns","useEffect","useStore","h","useContext","centroid","buffer","booleanPointInPolygon","lineIntersect","nearestPointOnLine","distance"],"mappings":"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"}

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

@@ -2,12 +2,32 @@ import { LineString, Point } from 'geojson';
 import { StoreApi } from 'zustand';
 import { ColumnGeoJSONRecord } from '@macrostrat/api-types';
 import { ReactNode } from 'react';
+export type CorrelationSelectionMode = "line" | "manual";
 export interface CorrelationMapInput {
     columns: ColumnGeoJSONRecord[];
     focusedLine: LineString | null;
+    /** When set, columns are selected manually (by clicking) in this order,
+     * rather than derived from a line of section. */
+    manualColumns?: number[] | null;
 }
 export interface CorrelationMapStore extends CorrelationMapInput {
     onClickMap: (event: mapboxgl.MapMouseEvent, point: Point) => void;
+    /** Toggle a column in/out of the manual selection (used in "manual" mode) */
+    toggleColumn: (colID: number) => void;
+    /** Remove a column from the selection. In "line" mode this converts the
+     * current selection to a manual one (a line can't represent an arbitrary
+     * subset), so removing a column switches modes. */
+    removeColumn: (colID: number) => void;
+    /** Replace the manual column selection with an explicit ordered list (used
+     * e.g. for drag-and-drop reordering). Switches to manual mode. */
+    setManualColumns: (colIDs: number[]) => void;
+    setHoveredColumn: (colID: number | null) => void;
+    hoveredColumn: number | null;
+    /** Request the map to frame a particular column (e.g. on header click). */
+    zoomToColumn: (colID: number | null) => void;
+    zoomColumn: number | null;
+    /** Incremented on each zoom request so repeat clicks re-frame the column. */
+    zoomNonce: number;
     projectID?: number;
 }
 export interface CorrelationProviderProps extends CorrelationMapInput {
@@ -19,9 +39,19 @@ export interface CorrelationProviderProps extends CorrelationMapInput {
 }
 type ComputedStore = {
     focusedColumns: FocusedColumnGeoJSONRecord[];
+    selectionMode: CorrelationSelectionMode;
 };
-export declare function ColumnCorrelationProvider({ children, columns, projectID, inProcess, focusedLine, onSelectColumns, }: CorrelationProviderProps): import('react').FunctionComponentElement<import('react').ProviderProps<StoreApi<CorrelationMapStore> | null>>;
+export declare function ColumnCorrelationProvider({ children, columns, projectID, inProcess, focusedLine, manualColumns, onSelectColumns, }: CorrelationProviderProps): import('react').FunctionComponentElement<import('react').ProviderProps<StoreApi<CorrelationMapStore> | null>>;
 export declare function useCorrelationMapStore(selector: (state: CorrelationMapStore & ComputedStore) => any): any;
+export interface ColumnMapLink {
+    onColumnMouseOver: (colID: number | null) => void;
+    onColumnClick: (colID: number) => void;
+}
+/** Wire a correlation chart's column-level events to the correlation map:
+ * hovering a column highlights it on the map, and clicking a column header
+ * frames it. Spread the result into `CorrelationChart`. Must be used within a
+ * `ColumnCorrelationProvider`. */
+export declare function useColumnMapLink(): ColumnMapLink;
 interface FocusedColumnGeoJSONRecord extends ColumnGeoJSONRecord {
     properties: {
         centroid: Point;

package/dist/maps/column-correlation/state.js

@@ -11,9 +11,12 @@ import { buffer } from "@turf/buffer";
 import { booleanPointInPolygon } from "@turf/boolean-point-in-polygon";
 const CorrelationStoreContext = createContext(null);
 const computed = createComputed((state) => {
+  const manual = state.manualColumns != null;
   return {
-    // We compute the focused columns based on columns and focusedLine
-    focusedColumns: buildCorrelationColumns(state.columns, state.focusedLine)
+    selectionMode: manual ? "manual" : "line",
+    // Focused columns are derived either from an explicit manual selection or
+    // from the columns intersecting the line of section.
+    focusedColumns: manual ? buildManualColumns(state.columns, state.manualColumns) : buildCorrelationColumns(state.columns, state.focusedLine)
   };
 });
 function ColumnCorrelationProvider({
@@ -22,6 +25,7 @@ function ColumnCorrelationProvider({
   projectID,
   inProcess,
   focusedLine,
+  manualColumns = null,
   onSelectColumns
 }) {
   const [store] = useState(() => {
@@ -29,10 +33,15 @@ function ColumnCorrelationProvider({
       computed((set, get) => {
         return {
           focusedLine,
+          manualColumns,
+          hoveredColumn: null,
+          zoomColumn: null,
+          zoomNonce: 0,
           projectID,
           columns: null,
           onClickMap(event, point) {
             const state = get();
+            if (state.manualColumns != null) return;
             const shiftKeyPressed = event.originalEvent.shiftKey;
             let existingCoords = state.focusedLine?.coordinates ?? [];
             if (existingCoords.length >= 2 && !shiftKeyPressed) {
@@ -44,6 +53,29 @@ function ColumnCorrelationProvider({
                 coordinates: [...existingCoords, point.coordinates]
               }
             });
+          },
+          toggleColumn(colID) {
+            const state = get();
+            const current = state.manualColumns ?? state.focusedColumns.map((d) => d.properties.col_id);
+            const next = current.includes(colID) ? current.filter((d) => d !== colID) : [...current, colID];
+            set({ manualColumns: next, focusedLine: null });
+          },
+          removeColumn(colID) {
+            const state = get();
+            const current = state.manualColumns ?? state.focusedColumns.map((d) => d.properties.col_id);
+            set({
+              manualColumns: current.filter((d) => d !== colID),
+              focusedLine: null
+            });
+          },
+          setManualColumns(colIDs) {
+            set({ manualColumns: colIDs, focusedLine: null });
+          },
+          setHoveredColumn(colID) {
+            set({ hoveredColumn: colID });
+          },
+          zoomToColumn(colID) {
+            set({ zoomColumn: colID, zoomNonce: get().zoomNonce + 1 });
           }
         };
       })
@@ -69,6 +101,14 @@ function useCorrelationMapStore(selector) {
   }
   return useStore(storeApi, selector);
 }
+function useColumnMapLink() {
+  const setHoveredColumn = useCorrelationMapStore((s) => s.setHoveredColumn);
+  const zoomToColumn = useCorrelationMapStore((s) => s.zoomToColumn);
+  return {
+    onColumnMouseOver: setHoveredColumn,
+    onColumnClick: zoomToColumn
+  };
+}
 function buildCorrelationColumns(columns, line) {
   if (columns == null || line == null || line.coordinates.length < 2) {
     return [];
@@ -78,6 +118,26 @@ function buildCorrelationColumns(columns, line) {
     line
   );
 }
+function buildManualColumns(columns, ids) {
+  if (columns == null || ids == null) return [];
+  const byID = new Map(columns.map((c) => [c.properties.col_id, c]));
+  const result = [];
+  ids.forEach((id, i) => {
+    const col = byID.get(id);
+    if (col == null) return;
+    const c = centroid(col.geometry);
+    result.push({
+      ...col,
+      properties: {
+        ...col.properties,
+        centroid: c,
+        nearestPointOnLine: c,
+        distanceAlongLine: i
+      }
+    });
+  });
+  return result;
+}
 function computeIntersectingColumns(columns, line) {
   if (columns == null || line == null) {
     return [];
@@ -124,6 +184,7 @@ function sorted(data, accessor) {
 }
 export {
   ColumnCorrelationProvider,
+  useColumnMapLink,
   useCorrelationMapStore
 };
 //# sourceMappingURL=state.js.map

package/dist/maps/column-correlation/state.js.map

@@ -1 +1 @@
-{"version":3,"file":"state.js","sources":["../../../src/maps/column-correlation/state.ts"],"sourcesContent":["import { LineString, Point } from \"geojson\";\nimport { create, StoreApi, useStore } from \"zustand\";\nimport type { ColumnGeoJSONRecord } from \"@macrostrat/api-types\";\n// Turf intersection\nimport { lineIntersect } from \"@turf/line-intersect\";\nimport distance from \"@turf/distance\";\nimport { nearestPointOnLine } from \"@turf/nearest-point-on-line\";\nimport { centroid } from \"@turf/centroid\";\nimport {\n  createContext,\n  useState,\n  useContext,\n  ReactNode,\n  useEffect,\n} from \"react\";\nimport h from \"@macrostrat/hyper\";\nimport { createComputed } from \"zustand-computed\";\nimport { useMacrostratColumns } from \"@macrostrat/data-provider\";\nimport { buffer } from \"@turf/buffer\";\nimport { booleanPointInPolygon } from \"@turf/boolean-point-in-polygon\";\n\nexport interface CorrelationMapInput {\n  columns: ColumnGeoJSONRecord[];\n  focusedLine: LineString | null;\n}\n\nexport interface CorrelationMapStore extends CorrelationMapInput {\n  onClickMap: (event: mapboxgl.MapMouseEvent, point: Point) => void;\n  projectID?: number;\n}\n\nexport interface CorrelationProviderProps extends CorrelationMapInput {\n  projectID?: number;\n  inProcess?: boolean;\n  columns: ColumnGeoJSONRecord[] | null;\n  children: ReactNode;\n  onSelectColumns?: (\n    columns: FocusedColumnGeoJSONRecord[],\n    line: LineString | null,\n  ) => void;\n}\n\nconst CorrelationStoreContext =\n  createContext<StoreApi<CorrelationMapStore> | null>(null);\n\ntype ComputedStore = {\n  focusedColumns: FocusedColumnGeoJSONRecord[];\n};\n\n/** A computed store that will automatically update when the state changes */\nconst computed = createComputed((state: CorrelationMapStore): ComputedStore => {\n  return {\n    // We compute the focused columns based on columns and focusedLine\n    focusedColumns: buildCorrelationColumns(state.columns, state.focusedLine),\n  };\n}) as any;\n\nexport function ColumnCorrelationProvider({\n  children,\n  columns,\n  projectID,\n  inProcess,\n  focusedLine,\n  onSelectColumns,\n}: CorrelationProviderProps) {\n  const [store] = useState(() => {\n    return create<CorrelationMapStore & ComputedStore>(\n      computed((set, get): CorrelationMapStore => {\n        return {\n          focusedLine,\n          projectID,\n          columns: null,\n          onClickMap(event: mapboxgl.MapMouseEvent, point: Point) {\n            const state = get();\n            // Check if shift key is pressed\n            const shiftKeyPressed = event.originalEvent.shiftKey;\n            let existingCoords = state.focusedLine?.coordinates ?? [];\n\n            if (existingCoords.length >= 2 && !shiftKeyPressed) {\n              // Reset the line to zero length\n              existingCoords = [];\n            }\n            set({\n              focusedLine: {\n                type: \"LineString\",\n                coordinates: [...existingCoords, point.coordinates],\n              },\n            });\n          },\n        };\n      }),\n    );\n  });\n\n  // Set up the store\n  /** TODO: move the fetching of all columns to within the map */\n  const _columns = useMacrostratColumns(projectID, inProcess);\n  useEffect(() => {\n    if (_columns != null) {\n      store.setState({ columns: _columns });\n    }\n  }, [_columns]);\n\n  // Kind of an awkward way to do this but we need to allow the selector to run\n  const focusedColumns = useStore(store, (state) => state.focusedColumns);\n  const _focusedLine = useStore(store, (state) => state.focusedLine);\n\n  useEffect(() => {\n    onSelectColumns?.(focusedColumns, _focusedLine);\n  }, [focusedColumns, _focusedLine]);\n\n  return h(CorrelationStoreContext.Provider, { value: store }, children);\n}\n\nexport function useCorrelationMapStore(\n  selector: (state: CorrelationMapStore & ComputedStore) => any,\n) {\n  const storeApi = useContext(CorrelationStoreContext);\n  if (storeApi == null) {\n    throw new Error(\"Missing CorrelationMapProvider\");\n  }\n  return useStore(storeApi, selector);\n}\n\nfunction buildCorrelationColumns(\n  columns: ColumnGeoJSONRecord[],\n  line: LineString,\n): FocusedColumnGeoJSONRecord[] {\n  if (columns == null || line == null || line.coordinates.length < 2) {\n    return [];\n  }\n  return orderColumnsByDistance(\n    computeIntersectingColumns(columns, line),\n    line,\n  );\n}\n\nfunction computeIntersectingColumns(\n  columns: ColumnGeoJSONRecord[],\n  line: LineString,\n): ColumnGeoJSONRecord[] {\n  if (columns == null || line == null) {\n    return [];\n  }\n\n  /** eODP-focused process. Find buffers around line and then find columns intersecting that buffer */\n  const bufferedLine = buffer(line, 1, { units: \"degrees\" });\n\n  const nearbyPoints = columns.filter((col) => {\n    if (col.geometry?.type != \"Point\") {\n      return false;\n    }\n    return booleanPointInPolygon(col.geometry, bufferedLine);\n  });\n\n  const intersectingPolygons = columns.filter((col) => {\n    const poly = col.geometry;\n\n    // Some in-process datasets seem to have null geometries\n    if (poly == null) return false;\n    if (poly.type != \"Polygon\" && poly.type != \"MultiPolygon\") return false;\n\n    const intersection = lineIntersect(line, poly);\n    return intersection.features.length > 0;\n  });\n\n  return [...intersectingPolygons, ...nearbyPoints];\n}\n\ninterface FocusedColumnGeoJSONRecord extends ColumnGeoJSONRecord {\n  properties: {\n    centroid: Point;\n    nearestPointOnLine: Point;\n    distanceAlongLine: number;\n  } & ColumnGeoJSONRecord[\"properties\"];\n}\n\nfunction orderColumnsByDistance(\n  columns: ColumnGeoJSONRecord[],\n  line: LineString,\n): FocusedColumnGeoJSONRecord[] {\n  const centroids = columns.map((col) => centroid(col.geometry));\n  const projectedPoints = centroids.map((point) =>\n    nearestPointOnLine(line, point),\n  );\n  const distances = projectedPoints.map((point) =>\n    distance(point.geometry.coordinates, line.coordinates[0]),\n  );\n\n  let newColumns = columns.map((col, i) => {\n    return {\n      ...col,\n      properties: {\n        ...col.properties,\n        centroid: centroids[i],\n        nearestPointOnLine: projectedPoints[i],\n        distanceAlongLine: distances[i],\n      },\n    };\n  });\n\n  return sorted(newColumns, (d) => d.properties.distanceAlongLine);\n}\n\nfunction sorted(data, accessor: (d) => number) {\n  return data.sort((a, b) => accessor(a) - accessor(b));\n}\n"],"names":[],"mappings":"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"}
+{"version":3,"file":"state.js","sources":["../../../src/maps/column-correlation/state.ts"],"sourcesContent":["import { LineString, Point } from \"geojson\";\nimport { create, StoreApi, useStore } from \"zustand\";\nimport type { ColumnGeoJSONRecord } from \"@macrostrat/api-types\";\n// Turf intersection\nimport { lineIntersect } from \"@turf/line-intersect\";\nimport distance from \"@turf/distance\";\nimport { nearestPointOnLine } from \"@turf/nearest-point-on-line\";\nimport { centroid } from \"@turf/centroid\";\nimport {\n  createContext,\n  useState,\n  useContext,\n  ReactNode,\n  useEffect,\n} from \"react\";\nimport h from \"@macrostrat/hyper\";\nimport { createComputed } from \"zustand-computed\";\nimport { useMacrostratColumns } from \"@macrostrat/data-provider\";\nimport { buffer } from \"@turf/buffer\";\nimport { booleanPointInPolygon } from \"@turf/boolean-point-in-polygon\";\n\nexport type CorrelationSelectionMode = \"line\" | \"manual\";\n\nexport interface CorrelationMapInput {\n  columns: ColumnGeoJSONRecord[];\n  focusedLine: LineString | null;\n  /** When set, columns are selected manually (by clicking) in this order,\n   * rather than derived from a line of section. */\n  manualColumns?: number[] | null;\n}\n\nexport interface CorrelationMapStore extends CorrelationMapInput {\n  onClickMap: (event: mapboxgl.MapMouseEvent, point: Point) => void;\n  /** Toggle a column in/out of the manual selection (used in \"manual\" mode) */\n  toggleColumn: (colID: number) => void;\n  /** Remove a column from the selection. In \"line\" mode this converts the\n   * current selection to a manual one (a line can't represent an arbitrary\n   * subset), so removing a column switches modes. */\n  removeColumn: (colID: number) => void;\n  /** Replace the manual column selection with an explicit ordered list (used\n   * e.g. for drag-and-drop reordering). Switches to manual mode. */\n  setManualColumns: (colIDs: number[]) => void;\n  setHoveredColumn: (colID: number | null) => void;\n  hoveredColumn: number | null;\n  /** Request the map to frame a particular column (e.g. on header click). */\n  zoomToColumn: (colID: number | null) => void;\n  zoomColumn: number | null;\n  /** Incremented on each zoom request so repeat clicks re-frame the column. */\n  zoomNonce: number;\n  projectID?: number;\n}\n\nexport interface CorrelationProviderProps extends CorrelationMapInput {\n  projectID?: number;\n  inProcess?: boolean;\n  columns: ColumnGeoJSONRecord[] | null;\n  children: ReactNode;\n  onSelectColumns?: (\n    columns: FocusedColumnGeoJSONRecord[],\n    line: LineString | null,\n  ) => void;\n}\n\nconst CorrelationStoreContext =\n  createContext<StoreApi<CorrelationMapStore> | null>(null);\n\ntype ComputedStore = {\n  focusedColumns: FocusedColumnGeoJSONRecord[];\n  selectionMode: CorrelationSelectionMode;\n};\n\n/** A computed store that will automatically update when the state changes */\nconst computed = createComputed((state: CorrelationMapStore): ComputedStore => {\n  const manual = state.manualColumns != null;\n  return {\n    selectionMode: manual ? \"manual\" : \"line\",\n    // Focused columns are derived either from an explicit manual selection or\n    // from the columns intersecting the line of section.\n    focusedColumns: manual\n      ? buildManualColumns(state.columns, state.manualColumns)\n      : buildCorrelationColumns(state.columns, state.focusedLine),\n  };\n}) as any;\n\nexport function ColumnCorrelationProvider({\n  children,\n  columns,\n  projectID,\n  inProcess,\n  focusedLine,\n  manualColumns = null,\n  onSelectColumns,\n}: CorrelationProviderProps) {\n  const [store] = useState(() => {\n    return create<CorrelationMapStore & ComputedStore>(\n      computed((set, get): CorrelationMapStore => {\n        return {\n          focusedLine,\n          manualColumns,\n          hoveredColumn: null,\n          zoomColumn: null,\n          zoomNonce: 0,\n          projectID,\n          columns: null,\n          onClickMap(event: mapboxgl.MapMouseEvent, point: Point) {\n            const state = get();\n            // In manual-selection mode the map click is handled per-column\n            if (state.manualColumns != null) return;\n            // Check if shift key is pressed\n            const shiftKeyPressed = event.originalEvent.shiftKey;\n            let existingCoords = state.focusedLine?.coordinates ?? [];\n\n            if (existingCoords.length >= 2 && !shiftKeyPressed) {\n              // Reset the line to zero length\n              existingCoords = [];\n            }\n            set({\n              focusedLine: {\n                type: \"LineString\",\n                coordinates: [...existingCoords, point.coordinates],\n              },\n            });\n          },\n          toggleColumn(colID: number) {\n            const state = get();\n            const current =\n              state.manualColumns ??\n              state.focusedColumns.map((d) => d.properties.col_id);\n            const next = current.includes(colID)\n              ? current.filter((d) => d !== colID)\n              : [...current, colID];\n            set({ manualColumns: next, focusedLine: null });\n          },\n          removeColumn(colID: number) {\n            const state = get();\n            // Seed from the current selection (line-derived or manual)\n            const current =\n              state.manualColumns ??\n              state.focusedColumns.map((d) => d.properties.col_id);\n            set({\n              manualColumns: current.filter((d) => d !== colID),\n              focusedLine: null,\n            });\n          },\n          setManualColumns(colIDs: number[]) {\n            set({ manualColumns: colIDs, focusedLine: null });\n          },\n          setHoveredColumn(colID: number | null) {\n            set({ hoveredColumn: colID });\n          },\n          zoomToColumn(colID: number | null) {\n            set({ zoomColumn: colID, zoomNonce: get().zoomNonce + 1 });\n          },\n        };\n      }),\n    );\n  });\n\n  // Set up the store\n  /** TODO: move the fetching of all columns to within the map */\n  const _columns = useMacrostratColumns(projectID, inProcess);\n  useEffect(() => {\n    if (_columns != null) {\n      store.setState({ columns: _columns });\n    }\n  }, [_columns]);\n\n  // Kind of an awkward way to do this but we need to allow the selector to run\n  const focusedColumns = useStore(store, (state) => state.focusedColumns);\n  const _focusedLine = useStore(store, (state) => state.focusedLine);\n\n  useEffect(() => {\n    onSelectColumns?.(focusedColumns, _focusedLine);\n  }, [focusedColumns, _focusedLine]);\n\n  return h(CorrelationStoreContext.Provider, { value: store }, children);\n}\n\nexport function useCorrelationMapStore(\n  selector: (state: CorrelationMapStore & ComputedStore) => any,\n) {\n  const storeApi = useContext(CorrelationStoreContext);\n  if (storeApi == null) {\n    throw new Error(\"Missing CorrelationMapProvider\");\n  }\n  return useStore(storeApi, selector);\n}\n\nexport interface ColumnMapLink {\n  onColumnMouseOver: (colID: number | null) => void;\n  onColumnClick: (colID: number) => void;\n}\n\n/** Wire a correlation chart's column-level events to the correlation map:\n * hovering a column highlights it on the map, and clicking a column header\n * frames it. Spread the result into `CorrelationChart`. Must be used within a\n * `ColumnCorrelationProvider`. */\nexport function useColumnMapLink(): ColumnMapLink {\n  const setHoveredColumn = useCorrelationMapStore((s) => s.setHoveredColumn);\n  const zoomToColumn = useCorrelationMapStore((s) => s.zoomToColumn);\n  return {\n    onColumnMouseOver: setHoveredColumn,\n    onColumnClick: zoomToColumn,\n  };\n}\n\nfunction buildCorrelationColumns(\n  columns: ColumnGeoJSONRecord[],\n  line: LineString,\n): FocusedColumnGeoJSONRecord[] {\n  if (columns == null || line == null || line.coordinates.length < 2) {\n    return [];\n  }\n  return orderColumnsByDistance(\n    computeIntersectingColumns(columns, line),\n    line,\n  );\n}\n\nfunction buildManualColumns(\n  columns: ColumnGeoJSONRecord[],\n  ids: number[],\n): FocusedColumnGeoJSONRecord[] {\n  /** Build focused columns from an explicit, ordered list of column IDs. The\n   * ordering line simply connects them in the order they were selected. */\n  if (columns == null || ids == null) return [];\n  const byID = new Map(columns.map((c) => [c.properties.col_id, c]));\n  const result: FocusedColumnGeoJSONRecord[] = [];\n  ids.forEach((id, i) => {\n    const col = byID.get(id);\n    if (col == null) return;\n    const c = centroid(col.geometry);\n    result.push({\n      ...col,\n      properties: {\n        ...col.properties,\n        centroid: c,\n        nearestPointOnLine: c,\n        distanceAlongLine: i,\n      },\n    });\n  });\n  return result;\n}\n\nfunction computeIntersectingColumns(\n  columns: ColumnGeoJSONRecord[],\n  line: LineString,\n): ColumnGeoJSONRecord[] {\n  if (columns == null || line == null) {\n    return [];\n  }\n\n  /** eODP-focused process. Find buffers around line and then find columns intersecting that buffer */\n  const bufferedLine = buffer(line, 1, { units: \"degrees\" });\n\n  const nearbyPoints = columns.filter((col) => {\n    if (col.geometry?.type != \"Point\") {\n      return false;\n    }\n    return booleanPointInPolygon(col.geometry, bufferedLine);\n  });\n\n  const intersectingPolygons = columns.filter((col) => {\n    const poly = col.geometry;\n\n    // Some in-process datasets seem to have null geometries\n    if (poly == null) return false;\n    if (poly.type != \"Polygon\" && poly.type != \"MultiPolygon\") return false;\n\n    const intersection = lineIntersect(line, poly);\n    return intersection.features.length > 0;\n  });\n\n  return [...intersectingPolygons, ...nearbyPoints];\n}\n\ninterface FocusedColumnGeoJSONRecord extends ColumnGeoJSONRecord {\n  properties: {\n    centroid: Point;\n    nearestPointOnLine: Point;\n    distanceAlongLine: number;\n  } & ColumnGeoJSONRecord[\"properties\"];\n}\n\nfunction orderColumnsByDistance(\n  columns: ColumnGeoJSONRecord[],\n  line: LineString,\n): FocusedColumnGeoJSONRecord[] {\n  const centroids = columns.map((col) => centroid(col.geometry));\n  const projectedPoints = centroids.map((point) =>\n    nearestPointOnLine(line, point),\n  );\n  const distances = projectedPoints.map((point) =>\n    distance(point.geometry.coordinates, line.coordinates[0]),\n  );\n\n  let newColumns = columns.map((col, i) => {\n    return {\n      ...col,\n      properties: {\n        ...col.properties,\n        centroid: centroids[i],\n        nearestPointOnLine: projectedPoints[i],\n        distanceAlongLine: distances[i],\n      },\n    };\n  });\n\n  return sorted(newColumns, (d) => d.properties.distanceAlongLine);\n}\n\nfunction sorted(data, accessor: (d) => number) {\n  return data.sort((a, b) => accessor(a) - accessor(b));\n}\n"],"names":[],"mappings":"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"}

package/dist/maps/layers/columns.cjs

@@ -42,7 +42,11 @@ function buildColumnsStyle(opts = {}) {
   let columnColor = columnBaseColor;
   const columnSelectedColor = opts.selectedColor ?? colorUtils.getCSSVariable("--selection-color", "purple");
   const lineColor = opts.lineColor ?? columnBaseColor;
-  const isHovered = ["boolean", ["feature-state", "hover"], false];
+  const isHovered = [
+    "any",
+    ["boolean", ["feature-state", "hover"], false],
+    ["boolean", ["feature-state", "highlighted"], false]
+  ];
   if (typeof columnColor === "string") {
     columnColor = [
       "coalesce",

package/dist/maps/layers/columns.cjs.map

@@ -1 +1 @@
-{"version":3,"file":"columns.cjs","sources":["../../../src/maps/layers/columns.ts"],"sourcesContent":["import { useMapStyleOperator, useOverlayStyle } from \"@macrostrat/mapbox-react\";\nimport { setGeoJSON } from \"@macrostrat/mapbox-utils\";\nimport GeoJSON, { FeatureCollection } from \"geojson\";\nimport { GeoJSONFeature } from \"mapbox-gl\";\nimport { getCSSVariable } from \"@macrostrat/color-utils\";\nimport { buildGeoJSONSource } from \"@macrostrat/mapbox-utils\";\nimport { StyleFragment } from \"@macrostrat/mapbox-react\";\n\nexport interface ColumnsStyleOptions {\n  color?: string | any[];\n  selectedColor?: string | any[];\n  opacity?: number | any[];\n  circleRadius?: number | any[];\n  lineOpacity?: number | any[];\n  lineWidth?: number | any[];\n  lineColor?: string | any[];\n}\n\ninterface ColumnLayerOptions extends ColumnsStyleOptions {\n  enabled: boolean;\n  columns: FeatureCollection | GeoJSONFeature[];\n}\n\nexport function BaseColumnsLayer({\n  enabled = true,\n  columns,\n  ...rest\n}: ColumnLayerOptions) {\n  useOverlayStyle(() => (enabled ? buildColumnsStyle(rest) : null), [enabled]);\n\n  useMapStyleOperator(\n    (map) => {\n      if (columns == null) {\n        return;\n      }\n\n      setGeoJSON(map, \"columns\", promoteToFeatureCollection(columns));\n    },\n    [columns, enabled],\n  );\n  return null;\n}\n\nfunction promoteToFeatureCollection(\n  data: FeatureCollection | GeoJSONFeature | GeoJSONFeature[] | null,\n): FeatureCollection | null {\n  if (data == null) return null;\n  if (\"type\" in data && data.type == \"Feature\") {\n    return {\n      type: \"FeatureCollection\",\n      features: [data],\n    };\n  }\n  if (\n    \"type\" in data &&\n    data.type == \"FeatureCollection\" &&\n    \"features\" in data\n  ) {\n    return data;\n  }\n  return {\n    type: \"FeatureCollection\",\n    features: data,\n  };\n}\n\nexport function buildColumnsStyle(\n  opts: ColumnsStyleOptions = {},\n): StyleFragment {\n  const { color } = opts;\n  const columnBaseColor =\n    color ?? getCSSVariable(\"--text-subtle-color\", \"black\");\n  let columnColor: any = columnBaseColor;\n  const columnSelectedColor =\n    opts.selectedColor ?? getCSSVariable(\"--selection-color\", \"purple\");\n\n  const lineColor = opts.lineColor ?? columnBaseColor;\n  const isHovered = [\"boolean\", [\"feature-state\", \"hover\"], false];\n  // If color is in the feature state or geojson properties, use that as second choice\n  if (typeof columnColor === \"string\") {\n    columnColor = [\n      \"coalesce\",\n      [\"feature-state\", \"color\"],\n      [\"get\", \"color\"],\n      columnColor,\n    ];\n  }\n\n  const fillOpacity = opts.opacity ?? 0.1;\n\n  const lineOpacity = opts.lineOpacity ?? 0.5;\n  const lineWidth = opts.lineWidth ?? 2;\n\n  const circleRadius = opts.circleRadius ?? 4;\n\n  return {\n    sources: {\n      columns: buildGeoJSONSource(),\n    },\n    version: 8,\n    layers: [\n      {\n        id: \"columns-fill\",\n        type: \"fill\",\n        source: \"columns\",\n        paint: {\n          \"fill-color\": columnColor,\n          \"fill-opacity\": fillOpacity,\n        },\n      },\n      {\n        id: \"columns-points\",\n        type: \"circle\",\n        source: \"columns\",\n        paint: {\n          \"circle-radius\": circleRadius,\n          \"circle-color\": columnColor,\n          \"circle-opacity\": fillOpacity,\n        },\n        filter: [\"==\", \"$type\", \"Point\"],\n      },\n      {\n        id: \"columns-line\",\n        type: \"line\",\n        source: \"columns\",\n        paint: {\n          \"line-color\": [\"case\", isHovered, columnSelectedColor, lineColor],\n          \"line-width\": lineWidth,\n          \"line-opacity\": [\"case\", isHovered, 1.0, lineOpacity],\n        },\n      },\n    ],\n  };\n}\n\nexport type ColumnFeature = GeoJSON.Feature & { id: number };\n\nconst selectedColumnSourceID = \"selectedColumn\";\n\nexport function SelectedColumnOverlay({\n  selectedColumn,\n  ...styleOpts\n}: { selectedColumn: ColumnFeature | null } & SelectedColumnStyleOpts) {\n  useOverlayStyle(() => buildSelectedColumnStyle(styleOpts), []);\n\n  useMapStyleOperator(\n    (map) => {\n      setGeoJSON(\n        map,\n        selectedColumnSourceID,\n        promoteToFeatureCollection(selectedColumn as GeoJSONFeature | null),\n      );\n    },\n    [selectedColumn],\n  );\n\n  return null;\n}\n\ninterface SelectedColumnStyleOpts {\n  color?: string | any[];\n}\n\nfunction buildSelectedColumnStyle(\n  opts: SelectedColumnStyleOpts = {},\n): StyleFragment {\n  const columnSelectedColor: any =\n    opts.color ?? getCSSVariable(\"--selection-color\", \"purple\");\n\n  return {\n    sources: {\n      selectedColumn: buildGeoJSONSource(),\n    },\n    version: 8,\n    layers: [\n      {\n        id: \"selected-column-highlight\",\n        type: \"fill\",\n        source: selectedColumnSourceID,\n        paint: {\n          \"fill-color\": columnSelectedColor,\n          \"fill-opacity\": 0.5,\n        },\n        filter: [\"==\", \"$type\", \"Polygon\"],\n      },\n      {\n        id: \"selected-column-edge\",\n        type: \"line\",\n        source: selectedColumnSourceID,\n        paint: {\n          \"line-color\": columnSelectedColor,\n          \"line-width\": 2,\n          \"line-opacity\": 1.0,\n        },\n        filter: [\"==\", \"$type\", \"Polygon\"],\n      },\n      {\n        id: \"selected-column-point\",\n        type: \"circle\",\n        source: selectedColumnSourceID,\n        paint: {\n          \"circle-radius\": 6,\n          \"circle-color\": columnSelectedColor,\n          \"circle-opacity\": 1.0,\n        },\n        filter: [\"==\", \"$type\", \"Point\"],\n      },\n    ],\n  };\n}\n"],"names":["useOverlayStyle","useMapStyleOperator","setGeoJSON","getCSSVariable","buildGeoJSONSource"],"mappings":"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"}
+{"version":3,"file":"columns.cjs","sources":["../../../src/maps/layers/columns.ts"],"sourcesContent":["import { useMapStyleOperator, useOverlayStyle } from \"@macrostrat/mapbox-react\";\nimport { setGeoJSON } from \"@macrostrat/mapbox-utils\";\nimport GeoJSON, { FeatureCollection } from \"geojson\";\nimport { GeoJSONFeature } from \"mapbox-gl\";\nimport { getCSSVariable } from \"@macrostrat/color-utils\";\nimport { buildGeoJSONSource } from \"@macrostrat/mapbox-utils\";\nimport { StyleFragment } from \"@macrostrat/mapbox-react\";\n\nexport interface ColumnsStyleOptions {\n  color?: string | any[];\n  selectedColor?: string | any[];\n  opacity?: number | any[];\n  circleRadius?: number | any[];\n  lineOpacity?: number | any[];\n  lineWidth?: number | any[];\n  lineColor?: string | any[];\n}\n\ninterface ColumnLayerOptions extends ColumnsStyleOptions {\n  enabled: boolean;\n  columns: FeatureCollection | GeoJSONFeature[];\n}\n\nexport function BaseColumnsLayer({\n  enabled = true,\n  columns,\n  ...rest\n}: ColumnLayerOptions) {\n  useOverlayStyle(() => (enabled ? buildColumnsStyle(rest) : null), [enabled]);\n\n  useMapStyleOperator(\n    (map) => {\n      if (columns == null) {\n        return;\n      }\n\n      setGeoJSON(map, \"columns\", promoteToFeatureCollection(columns));\n    },\n    [columns, enabled],\n  );\n  return null;\n}\n\nfunction promoteToFeatureCollection(\n  data: FeatureCollection | GeoJSONFeature | GeoJSONFeature[] | null,\n): FeatureCollection | null {\n  if (data == null) return null;\n  if (\"type\" in data && data.type == \"Feature\") {\n    return {\n      type: \"FeatureCollection\",\n      features: [data],\n    };\n  }\n  if (\n    \"type\" in data &&\n    data.type == \"FeatureCollection\" &&\n    \"features\" in data\n  ) {\n    return data;\n  }\n  return {\n    type: \"FeatureCollection\",\n    features: data,\n  };\n}\n\nexport function buildColumnsStyle(\n  opts: ColumnsStyleOptions = {},\n): StyleFragment {\n  const { color } = opts;\n  const columnBaseColor =\n    color ?? getCSSVariable(\"--text-subtle-color\", \"black\");\n  let columnColor: any = columnBaseColor;\n  const columnSelectedColor =\n    opts.selectedColor ?? getCSSVariable(\"--selection-color\", \"purple\");\n\n  const lineColor = opts.lineColor ?? columnBaseColor;\n  // Highlight on either direct map hover or an externally-driven highlight\n  // (e.g. hovering the corresponding column header elsewhere in the UI).\n  const isHovered = [\n    \"any\",\n    [\"boolean\", [\"feature-state\", \"hover\"], false],\n    [\"boolean\", [\"feature-state\", \"highlighted\"], false],\n  ];\n  // If color is in the feature state or geojson properties, use that as second choice\n  if (typeof columnColor === \"string\") {\n    columnColor = [\n      \"coalesce\",\n      [\"feature-state\", \"color\"],\n      [\"get\", \"color\"],\n      columnColor,\n    ];\n  }\n\n  const fillOpacity = opts.opacity ?? 0.1;\n\n  const lineOpacity = opts.lineOpacity ?? 0.5;\n  const lineWidth = opts.lineWidth ?? 2;\n\n  const circleRadius = opts.circleRadius ?? 4;\n\n  return {\n    sources: {\n      columns: buildGeoJSONSource(),\n    },\n    version: 8,\n    layers: [\n      {\n        id: \"columns-fill\",\n        type: \"fill\",\n        source: \"columns\",\n        paint: {\n          \"fill-color\": columnColor,\n          \"fill-opacity\": fillOpacity,\n        },\n      },\n      {\n        id: \"columns-points\",\n        type: \"circle\",\n        source: \"columns\",\n        paint: {\n          \"circle-radius\": circleRadius,\n          \"circle-color\": columnColor,\n          \"circle-opacity\": fillOpacity,\n        },\n        filter: [\"==\", \"$type\", \"Point\"],\n      },\n      {\n        id: \"columns-line\",\n        type: \"line\",\n        source: \"columns\",\n        paint: {\n          \"line-color\": [\"case\", isHovered, columnSelectedColor, lineColor],\n          \"line-width\": lineWidth,\n          \"line-opacity\": [\"case\", isHovered, 1.0, lineOpacity],\n        },\n      },\n    ],\n  };\n}\n\nexport type ColumnFeature = GeoJSON.Feature & { id: number };\n\nconst selectedColumnSourceID = \"selectedColumn\";\n\nexport function SelectedColumnOverlay({\n  selectedColumn,\n  ...styleOpts\n}: { selectedColumn: ColumnFeature | null } & SelectedColumnStyleOpts) {\n  useOverlayStyle(() => buildSelectedColumnStyle(styleOpts), []);\n\n  useMapStyleOperator(\n    (map) => {\n      setGeoJSON(\n        map,\n        selectedColumnSourceID,\n        promoteToFeatureCollection(selectedColumn as GeoJSONFeature | null),\n      );\n    },\n    [selectedColumn],\n  );\n\n  return null;\n}\n\ninterface SelectedColumnStyleOpts {\n  color?: string | any[];\n}\n\nfunction buildSelectedColumnStyle(\n  opts: SelectedColumnStyleOpts = {},\n): StyleFragment {\n  const columnSelectedColor: any =\n    opts.color ?? getCSSVariable(\"--selection-color\", \"purple\");\n\n  return {\n    sources: {\n      selectedColumn: buildGeoJSONSource(),\n    },\n    version: 8,\n    layers: [\n      {\n        id: \"selected-column-highlight\",\n        type: \"fill\",\n        source: selectedColumnSourceID,\n        paint: {\n          \"fill-color\": columnSelectedColor,\n          \"fill-opacity\": 0.5,\n        },\n        filter: [\"==\", \"$type\", \"Polygon\"],\n      },\n      {\n        id: \"selected-column-edge\",\n        type: \"line\",\n        source: selectedColumnSourceID,\n        paint: {\n          \"line-color\": columnSelectedColor,\n          \"line-width\": 2,\n          \"line-opacity\": 1.0,\n        },\n        filter: [\"==\", \"$type\", \"Polygon\"],\n      },\n      {\n        id: \"selected-column-point\",\n        type: \"circle\",\n        source: selectedColumnSourceID,\n        paint: {\n          \"circle-radius\": 6,\n          \"circle-color\": columnSelectedColor,\n          \"circle-opacity\": 1.0,\n        },\n        filter: [\"==\", \"$type\", \"Point\"],\n      },\n    ],\n  };\n}\n"],"names":["useOverlayStyle","useMapStyleOperator","setGeoJSON","getCSSVariable","buildGeoJSONSource"],"mappings":"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"}

package/dist/maps/layers/columns.js

@@ -40,7 +40,11 @@ function buildColumnsStyle(opts = {}) {
   let columnColor = columnBaseColor;
   const columnSelectedColor = opts.selectedColor ?? getCSSVariable("--selection-color", "purple");
   const lineColor = opts.lineColor ?? columnBaseColor;
-  const isHovered = ["boolean", ["feature-state", "hover"], false];
+  const isHovered = [
+    "any",
+    ["boolean", ["feature-state", "hover"], false],
+    ["boolean", ["feature-state", "highlighted"], false]
+  ];
   if (typeof columnColor === "string") {
     columnColor = [
       "coalesce",

package/dist/maps/layers/columns.js.map

@@ -1 +1 @@
-{"version":3,"file":"columns.js","sources":["../../../src/maps/layers/columns.ts"],"sourcesContent":["import { useMapStyleOperator, useOverlayStyle } from \"@macrostrat/mapbox-react\";\nimport { setGeoJSON } from \"@macrostrat/mapbox-utils\";\nimport GeoJSON, { FeatureCollection } from \"geojson\";\nimport { GeoJSONFeature } from \"mapbox-gl\";\nimport { getCSSVariable } from \"@macrostrat/color-utils\";\nimport { buildGeoJSONSource } from \"@macrostrat/mapbox-utils\";\nimport { StyleFragment } from \"@macrostrat/mapbox-react\";\n\nexport interface ColumnsStyleOptions {\n  color?: string | any[];\n  selectedColor?: string | any[];\n  opacity?: number | any[];\n  circleRadius?: number | any[];\n  lineOpacity?: number | any[];\n  lineWidth?: number | any[];\n  lineColor?: string | any[];\n}\n\ninterface ColumnLayerOptions extends ColumnsStyleOptions {\n  enabled: boolean;\n  columns: FeatureCollection | GeoJSONFeature[];\n}\n\nexport function BaseColumnsLayer({\n  enabled = true,\n  columns,\n  ...rest\n}: ColumnLayerOptions) {\n  useOverlayStyle(() => (enabled ? buildColumnsStyle(rest) : null), [enabled]);\n\n  useMapStyleOperator(\n    (map) => {\n      if (columns == null) {\n        return;\n      }\n\n      setGeoJSON(map, \"columns\", promoteToFeatureCollection(columns));\n    },\n    [columns, enabled],\n  );\n  return null;\n}\n\nfunction promoteToFeatureCollection(\n  data: FeatureCollection | GeoJSONFeature | GeoJSONFeature[] | null,\n): FeatureCollection | null {\n  if (data == null) return null;\n  if (\"type\" in data && data.type == \"Feature\") {\n    return {\n      type: \"FeatureCollection\",\n      features: [data],\n    };\n  }\n  if (\n    \"type\" in data &&\n    data.type == \"FeatureCollection\" &&\n    \"features\" in data\n  ) {\n    return data;\n  }\n  return {\n    type: \"FeatureCollection\",\n    features: data,\n  };\n}\n\nexport function buildColumnsStyle(\n  opts: ColumnsStyleOptions = {},\n): StyleFragment {\n  const { color } = opts;\n  const columnBaseColor =\n    color ?? getCSSVariable(\"--text-subtle-color\", \"black\");\n  let columnColor: any = columnBaseColor;\n  const columnSelectedColor =\n    opts.selectedColor ?? getCSSVariable(\"--selection-color\", \"purple\");\n\n  const lineColor = opts.lineColor ?? columnBaseColor;\n  const isHovered = [\"boolean\", [\"feature-state\", \"hover\"], false];\n  // If color is in the feature state or geojson properties, use that as second choice\n  if (typeof columnColor === \"string\") {\n    columnColor = [\n      \"coalesce\",\n      [\"feature-state\", \"color\"],\n      [\"get\", \"color\"],\n      columnColor,\n    ];\n  }\n\n  const fillOpacity = opts.opacity ?? 0.1;\n\n  const lineOpacity = opts.lineOpacity ?? 0.5;\n  const lineWidth = opts.lineWidth ?? 2;\n\n  const circleRadius = opts.circleRadius ?? 4;\n\n  return {\n    sources: {\n      columns: buildGeoJSONSource(),\n    },\n    version: 8,\n    layers: [\n      {\n        id: \"columns-fill\",\n        type: \"fill\",\n        source: \"columns\",\n        paint: {\n          \"fill-color\": columnColor,\n          \"fill-opacity\": fillOpacity,\n        },\n      },\n      {\n        id: \"columns-points\",\n        type: \"circle\",\n        source: \"columns\",\n        paint: {\n          \"circle-radius\": circleRadius,\n          \"circle-color\": columnColor,\n          \"circle-opacity\": fillOpacity,\n        },\n        filter: [\"==\", \"$type\", \"Point\"],\n      },\n      {\n        id: \"columns-line\",\n        type: \"line\",\n        source: \"columns\",\n        paint: {\n          \"line-color\": [\"case\", isHovered, columnSelectedColor, lineColor],\n          \"line-width\": lineWidth,\n          \"line-opacity\": [\"case\", isHovered, 1.0, lineOpacity],\n        },\n      },\n    ],\n  };\n}\n\nexport type ColumnFeature = GeoJSON.Feature & { id: number };\n\nconst selectedColumnSourceID = \"selectedColumn\";\n\nexport function SelectedColumnOverlay({\n  selectedColumn,\n  ...styleOpts\n}: { selectedColumn: ColumnFeature | null } & SelectedColumnStyleOpts) {\n  useOverlayStyle(() => buildSelectedColumnStyle(styleOpts), []);\n\n  useMapStyleOperator(\n    (map) => {\n      setGeoJSON(\n        map,\n        selectedColumnSourceID,\n        promoteToFeatureCollection(selectedColumn as GeoJSONFeature | null),\n      );\n    },\n    [selectedColumn],\n  );\n\n  return null;\n}\n\ninterface SelectedColumnStyleOpts {\n  color?: string | any[];\n}\n\nfunction buildSelectedColumnStyle(\n  opts: SelectedColumnStyleOpts = {},\n): StyleFragment {\n  const columnSelectedColor: any =\n    opts.color ?? getCSSVariable(\"--selection-color\", \"purple\");\n\n  return {\n    sources: {\n      selectedColumn: buildGeoJSONSource(),\n    },\n    version: 8,\n    layers: [\n      {\n        id: \"selected-column-highlight\",\n        type: \"fill\",\n        source: selectedColumnSourceID,\n        paint: {\n          \"fill-color\": columnSelectedColor,\n          \"fill-opacity\": 0.5,\n        },\n        filter: [\"==\", \"$type\", \"Polygon\"],\n      },\n      {\n        id: \"selected-column-edge\",\n        type: \"line\",\n        source: selectedColumnSourceID,\n        paint: {\n          \"line-color\": columnSelectedColor,\n          \"line-width\": 2,\n          \"line-opacity\": 1.0,\n        },\n        filter: [\"==\", \"$type\", \"Polygon\"],\n      },\n      {\n        id: \"selected-column-point\",\n        type: \"circle\",\n        source: selectedColumnSourceID,\n        paint: {\n          \"circle-radius\": 6,\n          \"circle-color\": columnSelectedColor,\n          \"circle-opacity\": 1.0,\n        },\n        filter: [\"==\", \"$type\", \"Point\"],\n      },\n    ],\n  };\n}\n"],"names":[],"mappings":"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"}
+{"version":3,"file":"columns.js","sources":["../../../src/maps/layers/columns.ts"],"sourcesContent":["import { useMapStyleOperator, useOverlayStyle } from \"@macrostrat/mapbox-react\";\nimport { setGeoJSON } from \"@macrostrat/mapbox-utils\";\nimport GeoJSON, { FeatureCollection } from \"geojson\";\nimport { GeoJSONFeature } from \"mapbox-gl\";\nimport { getCSSVariable } from \"@macrostrat/color-utils\";\nimport { buildGeoJSONSource } from \"@macrostrat/mapbox-utils\";\nimport { StyleFragment } from \"@macrostrat/mapbox-react\";\n\nexport interface ColumnsStyleOptions {\n  color?: string | any[];\n  selectedColor?: string | any[];\n  opacity?: number | any[];\n  circleRadius?: number | any[];\n  lineOpacity?: number | any[];\n  lineWidth?: number | any[];\n  lineColor?: string | any[];\n}\n\ninterface ColumnLayerOptions extends ColumnsStyleOptions {\n  enabled: boolean;\n  columns: FeatureCollection | GeoJSONFeature[];\n}\n\nexport function BaseColumnsLayer({\n  enabled = true,\n  columns,\n  ...rest\n}: ColumnLayerOptions) {\n  useOverlayStyle(() => (enabled ? buildColumnsStyle(rest) : null), [enabled]);\n\n  useMapStyleOperator(\n    (map) => {\n      if (columns == null) {\n        return;\n      }\n\n      setGeoJSON(map, \"columns\", promoteToFeatureCollection(columns));\n    },\n    [columns, enabled],\n  );\n  return null;\n}\n\nfunction promoteToFeatureCollection(\n  data: FeatureCollection | GeoJSONFeature | GeoJSONFeature[] | null,\n): FeatureCollection | null {\n  if (data == null) return null;\n  if (\"type\" in data && data.type == \"Feature\") {\n    return {\n      type: \"FeatureCollection\",\n      features: [data],\n    };\n  }\n  if (\n    \"type\" in data &&\n    data.type == \"FeatureCollection\" &&\n    \"features\" in data\n  ) {\n    return data;\n  }\n  return {\n    type: \"FeatureCollection\",\n    features: data,\n  };\n}\n\nexport function buildColumnsStyle(\n  opts: ColumnsStyleOptions = {},\n): StyleFragment {\n  const { color } = opts;\n  const columnBaseColor =\n    color ?? getCSSVariable(\"--text-subtle-color\", \"black\");\n  let columnColor: any = columnBaseColor;\n  const columnSelectedColor =\n    opts.selectedColor ?? getCSSVariable(\"--selection-color\", \"purple\");\n\n  const lineColor = opts.lineColor ?? columnBaseColor;\n  // Highlight on either direct map hover or an externally-driven highlight\n  // (e.g. hovering the corresponding column header elsewhere in the UI).\n  const isHovered = [\n    \"any\",\n    [\"boolean\", [\"feature-state\", \"hover\"], false],\n    [\"boolean\", [\"feature-state\", \"highlighted\"], false],\n  ];\n  // If color is in the feature state or geojson properties, use that as second choice\n  if (typeof columnColor === \"string\") {\n    columnColor = [\n      \"coalesce\",\n      [\"feature-state\", \"color\"],\n      [\"get\", \"color\"],\n      columnColor,\n    ];\n  }\n\n  const fillOpacity = opts.opacity ?? 0.1;\n\n  const lineOpacity = opts.lineOpacity ?? 0.5;\n  const lineWidth = opts.lineWidth ?? 2;\n\n  const circleRadius = opts.circleRadius ?? 4;\n\n  return {\n    sources: {\n      columns: buildGeoJSONSource(),\n    },\n    version: 8,\n    layers: [\n      {\n        id: \"columns-fill\",\n        type: \"fill\",\n        source: \"columns\",\n        paint: {\n          \"fill-color\": columnColor,\n          \"fill-opacity\": fillOpacity,\n        },\n      },\n      {\n        id: \"columns-points\",\n        type: \"circle\",\n        source: \"columns\",\n        paint: {\n          \"circle-radius\": circleRadius,\n          \"circle-color\": columnColor,\n          \"circle-opacity\": fillOpacity,\n        },\n        filter: [\"==\", \"$type\", \"Point\"],\n      },\n      {\n        id: \"columns-line\",\n        type: \"line\",\n        source: \"columns\",\n        paint: {\n          \"line-color\": [\"case\", isHovered, columnSelectedColor, lineColor],\n          \"line-width\": lineWidth,\n          \"line-opacity\": [\"case\", isHovered, 1.0, lineOpacity],\n        },\n      },\n    ],\n  };\n}\n\nexport type ColumnFeature = GeoJSON.Feature & { id: number };\n\nconst selectedColumnSourceID = \"selectedColumn\";\n\nexport function SelectedColumnOverlay({\n  selectedColumn,\n  ...styleOpts\n}: { selectedColumn: ColumnFeature | null } & SelectedColumnStyleOpts) {\n  useOverlayStyle(() => buildSelectedColumnStyle(styleOpts), []);\n\n  useMapStyleOperator(\n    (map) => {\n      setGeoJSON(\n        map,\n        selectedColumnSourceID,\n        promoteToFeatureCollection(selectedColumn as GeoJSONFeature | null),\n      );\n    },\n    [selectedColumn],\n  );\n\n  return null;\n}\n\ninterface SelectedColumnStyleOpts {\n  color?: string | any[];\n}\n\nfunction buildSelectedColumnStyle(\n  opts: SelectedColumnStyleOpts = {},\n): StyleFragment {\n  const columnSelectedColor: any =\n    opts.color ?? getCSSVariable(\"--selection-color\", \"purple\");\n\n  return {\n    sources: {\n      selectedColumn: buildGeoJSONSource(),\n    },\n    version: 8,\n    layers: [\n      {\n        id: \"selected-column-highlight\",\n        type: \"fill\",\n        source: selectedColumnSourceID,\n        paint: {\n          \"fill-color\": columnSelectedColor,\n          \"fill-opacity\": 0.5,\n        },\n        filter: [\"==\", \"$type\", \"Polygon\"],\n      },\n      {\n        id: \"selected-column-edge\",\n        type: \"line\",\n        source: selectedColumnSourceID,\n        paint: {\n          \"line-color\": columnSelectedColor,\n          \"line-width\": 2,\n          \"line-opacity\": 1.0,\n        },\n        filter: [\"==\", \"$type\", \"Polygon\"],\n      },\n      {\n        id: \"selected-column-point\",\n        type: \"circle\",\n        source: selectedColumnSourceID,\n        paint: {\n          \"circle-radius\": 6,\n          \"circle-color\": columnSelectedColor,\n          \"circle-opacity\": 1.0,\n        },\n        filter: [\"==\", \"$type\", \"Point\"],\n      },\n    ],\n  };\n}\n"],"names":[],"mappings":"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"}

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

@@ -9,10 +9,11 @@ function buildCompositeScaleInfo(inputScales, unconformityHeight) {
   let totalHeight = unconformityHeight / 2;
   let lastSectionTopHeight = 0;
   const packages2 = [];
-  for (const group of inputScales) {
+  for (let i = 0; i < inputScales.length; i++) {
+    const group = inputScales[i];
     const { domain, scale } = group;
     const [b_age, t_age] = domain;
-    const key = `package-${b_age}-${t_age}`;
+    const key = `package-${i}`;
     packages2.push({
       ...createPackageScale(group, totalHeight),
       key,
@@ -79,6 +80,7 @@ function buildSectionScale(data, opts) {
     minPixelScale = 0.2,
     axisType,
     minSectionHeight,
+    visibleWindow,
     scale,
     hybridScale
   } = opts;
@@ -97,7 +99,7 @@ function buildSectionScale(data, opts) {
   }
   if (scale == null) {
     if (_pixelScale == null) {
-      const avgAgeRange = findAverageUnitHeight(data, axisType);
+      const avgAgeRange = findAverageUnitHeight(data, axisType, visibleWindow);
       _pixelScale = Math.max(targetUnitHeight / avgAgeRange, minPixelScale);
     }
     let height = dAge * _pixelScale;
@@ -112,6 +114,78 @@ function buildSectionScale(data, opts) {
     0
   );
 }
+function resolveWindowScales(sections, focalWindow, floor) {
+  const [b_focal, t_focal] = focalWindow;
+  const scales = /* @__PURE__ */ new Map();
+  for (const section of sections) {
+    const t_age = Math.max(section.t_age, t_focal);
+    const b_age = Math.min(section.b_age, b_focal);
+    if (b_age <= t_age) continue;
+    const natural = section.scaleInfo.pixelScale;
+    if (!(natural > 0)) continue;
+    const isClipped = b_age < section.b_age || t_age > section.t_age;
+    const needed = isClipped && floor > 0 ? floor / (b_age - t_age) : 0;
+    scales.set(section, Math.max(natural, needed));
+  }
+  return scales;
+}
+function padWindowByPixels(sections, window, padding, scaleFor) {
+  if (!(padding > 0) || sections.length === 0) return window;
+  const [b_age, t_age] = window;
+  return [
+    spendOutward(sections, b_age, 1, padding, scaleFor),
+    spendOutward(sections, t_age, -1, padding, scaleFor)
+  ];
+}
+function spendOutward(sections, edge, direction, padding, scaleFor) {
+  const beyond = sections.filter(
+    (s) => direction * (s.b_age - edge) > 0 || direction * (s.t_age - edge) > 0
+  ).sort((a, b) => direction * (nearEdge(a, direction) - nearEdge(b, direction)));
+  let bound = edge;
+  let budget = padding;
+  for (const section of beyond) {
+    const pixelScale = scaleFor(section);
+    if (!(pixelScale > 0)) continue;
+    const from = direction > 0 ? Math.max(section.t_age, bound) : Math.min(section.b_age, bound);
+    const available = direction > 0 ? section.b_age - from : from - section.t_age;
+    if (available <= 0) continue;
+    const cost = available * pixelScale;
+    if (budget <= cost) return from + direction * (budget / pixelScale);
+    bound = direction > 0 ? section.b_age : section.t_age;
+    budget -= cost;
+  }
+  return bound;
+}
+function nearEdge(section, direction) {
+  return direction > 0 ? section.t_age : section.b_age;
+}
+function trimSectionsToWindow(sections, window, scaleFor) {
+  const [b_win, t_win] = window;
+  const out = [];
+  for (const section of sections) {
+    const t_age = Math.max(section.t_age, t_win);
+    const b_age = Math.min(section.b_age, b_win);
+    if (b_age <= t_age) continue;
+    const pixelScale = scaleFor(section);
+    if (b_age === section.b_age && t_age === section.t_age && pixelScale === section.scaleInfo.pixelScale) {
+      out.push(section);
+      continue;
+    }
+    out.push({
+      ...section,
+      t_age,
+      b_age,
+      units: section.units.filter((u) => utils.agesOverlap(u, { t_age, b_age })),
+      scaleInfo: createPackageScale({
+        domain: [b_age, t_age],
+        pixelScale,
+        pixelHeight: (b_age - t_age) * pixelScale,
+        scale: null
+      })
+    });
+  }
+  return out;
+}
 function createPackageScale(def, offset = 0) {
   const { domain, pixelScale, pixelHeight, scale, heightScale } = def;
   if (scale == null && pixelScale == null) {
@@ -159,12 +233,21 @@ function findSectionHeightRange(data, axisType) {
     return [b_pos, t_pos];
   }
 }
-function findAverageUnitHeight(data, axisType) {
-  const unitHeights = data.map((d) => {
+function findAverageUnitHeight(data, axisType, visibleWindow) {
+  const durations = (clip) => data.map((d) => {
     const [b_pos, t_pos] = utils.getUnitHeightRange(d, axisType);
-    return Math.abs(b_pos - t_pos);
-  });
-  return unitHeights.reduce((a, b) => a + b, 0) / unitHeights.length;
+    if (!clip) return Math.abs(b_pos - t_pos);
+    const [b_win, t_win] = visibleWindow;
+    return Math.max(
+      0,
+      Math.min(b_pos, b_win) - Math.max(t_pos, t_win)
+    );
+  }).filter((d) => d > 0);
+  const useWindow = visibleWindow != null && axisType === columnComponents.ColumnAxisType.AGE;
+  let heights = useWindow ? durations(true) : [];
+  if (heights.length === 0) heights = durations(false);
+  if (heights.length === 0) return 1;
+  return heights.reduce((a, b) => a + b, 0) / heights.length;
 }
 function createCompositeScale(sections, interpolateUnconformities = false) {
   const scales = [];
@@ -280,4 +363,7 @@ exports.computeSectionHeights = computeSectionHeights;
 exports.createCompositeScale = createCompositeScale;
 exports.createPackageScale = createPackageScale;
 exports.finalizeSectionHeights = finalizeSectionHeights;
+exports.padWindowByPixels = padWindowByPixels;
+exports.resolveWindowScales = resolveWindowScales;
+exports.trimSectionsToWindow = trimSectionsToWindow;
 //# sourceMappingURL=composite-scale.cjs.map