@macrostrat/column-views 3.9.0 → 3.11.0

package/dist/maps/layers/units.cjs

@@ -1,207 +0,0 @@
-"use strict";
-Object.defineProperty(exports, Symbol.toStringTag, { value: "Module" });
-const dataProvider = require("@macrostrat/data-provider");
-const uiComponents = require("@macrostrat/ui-components");
-const mapboxReact = require("@macrostrat/mapbox-react");
-const React = require("react");
-const mapboxUtils = require("@macrostrat/mapbox-utils");
-const resolvers = require("../../units/resolvers.cjs");
-const mapStyles = require("@macrostrat/map-styles");
-const colorUtils = require("@macrostrat/color-utils");
-const pMap = require("p-map");
-const columns = require("./columns.cjs");
-const h = require("@macrostrat/hyper");
-const colors = require("../../units/colors.cjs");
-const _interopDefault = (e) => e && e.__esModule ? e : { default: e };
-const pMap__default = /* @__PURE__ */ _interopDefault(pMap);
-const h__default = /* @__PURE__ */ _interopDefault(h);
-function MacrostratUnitsOverlay(props) {
-  const { time, ageSpan = 0.05, patterns = false } = props;
-  const lithMap = dataProvider.useLithologies();
-  mapboxReact.useOverlayStyle(() => {
-    return buildUnitsStyle({ patterns });
-  }, [patterns]);
-  mapboxReact.useMapStyleOperator(
-    (map) => {
-      if (!patterns) return;
-      mapStyles.setupStyleImageManager(map, { verbose: false });
-    },
-    [patterns]
-  );
-  const params = React.useMemo(() => {
-    let project;
-    if (Number.isFinite(props.project)) {
-      project = [props.project];
-    } else if (!Array.isArray(props.project)) {
-      project = void 0;
-    }
-    const projectCompat = project != null && project.length > 0 ? project[0] : void 0;
-    return {
-      age_bottom: time + ageSpan / 2,
-      age_top: time - ageSpan / 2,
-      response: "long",
-      project: projectCompat
-    };
-  }, [time, ageSpan, props.project]);
-  const units = uiComponents.useAPIResult("/units", params);
-  const columns$1 = dataProvider.useMacrostratColumns(params.project, false);
-  mapboxReact.useMapStyleOperator(
-    (map) => {
-      if (units == null || columns$1 == null || lithMap == null) {
-        return;
-      }
-      const getColorForLithology = (data) => {
-        return lithMap?.get(data.lith_id)?.color ?? null;
-      };
-      const unitsMap = postProcessUnits(units, getColorForLithology);
-      handleUnitsLayerUpdate(map, unitsMap, columns$1);
-      if (patterns) {
-        handlePatternOverlayUpdate(
-          map,
-          unitsMap,
-          columns$1,
-          getColorForLithology
-        ).then(() => {
-        });
-      }
-    },
-    [units, lithMap, columns$1, patterns]
-  );
-  const isHovered = ["boolean", ["feature-state", "hover"], false];
-  const isShown = ["boolean", ["feature-state", "shown"], false];
-  const opacity = [
-    "case",
-    ["all", isHovered, isShown],
-    0.9,
-    isShown,
-    0.8,
-    isHovered,
-    0.3,
-    0
-  ];
-  return h__default.default([
-    h__default.default(columns.BaseColumnsLayer, {
-      enabled: true,
-      columns: columns$1,
-      opacity,
-      lineOpacity: 0.2,
-      lineColor: "lightgray",
-      color: "transparent"
-    })
-  ]);
-}
-function handleUnitsLayerUpdate(map, unitsMap, columns2) {
-  for (const column of columns2) {
-    const col_id = column.properties.col_id;
-    const info = unitsMap.get(Number(col_id));
-    const color = info?.color;
-    map.setFeatureState(
-      { source: "columns", id: col_id },
-      {
-        color,
-        shown: color != null
-      }
-    );
-  }
-}
-async function handlePatternOverlayUpdate(map, unitsMap, columns2, getColor) {
-  const colsWithPatterns = [];
-  const patternIDs = /* @__PURE__ */ new Set();
-  for (const column of columns2) {
-    const col_id = column.properties.col_id;
-    const info = unitsMap.get(Number(col_id));
-    if (info == null) continue;
-    const pattern = getPatternSpec(info?.liths, getColor);
-    if (pattern == null) continue;
-    colsWithPatterns.push({
-      type: "Feature",
-      geometry: column.geometry,
-      properties: {
-        col_id,
-        pattern
-      }
-    });
-    patternIDs.add(pattern);
-  }
-  const patternsToLoad = patternIDs.values().filter((d) => !map.hasImage(d));
-  const mapper = async (patternID) => {
-    try {
-      await mapStyles.loadStyleImage(map, patternID, { pixelRatio: 10 });
-    } catch (e) {
-    }
-  };
-  await pMap__default.default(patternsToLoad, mapper, { concurrency: 5 });
-  const patternData = {
-    type: "FeatureCollection",
-    features: colsWithPatterns
-  };
-  mapboxUtils.setGeoJSON(map, "column-patterns", patternData);
-}
-const cachedColors = /* @__PURE__ */ new Map();
-function getDarkenedColor(color) {
-  if (cachedColors.has(color)) {
-    return cachedColors.get(color);
-  }
-  const c1 = colorUtils.asChromaColor(color).set("hsl.l", 0.4).set("hsl.s", 0.8).hex();
-  cachedColors.set(color, c1);
-  return c1;
-}
-function postProcessUnits(units, getColor) {
-  const unitsByColumn = /* @__PURE__ */ new Map();
-  for (const unit of units) {
-    const col_id = Number(unit.col_id);
-    if (!unitsByColumn.has(col_id)) {
-      unitsByColumn.set(col_id, [unit]);
-    } else {
-      unitsByColumn.set(col_id, [...unitsByColumn.get(col_id), unit]);
-    }
-  }
-  const res = /* @__PURE__ */ new Map();
-  for (const [col_id, unitList] of unitsByColumn.entries()) {
-    const liths = colors.flattenLithologies(unitList.map((u) => u.lith));
-    res.set(col_id, {
-      col_id,
-      units: unitList,
-      liths,
-      color: colors.getMixedColorForData(liths, getColor)
-    });
-  }
-  return res;
-}
-function getPatternSpec(liths, getColor) {
-  const patternData = resolvers.getBestFGDCPatternForLithologyList(liths);
-  if (patternData == null) return null;
-  let { patternID, lith } = patternData;
-  const color = getDarkenedColor(getColor(lith));
-  return `fgdc:${patternID}:${color}:transparent`;
-}
-function buildUnitsStyle(opts = {}) {
-  const { patterns = false } = opts;
-  const baseStyle = {
-    sources: {},
-    version: 8
-  };
-  if (!patterns) {
-    return baseStyle;
-  }
-  const patternStyle = {
-    sources: {
-      "column-patterns": mapboxUtils.buildGeoJSONSource()
-    },
-    layers: [
-      {
-        id: "columns-fill-pattern",
-        type: "fill",
-        source: "column-patterns",
-        paint: {
-          "fill-pattern": ["get", "pattern"],
-          "fill-opacity": 1
-        }
-      }
-    ]
-  };
-  return mapboxUtils.mergeStyles(baseStyle, patternStyle);
-}
-exports.MacrostratUnitsOverlay = MacrostratUnitsOverlay;
-exports.buildUnitsStyle = buildUnitsStyle;
-//# sourceMappingURL=units.cjs.map

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

