Skip to content

Commit a0f6e12

Browse files
committed
Aligns measurement merging with ShotFinish schema
Switches merging to flat ShotFinish fields (Carry, Total, Side, SideTotal, Curve) instead of nested Actual.* Populates Side/Total Side/Curve actuals and drops deprecated Offline/LaunchDirection mappings Reorders Curve Actual tile after side distances for clearer grouping Ensures accurate actual values display in the inspector
1 parent a7b32ea commit a0f6e12

File tree

2 files changed

+6
-6
lines changed

2 files changed

+6
-6
lines changed

src/components/WebhookInspector/MeasurementTilesView.tsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -135,9 +135,9 @@ const MEASUREMENT_TILES: MeasurementTile[] = [
135135
// On Course Distances (Actual values from ShotFinish)
136136
{ title: 'Carry Actual', key: 'CarryActual', unitType: 'distance', precision: 1, category: 'On Course Distances' },
137137
{ title: 'Total Actual', key: 'TotalActual', unitType: 'distance', precision: 1, category: 'On Course Distances' },
138-
{ title: 'Curve Actual', key: 'CurveActual', unitType: 'distance', precision: 1, category: 'On Course Distances' },
139138
{ title: 'Side Actual', key: 'SideActual', unitType: 'distance', precision: 1, category: 'On Course Distances' },
140139
{ title: 'Total Side Actual', key: 'SideTotalActual', unitType: 'distance', precision: 1, category: 'On Course Distances' },
140+
{ title: 'Curve Actual', key: 'CurveActual', unitType: 'distance', precision: 1, category: 'On Course Distances' },
141141

142142
// Trajectory
143143
{ title: 'Max Height', key: 'MaxHeight', unitType: 'distance', precision: 1, category: 'Trajectory' },

src/utils/measurementDataUtils.ts

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -74,15 +74,15 @@ export function getMeasurementData(event: EventItem, eventsList: EventItem[]) {
7474
console.log(`[getMeasurementData] Found matching OnStrokeCompletedEvent at index ${i}`);
7575
const prevPayload = getEventModelPayload(prevEvent);
7676
const measurement = prevPayload?.Measurement;
77-
7877
if (measurement) {
7978
// Merge the Actual values from ShotFinish
8079
const merged = {
8180
...measurement,
82-
CarryActual: payload.Actual?.Carry ?? measurement.CarryActual,
83-
TotalActual: payload.Actual?.Total ?? measurement.TotalActual,
84-
OfflineActual: payload.Actual?.Offline ?? measurement.OfflineActual,
85-
LaunchDirectionActual: payload.Actual?.LaunchDirection ?? measurement.LaunchDirectionActual,
81+
CarryActual: payload?.Carry ?? measurement.CarryActual,
82+
TotalActual: payload?.Total ?? measurement.TotalActual,
83+
SideActual: payload?.Side ?? measurement.SideActual,
84+
SideTotalActual: payload?.SideTotal ?? measurement.SideTotalActual,
85+
CurveActual: payload?.Curve ?? measurement.CurveActual,
8686
StartingPosition: payload.StartingPosition,
8787
FinishingPosition: payload.FinishingPosition
8888
};

0 commit comments

Comments
 (0)