Time fuelling area transit separately.

Author: jamesremuscat

src/messages/PitMessage.js

@@ -21,24 +21,42 @@ export const PitMessage = (se, oldCar, newCar, cache) => {
 
     const driverText = driver ? ` (${driver})` : '';
 
+    if (oldState !== 'FUEL' && newState === 'FUEL') {
+      cache['PitMessage'][carNum].lastFuelIn = cache.lastUpdated;
+    }
+
+    if (oldState === 'FUEL' && newState !== 'FUEL') {
+      cache['PitMessage'][carNum].lastFuelOut = cache.lastUpdated;
+    }
+
+    if (oldState !== 'PIT' && newState === 'PIT') {
+      cache['PitMessage'][carNum].lastPitIn = cache.lastUpdated;
+    }
+
+    if (oldState === 'PIT' && newState !== 'PIT') {
+      cache['PitMessage'][carNum].lastPitOut = cache.lastUpdated;
+    }
+
     if ((oldState !== 'RUN' && oldState !== 'STOP' && newState === 'OUT') || ((oldState === 'PIT' || oldState === 'FUEL') && newState === 'RUN')) {
-      const lastPitIn = cache['PitMessage'][carNum].lastPitIn;
+      const { lastFuelIn, lastFuelOut, lastPitIn, lastPitOut } = cache['PitMessage'][carNum];
       let pitTimeMsg = '';
-      if (Number.isInteger(lastPitIn)) {
-        const pitTime = cache.lastUpdated - lastPitIn;
-        pitTimeMsg = `(pit time: ${timeInSeconds(pitTime, 0)})`;
-        delete cache['PitMessage'][carNum].lastPitIn;
+      if (Number.isInteger(lastPitIn) && Number.isInteger(lastPitOut)) {
+        const pitTime = lastPitOut - lastPitIn;
+
+        const fuelTime = (lastFuelOut || 0) - (lastFuelIn || 0);
+        if (fuelTime > 0) {
+          pitTimeMsg = `(total pit time: ${timeInSeconds(pitTime + fuelTime, 0)}, ${timeInSeconds(fuelTime, 0)} fuel)`;
+        }
+        else {
+          pitTimeMsg = `(pit time: ${timeInSeconds(pitTime, 0)})`;
+        }
+
+        delete cache['PitMessage'][carNum];
       }
       return new Message(clazz, `#${carNum}${driverText} has left the pits ${pitTimeMsg}`.trim(), 'out', carNum);
     }
     else if (newState === 'PIT') {
-      if (oldState !== 'FUEL') {
-        cache['PitMessage'][carNum].lastPitIn = cache.lastUpdated;
-      }
       return new Message(clazz, `#${carNum}${driverText} has entered the pits`, 'pit', carNum);
     }
-    else if (newState === 'FUEL' && oldState !== 'PIT') {
-      cache['PitMessage'][carNum].lastPitIn = cache.lastUpdated;
-    }
   }
 };

src/messages/__tests__/PitMessage.js

@@ -65,7 +65,7 @@ it('calculates a total pit time if both pit-in and pit-out have been seen and ca
   expect(outMsgs[0][2]).toEqual('#1 (John Hindhaugh) has left the pits (pit time: 2:03)');
 });
 
-it('calculates a total pit time if both pit-in and pit-out have been seen and car comes in via fuelling area', () => {
+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', () => {
   const oldCars = [['1', 'RUN', 'LMP1', 'John Hindhaugh'], ['2', 'RUN', 'LMP1', 'Eve Hewitt']];
   const pitInCars = [['1', 'PIT', 'LMP1', 'John Hindhaugh'], ['2', 'RUN', 'LMP1', 'Eve Hewitt']];
   const pitFuelCars = [['1', 'FUEL', 'LMP1', 'John Hindhaugh'], ['2', 'RUN', 'LMP1', 'Eve Hewitt']];
@@ -78,5 +78,5 @@ it('calculates a total pit time if both pit-in and pit-out have been seen and ca
   const outMsgs = generator.generate({ colSpec }, { cars: pitInCars, lastUpdated: 0 }, { cars: pitOutCars, lastUpdated: 123 });
 
   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:02 fuel)');
 });