@@ -1 +0,0 @@
-{"version":3,"file":"units.cjs","sources":["../../../src/maps/layers/units.ts"],"sourcesContent":["import {\n  useLithologies,\n  useMacrostratColumns,\n} from \"@macrostrat/data-provider\";\nimport { useAPIResult } from \"@macrostrat/ui-components\";\nimport { useMapStyleOperator, useOverlayStyle } from \"@macrostrat/mapbox-react\";\nimport { FeatureCollection } from \"geojson\";\nimport { useMemo } from \"react\";\nimport { mergeStyles, setGeoJSON } from \"@macrostrat/mapbox-utils\";\nimport { UnitLithology, UnitLong } from \"@macrostrat/api-types\";\nimport { flattenLithologies, getMixedColorForData } from \"../../units\";\nimport { getBestFGDCPatternForLithologyList } from \"../../units/resolvers\";\nimport {\n  setupStyleImageManager,\n  loadStyleImage,\n  StyleFragment,\n} from \"@macrostrat/map-styles\";\nimport { asChromaColor } from \"@macrostrat/color-utils\";\nimport { buildGeoJSONSource } from \"@macrostrat/mapbox-utils\";\nimport pMap from \"p-map\";\nimport { BaseColumnsLayer } from \"./columns\";\nimport h from \"@macrostrat/hyper\";\n\nexport interface UnitsOverlayProps {\n  time: number;\n  ageSpan?: number;\n  project?: number | number[];\n  patterns?: boolean;\n}\n\nexport function MacrostratUnitsOverlay(props: UnitsOverlayProps) {\n  const { time, ageSpan = 0.05, patterns = false } = props;\n  const lithMap = useLithologies();\n\n  useOverlayStyle(() => {\n    return buildUnitsStyle({ patterns });\n  }, [patterns]);\n\n  useMapStyleOperator(\n    (map) => {\n      if (!patterns) return;\n      setupStyleImageManager(map, { verbose: false });\n    },\n    [patterns],\n  );\n\n  const params = useMemo(() => {\n    let project: number[] | undefined;\n    if (Number.isFinite(props.project)) {\n      project = [props.project as number];\n    } else if (!Array.isArray(props.project)) {\n      project = undefined;\n    }\n    // Project can only be a single project for now\n    const projectCompat =\n      project != null && project.length > 0 ? project[0] : undefined;\n\n    return {\n      age_bottom: time + ageSpan / 2,\n      age_top: time - ageSpan / 2,\n      response: \"long\",\n      project: projectCompat,\n    };\n  }, [time, ageSpan, props.project]);\n\n  const units: UnitLong[] = useAPIResult(\"/units\", params);\n  const columns = useMacrostratColumns(params.project, false);\n\n  useMapStyleOperator(\n    (map) => {\n      if (units == null || columns == null || lithMap == null) {\n        return;\n      }\n\n      const getColorForLithology = (data: UnitLithology): string | null => {\n        return lithMap?.get(data.lith_id)?.color ?? null;\n      };\n\n      const unitsMap = postProcessUnits(units, getColorForLithology);\n      handleUnitsLayerUpdate(map, unitsMap, columns);\n      if (patterns) {\n        handlePatternOverlayUpdate(\n          map,\n          unitsMap,\n          columns,\n          getColorForLithology,\n        ).then(() => {});\n      }\n    },\n    [units, lithMap, columns, patterns],\n  );\n\n  const isHovered = [\"boolean\", [\"feature-state\", \"hover\"], false];\n  const isShown = [\"boolean\", [\"feature-state\", \"shown\"], false];\n\n  const opacity = [\n    \"case\",\n    [\"all\", isHovered, isShown],\n    0.9,\n    isShown,\n    0.8,\n    isHovered,\n    0.3,\n    0.0,\n  ];\n\n  return h([\n    h(BaseColumnsLayer, {\n      enabled: true,\n      columns,\n      opacity,\n      lineOpacity: 0.2,\n      lineColor: \"lightgray\",\n      color: \"transparent\",\n    }),\n  ]);\n}\n\nfunction handleUnitsLayerUpdate(\n  map,\n  unitsMap: Map<number, UnitsDisplayInfo>,\n  columns: any[],\n) {\n  // Update feature states\n  for (const column of columns) {\n    const col_id = column.properties.col_id;\n    const info = unitsMap.get(Number(col_id));\n    const color = info?.color;\n    map.setFeatureState(\n      { source: \"columns\", id: col_id },\n      {\n        color,\n        shown: color != null,\n      },\n    );\n  }\n}\n\nasync function handlePatternOverlayUpdate(\n  map,\n  unitsMap: Map<number, UnitsDisplayInfo>,\n  columns: any[],\n  getColor: LithologyColorGetter,\n) {\n  // synthesize patterns not yet in cache\n\n  const colsWithPatterns = [];\n  const patternIDs = new Set<string>();\n  // Update feature states\n  for (const column of columns) {\n    const col_id = column.properties.col_id;\n    const info = unitsMap.get(Number(col_id));\n    if (info == null) continue;\n    const pattern = getPatternSpec(info?.liths, getColor);\n    if (pattern == null) continue;\n\n    colsWithPatterns.push({\n      type: \"Feature\",\n      geometry: column.geometry,\n      properties: {\n        col_id,\n        pattern,\n      },\n    });\n    patternIDs.add(pattern);\n  }\n\n  const patternsToLoad = patternIDs.values().filter((d) => !map.hasImage(d));\n\n  const mapper = async (patternID) => {\n    try {\n      await loadStyleImage(map, patternID, { pixelRatio: 10 });\n    } catch (e) {}\n  };\n  // Load all pattern images\n  await pMap(patternsToLoad, mapper, { concurrency: 5 });\n\n  // Set data for pattern layer\n  // This is inefficient but the only way to set per-feature patterns in Mapbox\n  const patternData: FeatureCollection = {\n    type: \"FeatureCollection\",\n    features: colsWithPatterns,\n  };\n  setGeoJSON(map, \"column-patterns\", patternData);\n}\n\nconst cachedColors = new Map<string, string>();\n\nfunction getDarkenedColor(color: string): string {\n  /** Memoized function to get a darkened version of a color for pattern use */\n  if (cachedColors.has(color)) {\n    return cachedColors.get(color);\n  }\n  const c1 = asChromaColor(color).set(\"hsl.l\", 0.4).set(\"hsl.s\", 0.8).hex();\n  cachedColors.set(color, c1);\n  return c1;\n}\n\ninterface UnitsDisplayInfo {\n  col_id: number;\n  units: UnitLong[];\n  color: string;\n  liths: UnitLithology[];\n}\n\ntype LithologyColorGetter = (val: UnitLithology) => string | null;\n\nfunction postProcessUnits(\n  units: UnitLong[],\n  getColor: LithologyColorGetter,\n): Map<number, UnitsDisplayInfo> {\n  // Group by col_id\n  const unitsByColumn: Map<number, UnitLong[]> = new Map();\n  for (const unit of units) {\n    const col_id = Number(unit.col_id);\n    if (!unitsByColumn.has(col_id)) {\n      unitsByColumn.set(col_id, [unit]);\n    } else {\n      unitsByColumn.set(col_id, [...unitsByColumn.get(col_id), unit]);\n    }\n  }\n\n  // Summarize units for display\n  const res = new Map<number, UnitsDisplayInfo>();\n  for (const [col_id, unitList] of unitsByColumn.entries()) {\n    const liths = flattenLithologies(unitList.map((u) => u.lith));\n    res.set(col_id, {\n      col_id,\n      units: unitList,\n      liths,\n      color: getMixedColorForData(liths, getColor),\n    });\n  }\n\n  return res;\n}\n\nfunction getPatternSpec(\n  liths: UnitLithology[],\n  getColor: LithologyColorGetter,\n): string | null {\n  const patternData = getBestFGDCPatternForLithologyList(liths);\n  if (patternData == null) return null;\n  let { patternID, lith } = patternData;\n  const color = getDarkenedColor(getColor(lith));\n  return `fgdc:${patternID}:${color}:transparent`;\n}\n\ntype UnitsStyleOptions = {\n  color?: string;\n  patterns?: boolean;\n};\n\nexport function buildUnitsStyle(opts: UnitsStyleOptions = {}): StyleFragment {\n  const { patterns = false } = opts;\n\n  // If color is in the feature state or geojson properties, use that as second choice\n\n  const baseStyle: StyleFragment = {\n    sources: {},\n    version: 8,\n  };\n\n  if (!patterns) {\n    return baseStyle;\n  }\n\n  const patternStyle: StyleFragment = {\n    sources: {\n      \"column-patterns\": buildGeoJSONSource(),\n    },\n    layers: [\n      {\n        id: \"columns-fill-pattern\",\n        type: \"fill\",\n        source: \"column-patterns\",\n        paint: {\n          \"fill-pattern\": [\"get\", \"pattern\"],\n          \"fill-opacity\": 1,\n        },\n      },\n    ],\n  };\n\n  return mergeStyles(baseStyle, patternStyle);\n}\n"],"names":["useLithologies","useOverlayStyle","useMapStyleOperator","setupStyleImageManager","useMemo","useAPIResult","columns","useMacrostratColumns","h","BaseColumnsLayer","loadStyleImage","pMap","setGeoJSON","asChromaColor","flattenLithologies","getMixedColorForData","getBestFGDCPatternForLithologyList","buildGeoJSONSource","mergeStyles"],"mappings":"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"}

