Merge pull request #174 from UW-Macrostrat/point-feature-fixes

davenquinn · web-flow · commit 7c4b95ec6333 · 2025-10-05T13:35:04.000-05:00
Added point features and prepared to bundle
diff --git a/package.json b/package.json
@@ -27,11 +27,11 @@
     "@blueprintjs/core": "^5.10.2",
     "@macrostrat/hyper": "^3.0.6",
     "@mdx-js/rollup": "^3.1.0",
-    "@parcel/bundler-default": "2.15.4",
-    "@parcel/bundler-library": "^2.14.4",
-    "@parcel/config-default": "2.15.4",
-    "@parcel/transformer-sass": "2.15.4",
-    "@parcel/transformer-typescript-types": "2.15.4",
+    "@parcel/bundler-default": "^2.16.0",
+    "@parcel/bundler-library": "^2.16.0",
+    "@parcel/config-default": "^2.16.0",
+    "@parcel/transformer-sass": "^2.16.0",
+    "@parcel/transformer-typescript-types": "^2.16.0",
     "@storybook/addon-docs": "9.0.12",
     "@storybook/addon-links": "9.0.12",
     "@storybook/builder-vite": "9.0.12",
@@ -47,7 +47,7 @@
     "marked": "^11.0",
     "marked-terminal": "^7.1.0",
     "node-fetch": "^3.2.9",
-    "parcel": "2.15.4",
+    "parcel": "^2.16.0",
     "prettier": "^3.6.1",
     "react": "^19",
     "react-dom": "^19",
@@ -71,8 +71,8 @@
   ],
   "packageManager": "yarn@4.8.1",
   "devDependencies": {
-    "@parcel/packager-ts": "2.15.4",
-    "@parcel/transformer-stylus": "2.15.4",
+    "@parcel/packager-ts": "^2.16.0",
+    "@parcel/transformer-stylus": "^2.16.0",
     "@types/d3-array": "^3.2.1",
     "@types/underscore": "^1.13.0",
     "madge": "^8.0.0",
diff --git a/packages/api-types/package.json b/packages/api-types/package.json
@@ -19,7 +19,7 @@
     "directory": "packages/api-types"
   },
   "devDependencies": {
-    "parcel": "^2.15.4"
+    "parcel": "^2.16.0"
   },
   "dependencies": {
     "@types/geojson": "^7946.0.16"
diff --git a/packages/color-utils/package.json b/packages/color-utils/package.json
@@ -32,6 +32,6 @@
     "directory": "packages/color-utils"
   },
   "devDependencies": {
-    "parcel": "^2.15.4"
+    "parcel": "^2.16.0"
   }
 }
diff --git a/packages/column-components/package.json b/packages/column-components/package.json
@@ -43,7 +43,7 @@
   "author": "Daven Quinn <dev@davenquinn.com>",
   "license": "MIT",
   "devDependencies": {
-    "parcel": "^2.15.4",
+    "parcel": "^2.16.0",
     "stylus": "^0.59.0"
   },
   "dependencies": {
diff --git a/packages/column-creator/package.json b/packages/column-creator/package.json
@@ -51,7 +51,7 @@
     "directory": "packages/column-creator"
   },
   "devDependencies": {
-    "parcel": "^2.15.4"
+    "parcel": "^2.16.0"
   },
   "files": [
     "dist",
diff --git a/packages/column-views/package.json b/packages/column-views/package.json
@@ -81,7 +81,7 @@
   "devDependencies": {
     "@types/d3-path": "^3.1.1",
     "@types/d3-scale": "^4.0.9",
-    "parcel": "^2.15.4",
+    "parcel": "^2.16.0",
     "postcss": "^8.0.0",
     "postcss-modules": "^6.0.0"
   },
diff --git a/packages/column-views/src/facets/fossils/index.ts b/packages/column-views/src/facets/fossils/index.ts
@@ -138,7 +138,7 @@ export function PBDBFossilsColumn({ columnID, color = "magenta" }) {
   );
 }
 
