diff --git a/backend/src/prediction/predictionService.ts b/backend/src/prediction/predictionService.ts index b076730..e46afd3 100644 --- a/backend/src/prediction/predictionService.ts +++ b/backend/src/prediction/predictionService.ts @@ -54,13 +54,15 @@ interface PredictionDetail { insuranceData: unknown; }>; weather: Array<{ - weatherDtm: string; - windSpd: number | null; - windDir: string | null; - waveHgt: number | null; - currentSpd: number | null; - currentDir: string | null; - temp: number | null; + obsDtm: string; + locNm: string; + temp: string; + weatherDc: string; + wind: string; + wave: string; + humid: string; + vis: string; + sst: string; }>; } @@ -244,16 +246,18 @@ export async function getAnalysisDetail(acdntSn: number): Promise) => ({ - weatherDtm: String(w['weather_dtm'] ?? ''), - windSpd: w['wind_spd'] != null ? parseFloat(String(w['wind_spd'])) : null, - windDir: w['wind_dir'] != null ? String(w['wind_dir']) : null, - waveHgt: w['wave_hgt'] != null ? parseFloat(String(w['wave_hgt'])) : null, - currentSpd: w['current_spd'] != null ? parseFloat(String(w['current_spd'])) : null, - currentDir: w['current_dir'] != null ? String(w['current_dir']) : null, - temp: w['temp'] != null ? parseFloat(String(w['temp'])) : null, + obsDtm: w['obs_dtm'] ? String(w['obs_dtm']) : '', + locNm: String(w['loc_nm'] ?? ''), + temp: String(w['temp'] ?? ''), + weatherDc: String(w['weather_dc'] ?? ''), + wind: String(w['wind'] ?? ''), + wave: String(w['wave'] ?? ''), + humid: String(w['humid'] ?? ''), + vis: String(w['vis'] ?? ''), + sst: String(w['sst'] ?? ''), })); return { diff --git a/frontend/src/tabs/prediction/services/predictionApi.ts b/frontend/src/tabs/prediction/services/predictionApi.ts index 53b4651..fcd0d65 100644 --- a/frontend/src/tabs/prediction/services/predictionApi.ts +++ b/frontend/src/tabs/prediction/services/predictionApi.ts @@ -54,13 +54,15 @@ export interface PredictionDetail { insuranceData: unknown; }>; weather: Array<{ - weatherDtm: string; - windSpd: number | null; - windDir: string | null; - waveHgt: number | null; - currentSpd: number | null; - currentDir: string | null; - temp: number | null; + obsDtm: string; + locNm: string; + temp: string; + weatherDc: string; + wind: string; + wave: string; + humid: string; + vis: string; + sst: string; }>; }