@trackunit/react-map 0.2.8 → 0.2.9-alpha-636ec415cd1.0

package/index.cjs.js

@@ -7702,7 +7702,9 @@ const buildContendedShapes = (group) => group.map(record => {
     for (const other of group) {
         if (other.id === record.id)
             continue;
-        if (geoJsonUtils.isFullyContainedInGeoJsonGeometry(record.geometry, other.geometry) === true) {
+        // Pure predicate: geometry was validated once at the computeFillTiling
+        // boundary, so this O(n²) loop performs no safeParse per pair (SAGA-664).
+        if (geoJsonUtils.isFullyContainedInGeometry(record.geometry, other.geometry)) {
             containedIn.push(other.id);
         }
     }
@@ -7775,6 +7777,37 @@ const computePromotionGroupFills = (members, winnerId, restingPeerFills = new Ma
 };
 const computeFillTiling = (input) => {
     const { features, viewportBounds, resolveStackOrder, selectedFeatureId, suppressedFeatureIds, layerGeodesic, featureStyles, } = input;
+    // Validation boundary (SAGA-664): validate each input feature's polygonal
+    // geometry once here — O(n) — dropping malformed geometry. The downstream O(n²)
+    // overlap loop then runs the pure predicates on trusted geometry without a
+    // safeParse per pair. Validate the input (not the densified output), since
+    // densification is our own transform of already-valid geometry.
+    const validFeatures = [];
+    const droppedInvalidFeatures = [];
+    for (const feature of features) {
+        const geometry = polygonalGeometry(feature);
+        if (geometry === null)
+            continue;
+        const parsed = geometry.type === "Polygon"
+            ? geoJsonUtils.geoJsonPolygonSchema.safeParse(geometry)
+            : geoJsonUtils.geoJsonMultiPolygonSchema.safeParse(geometry);
+        if (!parsed.success) {
+            droppedInvalidFeatures.push({
+                feature,
+                validationError: parsed.error.format(),
+            });
+            continue;
+        }
+        validFeatures.push(feature);
+    }
+    if (droppedInvalidFeatures.length > 0) {
+        const idList = droppedInvalidFeatures
+            .map(entry => (entry.feature.id !== undefined ? String(entry.feature.id) : undefined))
+            .filter((id) => id !== undefined)
+            .join(", ") || "(no feature ids)";
+        // eslint-disable-next-line no-console -- Intentional: warn devs when schema-invalid polygonal geometry is excluded from fill tiling
+        console.warn(`[computeFillTiling] Excluded ${droppedInvalidFeatures.length} feature(s) with invalid polygonal geometry from fill tiling (full fill still renders; overlap clipping is skipped): ${idList}`);
+    }
     // Densify before any polygon/boundary math so clip geometry follows great-circle
     // arcs on large polygons (mirrors the ADR-0024 precedent for edge labels). Always
     // defer to densifyGeodesicFeatures' per-feature resolution (geodesic override >
@@ -7783,7 +7816,7 @@ const computeFillTiling = (input) => {
     // original collection when nothing is densified.
     const featureCollection = {
         type: "FeatureCollection",
-        features: Array.from(features),
+        features: validFeatures,
     };
     const densifiedFeatures = reactMapAdapterShared.densifyGeodesicFeatures(featureCollection, layerGeodesic ?? true, featureStyles).features;
     const records = [];
@@ -7876,7 +7909,12 @@ const computeFillTiling = (input) => {
             fillGeometries.set(id, EMPTY_FILL);
         }
     }
-    return { fillGeometries, featureToGroupKey, featureZIndex };
+    return {
+        fillGeometries,
+        featureToGroupKey,
+        featureZIndex,
+        droppedInvalidFeatures,
+    };
 };
 
 const DEFAULT_ZOOM = 0;
@@ -9950,6 +9988,44 @@ const useShapeDecorations = ({ onDecorationsChange, onStyleOverridesChange, api,
     return react.useMemo(() => ({ subscribe, getSnapshot }), [subscribe, getSnapshot]);
 };
 
+const resolveDroppedFeatureDedupeKey = (layerHandleId, entry) => {
+    if (entry.feature.id !== undefined) {
+        return `${layerHandleId}:${String(entry.feature.id)}`;
+    }
+    const geometry = entry.feature.geometry;
+    if (geometry === null) {
+        return `${layerHandleId}:anonymous:null-geometry`;
+    }
+    if (geometry.type === "Polygon") {
+        return `${layerHandleId}:anonymous:Polygon:${geometry.coordinates.flat(2).length}`;
+    }
+    if (geometry.type === "MultiPolygon") {
+        return `${layerHandleId}:anonymous:MultiPolygon:${geometry.coordinates.flat(3).length}`;
+    }
+    return `${layerHandleId}:anonymous:${geometry.type}`;
+};
+const captureOnce = (key, report, sessionReportedDedupeKeys, payload) => {
+    if (sessionReportedDedupeKeys.has(key))
+        return; // skip sentry warning if already reported this session
+    sessionReportedDedupeKeys.add(key); // add key to ref set to prevent duplicate warnings in this session
+    report(payload);
+};
+/**
+ * Report to Sentry each dropped invalid feature via `report`, at most once per handle/feature per session.
+ * Note: `computeFillTiling` emits `console.warn` separately.
+ */
+const captureDroppedInvalidFillTilingFeatures = (droppedInvalidFeatures, layerHandleId, sessionReportedDedupeKeys, report) => {
+    for (const entry of droppedInvalidFeatures) {
+        const key = resolveDroppedFeatureDedupeKey(layerHandleId, entry);
+        const featureId = entry.feature.id !== undefined ? String(entry.feature.id) : undefined;
+        captureOnce(key, report, sessionReportedDedupeKeys, {
+            layerHandleId,
+            featureId,
+            validationError: entry.validationError,
+        });
+    }
+};
+
 // ============================================================================
 // Default resolver
 // ============================================================================
@@ -10142,6 +10218,9 @@ const pickFillPromotionCandidates = (fillHits, compareByArea) => {
  * @internal
  */
 const useShapeFillTiling = ({ api, handles, onFillGeometriesChange, onZIndexOverridesChange, onSettledHover, selectedFeatureId, selectedHandleId, suppressedFillIdsByHandle, }) => {
+    const errorHandler = reactCoreHooks.useErrorHandlerOrNull();
+    /** Handle/feature keys already reported to Sentry this session. */
+    const sessionReportedDedupeKeysRef = react.useRef(new Set());
     const tilingContentKey = react.useMemo(() => buildTilingContentKey(handles), [handles]);
     const tilingHandles = react.useMemo(() => handles.filter((handle) => handle.layerType === "shapes" && handle.overlap?.mode === "tile"), [handles]);
     const hasTilingHandles = tilingHandles.length > 0;
@@ -10375,7 +10454,7 @@ const useShapeFillTiling = ({ api, handles, onFillGeometriesChange, onZIndexOver
         const nextRestingFills = new Map();
         const nextRestingZIndices = new Map();
         for (const handle of currentHandles) {
-            const { fillGeometries, featureToGroupKey, featureZIndex } = computeFillTiling({
+            const { fillGeometries, featureToGroupKey, featureZIndex, droppedInvalidFeatures } = computeFillTiling({
                 features: handle.features.features,
                 viewportBounds: GLOBAL_BOUNDS,
                 resolveStackOrder: handle.overlap?.resolveStackOrder ?? defaultShapeStackOrder,
@@ -10383,6 +10462,14 @@ const useShapeFillTiling = ({ api, handles, onFillGeometriesChange, onZIndexOver
                 layerGeodesic: handle.style.geodesic,
                 featureStyles: handle.featureStyles,
             });
+            if (errorHandler !== null && droppedInvalidFeatures.length > 0) {
+                captureDroppedInvalidFillTilingFeatures(droppedInvalidFeatures, handle.id, sessionReportedDedupeKeysRef.current, payload => {
+                    errorHandler.captureException(new Error(`Schema-invalid polygonal geometry excluded from fill tiling: ${JSON.stringify(payload)}`), {
+                        level: "warning",
+                        fingerprint: ["react-map", "fill-tiling", "invalid-polygonal-geometry"],
+                    });
+                });
+            }
             featureToGroupKeyByHandleRef.current.set(handle.id, new Map(featureToGroupKey));
             if (fillGeometries.size > 0) {
                 nextRestingFills.set(handle.id, fillGeometries);
@@ -10395,7 +10482,7 @@ const useShapeFillTiling = ({ api, handles, onFillGeometriesChange, onZIndexOver
         restingZIndexByHandleRef.current = nextRestingZIndices;
         retrySelectionPromotionRef.current?.();
         emitWithPromotion();
-    }, [emitWithPromotion]);
+    }, [emitWithPromotion, errorHandler]);
     const flushPendingRestingRecompute = react.useCallback(() => {
         if (!pendingRestingRecomputeRef.current)
             return;

package/index.esm.js

@@ -9,12 +9,12 @@ import { twMerge } from 'tailwind-merge';
 import { useFloating, autoUpdate, offset, flip, useHover, safePolygon, useInteractions, shift, hide, useDismiss, useRole } from '@floating-ui/react';
 import { createPortal } from 'react-dom';
 import { isEqual } from 'es-toolkit';
-import { useGeolocation } from '@trackunit/react-core-hooks';
+import { useGeolocation, useErrorHandlerOrNull } from '@trackunit/react-core-hooks';
 import { Checkbox, ToggleSwitch, RadioGroup as RadioGroup$1, RadioItem, FormGroup, Search as Search$1, SelectField, BaseSelect } from '@trackunit/react-form-components';
 import { z } from 'zod';
 import { PieChart } from 'react-minimal-pie-chart';
 import { tailwindPalette } from '@trackunit/ui-design-tokens';
-import { lngLatToMercatorPxWS, validateBboxWithFallback, extractPositionsFromGeometry, geoJsonPositionSchema, validateFeatureCollection, EMPTY_FEATURE_COLLECTION, validateBbox, projectPolygonalToWebMercator, geoJsonPolygonDifference, unprojectPolygonalFromWebMercator, distanceToGeoJsonPolygonBoundary, getGeoJsonPolygonIntersection, isFullyContainedInGeoJsonGeometry, isGeoJsonPointInPolygon, isBboxInsideFeatureCollection, extractEdges, computeGeometryCentroid, mercatorPxToLngLatWS, isPositionInsideRing, lngLatToWebMercatorPx, edgePixelLength } from '@trackunit/geo-json-utils';
+import { lngLatToMercatorPxWS, validateBboxWithFallback, extractPositionsFromGeometry, geoJsonPositionSchema, validateFeatureCollection, EMPTY_FEATURE_COLLECTION, validateBbox, projectPolygonalToWebMercator, geoJsonPolygonDifference, unprojectPolygonalFromWebMercator, geoJsonPolygonSchema, geoJsonMultiPolygonSchema, distanceToGeoJsonPolygonBoundary, getGeoJsonPolygonIntersection, isFullyContainedInGeometry, isGeoJsonPointInPolygon, isBboxInsideFeatureCollection, extractEdges, computeGeometryCentroid, mercatorPxToLngLatWS, isPositionInsideRing, lngLatToWebMercatorPx, edgePixelLength, isFullyContainedInGeoJsonGeometry } from '@trackunit/geo-json-utils';
 import { darkenColor, lightenColor } from '@trackunit/react-map-color-utils';
 
 var defaultTranslations = {
@@ -7701,7 +7701,9 @@ const buildContendedShapes = (group) => group.map(record => {
     for (const other of group) {
         if (other.id === record.id)
             continue;
-        if (isFullyContainedInGeoJsonGeometry(record.geometry, other.geometry) === true) {
+        // Pure predicate: geometry was validated once at the computeFillTiling
+        // boundary, so this O(n²) loop performs no safeParse per pair (SAGA-664).
+        if (isFullyContainedInGeometry(record.geometry, other.geometry)) {
             containedIn.push(other.id);
         }
     }
@@ -7774,6 +7776,37 @@ const computePromotionGroupFills = (members, winnerId, restingPeerFills = new Ma
 };
 const computeFillTiling = (input) => {
     const { features, viewportBounds, resolveStackOrder, selectedFeatureId, suppressedFeatureIds, layerGeodesic, featureStyles, } = input;
+    // Validation boundary (SAGA-664): validate each input feature's polygonal
+    // geometry once here — O(n) — dropping malformed geometry. The downstream O(n²)
+    // overlap loop then runs the pure predicates on trusted geometry without a
+    // safeParse per pair. Validate the input (not the densified output), since
+    // densification is our own transform of already-valid geometry.
+    const validFeatures = [];
+    const droppedInvalidFeatures = [];
+    for (const feature of features) {
+        const geometry = polygonalGeometry(feature);
+        if (geometry === null)
+            continue;
+        const parsed = geometry.type === "Polygon"
+            ? geoJsonPolygonSchema.safeParse(geometry)
+            : geoJsonMultiPolygonSchema.safeParse(geometry);
+        if (!parsed.success) {
+            droppedInvalidFeatures.push({
+                feature,
+                validationError: parsed.error.format(),
+            });
+            continue;
+        }
+        validFeatures.push(feature);
+    }
+    if (droppedInvalidFeatures.length > 0) {
+        const idList = droppedInvalidFeatures
+            .map(entry => (entry.feature.id !== undefined ? String(entry.feature.id) : undefined))
+            .filter((id) => id !== undefined)
+            .join(", ") || "(no feature ids)";
+        // eslint-disable-next-line no-console -- Intentional: warn devs when schema-invalid polygonal geometry is excluded from fill tiling
+        console.warn(`[computeFillTiling] Excluded ${droppedInvalidFeatures.length} feature(s) with invalid polygonal geometry from fill tiling (full fill still renders; overlap clipping is skipped): ${idList}`);
+    }
     // Densify before any polygon/boundary math so clip geometry follows great-circle
     // arcs on large polygons (mirrors the ADR-0024 precedent for edge labels). Always
     // defer to densifyGeodesicFeatures' per-feature resolution (geodesic override >
@@ -7782,7 +7815,7 @@ const computeFillTiling = (input) => {
     // original collection when nothing is densified.
     const featureCollection = {
         type: "FeatureCollection",
-        features: Array.from(features),
+        features: validFeatures,
     };
     const densifiedFeatures = densifyGeodesicFeatures(featureCollection, layerGeodesic ?? true, featureStyles).features;
     const records = [];
@@ -7875,7 +7908,12 @@ const computeFillTiling = (input) => {
             fillGeometries.set(id, EMPTY_FILL);
         }
     }
-    return { fillGeometries, featureToGroupKey, featureZIndex };
+    return {
+        fillGeometries,
+        featureToGroupKey,
+        featureZIndex,
+        droppedInvalidFeatures,
+    };
 };
 
 const DEFAULT_ZOOM = 0;
@@ -9949,6 +9987,44 @@ const useShapeDecorations = ({ onDecorationsChange, onStyleOverridesChange, api,
     return useMemo(() => ({ subscribe, getSnapshot }), [subscribe, getSnapshot]);
 };
 
+const resolveDroppedFeatureDedupeKey = (layerHandleId, entry) => {
+    if (entry.feature.id !== undefined) {
+        return `${layerHandleId}:${String(entry.feature.id)}`;
+    }
+    const geometry = entry.feature.geometry;
+    if (geometry === null) {
+        return `${layerHandleId}:anonymous:null-geometry`;
+    }
+    if (geometry.type === "Polygon") {
+        return `${layerHandleId}:anonymous:Polygon:${geometry.coordinates.flat(2).length}`;
+    }
+    if (geometry.type === "MultiPolygon") {
+        return `${layerHandleId}:anonymous:MultiPolygon:${geometry.coordinates.flat(3).length}`;
+    }
+    return `${layerHandleId}:anonymous:${geometry.type}`;
+};
+const captureOnce = (key, report, sessionReportedDedupeKeys, payload) => {
+    if (sessionReportedDedupeKeys.has(key))
+        return; // skip sentry warning if already reported this session
+    sessionReportedDedupeKeys.add(key); // add key to ref set to prevent duplicate warnings in this session
+    report(payload);
+};
+/**
+ * Report to Sentry each dropped invalid feature via `report`, at most once per handle/feature per session.
+ * Note: `computeFillTiling` emits `console.warn` separately.
+ */
+const captureDroppedInvalidFillTilingFeatures = (droppedInvalidFeatures, layerHandleId, sessionReportedDedupeKeys, report) => {
+    for (const entry of droppedInvalidFeatures) {
+        const key = resolveDroppedFeatureDedupeKey(layerHandleId, entry);
+        const featureId = entry.feature.id !== undefined ? String(entry.feature.id) : undefined;
+        captureOnce(key, report, sessionReportedDedupeKeys, {
+            layerHandleId,
+            featureId,
+            validationError: entry.validationError,
+        });
+    }
+};
+
 // ============================================================================
 // Default resolver
 // ============================================================================
@@ -10141,6 +10217,9 @@ const pickFillPromotionCandidates = (fillHits, compareByArea) => {
  * @internal
  */
 const useShapeFillTiling = ({ api, handles, onFillGeometriesChange, onZIndexOverridesChange, onSettledHover, selectedFeatureId, selectedHandleId, suppressedFillIdsByHandle, }) => {
+    const errorHandler = useErrorHandlerOrNull();
+    /** Handle/feature keys already reported to Sentry this session. */
+    const sessionReportedDedupeKeysRef = useRef(new Set());
     const tilingContentKey = useMemo(() => buildTilingContentKey(handles), [handles]);
     const tilingHandles = useMemo(() => handles.filter((handle) => handle.layerType === "shapes" && handle.overlap?.mode === "tile"), [handles]);
     const hasTilingHandles = tilingHandles.length > 0;
@@ -10374,7 +10453,7 @@ const useShapeFillTiling = ({ api, handles, onFillGeometriesChange, onZIndexOver
         const nextRestingFills = new Map();
         const nextRestingZIndices = new Map();
         for (const handle of currentHandles) {
-            const { fillGeometries, featureToGroupKey, featureZIndex } = computeFillTiling({
+            const { fillGeometries, featureToGroupKey, featureZIndex, droppedInvalidFeatures } = computeFillTiling({
                 features: handle.features.features,
                 viewportBounds: GLOBAL_BOUNDS,
                 resolveStackOrder: handle.overlap?.resolveStackOrder ?? defaultShapeStackOrder,
@@ -10382,6 +10461,14 @@ const useShapeFillTiling = ({ api, handles, onFillGeometriesChange, onZIndexOver
                 layerGeodesic: handle.style.geodesic,
                 featureStyles: handle.featureStyles,
             });
+            if (errorHandler !== null && droppedInvalidFeatures.length > 0) {
+                captureDroppedInvalidFillTilingFeatures(droppedInvalidFeatures, handle.id, sessionReportedDedupeKeysRef.current, payload => {
+                    errorHandler.captureException(new Error(`Schema-invalid polygonal geometry excluded from fill tiling: ${JSON.stringify(payload)}`), {
+                        level: "warning",
+                        fingerprint: ["react-map", "fill-tiling", "invalid-polygonal-geometry"],
+                    });
+                });
+            }
             featureToGroupKeyByHandleRef.current.set(handle.id, new Map(featureToGroupKey));
             if (fillGeometries.size > 0) {
                 nextRestingFills.set(handle.id, fillGeometries);
@@ -10394,7 +10481,7 @@ const useShapeFillTiling = ({ api, handles, onFillGeometriesChange, onZIndexOver
         restingZIndexByHandleRef.current = nextRestingZIndices;
         retrySelectionPromotionRef.current?.();
         emitWithPromotion();
-    }, [emitWithPromotion]);
+    }, [emitWithPromotion, errorHandler]);
     const flushPendingRestingRecompute = useCallback(() => {
         if (!pendingRestingRecomputeRef.current)
             return;

package/package.json

@@ -1,22 +1,22 @@
 {
   "name": "@trackunit/react-map",
-  "version": "0.2.8",
+  "version": "0.2.9-alpha-636ec415cd1.0",
   "repository": "https://github.com/Trackunit/manager",
   "license": "SEE LICENSE IN LICENSE.txt",
   "engines": {
     "node": ">=24.x"
   },
   "dependencies": {
-    "@trackunit/react-components": "2.2.5",
-    "@trackunit/css-class-variance-utilities": "1.13.63",
-    "@trackunit/react-form-components": "2.2.6",
-    "@trackunit/react-core-hooks": "1.18.4",
-    "@trackunit/geo-json-utils": "1.14.66",
-    "@trackunit/i18n-library-translation": "2.1.4",
+    "@trackunit/react-components": "2.2.6-alpha-636ec415cd1.0",
+    "@trackunit/css-class-variance-utilities": "1.13.64-alpha-636ec415cd1.0",
+    "@trackunit/react-form-components": "2.2.7-alpha-636ec415cd1.0",
+    "@trackunit/react-core-hooks": "1.18.5-alpha-636ec415cd1.0",
+    "@trackunit/geo-json-utils": "1.14.67-alpha-636ec415cd1.0",
+    "@trackunit/i18n-library-translation": "2.1.5-alpha-636ec415cd1.0",
     "react-minimal-pie-chart": "^8.4.0",
-    "@trackunit/react-map-adapter-shared": "0.0.47",
-    "@trackunit/react-map-color-utils": "0.0.32",
-    "@trackunit/ui-design-tokens": "1.13.62",
+    "@trackunit/react-map-adapter-shared": "0.0.48-alpha-636ec415cd1.0",
+    "@trackunit/react-map-color-utils": "0.0.33-alpha-636ec415cd1.0",
+    "@trackunit/ui-design-tokens": "1.13.63-alpha-636ec415cd1.0",
     "@floating-ui/react": "^0.26.25",
     "es-toolkit": "^1.39.10",
     "tailwind-merge": "^2.0.0",

package/src/layers/useShapes/captureDroppedInvalidFillTilingFeatures.d.ts

@@ -0,0 +1,8 @@
+import type { DroppedInvalidFillTilingFeature } from "./shapeFillTiling";
+type ReportDroppedInvalidFillTilingEvent = (payload: Record<string, unknown>) => void;
+/**
+ * Report to Sentry each dropped invalid feature via `report`, at most once per handle/feature per session.
+ * Note: `computeFillTiling` emits `console.warn` separately.
+ */
+export declare const captureDroppedInvalidFillTilingFeatures: (droppedInvalidFeatures: ReadonlyArray<DroppedInvalidFillTilingFeature>, layerHandleId: string, sessionReportedDedupeKeys: Set<string>, report: ReportDroppedInvalidFillTilingEvent) => void;
+export {};

package/src/layers/useShapes/shapeFillTiling.d.ts

@@ -68,6 +68,13 @@ export type FillTilingResult = Readonly<{
      * only overrides the promoted feature's value to raise it above its peers.
      */
     featureZIndex: ReadonlyMap<string, number>;
+    /** Features excluded from fill tiling when boundary schema validation fails. */
+    droppedInvalidFeatures: ReadonlyArray<DroppedInvalidFillTilingFeature>;
+}>;
+export type DroppedInvalidFillTilingFeature = Readonly<{
+    feature: GeoJsonFeature;
+    /** `safeParse` failure details (`parsed.error.format()`). */
+    validationError: unknown;
 }>;
 /**
  * Planar area of any GeoJSON geometry (outer rings minus holes). Returns 0 for