package/dist/maps/layers/units.d.ts

@@ -1,14 +0,0 @@
-import { StyleFragment } from '@macrostrat/map-styles';
-export interface UnitsOverlayProps {
-    time: number;
-    ageSpan?: number;
-    project?: number | number[];
-    patterns?: boolean;
-}
-export declare function MacrostratUnitsOverlay(props: UnitsOverlayProps): import('react').ReactElement<unknown, string | import('react').JSXElementConstructor<any>>;
-type UnitsStyleOptions = {
-    color?: string;
-    patterns?: boolean;
-};
-export declare function buildUnitsStyle(opts?: UnitsStyleOptions): StyleFragment;
-export {};

package/dist/maps/layers/units.js

@@ -1,204 +0,0 @@
-import { useLithologies, useMacrostratColumns } from "@macrostrat/data-provider";
-import { useAPIResult } from "@macrostrat/ui-components";
-import { useOverlayStyle, useMapStyleOperator } from "@macrostrat/mapbox-react";
-import { useMemo } from "react";
-import { buildGeoJSONSource, mergeStyles, setGeoJSON } from "@macrostrat/mapbox-utils";
-import { getBestFGDCPatternForLithologyList } from "../../units/resolvers.js";
-import { setupStyleImageManager, loadStyleImage } from "@macrostrat/map-styles";
-import { asChromaColor } from "@macrostrat/color-utils";
-import pMap from "p-map";
-import { BaseColumnsLayer } from "./columns.js";
-import h from "@macrostrat/hyper";
-import { flattenLithologies, getMixedColorForData } from "../../units/colors.js";
-function MacrostratUnitsOverlay(props) {
-  const { time, ageSpan = 0.05, patterns = false } = props;
-  const lithMap = useLithologies();
-  useOverlayStyle(() => {
-    return buildUnitsStyle({ patterns });
-  }, [patterns]);
-  useMapStyleOperator(
-    (map) => {
-      if (!patterns) return;
-      setupStyleImageManager(map, { verbose: false });
-    },
-    [patterns]
-  );
-  const params = useMemo(() => {
-    let project;
-    if (Number.isFinite(props.project)) {
-      project = [props.project];
-    } else if (!Array.isArray(props.project)) {
-      project = void 0;
-    }
-    const projectCompat = project != null && project.length > 0 ? project[0] : void 0;
-    return {
-      age_bottom: time + ageSpan / 2,
-      age_top: time - ageSpan / 2,
-      response: "long",
-      project: projectCompat
-    };
-  }, [time, ageSpan, props.project]);
-  const units = useAPIResult("/units", params);
-  const columns = useMacrostratColumns(params.project, false);
-  useMapStyleOperator(
-    (map) => {
-      if (units == null || columns == null || lithMap == null) {
-        return;
-      }
-      const getColorForLithology = (data) => {
-        return lithMap?.get(data.lith_id)?.color ?? null;
-      };
-      const unitsMap = postProcessUnits(units, getColorForLithology);
-      handleUnitsLayerUpdate(map, unitsMap, columns);
-      if (patterns) {
-        handlePatternOverlayUpdate(
-          map,
-          unitsMap,
-          columns,
-          getColorForLithology
-        ).then(() => {
-        });
-      }
-    },
-    [units, lithMap, columns, patterns]
-  );
-  const isHovered = ["boolean", ["feature-state", "hover"], false];
-  const isShown = ["boolean", ["feature-state", "shown"], false];
-  const opacity = [
-    "case",
-    ["all", isHovered, isShown],
-    0.9,
-    isShown,
-    0.8,
-    isHovered,
-    0.3,
-    0
-  ];
-  return h([
-    h(BaseColumnsLayer, {
-      enabled: true,
-      columns,
-      opacity,
-      lineOpacity: 0.2,
-      lineColor: "lightgray",
-      color: "transparent"
-    })
-  ]);
-}
-function handleUnitsLayerUpdate(map, unitsMap, columns) {
-  for (const column of columns) {
-    const col_id = column.properties.col_id;
-    const info = unitsMap.get(Number(col_id));
-    const color = info?.color;
-    map.setFeatureState(
-      { source: "columns", id: col_id },
-      {
-        color,
-        shown: color != null
-      }
-    );
-  }
-}
-async function handlePatternOverlayUpdate(map, unitsMap, columns, getColor) {
-  const colsWithPatterns = [];
-  const patternIDs = /* @__PURE__ */ new Set();
-  for (const column of columns) {
-    const col_id = column.properties.col_id;
-    const info = unitsMap.get(Number(col_id));
-    if (info == null) continue;
-    const pattern = getPatternSpec(info?.liths, getColor);
-    if (pattern == null) continue;
-    colsWithPatterns.push({
-      type: "Feature",
-      geometry: column.geometry,
-      properties: {
-        col_id,
-        pattern
-      }
-    });
-    patternIDs.add(pattern);
-  }
-  const patternsToLoad = patternIDs.values().filter((d) => !map.hasImage(d));
-  const mapper = async (patternID) => {
-    try {
-      await loadStyleImage(map, patternID, { pixelRatio: 10 });
-    } catch (e) {
-    }
-  };
-  await pMap(patternsToLoad, mapper, { concurrency: 5 });
-  const patternData = {
-    type: "FeatureCollection",
-    features: colsWithPatterns
-  };
-  setGeoJSON(map, "column-patterns", patternData);
-}
-const cachedColors = /* @__PURE__ */ new Map();
-function getDarkenedColor(color) {
-  if (cachedColors.has(color)) {
-    return cachedColors.get(color);
-  }
-  const c1 = asChromaColor(color).set("hsl.l", 0.4).set("hsl.s", 0.8).hex();
-  cachedColors.set(color, c1);
-  return c1;
-}
-function postProcessUnits(units, getColor) {
-  const unitsByColumn = /* @__PURE__ */ new Map();
-  for (const unit of units) {
-    const col_id = Number(unit.col_id);
-    if (!unitsByColumn.has(col_id)) {
-      unitsByColumn.set(col_id, [unit]);
-    } else {
-      unitsByColumn.set(col_id, [...unitsByColumn.get(col_id), unit]);
-    }
-  }
-  const res = /* @__PURE__ */ new Map();
-  for (const [col_id, unitList] of unitsByColumn.entries()) {
-    const liths = flattenLithologies(unitList.map((u) => u.lith));
-    res.set(col_id, {
-      col_id,
-      units: unitList,
-      liths,
-      color: getMixedColorForData(liths, getColor)
-    });
-  }
-  return res;
-}
-function getPatternSpec(liths, getColor) {
-  const patternData = getBestFGDCPatternForLithologyList(liths);
-  if (patternData == null) return null;
-  let { patternID, lith } = patternData;
-  const color = getDarkenedColor(getColor(lith));
-  return `fgdc:${patternID}:${color}:transparent`;
-}
-function buildUnitsStyle(opts = {}) {
-  const { patterns = false } = opts;
-  const baseStyle = {
-    sources: {},
-    version: 8
-  };
-  if (!patterns) {
-    return baseStyle;
-  }
-  const patternStyle = {
-    sources: {
-      "column-patterns": buildGeoJSONSource()
-    },
-    layers: [
-      {
-        id: "columns-fill-pattern",
-        type: "fill",
-        source: "column-patterns",
-        paint: {
-          "fill-pattern": ["get", "pattern"],
-          "fill-opacity": 1
-        }
-      }
-    ]
-  };
-  return mergeStyles(baseStyle, patternStyle);
-}
-export {
-  MacrostratUnitsOverlay,
-  buildUnitsStyle
-};
-//# sourceMappingURL=units.js.map

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

