From 73a52022d549ee3b401cea938f40321702c52b2b Mon Sep 17 00:00:00 2001 From: Ariel Costas Guerrero Date: Sat, 4 Apr 2026 17:26:20 +0200 Subject: Update marker design for positions without bearing --- src/frontend/app/api/schema.ts | 9 +--- src/frontend/app/components/stop/StopMapModal.tsx | 64 ++++++++++++++++------- 2 files changed, 48 insertions(+), 25 deletions(-) (limited to 'src/frontend/app') diff --git a/src/frontend/app/api/schema.ts b/src/frontend/app/api/schema.ts index 4d34a44..fe90642 100644 --- a/src/frontend/app/api/schema.ts +++ b/src/frontend/app/api/schema.ts @@ -37,7 +37,7 @@ export const ShiftBadgeSchema = z.object({ export const PositionSchema = z.object({ latitude: z.number(), longitude: z.number(), - orientationDegrees: z.number().optional().nullable(), + bearing: z.number().optional().nullable(), shapeIndex: z.number().optional().nullable(), }); @@ -174,12 +174,7 @@ export const ConsolidatedCirculationSchema = z.object({ .optional() .nullable(), currentPosition: z - .object({ - latitude: z.number(), - longitude: z.number(), - orientationDegrees: z.number(), - shapeIndex: z.number().optional().nullable(), - }) + .object(PositionSchema) .optional() .nullable(), isPreviousTrip: z.boolean().optional().nullable(), diff --git a/src/frontend/app/components/stop/StopMapModal.tsx b/src/frontend/app/components/stop/StopMapModal.tsx index 8d3c6f8..0aec0dd 100644 --- a/src/frontend/app/components/stop/StopMapModal.tsx +++ b/src/frontend/app/components/stop/StopMapModal.tsx @@ -15,7 +15,7 @@ import "./StopMapModal.css"; export interface Position { latitude: number; longitude: number; - orientationDegrees?: number | null; + bearing?: number | null; shapeIndex?: number | null | undefined; } @@ -475,26 +475,54 @@ export const StopMapModal: React.FC = ({ flexDirection: "column", alignItems: "center", gap: 6, - transform: `rotate(${selectedBus.currentPosition.orientationDegrees}deg)`, + transform: `rotate(${selectedBus.currentPosition.bearing ?? 0}deg)`, transformOrigin: "center center", }} > - - - + {selectedBus.currentPosition.bearing ? ( + + + + ) : ( + + + + + )} )} -- cgit v1.3