-interface BaseMeasurementsColumnProps<T> {
+export interface BaseMeasurementsColumnProps<T> {
   data: T[];
   noteComponent?: any;
   width?: number;
diff --git a/packages/data-components/package.json b/packages/data-components/package.json
@@ -34,7 +34,7 @@
   "devDependencies": {
     "@blueprintjs/core": "^5.10.2",
     "@types/d3-array": "^3.2.1",
-    "parcel": "^2.15.4"
+    "parcel": "^2.16.0"
   },
   "peerDependencies": {
     "@blueprintjs/core": "^5.10.2",
diff --git a/packages/data-sheet/package.json b/packages/data-sheet/package.json
@@ -56,6 +56,6 @@
   },
   "devDependencies": {
     "@types/underscore": "^1.13.0",
-    "parcel": "^2.15.4"
+    "parcel": "^2.16.0"
   }
 }
diff --git a/packages/feedback-components/package.json b/packages/feedback-components/package.json
@@ -58,6 +58,6 @@
     "directory": "packages/feedback-components"
   },
   "devDependencies": {
-    "parcel": "^2.15.4"
+    "parcel": "^2.16.0"
   }
 }
diff --git a/packages/form-components/package.json b/packages/form-components/package.json
@@ -40,7 +40,7 @@
   "devDependencies": {
     "@types/mapbox-gl": "^2.7.21",
     "@types/react": "^18.3.12",
-    "parcel": "^2.15.4"
+    "parcel": "^2.16.0"
   },
   "peerDependencies": {
     "react": "^16.13.1||^17||^18||^19",
diff --git a/packages/map-interface/package.json b/packages/map-interface/package.json
@@ -30,7 +30,7 @@
     "use-resize-observer": "^9.1.0"
   },
   "devDependencies": {
-    "parcel": "^2.15.4",
+    "parcel": "^2.16.0",
     "ui-box": "^5.4.1"
   },
   "peerDependencies": {
diff --git a/packages/map-styles/CHANGELOG.md b/packages/map-styles/CHANGELOG.md
@@ -4,6 +4,11 @@ All notable changes to this project will be documented in this file. The format
 is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/), and this
 project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
 
+## [1.2.2] - 2025-10-05
+
+- Add `pointSymbolIndex` to allow custom loading of symbols by external code
+- Add `sample_locality` and `fold_axis` symbols
+
 ## [1.2.1] - 2025-06-25
 
 Small improvements to types and styles
diff --git a/packages/map-styles/package.json b/packages/map-styles/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@macrostrat/map-styles",
-  "version": "1.2.1",
+  "version": "1.2.2",
   "description": "Utilities for working with Mapbox map styles",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",
@@ -18,7 +18,7 @@
     "src"
   ],
   "devDependencies": {
-    "parcel": "^2.15.4",
+    "parcel": "^2.16.0",
     "ts-node": "^10.7.0"
   },
   "scripts": {
diff --git a/packages/map-styles/src/layer-helpers/point-features/index.ts b/packages/map-styles/src/layer-helpers/point-features/index.ts
@@ -77,6 +77,8 @@ class MeasurementStyler {
   }
 }
 
+const pointSymbolIndex = pointSymbols;
+
 async function setupPointSymbols(map) {
   /** Load and prepare all symbols for measurements */
   return Promise.all(
@@ -89,6 +91,7 @@ async function setupPointSymbols(map) {
   );
 }
 
+export { pointSymbolIndex };
 export * from "./icon-image";
 export * from "./symbol-layer";
 export { MeasurementStyler, setupPointSymbols };
diff --git a/packages/map-styles/src/layer-helpers/point-features/symbols/fold_axis.png b/packages/map-styles/src/layer-helpers/point-features/symbols/fold_axis.png
diff --git a/packages/map-styles/src/layer-helpers/point-features/symbols/index.ts b/packages/map-styles/src/layer-helpers/point-features/symbols/index.ts
@@ -14,6 +14,8 @@ import point from "./point.png";
 import shearZoneInclined from "./shear_zone_inclined.png";
 import shearZoneVertical from "./shear_zone_vertical.png";
 import vein from "./vein.png";
+import foldAxis from "./fold_axis.png";
+import sampleLocality from "./sample_locality.png";
 
 export {
   beddingHorizontal,
@@ -32,6 +34,8 @@ export {
   shearZoneInclined,
   shearZoneVertical,
   vein,
+  foldAxis,
+  sampleLocality,
 };
 
 export default {
@@ -50,6 +54,8 @@ export default {
   shearZoneInclined,
   shearZoneVertical,
   vein,
+  foldAxis,
+  sampleLocality,
 };
 
 export type PointSymbolName =
@@ -67,5 +73,7 @@ export type PointSymbolName =
   | "lineationGeneral"
   | "point"
   | "vein"
+  | "foldAxis"
+  | "sampleLocality"
   | "shearZoneInclined"
   | "shearZoneVertical";
diff --git a/packages/map-styles/src/layer-helpers/point-features/symbols/sample_locality.png b/packages/map-styles/src/layer-helpers/point-features/symbols/sample_locality.png
diff --git a/packages/mapbox-react/package.json b/packages/mapbox-react/package.json
@@ -50,6 +50,6 @@
     "directory": "packages/mapbox-react"
   },
   "devDependencies": {
-    "parcel": "^2.15.4"
+    "parcel": "^2.16.0"
   }
 }
diff --git a/packages/mapbox-utils/package.json b/packages/mapbox-utils/package.json
@@ -34,6 +34,6 @@
     "directory": "packages/mapbox-utils"
   },
   "devDependencies": {
-    "parcel": "^2.15.4"
+    "parcel": "^2.16.0"
   }
 }