@@ -1 +0,0 @@
-{"version":3,"file":"units.js","sources":["../../../src/maps/layers/units.ts"],"sourcesContent":["import {\n  useLithologies,\n  useMacrostratColumns,\n} from \"@macrostrat/data-provider\";\nimport { useAPIResult } from \"@macrostrat/ui-components\";\nimport { useMapStyleOperator, useOverlayStyle } from \"@macrostrat/mapbox-react\";\nimport { FeatureCollection } from \"geojson\";\nimport { useMemo } from \"react\";\nimport { mergeStyles, setGeoJSON } from \"@macrostrat/mapbox-utils\";\nimport { UnitLithology, UnitLong } from \"@macrostrat/api-types\";\nimport { flattenLithologies, getMixedColorForData } from \"../../units\";\nimport { getBestFGDCPatternForLithologyList } from \"../../units/resolvers\";\nimport {\n  setupStyleImageManager,\n  loadStyleImage,\n  StyleFragment,\n} from \"@macrostrat/map-styles\";\nimport { asChromaColor } from \"@macrostrat/color-utils\";\nimport { buildGeoJSONSource } from \"@macrostrat/mapbox-utils\";\nimport pMap from \"p-map\";\nimport { BaseColumnsLayer } from \"./columns\";\nimport h from \"@macrostrat/hyper\";\n\nexport interface UnitsOverlayProps {\n  time: number;\n  ageSpan?: number;\n  project?: number | number[];\n  patterns?: boolean;\n}\n\nexport function MacrostratUnitsOverlay(props: UnitsOverlayProps) {\n  const { time, ageSpan = 0.05, patterns = false } = props;\n  const lithMap = useLithologies();\n\n  useOverlayStyle(() => {\n    return buildUnitsStyle({ patterns });\n  }, [patterns]);\n\n  useMapStyleOperator(\n    (map) => {\n      if (!patterns) return;\n      setupStyleImageManager(map, { verbose: false });\n    },\n    [patterns],\n  );\n\n  const params = useMemo(() => {\n    let project: number[] | undefined;\n    if (Number.isFinite(props.project)) {\n      project = [props.project as number];\n    } else if (!Array.isArray(props.project)) {\n      project = undefined;\n    }\n    // Project can only be a single project for now\n    const projectCompat =\n      project != null && project.length > 0 ? project[0] : undefined;\n\n    return {\n      age_bottom: time + ageSpan / 2,\n      age_top: time - ageSpan / 2,\n      response: \"long\",\n      project: projectCompat,\n    };\n  }, [time, ageSpan, props.project]);\n\n  const units: UnitLong[] = useAPIResult(\"/units\", params);\n  const columns = useMacrostratColumns(params.project, false);\n\n  useMapStyleOperator(\n    (map) => {\n      if (units == null || columns == null || lithMap == null) {\n        return;\n      }\n\n      const getColorForLithology = (data: UnitLithology): string | null => {\n        return lithMap?.get(data.lith_id)?.color ?? null;\n      };\n\n      const unitsMap = postProcessUnits(units, getColorForLithology);\n      handleUnitsLayerUpdate(map, unitsMap, columns);\n      if (patterns) {\n        handlePatternOverlayUpdate(\n          map,\n          unitsMap,\n          columns,\n          getColorForLithology,\n        ).then(() => {});\n      }\n    },\n    [units, lithMap, columns, patterns],\n  );\n\n  const isHovered = [\"boolean\", [\"feature-state\", \"hover\"], false];\n  const isShown = [\"boolean\", [\"feature-state\", \"shown\"], false];\n\n  const opacity = [\n    \"case\",\n    [\"all\", isHovered, isShown],\n    0.9,\n    isShown,\n    0.8,\n    isHovered,\n    0.3,\n    0.0,\n  ];\n\n  return h([\n    h(BaseColumnsLayer, {\n      enabled: true,\n      columns,\n      opacity,\n      lineOpacity: 0.2,\n      lineColor: \"lightgray\",\n      color: \"transparent\",\n    }),\n  ]);\n}\n\nfunction handleUnitsLayerUpdate(\n  map,\n  unitsMap: Map<number, UnitsDisplayInfo>,\n  columns: any[],\n) {\n  // Update feature states\n  for (const column of columns) {\n    const col_id = column.properties.col_id;\n    const info = unitsMap.get(Number(col_id));\n    const color = info?.color;\n    map.setFeatureState(\n      { source: \"columns\", id: col_id },\n      {\n        color,\n        shown: color != null,\n      },\n    );\n  }\n}\n\nasync function handlePatternOverlayUpdate(\n  map,\n  unitsMap: Map<number, UnitsDisplayInfo>,\n  columns: any[],\n  getColor: LithologyColorGetter,\n) {\n  // synthesize patterns not yet in cache\n\n  const colsWithPatterns = [];\n  const patternIDs = new Set<string>();\n  // Update feature states\n  for (const column of columns) {\n    const col_id = column.properties.col_id;\n    const info = unitsMap.get(Number(col_id));\n    if (info == null) continue;\n    const pattern = getPatternSpec(info?.liths, getColor);\n    if (pattern == null) continue;\n\n    colsWithPatterns.push({\n      type: \"Feature\",\n      geometry: column.geometry,\n      properties: {\n        col_id,\n        pattern,\n      },\n    });\n    patternIDs.add(pattern);\n  }\n\n  const patternsToLoad = patternIDs.values().filter((d) => !map.hasImage(d));\n\n  const mapper = async (patternID) => {\n    try {\n      await loadStyleImage(map, patternID, { pixelRatio: 10 });\n    } catch (e) {}\n  };\n  // Load all pattern images\n  await pMap(patternsToLoad, mapper, { concurrency: 5 });\n\n  // Set data for pattern layer\n  // This is inefficient but the only way to set per-feature patterns in Mapbox\n  const patternData: FeatureCollection = {\n    type: \"FeatureCollection\",\n    features: colsWithPatterns,\n  };\n  setGeoJSON(map, \"column-patterns\", patternData);\n}\n\nconst cachedColors = new Map<string, string>();\n\nfunction getDarkenedColor(color: string): string {\n  /** Memoized function to get a darkened version of a color for pattern use */\n  if (cachedColors.has(color)) {\n    return cachedColors.get(color);\n  }\n  const c1 = asChromaColor(color).set(\"hsl.l\", 0.4).set(\"hsl.s\", 0.8).hex();\n  cachedColors.set(color, c1);\n  return c1;\n}\n\ninterface UnitsDisplayInfo {\n  col_id: number;\n  units: UnitLong[];\n  color: string;\n  liths: UnitLithology[];\n}\n\ntype LithologyColorGetter = (val: UnitLithology) => string | null;\n\nfunction postProcessUnits(\n  units: UnitLong[],\n  getColor: LithologyColorGetter,\n): Map<number, UnitsDisplayInfo> {\n  // Group by col_id\n  const unitsByColumn: Map<number, UnitLong[]> = new Map();\n  for (const unit of units) {\n    const col_id = Number(unit.col_id);\n    if (!unitsByColumn.has(col_id)) {\n      unitsByColumn.set(col_id, [unit]);\n    } else {\n      unitsByColumn.set(col_id, [...unitsByColumn.get(col_id), unit]);\n    }\n  }\n\n  // Summarize units for display\n  const res = new Map<number, UnitsDisplayInfo>();\n  for (const [col_id, unitList] of unitsByColumn.entries()) {\n    const liths = flattenLithologies(unitList.map((u) => u.lith));\n    res.set(col_id, {\n      col_id,\n      units: unitList,\n      liths,\n      color: getMixedColorForData(liths, getColor),\n    });\n  }\n\n  return res;\n}\n\nfunction getPatternSpec(\n  liths: UnitLithology[],\n  getColor: LithologyColorGetter,\n): string | null {\n  const patternData = getBestFGDCPatternForLithologyList(liths);\n  if (patternData == null) return null;\n  let { patternID, lith } = patternData;\n  const color = getDarkenedColor(getColor(lith));\n  return `fgdc:${patternID}:${color}:transparent`;\n}\n\ntype UnitsStyleOptions = {\n  color?: string;\n  patterns?: boolean;\n};\n\nexport function buildUnitsStyle(opts: UnitsStyleOptions = {}): StyleFragment {\n  const { patterns = false } = opts;\n\n  // If color is in the feature state or geojson properties, use that as second choice\n\n  const baseStyle: StyleFragment = {\n    sources: {},\n    version: 8,\n  };\n\n  if (!patterns) {\n    return baseStyle;\n  }\n\n  const patternStyle: StyleFragment = {\n    sources: {\n      \"column-patterns\": buildGeoJSONSource(),\n    },\n    layers: [\n      {\n        id: \"columns-fill-pattern\",\n        type: \"fill\",\n        source: \"column-patterns\",\n        paint: {\n          \"fill-pattern\": [\"get\", \"pattern\"],\n          \"fill-opacity\": 1,\n        },\n      },\n    ],\n  };\n\n  return mergeStyles(baseStyle, patternStyle);\n}\n"],"names":[],"mappings":"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"}

