fix: undefined error on main map

dataforgoodfr · Oct 16, 2024 · 6a6b122 · 6a6b122
1 parent fb11de9
commit 6a6b122
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 5 deletions.
diff --git a/frontend/components/core/map/main-map.tsx b/frontend/components/core/map/main-map.tsx
@@ -192,7 +192,7 @@ export default function CoreMap({ vesselsPositions }: CoreMapProps) {
   )
 }
 function toSegmentsGeo({ segments, vesselId }: VesselExcursionSegments): any {
-  const segmentsGeo = segments.map((segment: VesselExcursionSegment) => {
+  const segmentsGeo = segments?.map((segment: VesselExcursionSegment) => {
     return {
       speed: segment.average_speed,
       navigational_status: "unknown",
@@ -205,6 +205,6 @@ function toSegmentsGeo({ segments, vesselId }: VesselExcursionSegments): any {
       } 
     }
   })
-  return { vesselId, type: "FeatureCollection", features: segmentsGeo };
+  return { vesselId, type: "FeatureCollection", features: segmentsGeo ?? [] };
 }
 
diff --git a/frontend/services/backend-rest-client.ts b/frontend/services/backend-rest-client.ts
@@ -2,6 +2,7 @@
 import { Vessel, VesselExcursion, VesselExcursionSegment, VesselPositions, VesselTrackingTimeDto } from "@/types/vessel";
 import { ZoneVisitTimeDto } from "@/types/zone";
 import axios, { InternalAxiosRequestConfig } from "axios";
+import { log } from "console";
 
 const BASE_URL = process.env.NEXT_PUBLIC_BACKEND_BASE_URL;
 const API_KEY = process.env.NEXT_PUBLIC_BACKEND_API_KEY ?? 'no-key-found';
@@ -37,9 +38,15 @@ export function getVesselSegments(vesselId: number, excursionId: number) {
 }
 
 export async function getVesselFirstExcursionSegments(vesselId: number) {
-  const response = await getVesselExcursion(vesselId);
-  const excursionId = response?.data[0]?.id;
-  return !!excursionId ? getVesselSegments(vesselId, excursionId) : [];
+  try {
+    const response = await getVesselExcursion(vesselId);
+    const excursionId = response?.data[0]?.id;
+    return !!excursionId ? getVesselSegments(vesselId, excursionId) : [];
+
+  } catch(error) {
+    console.error(error);
+    return [];
+  }
 }
 
 export function getTopVesselsInActivity(startAt: string, endAt: string, topVesselsLimit: number) {