diff --git a/packages/stratigraphy-utils/package.json b/packages/stratigraphy-utils/package.json
@@ -28,6 +28,6 @@
     "directory": "packages/stratigraphy-utils"
   },
   "devDependencies": {
-    "parcel": "^2.15.4"
+    "parcel": "^2.16.0"
   }
 }
diff --git a/packages/svg-map-components/package.json b/packages/svg-map-components/package.json
@@ -66,6 +66,6 @@
     "react-dom": "^16.13.1||^17||^18||^19"
   },
   "devDependencies": {
-    "parcel": "^2.15.4"
+    "parcel": "^2.16.0"
   }
 }
diff --git a/packages/timescale/package.json b/packages/timescale/package.json
@@ -52,6 +52,6 @@
     "directory": "packages/timescale"
   },
   "devDependencies": {
-    "parcel": "^2.15.4"
+    "parcel": "^2.16.0"
   }
 }
diff --git a/packages/ui-components/package.json b/packages/ui-components/package.json
@@ -74,6 +74,6 @@
     "directory": "packages/ui-components"
   },
   "devDependencies": {
-    "parcel": "^2.15.4"
+    "parcel": "^2.16.0"
   }
 }
diff --git a/toolchain/hyperstyle-loader/package.json b/toolchain/hyperstyle-loader/package.json
@@ -10,6 +10,6 @@
     "webpack": "^5.0.0"
   },
   "devDependencies": {
-    "parcel": "^2.15.4"
+    "parcel": "^2.16.0"
   }
 }
diff --git a/toolchain/vite-plugin-hyperstyles/package.json b/toolchain/vite-plugin-hyperstyles/package.json
@@ -11,7 +11,7 @@
   },
   "devDependencies": {
     "@types/node": "^22.14.1",
-    "parcel": "^2.15.4"
+    "parcel": "^2.16.0"
   },
   "scripts": {
     "build": "parcel build"
diff --git a/yarn.lock b/yarn.lock

Original file line number	Diff line number	Diff line change
`@@ -32,6 +32,6 @@`
`32`	`32`	`"directory": "packages/color-utils"`
`33`	`33`	`},`
`34`	`34`	`"devDependencies": {`
`35`		`- "parcel": "^2.15.4"`
	`35`	`+ "parcel": "^2.16.0"`
`36`	`36`	`}`
`37`	`37`	`}`
Original file line number	Diff line number	Diff line change
`@@ -138,7 +138,7 @@ export function PBDBFossilsColumn({ columnID, color = "magenta" }) {`
`138`	`138`	`);`
`139`	`139`	`}`
`140`	`140`
`141`		`-interface BaseMeasurementsColumnProps<T> {`
	`141`	`+export interface BaseMeasurementsColumnProps<T> {`
`142`	`142`	`data: T[];`
`143`	`143`	`noteComponent?: any;`
`144`	`144`	`width?: number;`
Original file line number	Diff line number	Diff line change
`@@ -56,6 +56,6 @@`
`56`	`56`	`},`
`57`	`57`	`"devDependencies": {`
`58`	`58`	`"@types/underscore": "^1.13.0",`
`59`		`- "parcel": "^2.15.4"`
	`59`	`+ "parcel": "^2.16.0"`
`60`	`60`	`}`
`61`	`61`	`}`
Original file line number	Diff line number	Diff line change
`@@ -58,6 +58,6 @@`
`58`	`58`	`"directory": "packages/feedback-components"`
`59`	`59`	`},`
`60`	`60`	`"devDependencies": {`
`61`		`- "parcel": "^2.15.4"`
	`61`	`+ "parcel": "^2.16.0"`
`62`	`62`	`}`
`63`	`63`	`}`