package/dist/units/colors.cjs

@@ -1,115 +0,0 @@
-"use strict";
-Object.defineProperty(exports, Symbol.toStringTag, { value: "Module" });
-const chroma = require("chroma-js");
-const _interopDefault = (e) => e && e.__esModule ? e : { default: e };
-const chroma__default = /* @__PURE__ */ _interopDefault(chroma);
-function getMixedUnitColor(unit, lithMap, inDarkMode = false, asBackground = true, keyOpts = null) {
-  const { key = "lith", id_key = "lith_id" } = keyOpts ?? {};
-  const liths = unit[key];
-  const getColor = (data) => {
-    return lithMap?.get(data[id_key])?.color ?? null;
-  };
-  return getMixedColorForData(liths, getColor, {
-    inDarkMode,
-    asBackground
-  });
-}
-function flattenLithologies(liths, normalize = true) {
-  if (liths == null || liths.length === 0) {
-    return [];
-  }
-  const unitCount = liths.length;
-  let newLiths = [];
-  for (const unitLiths of liths) {
-    let l1 = unitLiths;
-    if (normalize) {
-      l1 = addProportionsToAllData(unitLiths);
-    }
-    for (const lith of l1) {
-      if (lith.prop == null || isNaN(lith.prop) || lith.prop <= 0) {
-        continue;
-      }
-      lith.prop = lith.prop / unitCount;
-    }
-    newLiths.push(...l1);
-  }
-  if (newLiths[0]?.lith_id != null) {
-    newLiths = mergeLikeData(newLiths, "lith_id");
-  } else if (newLiths[0]?.environ_id != null) {
-    newLiths = mergeLikeData(newLiths, "environ_id");
-  }
-  newLiths.sort((a, b) => b.prop - a.prop);
-  return newLiths;
-}
-function getMixedColorForData(liths, getColor, options = {}) {
-  const { inDarkMode = false, asBackground = true } = options;
-  if (liths == null || liths.length === 0) {
-    return null;
-  }
-  const lithData = liths.map((d) => {
-    let prop = d.prop;
-    if (prop == null || isNaN(prop) || prop <= 0) {
-      prop = null;
-    }
-    return {
-      ...d,
-      prop,
-      color: getColor?.(d) ?? d.color
-    };
-  }).filter((d) => d.color != null);
-  if (lithData.length == 0) {
-    return null;
-  }
-  const lithsWithProp = addProportionsToAllData(lithData);
-  const baseColor = chroma__default.default.average(
-    lithsWithProp.map((d) => d.color),
-    "lrgb",
-    lithsWithProp.map((d) => d.prop)
-  );
-  if (!asBackground) {
-    return baseColor.hex();
-  }
-  if (inDarkMode) {
-    return baseColor.set("hsl.l", 0.2).hex();
-  } else {
-    return baseColor.set("hsl.l", 0.9).hex();
-  }
-}
-function addProportionsToAllData(liths) {
-  const lithsWithProp = liths.filter((d) => d.prop != null);
-  const lithsWithoutProp = liths.filter((d) => d.prop == null);
-  const totalProp = lithsWithProp.reduce((sum, d) => sum + d.prop, 0);
-  let overallTotal = 1;
-  if (totalProp < overallTotal && lithsWithoutProp.length > 0) {
-    const remainingProp = overallTotal - totalProp;
-    const equalProp = remainingProp / lithsWithoutProp.length;
-    lithsWithoutProp.forEach((d) => {
-      lithsWithProp.push({
-        ...d,
-        prop: equalProp
-      });
-    });
-  }
-  return lithsWithProp;
-}
-function mergeLikeData(liths, key) {
-  const mergedMap = /* @__PURE__ */ new Map();
-  for (const lith of liths) {
-    const id = lith[key];
-    if (id == null) continue;
-    if (mergedMap.has(id)) {
-      const existing = mergedMap.get(id);
-      mergedMap.set(id, {
-        ...existing,
-        prop: existing.prop + lith.prop
-      });
-    } else {
-      mergedMap.set(id, { ...lith });
-    }
-  }
-  return Array.from(mergedMap.values());
-}
-exports.flattenLithologies = flattenLithologies;
-exports.getMixedColorForData = getMixedColorForData;
-exports.getMixedUnitColor = getMixedUnitColor;
-//# sourceMappingURL=colors.cjs.map

