diff --git a/src/components/BroadcastGraphics/TimingBoard/TimingTower/TimingTower.tsx b/src/components/BroadcastGraphics/TimingBoard/TimingTower/TimingTower.tsx
index 019d694..7b39bc0 100644
--- a/src/components/BroadcastGraphics/TimingBoard/TimingTower/TimingTower.tsx
+++ b/src/components/BroadcastGraphics/TimingBoard/TimingTower/TimingTower.tsx
@@ -4,6 +4,8 @@ import { broadcastGraphicsSelector } from "../../../../features/broadcast/graphi
import { eventSelector } from "../../../../features/event/eventSelector";
import { BGTimingTowerModes, Car, CarStatus } from "../../../../types/state";
import { orMatch } from "../../../../utils/common";
+import { timeDiff } from "../../../../utils/event";
+import { formatTime } from "../../../../utils/styling";
import { PositionFlag } from "../../Common/PositionFlag";
import { Spacer } from "../../Common/Spacer.styled";
@@ -15,6 +17,7 @@ import {
RowRightHalf,
RowRightHalfLayout,
RowsContainer,
+ TimeDiff,
} from "./styles";
type TimingTowerProps = {
@@ -39,6 +42,8 @@ export function TimingTower({
}
});
+ let forwardCarDistance = -1;
+
const buildRow = (
car: Car,
index: number,
@@ -46,6 +51,32 @@ export function TimingTower({
) => {
const lastRow = index + 1 === count;
+ let leader = false;
+ if (forwardCarDistance === -1) {
+ leader = true;
+ forwardCarDistance = car.distance;
+ }
+
+ let rightHalfContent = "";
+ let xScale = 1.0;
+ if (leader) {
+ rightHalfContent = timingBoard.timingTower.mode === BGTimingTowerModes.Leader
+ ? "Leader" : timingBoard.timingTower.mode === BGTimingTowerModes.Interval
+ ? "Interval" : "";
+ } else if (car.status === CarStatus.Retired) {
+ rightHalfContent = "OUT";
+ } else {
+ rightHalfContent = `+${formatTime(timeDiff(
+ forwardCarDistance,
+ car.distance,
+ ))}`;
+ xScale = rightHalfContent.includes(".") && rightHalfContent.length > 7 ? 0.75 : 0.9;
+ }
+
+ if (timingBoard.timingTower.mode === BGTimingTowerModes.Interval) {
+ forwardCarDistance = car.distance;
+ }
+
return (
@@ -75,14 +108,22 @@ export function TimingTower({
-
+
+ {rightHalfContent}
+
diff --git a/src/components/BroadcastGraphics/TimingBoard/TimingTower/styles.ts b/src/components/BroadcastGraphics/TimingBoard/TimingTower/styles.ts
index a98ea5b..8c77ca8 100644
--- a/src/components/BroadcastGraphics/TimingBoard/TimingTower/styles.ts
+++ b/src/components/BroadcastGraphics/TimingBoard/TimingTower/styles.ts
@@ -1,5 +1,7 @@
import styled, { css } from "styled-components";
+import { Fraction, Px } from "../../../../types/style";
+
export const RowsContainer = styled.div`
display: flex;
flex-direction: column;
@@ -25,14 +27,18 @@ export const RowContainer = styled.div`
${({ topGap }) => topGap && css`margin-top: 3px;`}
${({ bottomGap }) => bottomGap && css`margin-bottom: 3px;`}
- ${({ retired }) => retired && css`opacity: 0.4;`}
+ ${({ retired }) => retired && css`opacity: 0.7;`}
`;
type RoundedProp = {
- roundedCorner?: boolean;
+ roundedCornerTop?: Px,
+ roundedCornerBottom?: Px,
};
const Rounded = styled.div`
- ${({ roundedCorner }) => roundedCorner && css`border-bottom-right-radius: 5px;`}
+ ${({ roundedCornerTop }) =>
+ roundedCornerTop && css`border-top-right-radius: ${roundedCornerTop}px;`}
+ ${({ roundedCornerBottom }) =>
+ roundedCornerBottom && css`border-bottom-right-radius: ${roundedCornerBottom}px;`}
`;
export const RowLeftHalf = styled(Rounded)`
@@ -43,7 +49,7 @@ export const RowLeftHalf = styled(Rounded)`
width: 147px; // Future will be animated.
height: 36px;
- background-color: #000000cb
+ background-color: #000000e5
`;
export const RowLeftHalfLayout = styled.div`
@@ -77,6 +83,7 @@ export const RowRightHalfLayout = styled.div`
align-items: center;
justify-content: flex-end;
+ padding-right: 8px;
`;
export const DriverName = styled.span`
@@ -84,3 +91,18 @@ export const DriverName = styled.span`
font-family: ${p => p.theme.fonts.f1Bold};
font-size: 20px;
`;
+
+type TimeDiffProps = {
+ xScale: Fraction,
+};
+export const TimeDiff = styled.span`
+ color: white;
+ font-family: ${p => p.theme.fonts.f1Regular};
+ font-size: 20px;
+
+ text-align: end;
+
+ font-feature-settings: 'tnum' 1;
+ transform-origin: right;
+ transform: scaleX(${({ xScale }) => xScale});
+`;
diff --git a/src/domain/data/workspaces.ts b/src/domain/data/workspaces.ts
index 6ad2b9d..821fdda 100644
--- a/src/domain/data/workspaces.ts
+++ b/src/domain/data/workspaces.ts
@@ -92,8 +92,8 @@ export const workspaces: WorkspaceObject = {
"timing-board-intervals-yellow-flag.png",
],
previewWindowDimensions: {
- width: 350,
- height: 820,
+ width: 700,
+ height: 900,
},
},
timingBoardShort: {
@@ -102,8 +102,8 @@ export const workspaces: WorkspaceObject = {
"timing-board-portrait-gap.png",
],
previewWindowDimensions: {
- width: 350,
- height: 410,
+ width: 700,
+ height: 450,
},
},
};
diff --git a/src/features/event/eventSlice.ts b/src/features/event/eventSlice.ts
index 3cea007..a539b64 100644
--- a/src/features/event/eventSlice.ts
+++ b/src/features/event/eventSlice.ts
@@ -19,26 +19,26 @@ const initialState: RootState["event"] = {
lapCount: 10,
},
grid: [
- { position: 1, status: CarStatus.Normal, driver: cloneDriver("verstappen") },
- { position: 2, status: CarStatus.Normal, driver: cloneDriver("hamilton") },
- { position: 3, status: CarStatus.Normal, driver: cloneDriver("bottas") },
- { position: 4, status: CarStatus.Retired, driver: cloneDriver("perez") },
- { position: 5, status: CarStatus.Normal, driver: cloneDriver("sainz") },
- { position: 6, status: CarStatus.Retired, driver: cloneDriver("norris") },
- { position: 7, status: CarStatus.Normal, driver: cloneDriver("leclerc") },
- { position: 8, status: CarStatus.Normal, driver: cloneDriver("ricciardo") },
- { position: 9, status: CarStatus.Normal, driver: cloneDriver("gasly") },
- { position: 10, status: CarStatus.Normal, driver: cloneDriver("alonso") },
- { position: 11, status: CarStatus.Normal, driver: cloneDriver("ocon") },
- { position: 12, status: CarStatus.Normal, driver: cloneDriver("vettel") },
- { position: 13, status: CarStatus.Normal, driver: cloneDriver("stroll") },
- { position: 14, status: CarStatus.Normal, driver: cloneDriver("tsunoda") },
- { position: 15, status: CarStatus.Normal, driver: cloneDriver("russell") },
- { position: 16, status: CarStatus.Normal, driver: cloneDriver("raikkonen") },
- { position: 17, status: CarStatus.Normal, driver: cloneDriver("latifi") },
- { position: 18, status: CarStatus.Normal, driver: cloneDriver("giovinazzi") },
- { position: 19, status: CarStatus.Normal, driver: cloneDriver("schumacher") },
- { position: 20, status: CarStatus.Normal, driver: cloneDriver("mazepin") },
+ { position: 1, status: CarStatus.Normal, distance: 2000 * 2, driver: cloneDriver("verstappen") },
+ { position: 2, status: CarStatus.Normal, distance: 1900 * 2, driver: cloneDriver("hamilton") },
+ { position: 3, status: CarStatus.Normal, distance: 1800 * 2, driver: cloneDriver("bottas") },
+ { position: 4, status: CarStatus.Retired, distance: 1700 * 2, driver: cloneDriver("perez") },
+ { position: 5, status: CarStatus.Normal, distance: 1600 * 2, driver: cloneDriver("sainz") },
+ { position: 6, status: CarStatus.Retired, distance: 1500 * 2, driver: cloneDriver("norris") },
+ { position: 7, status: CarStatus.Normal, distance: 1400 * 2, driver: cloneDriver("leclerc") },
+ { position: 8, status: CarStatus.Normal, distance: 1300 * 2, driver: cloneDriver("ricciardo") },
+ { position: 9, status: CarStatus.Normal, distance: 1200 * 2, driver: cloneDriver("gasly") },
+ { position: 10, status: CarStatus.Normal, distance: 1100 * 2, driver: cloneDriver("alonso") },
+ { position: 11, status: CarStatus.Normal, distance: 1000 * 2, driver: cloneDriver("ocon") },
+ { position: 12, status: CarStatus.Normal, distance: 900 * 2, driver: cloneDriver("vettel") },
+ { position: 13, status: CarStatus.Normal, distance: 800 * 2, driver: cloneDriver("stroll") },
+ { position: 14, status: CarStatus.Normal, distance: 700 * 2, driver: cloneDriver("tsunoda") },
+ { position: 15, status: CarStatus.Normal, distance: 600 * 2, driver: cloneDriver("russell") },
+ { position: 16, status: CarStatus.Normal, distance: 500 * 2, driver: cloneDriver("raikkonen") },
+ { position: 17, status: CarStatus.Normal, distance: 400 * 2, driver: cloneDriver("latifi") },
+ { position: 18, status: CarStatus.Normal, distance: 300 * 2, driver: cloneDriver("giovinazzi") },
+ { position: 19, status: CarStatus.Normal, distance: 200 * 2, driver: cloneDriver("schumacher") },
+ { position: 20, status: CarStatus.Normal, distance: 1, driver: cloneDriver("mazepin") },
],
};
diff --git a/src/types/state.d.ts b/src/types/state.d.ts
index 0f5e112..42cf032 100644
--- a/src/types/state.d.ts
+++ b/src/types/state.d.ts
@@ -1,4 +1,4 @@
-import { Milliseconds, Optional } from "./util";
+import { Meters, Milliseconds, Optional } from "./util";
import { Corner, Fraction } from "./style";
export interface RootState {
@@ -113,7 +113,7 @@ export interface Car {
status: CarStatus;
// flags: ???, // blue, red, meatball, black/white, black
// notices: ???; // Penalties, warnings, investigations, blue flags, etc
- // distance: number;
+ distance: Meters;
}
export interface Driver {
id: DriverId;
diff --git a/src/types/util.d.ts b/src/types/util.d.ts
index 09ccfa6..8eb4d7a 100644
--- a/src/types/util.d.ts
+++ b/src/types/util.d.ts
@@ -9,3 +9,9 @@ export type Milliseconds = number;
* Type to remind you that we're dealing with seconds.
*/
export type Seconds = number;
+
+
+/**
+ * Type to remind you that we're dealing with meters.
+ */
+export type Meters = number;
diff --git a/src/utils/event.ts b/src/utils/event.ts
new file mode 100644
index 0000000..834fde9
--- /dev/null
+++ b/src/utils/event.ts
@@ -0,0 +1,16 @@
+import { random } from "lodash";
+
+import { Meters } from "../types/util";
+
+export function timeDiff(
+ front: Meters,
+ back: Meters,
+) {
+ /**
+ * Spa length in 2020 was 308,052m. Hamilton won it in 1:24:08.761.
+ * That's 3600 + 1440 + 8.761 = 5,048.761 seconds.
+ * 61.015 m/s average. So, let's do that.
+ */
+
+ return random(0.95, 1.05) * ((front - back) / 61.015);
+}
diff --git a/src/utils/styling.ts b/src/utils/styling.ts
index de184de..3a32db0 100644
--- a/src/utils/styling.ts
+++ b/src/utils/styling.ts
@@ -127,9 +127,13 @@ export function outlineClipPath(
[0, height + outlineThickness],
];
}
+}
-
- // return [
-
- // ]
+export function formatTime(time: number) {
+ if (time < 60) {
+ return String(time.toFixed(3));
+ }
+ const minutes = Math.floor(time / 60);
+ const seconds = time % 60;
+ return `${minutes}:${String(seconds.toFixed(3)).padStart(6, "0")}`;
}