normalize uploaded area geometries

GlobalFishingWatch · Sep 2, 2024 · a203c5e · a203c5e
1 parent 50906db
commit a203c5e
Show file tree

Hide file tree

Showing 2 changed files with 15 additions and 2 deletions.
diff --git a/apps/fishing-map/features/areas/areas.slice.ts b/apps/fishing-map/features/areas/areas.slice.ts
@@ -190,7 +190,6 @@ export const fetchAreaDetailThunk = createAsyncThunk(
     }
     const dataset = selectDatasetById(datasetId)(getState() as RootState)
     const area = await fetchAreaDetail({ dataset, areaId, areaName, signal, simplify })
-    debugger
     return area
   },
   {

diff --git a/apps/fishing-map/features/datasets/upload/datasets-upload.utils.ts b/apps/fishing-map/features/datasets/upload/datasets-upload.utils.ts
@@ -1,4 +1,13 @@
-import { Feature, FeatureCollection, GeoJsonProperties, Point, Polygon } from 'geojson'
+import {
+  Feature,
+  FeatureCollection,
+  GeoJsonProperties,
+  GeometryCollection,
+  Point,
+  Polygon,
+} from 'geojson'
+import { flatten } from '@turf/flatten'
+import union from '@turf/union'
 import {
   Dataset,
   DatasetCategory,
@@ -23,6 +32,7 @@ import { isPrivateDataset } from 'features/datasets/datasets.utils'
 import { DatasetMetadata } from 'features/datasets/upload/NewDataset'
 import { getUTCDateTime } from 'utils/dates'
 import { FileType } from 'utils/files'
+import { AreaGeometry } from 'features/areas/areas.slice'
 
 type ExtractMetadataProps = { name: string; sourceFormat?: FileType; data: any }
 
@@ -184,6 +194,10 @@ export const parseGeoJsonProperties = <T extends Polygon | Point>(
       return {
         ...feature,
         properties,
+        geometry:
+          (feature.geometry as unknown as GeometryCollection).type === 'GeometryCollection'
+            ? (union(flatten(feature.geometry))?.geometry as AreaGeometry)
+            : (feature.geometry as AreaGeometry),
       }
     }) as Feature<T, GeoJsonProperties>[],
   }