Handle display properly, and round to nearest second.

We don't have sub-second accuracy here, let's not pretend.

Author: jamesremuscat

src/messages/PitMessage.js

@@ -1,7 +1,9 @@
-import { timeInSeconds } from '../formats.js';
+import dayjs from '../dates.js';
 import { Stat } from '../racing.js';
 import { Message } from './Message.js';
 
+const roundToSecond = (ts) => Math.round(ts / 1000) * 1000;
+
 export const PitMessage = (se, oldCar, newCar, cache) => {
   const oldState = se.get(oldCar, Stat.STATE);
   const newState = se.get(newCar, Stat.STATE);
@@ -41,14 +43,14 @@ export const PitMessage = (se, oldCar, newCar, cache) => {
       const { lastFuelIn, lastFuelOut, lastPitIn, lastPitOut } = cache['PitMessage'][carNum];
       let pitTimeMsg = '';
       if (Number.isInteger(lastPitIn) && Number.isInteger(lastPitOut)) {
-        const pitTime = lastPitOut - lastPitIn;
+        const pitTime = roundToSecond(lastPitOut) - roundToSecond(lastPitIn);
 
-        const fuelTime = (lastFuelOut || 0) - (lastFuelIn || 0);
+        const fuelTime = roundToSecond(lastFuelOut || 0) - roundToSecond(lastFuelIn || 0);
         if (fuelTime > 0) {
-          pitTimeMsg = `(total pit time: ${timeInSeconds(pitTime + fuelTime, 0)}, ${timeInSeconds(fuelTime, 0)} fuel)`;
+          pitTimeMsg = `(total pit time: ${dayjs.duration(pitTime + fuelTime).format('m:ss')}, ${dayjs.duration(fuelTime).format('m:ss')} fuel)`;
         }
         else {
-          pitTimeMsg = `(pit time: ${timeInSeconds(pitTime, 0)})`;
+          pitTimeMsg = `(pit time: ${dayjs.duration(pitTime).format('m:ss')})`;
         }
 
         delete cache['PitMessage'][carNum];

src/messages/__tests__/PitMessage.js

@@ -43,7 +43,7 @@ it('calculates a total pit time if both pit-in and pit-out have been seen', () =
   const generator = new MessageGenerator();
 
   generator.generate({ colSpec }, { cars: oldCars, lastUpdated: 0 }, { cars: pitInCars, lastUpdated: 0 });
-  const outMsgs = generator.generate({ colSpec }, { cars: pitInCars, lastUpdated: 0 }, { cars: pitOutCars, lastUpdated: 123 });
+  const outMsgs = generator.generate({ colSpec }, { cars: pitInCars, lastUpdated: 0 }, { cars: pitOutCars, lastUpdated: 123000 });
 
   expect(outMsgs.length).toEqual(1);
   expect(outMsgs[0][2]).toEqual('#1 (John Hindhaugh) has left the pits (pit time: 2:03)');
@@ -58,11 +58,11 @@ it('calculates a total pit time if both pit-in and pit-out have been seen and ca
   const generator = new MessageGenerator();
 
   generator.generate({ colSpec }, { cars: oldCars, lastUpdated: 0 }, { cars: pitInCars, lastUpdated: 0 });
-  generator.generate({ colSpec }, { cars: pitInCars, lastUpdated: 0 }, { cars: pitFuelCars, lastUpdated: 62 });
-  const outMsgs = generator.generate({ colSpec }, { cars: pitInCars, lastUpdated: 0 }, { cars: pitOutCars, lastUpdated: 123 });
+  generator.generate({ colSpec }, { cars: pitInCars, lastUpdated: 0 }, { cars: pitFuelCars, lastUpdated: 62000 });
+  const outMsgs = generator.generate({ colSpec }, { cars: pitFuelCars, lastUpdated: 62000 }, { cars: pitOutCars, lastUpdated: 123000 });
 
   expect(outMsgs.length).toEqual(1);
-  expect(outMsgs[0][2]).toEqual('#1 (John Hindhaugh) has left the pits (pit time: 2:03)');
+  expect(outMsgs[0][2]).toEqual('#1 (John Hindhaugh) has left the pits (total pit time: 2:03, 1:01 fuel)');
 });
 
 it('calculates total pit time and fuel time if both pit-in and pit-out have been seen and car comes in via fuelling area', () => {
@@ -74,9 +74,10 @@ it('calculates total pit time and fuel time if both pit-in and pit-out have been
   const generator = new MessageGenerator();
 
   generator.generate({ colSpec }, { cars: oldCars, lastUpdated: 0 }, { cars: pitFuelCars, lastUpdated: 0 });
-  generator.generate({ colSpec }, { cars: pitFuelCars, lastUpdated: 0 }, { cars: pitInCars, lastUpdated: 62 });
-  const outMsgs = generator.generate({ colSpec }, { cars: pitInCars, lastUpdated: 0 }, { cars: pitOutCars, lastUpdated: 123 });
+  generator.generate({ colSpec }, { cars: pitFuelCars, lastUpdated: 0 }, { cars: pitInCars, lastUpdated: 52499 });
+  // Also demonstrating rounding to the nearest second
+  const outMsgs = generator.generate({ colSpec }, { cars: pitInCars, lastUpdated: 52499 }, { cars: pitOutCars, lastUpdated: 123499 });
 
   expect(outMsgs.length).toEqual(1);
-  expect(outMsgs[0][2]).toEqual('#1 (John Hindhaugh) has left the pits (total pit time: 2:03, 1:02 fuel)');
+  expect(outMsgs[0][2]).toEqual('#1 (John Hindhaugh) has left the pits (total pit time: 2:03, 0:52 fuel)');
 });