diff --git a/src/components/BroadcastGraphics/TimingBoard/TimingTower/TimingTower.tsx b/src/components/BroadcastGraphics/TimingBoard/TimingTower/TimingTower.tsx index ee438c9..54e251b 100644 --- a/src/components/BroadcastGraphics/TimingBoard/TimingTower/TimingTower.tsx +++ b/src/components/BroadcastGraphics/TimingBoard/TimingTower/TimingTower.tsx @@ -40,42 +40,51 @@ export function TimingTower() { broadcastGraphicsSelector, ); - const [retiredCarsPresent, setRetiredCarsPresent] = useState(0); + const [startingCarsCount, setStartingCarsCount] = useState(0); + const [retiredCarsCount, setRetiredCarsCount] = useState(0); const [rows, setRows] = useState([]); useEffect(() => { - let anyRetired = 0; + // Filter away cars that are marked as not starting so they don't appear. + const startingGrid = grid.filter(car => car.status !== CarStatus.DidNotStart); + setStartingCarsCount(startingGrid.length); - setRows(grid.map((car, index, cars) => { + let retiredCount = 0; + startingGrid.forEach(car => { if (car.status === CarStatus.Retired) { - ++anyRetired; + ++retiredCount; } - return buildRow(car, index, cars.length); - })); - setRetiredCarsPresent(anyRetired); + }); + setRetiredCarsCount(retiredCount); + + setRows(startingGrid.map((car, index, grid) => + buildRow(car, index, startingGrid.length, retiredCount))); }, [lastUpdate, splitsMode]); const buildRow = ( car: Car, index: number, - count: number, + startingCarsCount: number, + retiredCarsCount: number, ) => { - const lastRow = index + 1 === count; + const bottomRounded = car.status === CarStatus.Retired ? ( + car.position === startingCarsCount + ) : ( + car.position === startingCarsCount - retiredCarsCount + ); + let rightHalfContent = ""; let xScale: Fraction = 1.0; let yScale: Fraction = 1.0; - if (index === leaderGridSpot) { - // Leading car shows "Leader" or "Interval". + if (car.position === 1) { rightHalfContent = splitsMode === BGTimingTowerSplitsMode.Leader ? "Leader" : splitsMode === BGTimingTowerSplitsMode.Interval ? "Interval" : ""; } else if (car.status === CarStatus.Retired) { - // Retired car shows "OUT". rightHalfContent = "OUT"; } else { - // Other cars show gaps. const deltaCar = getCarAtPos( grid, splitsMode === BGTimingTowerSplitsMode.Leader ? 1 : car.position - 1, @@ -104,7 +113,7 @@ export function TimingTower() { )} + 0} + > {rows} ); diff --git a/src/features/event/eventSlice.ts b/src/features/event/eventSlice.ts index bda64a6..bb688c3 100644 --- a/src/features/event/eventSlice.ts +++ b/src/features/event/eventSlice.ts @@ -93,7 +93,7 @@ const initialState: RootState["event"] = { }, { position: 9, - status: CarStatus.Normal, + status: CarStatus.DidNotStart, tyre: DEFAULT_TYRE, notices: [], distance: 1200 * 4, @@ -206,10 +206,18 @@ export const eventSlice = createSlice({ status: car.status, })); + const add = (status: CarStatus) => { + if (status === CarStatus.Retired) { + return 1000000; + } else if (status === CarStatus.DidNotStart) { + return 2000000; + } + return 0; + }; + sortingGrid.sort((a, b) => // Retired cars go to the end but still maintain their own order. - (b.distance - (b.status === CarStatus.Retired ? 1000000 : 0)) - - (a.distance - (a.status === CarStatus.Retired ? 1000000 : 0)), + (b.distance - add(b.status)) - (a.distance - add(a.status)), ); sortingGrid.forEach((entry, sortedPosition) => {