Marvine89 · Marvine89 · Nov 9, 2024 · Nov 9, 2024 · Nov 9, 2024
diff --git a/public/images/screenshot-1.png b/public/images/screenshot-1.png
diff --git a/public/images/screenshot-2.png b/public/images/screenshot-2.png
diff --git a/public/images/screenshot-3.png b/public/images/screenshot-3.png
diff --git a/public/images/screenshot-4.png b/public/images/screenshot-4.png
diff --git a/src/shared/hooks/use-fetch-work-surfece-store.ts b/src/shared/hooks/use-fetch-work-surfece-store.ts
@@ -3,14 +3,15 @@ import { workSurfacesSelector } from '../states/selectors';
 import { useFetchWorkSurfaceQuery } from '../api';
 import { useEffect } from 'react';
 import { setSurfaces } from '../states/work-surface.slice';
+import { transformCoordinates } from '../utils';
 
 export const useFetchWorkSurfaceStore = () => {
   const dispatch = useDispatch();
   const workSurfaces = useSelector(workSurfacesSelector);
   const { isLoading, isError, data } = useFetchWorkSurfaceQuery();
 
   useEffect(() => {
-    if (data) dispatch(setSurfaces(data));
+    if (data) dispatch(setSurfaces(transformCoordinates(data)));
   }, [data, dispatch]);
 
   return { isLoading, isError, data: workSurfaces };

diff --git a/src/shared/hooks/use-selected-coordinates.ts b/src/shared/hooks/use-selected-coordinates.ts
@@ -17,6 +17,7 @@ export function useSelectedCoordinates() {
     if (!polygoneMode) return setGeometryList(filteredCoords.map((coords) => coords[0]));
 
     const geometryList = polygoneMode === 'union' ? unionHelper(filteredCoords) : intersectHelper(filteredCoords);
+
     setGeometryList(geometryList);
     dispatch(setDisplayedPolygon(geometryList));
   }, [workSurfaces, removedFeature, setGeometryList, polygoneMode, dispatch]);

diff --git a/src/shared/interfaces/work-surfaces.ts b/src/shared/interfaces/work-surfaces.ts
@@ -10,15 +10,13 @@ export interface WorkSurface {
 
 export interface SurfaceFeatureResponse {
   type: string;
-  properties: Record<string, string>;
   geometry: SurfaceGeometry;
 }
 
 export interface SurfaceFeature {
   type: string;
   id: number;
   parentId: number;
-  properties: Record<string, string>;
   geometry: SurfaceGeometry;
 }
 

diff --git a/src/shared/utils/index.ts b/src/shared/utils/index.ts
@@ -4,3 +4,4 @@ export * from './filtered-coordinates';
 export * from './union';
 export * from './interception';
 export * from './area-calculation';
+export * from './transform-coordinates';
diff --git a/src/shared/utils/tests/mocks/features.mock.ts b/src/shared/utils/tests/mocks/features.mock.ts
@@ -4,7 +4,7 @@ export const FEATURE_1_MOCK: SurfaceFeature = {
   type: 'Feature 1',
   id: 1,
   parentId: 1,
-  properties: { name: 'Feature 1', description: 'Feature 1 description' },
+
   geometry: {
     type: 'Polygon',
     color: 'red',
@@ -24,7 +24,6 @@ export const FEATURE_2_MOCK: SurfaceFeature = {
   type: 'Feature 2',
   id: 1,
   parentId: 2,
-  properties: { name: 'Feature 2', description: 'Feature 2 description' },
   geometry: {
     type: 'Polygon',
     color: 'red',

diff --git a/src/shared/utils/transform-coordinates.ts b/src/shared/utils/transform-coordinates.ts
@@ -0,0 +1,20 @@
+import { WorkSurface } from '../interfaces';
+
+export function transformCoordinates(workSurfaces: WorkSurface[]): WorkSurface[] {
+  return workSurfaces.map((workSurface) => {
+    return {
+      ...workSurface,
+      features: workSurface.features.map((feature) => {
+        return {
+          ...feature,
+          geometry: {
+            ...feature.geometry,
+            coordinates: feature.geometry.coordinates.map((coords) => {
+              return coords.map(([lng, lat]) => [lat, lng]);
+            }),
+          },
+        };
+      }),
+    };
+  });
+}