package/dist/units/colors.cjs.map

@@ -1 +0,0 @@
-{"version":3,"file":"colors.cjs","sources":["../../src/units/colors.ts"],"sourcesContent":["import chroma from \"chroma-js\";\nimport {\n  Environment,\n  Lithology,\n  UnitLithology,\n  UnitLong,\n} from \"@macrostrat/api-types\";\n\ninterface KeyOptions {\n  key?: \"lith\" | \"environ\";\n  id_key?: \"lith_id\" | \"environ_id\";\n}\n\nexport function getMixedUnitColor(\n  unit: UnitLong,\n  lithMap: Map<number, { color: string }>,\n  inDarkMode = false,\n  asBackground = true,\n  keyOpts: KeyOptions = null,\n): string | null {\n  const { key = \"lith\", id_key = \"lith_id\" } = keyOpts ?? {};\n  const liths = unit[key];\n  const getColor = (data: UnitLithology): string | null => {\n    return lithMap?.get(data[id_key])?.color ?? null;\n  };\n\n  return getMixedColorForData(liths, getColor, {\n    inDarkMode,\n    asBackground,\n    key: id_key,\n  });\n}\n\ninterface ColorBuilderOptions {\n  key?: \"lith_id\" | \"environ_id\";\n  inDarkMode?: boolean;\n  asBackground?: boolean;\n}\n\nexport function flattenLithologies<\n  T extends { prop: number | null; lith_id?: number; environ_id?: number },\n>(liths: T[][], normalize: boolean = true): T[] {\n  /** Unify proportions in lithology/environment data across several units, normalizing if needed.\n   * If normalize is true, proportions are scaled to sum to 1 within each unit (with remaining proportions\n   * distributed equally among liths without specified proportions). This helps ensure that units with a\n   * few lithologies with specified proportions don't skew the color mixing.\n   *\n   * Lithologies are deduplicated based on their identifying property (lith_id or environ_id) if that is present.\n   */\n  if (liths == null || liths.length === 0) {\n    return [];\n  }\n\n  const unitCount = liths.length;\n\n  let newLiths: T[] = [];\n  for (const unitLiths of liths) {\n    let l1 = unitLiths;\n    if (normalize) {\n      l1 = addProportionsToAllData(unitLiths);\n    }\n    // Divide proportions by number of units to balance influence\n    for (const lith of l1) {\n      if (lith.prop == null || isNaN(lith.prop) || lith.prop <= 0) {\n        continue;\n      }\n      lith.prop = lith.prop / unitCount;\n    }\n    newLiths.push(...l1);\n  }\n  if (newLiths[0]?.lith_id != null) {\n    newLiths = mergeLikeData(newLiths, \"lith_id\");\n  } else if (newLiths[0]?.environ_id != null) {\n    newLiths = mergeLikeData(newLiths, \"environ_id\");\n  }\n  // Sort by proportion descending\n  newLiths.sort((a, b) => b.prop - a.prop);\n  return newLiths;\n}\n\nexport function getMixedColorForData<\n  T extends UnitLithology | Lithology | Environment,\n>(\n  liths: T[] | null,\n  getColor: (val: T) => string | null,\n  options: ColorBuilderOptions = {},\n): string | null {\n  const { inDarkMode = false, asBackground = true } = options;\n  if (liths == null || liths.length === 0) {\n    return null;\n  }\n  const lithData = liths\n    .map((d) => {\n      let prop = d.prop;\n      if (prop == null || isNaN(prop) || prop <= 0) {\n        prop = null;\n      }\n      return {\n        ...d,\n        prop,\n        color: getColor?.(d) ?? d.color,\n      };\n    })\n    .filter((d) => d.color != null);\n\n  if (lithData.length == 0) {\n    return null;\n  }\n\n  const lithsWithProp = addProportionsToAllData(lithData);\n\n  // Mix colors proportionally\n  const baseColor = chroma.average(\n    lithsWithProp.map((d) => d.color),\n    \"lrgb\",\n    lithsWithProp.map((d) => d.prop),\n  );\n\n  if (!asBackground) {\n    return baseColor.hex();\n  }\n\n  if (inDarkMode) {\n    return baseColor.set(\"hsl.l\", 0.2).hex();\n  } else {\n    return baseColor.set(\"hsl.l\", 0.9).hex();\n  }\n}\n\nfunction addProportionsToAllData<T extends { prop?: number }>(liths: T[]): T[] {\n  /** Make sure that all lithologies/environments have a defined proportion,\n   * and that proportions sum to 1. If some liths lack a defined proportion,\n   * the remaining proportion is distributed equally among them.\n   *\n   * NOTE: This function does not normalize proportions if they already sum to more than 1.\n   */\n  const lithsWithProp = liths.filter((d) => d.prop != null);\n  const lithsWithoutProp = liths.filter((d) => d.prop == null);\n\n  const totalProp = lithsWithProp.reduce((sum, d) => sum + d.prop, 0);\n  let overallTotal = 1;\n\n  if (totalProp < overallTotal && lithsWithoutProp.length > 0) {\n    const remainingProp = overallTotal - totalProp;\n    // Distribute remaining proportion equally among liths without prop\n    const equalProp = remainingProp / lithsWithoutProp.length;\n    lithsWithoutProp.forEach((d) => {\n      lithsWithProp.push({\n        ...d,\n        prop: equalProp,\n      } as T);\n    });\n  }\n  return lithsWithProp as T[];\n}\n\nfunction mergeLikeData<\n  T extends { prop: number; lith_id?: number; environ_id?: number },\n>(liths: T[], key: \"lith_id\" | \"environ_id\"): T[] {\n  /** Merge lithology/environment data with the same identifying property (lith_id or environ_id),\n   * summing their proportions.\n   *\n   * TODO: handle attribute merging\n   */\n  const mergedMap: Map<number, T> = new Map();\n\n  for (const lith of liths) {\n    const id = lith[key];\n    if (id == null) continue;\n\n    if (mergedMap.has(id)) {\n      const existing = mergedMap.get(id);\n      mergedMap.set(id, {\n        ...existing,\n        prop: existing.prop + lith.prop,\n      });\n    } else {\n      mergedMap.set(id, { ...lith });\n    }\n  }\n\n  return Array.from(mergedMap.values());\n}\n"],"names":["chroma"],"mappings":"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"}

package/dist/units/colors.d.ts

@@ -1,20 +0,0 @@
-import { Environment, Lithology, UnitLithology, UnitLong } from '@macrostrat/api-types';
-interface KeyOptions {
-    key?: "lith" | "environ";
-    id_key?: "lith_id" | "environ_id";
-}
-export declare function getMixedUnitColor(unit: UnitLong, lithMap: Map<number, {
-    color: string;
-}>, inDarkMode?: boolean, asBackground?: boolean, keyOpts?: KeyOptions): string | null;
-interface ColorBuilderOptions {
-    key?: "lith_id" | "environ_id";
-    inDarkMode?: boolean;
-    asBackground?: boolean;
-}
-export declare function flattenLithologies<T extends {
-    prop: number | null;
-    lith_id?: number;
-    environ_id?: number;
-}>(liths: T[][], normalize?: boolean): T[];
-export declare function getMixedColorForData<T extends UnitLithology | Lithology | Environment>(liths: T[] | null, getColor: (val: T) => string | null, options?: ColorBuilderOptions): string | null;
-export {};