@trackunit/filters-asset-filter-definitions 0.0.600 → 0.0.602

package/index.cjs.js

@@ -1710,10 +1710,14 @@ const RecentSearchesFooter = ({ count, onClearAll }) => {
 };
 
 const LOCAL_STORAGE_KEY = "area-filter-recent-searches";
-const areaFilterGeometrySchema = zod.z.union([geoJsonUtils.geoJsonPolygonSchema, geoJsonUtils.geoJsonPointSchema]);
+const areaFilterInternalGeoJsonGeometrySchema = zod.z.union([
+    geoJsonUtils.geoJsonPolygonSchema,
+    geoJsonUtils.geoJsonPointSchema,
+    geoJsonUtils.geoJsonMultiPolygonSchema,
+]);
 const areaFilterInternalSchema = zod.z.object({
     bBox: geoJsonUtils.geoJsonBboxSchema,
-    geometry: areaFilterGeometrySchema,
+    geometry: areaFilterInternalGeoJsonGeometrySchema,
     properties: zod.z.object({
         formattedAddress: zod.z.string(),
     }),
@@ -1736,7 +1740,7 @@ const AreaView = (props) => {
         return ((_b = (_a = stableData === null || stableData === void 0 ? void 0 : stableData.findPlaces) === null || _a === void 0 ? void 0 : _a.map(place => {
             var _a, _b;
             const parsedBbox = geoJsonUtils.geoJsonBboxSchema.safeParse(place.bbox);
-            const parsedGeometry = areaFilterGeometrySchema.safeParse(((_a = place.geometry) === null || _a === void 0 ? void 0 : _a.type)
+            const parsedGeometry = areaFilterInternalGeoJsonGeometrySchema.safeParse(((_a = place.geometry) === null || _a === void 0 ? void 0 : _a.type)
                 ? {
                     type: stringTs.titleCase(place.geometry.type),
                     coordinates: place.geometry.coordinates,
@@ -1880,7 +1884,7 @@ const useAreaFilter = ({ showWithSearch } = {
 const getSelectedOption = (value, options) => {
     return options.find(option => {
         // Polygons are compared by their coordinates directly
-        if (option.geometry.type === "Polygon") {
+        if (option.geometry.type === "Polygon" || option.geometry.type === "MultiPolygon") {
             return JSON.stringify(option.geometry.coordinates) === JSON.stringify(value === null || value === void 0 ? void 0 : value.coordinates);
         }
         // All other geometries are stored by the filter as a

package/index.esm.js

@@ -8,7 +8,7 @@ import { useMemo, useState, useCallback, useRef, useEffect } from 'react';
 import { useQuery } from '@apollo/client';
 import { useActiveAssetFilters, useAssetQueryFilters } from '@trackunit/filters-graphql-hook';
 import { ActivityIndicator } from '@trackunit/utilization-indicator';
-import { geoJsonPolygonSchema, geoJsonPointSchema, geoJsonBboxSchema, getPolygonFromBbox, getBboxFromGeoJsonPolygon, getGeoJsonPolygonFromBoundingBox } from '@trackunit/geo-json-utils';
+import { geoJsonPolygonSchema, geoJsonPointSchema, geoJsonMultiPolygonSchema, geoJsonBboxSchema, getPolygonFromBbox, getBboxFromGeoJsonPolygon, getGeoJsonPolygonFromBoundingBox } from '@trackunit/geo-json-utils';
 import { Tooltip, IconButton, Icon, Text, Button, useDebounce, useGeometry, Popover, PopoverTrigger, PopoverContent, MenuList, MenuItem } from '@trackunit/react-components';
 import { nonNullable, objectValues, hourIntervals, enumFromValue, objectKeys } from '@trackunit/shared-utils';
 import { titleCase, lowerCase } from 'string-ts';
@@ -1708,10 +1708,14 @@ const RecentSearchesFooter = ({ count, onClearAll }) => {
 };
 
 const LOCAL_STORAGE_KEY = "area-filter-recent-searches";
-const areaFilterGeometrySchema = z.union([geoJsonPolygonSchema, geoJsonPointSchema]);
+const areaFilterInternalGeoJsonGeometrySchema = z.union([
+    geoJsonPolygonSchema,
+    geoJsonPointSchema,
+    geoJsonMultiPolygonSchema,
+]);
 const areaFilterInternalSchema = z.object({
     bBox: geoJsonBboxSchema,
-    geometry: areaFilterGeometrySchema,
+    geometry: areaFilterInternalGeoJsonGeometrySchema,
     properties: z.object({
         formattedAddress: z.string(),
     }),
@@ -1734,7 +1738,7 @@ const AreaView = (props) => {
         return ((_b = (_a = stableData === null || stableData === void 0 ? void 0 : stableData.findPlaces) === null || _a === void 0 ? void 0 : _a.map(place => {
             var _a, _b;
             const parsedBbox = geoJsonBboxSchema.safeParse(place.bbox);
-            const parsedGeometry = areaFilterGeometrySchema.safeParse(((_a = place.geometry) === null || _a === void 0 ? void 0 : _a.type)
+            const parsedGeometry = areaFilterInternalGeoJsonGeometrySchema.safeParse(((_a = place.geometry) === null || _a === void 0 ? void 0 : _a.type)
                 ? {
                     type: titleCase(place.geometry.type),
                     coordinates: place.geometry.coordinates,
@@ -1878,7 +1882,7 @@ const useAreaFilter = ({ showWithSearch } = {
 const getSelectedOption = (value, options) => {
     return options.find(option => {
         // Polygons are compared by their coordinates directly
-        if (option.geometry.type === "Polygon") {
+        if (option.geometry.type === "Polygon" || option.geometry.type === "MultiPolygon") {
             return JSON.stringify(option.geometry.coordinates) === JSON.stringify(value === null || value === void 0 ? void 0 : value.coordinates);
         }
         // All other geometries are stored by the filter as a

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@trackunit/filters-asset-filter-definitions",
-  "version": "0.0.600",
+  "version": "0.0.602",
   "repository": "https://github.com/Trackunit/manager",
   "license": "SEE LICENSE IN LICENSE.txt",
   "engines": {
@@ -8,31 +8,31 @@
   },
   "dependencies": {
     "@graphql-codegen/cli": "^5.0.3",
-    "@trackunit/iris-app-build-utilities": "*",
-    "@trackunit/react-core-contexts-api": "*",
     "@apollo/client": "3.10.4",
-    "@trackunit/filters-filter-bar": "*",
-    "@trackunit/filters-graphql-hook": "*",
-    "@trackunit/utilization-indicator": "*",
     "react": "18.3.1",
-    "@trackunit/react-filter-components": "*",
-    "@trackunit/react-components": "*",
-    "@trackunit/translations-machine-type": "*",
-    "@trackunit/criticality-indicator": "*",
-    "@trackunit/react-core-hooks": "*",
-    "@trackunit/react-form-components": "*",
-    "@trackunit/shared-utils": "*",
-    "@trackunit/geo-json-utils": "*",
     "@graphql-typed-document-node/core": "^3.2.0",
     "graphql": "^16.9.0",
-    "@trackunit/iris-app-api": "*",
-    "@trackunit/react-core-contexts-test": "*",
     "zod": "3.22.4",
-    "@trackunit/i18n-library-translation": "*",
     "jest-fetch-mock": "^3.0.3",
     "@tanstack/react-router": "1.47.1",
     "string-ts": "^2.0.0",
-    "tailwind-merge": "^2.0.0"
+    "tailwind-merge": "^2.0.0",
+    "@trackunit/iris-app-build-utilities": "^0.0.464",
+    "@trackunit/filters-filter-bar": "^0.1.20",
+    "@trackunit/react-core-hooks": "^0.2.273",
+    "@trackunit/react-filter-components": "^0.1.18",
+    "@trackunit/react-form-components": "^0.2.12",
+    "@trackunit/filters-graphql-hook": "^0.0.513",
+    "@trackunit/utilization-indicator": "^0.0.326",
+    "@trackunit/geo-json-utils": "^0.0.5",
+    "@trackunit/react-components": "^0.5.42",
+    "@trackunit/shared-utils": "^0.0.92",
+    "@trackunit/translations-machine-type": "^0.0.253",
+    "@trackunit/criticality-indicator": "^0.0.322",
+    "@trackunit/iris-app-api": "^0.2.19",
+    "@trackunit/react-core-contexts-test": "^0.1.302",
+    "@trackunit/react-core-contexts-api": "^0.2.191",
+    "@trackunit/i18n-library-translation": "^0.0.231"
   },
   "module": "./index.esm.js",
   "main": "./index.cjs.js",

package/src/defaultFilters/defaults/AreaFilter.d.ts

@@ -20,6 +20,15 @@ declare const areaFilterInternalSchema: z.ZodObject<{
     }, {
         type: "Point";
         coordinates: [number, number];
+    }>, z.ZodObject<{
+        type: z.ZodLiteral<"MultiPolygon">;
+        coordinates: z.ZodArray<z.ZodArray<z.ZodEffects<z.ZodArray<z.ZodTuple<[z.ZodNumber, z.ZodNumber], null>, "many">, [number, number][], [number, number][]>, "many">, "many">;
+    }, "strict", z.ZodTypeAny, {
+        type: "MultiPolygon";
+        coordinates: [number, number][][][];
+    }, {
+        type: "MultiPolygon";
+        coordinates: [number, number][][][];
     }>]>;
     properties: z.ZodObject<{
         formattedAddress: z.ZodString;
@@ -37,6 +46,9 @@ declare const areaFilterInternalSchema: z.ZodObject<{
     } | {
         type: "Point";
         coordinates: [number, number];
+    } | {
+        type: "MultiPolygon";
+        coordinates: [number, number][][][];
     };
     properties: {
         formattedAddress: string;
@@ -50,6 +62,9 @@ declare const areaFilterInternalSchema: z.ZodObject<{
     } | {
         type: "Point";
         coordinates: [number, number];
+    } | {
+        type: "MultiPolygon";
+        coordinates: [number, number][][][];
     };
     properties: {
         formattedAddress: string;

package/src/generated/graphql-api/graphql.d.ts

@@ -130,6 +130,7 @@ export type Scalars = {
     };
 };
 export declare const areaFilterGeoJsonGeometryType: {
+    readonly MultiPolygon: "MultiPolygon";
     readonly Polygon: "Polygon";
 };
 export type AreaFilterGeoJsonGeometryType = (typeof areaFilterGeoJsonGeometryType)[keyof typeof areaFilterGeoJsonGeometryType];