@inventure71/paddockjs 4.2.0 → 4.3.1

package/src/simulation/pit/pitFlow.js

@@ -1,7 +1,7 @@
+import { clearCurrentDrsState } from '../timing/drsState.js';
 import { pitLaneStatusSnapshot } from './pitSnapshots.js';
 import {
   firstDifferentCompound,
-  normalizePitIntent,
   shouldStartPitStopForSimulation,
   updateAutomaticPitIntentForSimulation,
 } from './pitIntent.js';
@@ -17,7 +17,7 @@ import {
   isPitServiceQueueOccupied,
   releasePitQueue,
 } from './pitService.js';
-import { syncPitCarKinematics } from './pitKinematics.js';
+import { holdPitCarAtBox } from './pitCarPlacement.js';
 import {
   createPitApproachPoints,
   createRoute,
@@ -27,13 +27,12 @@ import {
 } from './pitRouting.js';
 import { metersToSimUnits } from '../units.js';
 import { applyWheelSurfaceState } from '../vehicle/wheelSurface.js';
+import { PIT_ENTRY_APPROACH_DISTANCE, PIT_BOX_APPROACH_DISTANCE } from './pitServiceConstants.js';
 
-const PIT_ENTRY_APPROACH_DISTANCE = metersToSimUnits(250);
-const PIT_BOX_APPROACH_DISTANCE = metersToSimUnits(34);
 const PIT_SERVICE_QUEUE_FALLBACK_GAP = metersToSimUnits(48);
 const PIT_ENTRY_LATE_THRESHOLD_DISTANCE = metersToSimUnits(90);
 
-export function isCarInActivePitStop(sim, car) {
+export function isCarInActivePitStop(car) {
   return Boolean(car?.pitStop && car.pitStop.status !== 'pending' && car.pitStop.status !== 'completed');
 }
 
@@ -82,7 +81,7 @@ export function canStartPitStop(sim, car) {
   let activeCount = 0;
   for (let index = 0; index < sim.cars.length; index += 1) {
     const candidate = sim.cars[index];
-    if (candidate === car || !isCarInActivePitStop(sim, candidate)) continue;
+    if (candidate === car || !isCarInActivePitStop(candidate)) continue;
     activeCount += 1;
     if (activeCount >= maxConcurrentPitLaneCars) return false;
   }
@@ -96,7 +95,7 @@ export function canStartPitStop(sim, car) {
   const candidateDistance = car.raceDistance ?? 0;
   for (let index = 0; index < sim.cars.length; index += 1) {
     const candidate = sim.cars[index];
-    if (candidate === car || !isCarInActivePitStop(sim, candidate)) continue;
+    if (candidate === car || !isCarInActivePitStop(candidate)) continue;
     const gap = (candidate.raceDistance ?? 0) - candidateDistance;
     if (gap >= 0 && gap < minimumGap) return false;
   }
@@ -126,10 +125,7 @@ export function startPitStop(sim, car) {
   if (!stop || !box || !pitLane?.enabled) return false;
 
   car.gridLocked = false;
-  car.drsActive = false;
-  car.drsEligible = false;
-  car.drsZoneId = null;
-  car.drsZoneEnabled = false;
+  clearCurrentDrsState(car);
   car.canAttack = false;
   stop.targetTire = stop.targetTire ?? firstDifferentCompound(car.tire, sim.rules.modules?.tireStrategy?.compounds);
 
@@ -213,25 +209,7 @@ export function advancePitStopCar(sim, car, delta) {
   if (stop.status === 'queued') {
     const box = getPitStopBox(sim, stop);
     if (!box) return true;
-    car.previousX = car.x;
-    car.previousY = car.y;
-    car.previousHeading = car.heading;
-    car.x = box.queuePoint.x;
-    car.y = box.queuePoint.y;
-    car.heading = sim.track.pitLane.mainLane.heading;
-    car.speed = 0;
-    car.throttle = 0;
-    car.brake = 1;
-    car.steeringAngle = 0;
-    car.yawRate = 0;
-    car.turnRadius = Infinity;
-    syncPitCarKinematics(car, { physicsMode: sim.physicsMode });
-    applyWheelSurfaceState(car, sim.track);
-    car.progress = car.trackState.distance;
-    car.raceDistance = getPitBoxRaceDistance(sim, stop, {
-      ...box,
-      distanceAlongLane: box.queueDistanceAlongLane ?? box.distanceAlongLane,
-    });
+    holdPitCarAtBox(sim, car, box, { queue: true, updatePreviousPose: true });
     if (!isPitServiceBusy(sim, car, box)) releasePitQueue(sim, car, box);
     return true;
   }

package/src/simulation/pit/pitIntent.js

@@ -1,6 +1,4 @@
 export const PIT_INTENT_NONE = 0;
-export const PIT_INTENT_IF_FREE = 1;
-export const PIT_INTENT_COMMITTED = 2;
 
 export function firstDifferentCompound(currentTire, compounds) {
   const available = Array.isArray(compounds) && compounds.length ? compounds : ['S', 'M', 'H'];
@@ -87,6 +85,9 @@ export function updateAutomaticPitIntentForSimulation(sim, car) {
   if (nextIntent === 0 || nextIntent <= (normalizePitIntent(stop.intent) ?? 0)) return;
 
   stop.intent = nextIntent;
-  if (stop.status === 'completed') sim.rearmCompletedPitStop(car, stop);
+  if (stop.status === 'completed') {
+    stop.targetTire = firstDifferentCompound(car.tire, sim.rules.modules?.tireStrategy?.compounds);
+    sim.rearmCompletedPitStop(car, stop);
+  }
   else sim.schedulePitStopAtNextEntry(car, stop);
 }

package/src/simulation/pit/pitOccupancy.js

@@ -7,7 +7,7 @@ export function getPitStopBox(sim, stop) {
     null;
 }
 
-export function isPitServiceAreaOccupied(sim, candidate, box, clearDistance) {
+export function isPitServiceAreaOccupied(candidate, box, clearDistance) {
   if (!blocksPitLane(candidate)) return false;
   const status = candidate?.pitStop?.status;
   const phase = candidate?.pitStop?.phase;
@@ -23,7 +23,7 @@ export function isPitServiceBusy(sim, car, box, clearDistance = PIT_SERVICE_CLEA
     candidate !== car &&
     blocksPitLane(candidate) &&
     candidate.pitStop?.boxId === box?.id &&
-    isPitServiceAreaOccupied(sim, candidate, box, clearDistance)
+    isPitServiceAreaOccupied(candidate, box, clearDistance)
   ));
 }
 

package/src/simulation/pit/pitQueue.js

@@ -1,6 +1,5 @@
-import { applyWheelSurfaceState } from '../vehicle/wheelSurface.js';
 import { createRoute, routePoint } from './pitRouting.js';
-import { syncPitCarKinematics } from './pitKinematics.js';
+import { holdPitCarAtBox } from './pitCarPlacement.js';
 import { PIT_QUEUE_RELEASE_SPEED } from './pitServiceConstants.js';
 import { getPitBoxRaceDistance } from './pitOccupancy.js';
 
@@ -12,22 +11,7 @@ export function beginPitQueue(sim, car, box) {
   stop.route = null;
   stop.routeProgress = 0;
   stop.queueingForService = false;
-  car.x = box.queuePoint.x;
-  car.y = box.queuePoint.y;
-  car.heading = sim.track.pitLane.mainLane.heading;
-  car.speed = 0;
-  car.throttle = 0;
-  car.brake = 1;
-  car.steeringAngle = 0;
-  car.yawRate = 0;
-  car.turnRadius = Infinity;
-  syncPitCarKinematics(car, { physicsMode: sim.physicsMode });
-  applyWheelSurfaceState(car, sim.track);
-  car.progress = car.trackState.distance;
-  car.raceDistance = getPitBoxRaceDistance(sim, stop, {
-    ...box,
-    distanceAlongLane: box.queueDistanceAlongLane ?? box.distanceAlongLane,
-  });
+  holdPitCarAtBox(sim, car, box, { queue: true });
   return true;
 }
 

package/src/simulation/pit/pitRouteMovement.js

@@ -9,9 +9,6 @@ import {
   sampleRouteInto,
 } from './pitRouting.js';
 import { syncPitCarKinematics } from './pitKinematics.js';
-import { completePitPenaltyService } from './pitPenaltyService.js';
-import { completePitService } from './pitTireService.js';
-import { getPitBoxRaceDistance, getPitStopBox } from './pitOccupancy.js';
 import {
   PIT_BOX_STOP_SPEED,
   PIT_ENTRY_BOX_CAPTURE_DISTANCE,
@@ -137,36 +134,4 @@ export function applyPitRoutePosition(sim, car, delta) {
   return remainingAfter <= PIT_ROUTE_FINISH_DISTANCE;
 }
 
-export function advancePitService(sim, car, delta) {
-  const stop = car.pitStop;
-  const box = getPitStopBox(sim, stop);
-  if (!box) return true;
-  if (stop.phase === 'penalty') {
-    stop.penaltyServiceRemaining = Math.max(0, (stop.penaltyServiceRemaining ?? 0) - delta);
-    stop.serviceRemaining = stop.penaltyServiceRemaining;
-  } else {
-    stop.serviceRemaining = Math.max(0, (stop.serviceRemaining ?? 0) - delta);
-  }
-  car.previousX = car.x;
-  car.previousY = car.y;
-  car.previousHeading = car.heading;
-  car.x = box.center.x;
-  car.y = box.center.y;
-  car.heading = sim.track.pitLane.mainLane.heading;
-  car.speed = 0;
-  car.throttle = 0;
-  car.brake = 1;
-  car.steeringAngle = 0;
-  car.yawRate = 0;
-  car.turnRadius = Infinity;
-  syncPitCarKinematics(car, { physicsMode: sim.physicsMode });
-  applyWheelSurfaceState(car, sim.track);
-  car.progress = car.trackState.distance;
-  car.raceDistance = getPitBoxRaceDistance(sim, stop, box);
-  if (stop.phase === 'penalty' && stop.penaltyServiceRemaining <= 0) {
-    completePitPenaltyService(sim, car);
-  } else if (stop.serviceRemaining <= 0) {
-    completePitService(sim, car);
-  }
-  return true;
-}
+export { advancePitService } from './pitServiceProgress.js';

package/src/simulation/pit/pitRouting.js

@@ -1,79 +1,14 @@
-import { clamp, normalizeAngle } from '../simMath.js';
+import { clamp } from '../simMath.js';
 import { metersToSimUnits } from '../units.js';
 import { nearestTrackState, offsetTrackPoint, pointAt } from '../track/trackModel.js';
+import { PIT_ENTRY_APPROACH_DISTANCE } from './pitServiceConstants.js';
 
-const PIT_ENTRY_APPROACH_DISTANCE = metersToSimUnits(250);
+export { clonePitLaneModel } from '../track/pitLaneModel.js';
+export { shiftPreviousRenderPose } from '../vehicle/vehicleKinematics.js';
+export { pointDistance } from './pitServiceConstants.js';
 
-function clonePointLike(point) {
-  if (!point) return point;
-  return { ...point };
-}
 
-function clonePointArray(points) {
-  return Array.isArray(points) ? points.map(clonePointLike) : points;
-}
 
-export function clonePitLaneModel(pitLane) {
-  if (!pitLane) return pitLane;
-  return {
-    ...pitLane,
-    entry: pitLane.entry ? {
-      ...pitLane.entry,
-      trackPoint: clonePointLike(pitLane.entry.trackPoint),
-      edgePoint: clonePointLike(pitLane.entry.edgePoint),
-      trackConnectPoint: clonePointLike(pitLane.entry.trackConnectPoint),
-      lanePoint: clonePointLike(pitLane.entry.lanePoint),
-      roadCenterline: clonePointArray(pitLane.entry.roadCenterline),
-      connector: clonePointArray(pitLane.entry.connector),
-    } : pitLane.entry,
-    exit: pitLane.exit ? {
-      ...pitLane.exit,
-      trackPoint: clonePointLike(pitLane.exit.trackPoint),
-      edgePoint: clonePointLike(pitLane.exit.edgePoint),
-      trackConnectPoint: clonePointLike(pitLane.exit.trackConnectPoint),
-      lanePoint: clonePointLike(pitLane.exit.lanePoint),
-      roadCenterline: clonePointArray(pitLane.exit.roadCenterline),
-      connector: clonePointArray(pitLane.exit.connector),
-    } : pitLane.exit,
-    mainLane: pitLane.mainLane ? {
-      ...pitLane.mainLane,
-      start: clonePointLike(pitLane.mainLane.start),
-      end: clonePointLike(pitLane.mainLane.end),
-      points: clonePointArray(pitLane.mainLane.points),
-    } : pitLane.mainLane,
-    workingLane: pitLane.workingLane ? {
-      ...pitLane.workingLane,
-      start: clonePointLike(pitLane.workingLane.start),
-      end: clonePointLike(pitLane.workingLane.end),
-      points: clonePointArray(pitLane.workingLane.points),
-    } : pitLane.workingLane,
-    fastLane: pitLane.fastLane ? { ...pitLane.fastLane } : pitLane.fastLane,
-    serviceNormal: clonePointLike(pitLane.serviceNormal),
-    boxes: Array.isArray(pitLane.boxes)
-      ? pitLane.boxes.map((box) => ({
-        ...box,
-        laneTarget: clonePointLike(box.laneTarget),
-        center: clonePointLike(box.center),
-        corners: clonePointArray(box.corners),
-      }))
-      : pitLane.boxes,
-    serviceAreas: Array.isArray(pitLane.serviceAreas)
-      ? pitLane.serviceAreas.map((area) => ({
-        ...area,
-        laneTarget: clonePointLike(area.laneTarget),
-        center: clonePointLike(area.center),
-        queuePoint: clonePointLike(area.queuePoint),
-        corners: clonePointArray(area.corners),
-        queueCorners: clonePointArray(area.queueCorners),
-        garageBoxIds: [...(area.garageBoxIds ?? [])],
-        pitCrew: area.pitCrew ? { ...area.pitCrew } : area.pitCrew,
-      }))
-      : pitLane.serviceAreas,
-    teams: Array.isArray(pitLane.teams)
-      ? pitLane.teams.map((team) => ({ ...team, boxIds: [...(team.boxIds ?? [])], pitCrew: team.pitCrew ? { ...team.pitCrew } : team.pitCrew }))
-      : pitLane.teams,
-  };
-}
 
 export function routePoint(point, heading = point?.heading, options = {}) {
   if (!point) return null;
@@ -114,18 +49,7 @@ function sameRoutePoint(first, second) {
   return first && second && Math.hypot(first.x - second.x, first.y - second.y) < 0.001;
 }
 
-export function shiftPreviousRenderPose(car, dx, dy, dheading = 0) {
-  car.previousX = Number.isFinite(car.previousX) ? car.previousX + dx : car.x + dx;
-  car.previousY = Number.isFinite(car.previousY) ? car.previousY + dy : car.y + dy;
-  car.previousHeading = normalizeAngle(
-    (Number.isFinite(car.previousHeading) ? car.previousHeading : car.heading) + dheading,
-  );
-}
 
-export function pointDistance(first, second) {
-  if (!first || !second) return Infinity;
-  return Math.hypot(first.x - second.x, first.y - second.y);
-}
 
 export function createRoute(points) {
   const routePoints = [];

package/src/simulation/pit/pitService.js

@@ -1,11 +1,4 @@
-import { applyWheelSurfaceState } from '../vehicle/wheelSurface.js';
-import { normalizePitCrewStats } from './pitState.js';
-import { beginPitPenaltyService } from './pitPenaltyService.js';
-import { beginTireService } from './pitTireService.js';
-import { syncPitCarKinematics } from './pitKinematics.js';
-import { getPitBoxRaceDistance } from './pitOccupancy.js';
-
-export { normalizePitCrewStats };
+export { normalizePitCrewStats } from './pitState.js';
 export {
   getPitBoxRaceDistance,
   getPitStopBox,
@@ -17,27 +10,5 @@ export { beginPitQueue, releasePitQueue } from './pitQueue.js';
 export { calculatePitServiceProfile } from './pitServiceProfile.js';
 export { beginPitPenaltyService, completePitPenaltyService, getPitServicePenalties } from './pitPenaltyService.js';
 export { beginTireService, completePitService, finishPitExit } from './pitTireService.js';
-export { advancePitService, applyPitRoutePosition } from './pitRouteMovement.js';
-
-export function beginPitService(sim, car, box) {
-  const stop = car.pitStop;
-  stop.status = 'servicing';
-  stop.route = null;
-  stop.routeProgress = 0;
-  car.x = box.center.x;
-  car.y = box.center.y;
-  car.heading = sim.track.pitLane.mainLane.heading;
-  car.speed = 0;
-  car.throttle = 0;
-  car.brake = 1;
-  car.steeringAngle = 0;
-  car.yawRate = 0;
-  car.turnRadius = Infinity;
-  syncPitCarKinematics(car, { physicsMode: sim.physicsMode });
-  applyWheelSurfaceState(car, sim.track);
-  car.progress = car.trackState.distance;
-  car.raceDistance = getPitBoxRaceDistance(sim, stop, box);
-
-  if (beginPitPenaltyService(sim, car)) return;
-  beginTireService(sim, car);
-}
+export { beginPitService, advancePitService } from './pitServiceProgress.js';
+export { applyPitRoutePosition } from './pitRouteMovement.js';

package/src/simulation/pit/pitServiceConstants.js

@@ -1,6 +1,7 @@
 import { kphToSimSpeed, metersToSimUnits } from '../units.js';
 import { VEHICLE_LIMITS } from '../vehicle/vehiclePhysics.js';
 
+export const PIT_ENTRY_APPROACH_DISTANCE = metersToSimUnits(250);
 export const PIT_ROUTE_FINISH_DISTANCE = metersToSimUnits(8.5);
 export const PIT_QUEUE_RELEASE_FINISH_DISTANCE = metersToSimUnits(4);
 export const PIT_QUEUE_CAPTURE_DISTANCE = metersToSimUnits(2.5);

package/src/simulation/pit/pitServiceProgress.js

@@ -0,0 +1,34 @@
+import { beginPitPenaltyService, completePitPenaltyService } from './pitPenaltyService.js';
+import { beginTireService, completePitService } from './pitTireService.js';
+import { getPitStopBox } from './pitOccupancy.js';
+import { holdPitCarAtBox } from './pitCarPlacement.js';
+
+export function beginPitService(sim, car, box) {
+  const stop = car.pitStop;
+  stop.status = 'servicing';
+  stop.route = null;
+  stop.routeProgress = 0;
+  holdPitCarAtBox(sim, car, box);
+
+  if (beginPitPenaltyService(sim, car)) return;
+  beginTireService(sim, car);
+}
+
+export function advancePitService(sim, car, delta) {
+  const stop = car.pitStop;
+  const box = getPitStopBox(sim, stop);
+  if (!box) return true;
+  if (stop.phase === 'penalty') {
+    stop.penaltyServiceRemaining = Math.max(0, (stop.penaltyServiceRemaining ?? 0) - delta);
+    stop.serviceRemaining = stop.penaltyServiceRemaining;
+  } else {
+    stop.serviceRemaining = Math.max(0, (stop.serviceRemaining ?? 0) - delta);
+  }
+  holdPitCarAtBox(sim, car, box, { updatePreviousPose: true });
+  if (stop.phase === 'penalty' && stop.penaltyServiceRemaining <= 0) {
+    completePitPenaltyService(sim, car);
+  } else if (stop.serviceRemaining <= 0) {
+    completePitService(sim, car);
+  }
+  return true;
+}

package/src/simulation/pit/pitSnapshots.js

@@ -1,4 +1,5 @@
-import { finiteOrNull } from '../vehicle/vehicleSnapshots.js';
+import { finiteOrNull } from '../simMath.js';
+import { normalizePitIntent, PIT_INTENT_NONE } from './pitIntent.js';
 
 export function pitLaneStatusSnapshot(raceControl, pitLane, pitStops) {
   const enabled = Boolean(pitLane?.enabled && pitStops?.enabled);
@@ -13,7 +14,7 @@ export function pitLaneStatusSnapshot(raceControl, pitLane, pitStops) {
   };
 }
 
-export function serializePitStop(pitStop, normalizePitIntent, PIT_INTENT_NONE) {
+export function serializePitStop(pitStop) {
   if (!pitStop) return null;
   return {
     status: pitStop.status,
@@ -34,7 +35,10 @@ export function serializePitStop(pitStop, normalizePitIntent, PIT_INTENT_NONE) {
     penaltyServiceTotalSeconds: finiteOrNull(pitStop.penaltyServiceTotal),
     servingPenaltyIds: [...(pitStop.servingPenaltyIds ?? [])],
     targetTire: pitStop.targetTire ?? null,
-    serviceProfile: pitStop.serviceProfile ? { ...pitStop.serviceProfile } : null,
+    serviceProfile: pitStop.serviceProfile ? {
+      ...pitStop.serviceProfile,
+      ...(pitStop.serviceProfile.pitCrew ? { pitCrew: { ...pitStop.serviceProfile.pitCrew } } : {}),
+    } : null,
   };
 }
 
@@ -47,7 +51,7 @@ export function serializeRenderPitStop(pitStop) {
   };
 }
 
-export function serializeObservationPitStop(pitStop, normalizePitIntent, PIT_INTENT_NONE) {
+export function serializeObservationPitStop(pitStop) {
   if (!pitStop) return null;
   return {
     status: pitStop.status,

package/src/simulation/pit/pitState.js

@@ -1,7 +1,5 @@
-import { metersToSimUnits } from '../units.js';
 import { firstDifferentCompound } from './pitIntent.js';
-
-const PIT_ENTRY_APPROACH_DISTANCE = metersToSimUnits(250);
+import { PIT_ENTRY_APPROACH_DISTANCE } from './pitServiceConstants.js';
 
 export function normalizePitCrewStats(value) {
   const source = value && typeof value === 'object' ? value : {};
@@ -73,7 +71,6 @@ export function initializePitStops({ cars, pitLane, pitStops, totalLaps, trackLe
 
   cars.forEach((car, index) => {
     const stopLapBase = trackLength * (1 + (index % pitWindowLapCount));
-    const trainPosition = Math.floor(index / pitWindowLapCount);
     const teamIndex = Math.floor(index / boxesPerTeam);
     const teamBoxIndex = index % boxesPerTeam;
     const garageBoxIndex = Math.min(pitLane.boxes.length - 1, teamIndex * boxesPerTeam + teamBoxIndex);
@@ -94,7 +91,6 @@ export function initializePitStops({ cars, pitLane, pitStops, totalLaps, trackLe
       entryRaceDistance: stopLapBase + pitLane.entry.distanceFromStart,
       plannedRaceDistance: stopLapBase + pitLane.entry.distanceFromStart -
         PIT_ENTRY_APPROACH_DISTANCE,
-      trainPosition,
       lapBase: stopLapBase,
       serviceRemaining: 0,
       penaltyServiceRemaining: 0,

package/src/simulation/race/classification.js

@@ -1,14 +1,7 @@
 import { clamp } from '../simMath.js';
 import { simUnitsToMeters } from '../units.js';
 import { isRaceDnf, raceDnfCars } from './retirements.js';
-
-function getPenaltyStats(statsByDriver, driverId) {
-  return statsByDriver.get(driverId) ?? {
-    seconds: 0,
-    positionDrop: 0,
-    disqualified: false,
-  };
-}
+import { getPenaltyStats } from '../rules/penaltyStats.js';
 
 export function applyOutstandingServicePenalties(sim, applyUnservedServicePenalty) {
   sim.penalties.forEach((penalty) => {

package/src/simulation/race/raceFinish.js

@@ -1,3 +1,4 @@
+import { clearCurrentDrsState } from '../timing/drsState.js';
 import { isRaceDnf } from './retirements.js';
 
 export function evaluateRaceFinishForSimulation(sim, orderedCars = sim.orderedCars()) {
@@ -23,10 +24,7 @@ export function evaluateRaceFinishForSimulation(sim, orderedCars = sim.orderedCa
     car.classifiedRank = car.finishRank;
     sim.raceControl.finishOrder.push(car.id);
     if (!sim.raceControl.winnerId) sim.raceControl.winnerId = car.id;
-    car.drsActive = false;
-    car.drsEligible = false;
-    car.drsZoneId = null;
-    car.drsZoneEnabled = false;
+    clearCurrentDrsState(car);
     car.canAttack = false;
     sim.events.unshift({
       type: 'car-finish',
@@ -67,10 +65,7 @@ export function evaluateRaceFinishForSimulation(sim, orderedCars = sim.orderedCa
     const classified = classification.find((entry) => entry.id === car.id);
     car.classifiedRank = classified?.rank ?? null;
     car.desiredOffset = 0;
-    car.drsActive = false;
-    car.drsEligible = false;
-    car.drsZoneId = null;
-    car.drsZoneEnabled = false;
+    clearCurrentDrsState(car);
     car.canAttack = false;
   });
   sim.events.unshift({

package/src/simulation/race/raceOrder.js

@@ -47,7 +47,7 @@ function collectLiveRaceOrderedCars(orderedCars, scratch) {
   return physicalCars;
 }
 
-function sortPhysicalCarsInTrackOrder(sim, physicalCars) {
+function sortPhysicalCarsInTrackOrder(physicalCars) {
   physicalCars.sort((a, b) => {
     const progressDelta = (b.progress ?? b.raceDistance ?? 0) - (a.progress ?? a.raceDistance ?? 0);
     if (progressDelta !== 0) return progressDelta;
@@ -121,7 +121,7 @@ function buildDrsReferenceArrayForSimulation(sim, orderedCars = orderedCarsForSi
       sim.runtimeBenchmarkStats.drsReferenceOrderedFastPathCalls = (sim.runtimeBenchmarkStats.drsReferenceOrderedFastPathCalls ?? 0) + 1;
     }
   } else {
-    sortPhysicalCarsInTrackOrder(sim, physicalCars);
+    sortPhysicalCarsInTrackOrder(physicalCars);
   }
 
   const trackLength = sim.track.length;
@@ -219,17 +219,6 @@ export function driverRaceContextForSimulation(sim, orderedCars = orderedCarsFor
   };
 }
 
-export function buildDrsReferenceByCarId(sim, orderedCars = orderedCarsForSimulation(sim)) {
-  const referencesByIndex = buildDrsReferenceArrayForSimulation(sim, orderedCars);
-  const references = new Map();
-  for (let index = 0; index < orderedCars.length; index += 1) {
-    const car = orderedCars[index];
-    if (!affectsRaceOrder(car) || isRaceDnf(car)) continue;
-    references.set(car.id, referencesByIndex[car.index] ?? null);
-  }
-  return references;
-}
-
 export function assignDrsReferenceCarsForSimulation(sim, orderedCars = orderedCarsForSimulation(sim)) {
   return buildDrsReferenceArrayForSimulation(sim, orderedCars);
 }

package/src/simulation/race/raceProgress.js

@@ -1,3 +1,4 @@
+import { clearCurrentDrsState } from '../timing/drsState.js';
 import { pointAt } from '../track/trackModel.js';
 import { applyWheelSurfaceState } from '../vehicle/wheelSurface.js';
 import {
@@ -30,10 +31,7 @@ export function refreshLocalRaceStateForSimulation(sim) {
         stabilityState: car.destroyed ? 'destroyed' : car.stabilityState,
       });
       car.canAttack = false;
-      car.drsEligible = false;
-      car.drsActive = false;
-      car.drsZoneId = null;
-      car.drsZoneEnabled = false;
+      clearCurrentDrsState(car);
       return;
     }
     const centerState = takeValidRunoffCenterState(car);
@@ -98,10 +96,7 @@ export function recalculateRaceStateForSimulation(sim, { updateDrs = true, refre
         stabilityState: car.destroyed ? 'destroyed' : car.stabilityState,
       });
       car.canAttack = false;
-      car.drsEligible = false;
-      car.drsActive = false;
-      car.drsZoneId = null;
-      car.drsZoneEnabled = false;
+      clearCurrentDrsState(car);
       recordTimingStateForCar(car, sim.time, sim.track, previousRaceDistanceForTiming, sim.runtimeBenchmarkStats);
       return;
     }
@@ -149,10 +144,7 @@ export function recalculateRaceStateForSimulation(sim, { updateDrs = true, refre
       car.gapAheadSeconds = Infinity;
       car.intervalAheadSeconds = Infinity;
       car.leaderGapSeconds = Infinity;
-      car.drsEligible = false;
-      car.drsActive = false;
-      car.drsZoneId = null;
-      car.drsZoneEnabled = false;
+      clearCurrentDrsState(car);
       car.canAttack = false;
     });
   } else if (sim?.runtimeBenchmarkStats) {
@@ -175,10 +167,7 @@ export function recalculateRaceStateForSimulation(sim, { updateDrs = true, refre
       car.gapAheadSeconds = Infinity;
       car.intervalAheadSeconds = Infinity;
       car.leaderGapSeconds = Infinity;
-      car.drsEligible = false;
-      car.drsActive = false;
-      car.drsZoneId = null;
-      car.drsZoneEnabled = false;
+      clearCurrentDrsState(car);
       car.canAttack = false;
       return;
     }
@@ -210,10 +199,7 @@ export function recalculateRaceStateForSimulation(sim, { updateDrs = true, refre
     car.canAttack = !sim.safetyCar.deployed && !car.finished && !activePitStop;
     car.aggression = sim.computeAggression(car, index, aggressionFieldDepth);
     if (activePitStop) {
-      car.drsEligible = false;
-      car.drsActive = false;
-      car.drsZoneId = null;
-      car.drsZoneEnabled = false;
+      clearCurrentDrsState(car);
     } else if (updateDrs) sim.updateDrsLatch(car, drsReference, Boolean(drsReference));
   });
   sim.evaluateRaceFinish(ordered);

package/src/simulation/race/raceSetup.js

@@ -13,7 +13,7 @@ import {
 } from '../timing/raceTiming.js';
 import { normalizePitIntent, PIT_INTENT_NONE } from '../pit/pitIntent.js';
 import { assignPitLaneTeams, initializePitStops } from '../pit/pitState.js';
-import { clonePitLaneModel } from '../pit/pitRouting.js';
+import { clonePitLaneModel } from '../track/pitLaneModel.js';
 import { createRaceControlState, createSafetyCarState } from './raceControlState.js';
 import { normalizeTotalLaps } from './raceDistance.js';
 import { normalizeRaceRules } from '../rulesConfig.js';

package/src/simulation/race/raceStep.js

@@ -1,4 +1,4 @@
-import { decideDriverControls } from '../driverController.js';
+import { decideDriverControls } from '../driver/driverController.js';
 import { clamp } from '../simMath.js';
 import { updateReplayGhosts } from '../replay/replayGhosts.js';
 import { integrateVehiclePhysics, isSimulatorPhysicsMode } from '../vehicle/vehiclePhysics.js';

package/src/simulation/race/redFlag.js

@@ -1,3 +1,4 @@
+import { clearCurrentDrsState } from '../timing/drsState.js';
 import { freezeVehicleMotion } from '../vehicle/vehicleKinematics.js';
 
 export function applyRedFlagHoldForSimulation(sim) {
@@ -6,10 +7,7 @@ export function applyRedFlagHoldForSimulation(sim) {
     car.previousY = car.y;
     car.previousHeading = car.heading;
     freezeVehicleMotion(car, { physicsMode: sim.physicsMode });
-    car.drsActive = false;
-    car.drsEligible = false;
-    car.drsZoneId = null;
-    car.drsZoneEnabled = false;
+    clearCurrentDrsState(car);
     car.canAttack = false;
   });
 }

package/src/simulation/race/safetyCar.js

@@ -1,3 +1,4 @@
+import { clearCurrentDrsState } from '../timing/drsState.js';
 import { pointAt } from '../track/trackModel.js';
 import { kphToSimSpeed } from '../units.js';
 import { freezeVehicleMotion, syncVehicleVelocityToHeading } from '../vehicle/vehicleKinematics.js';
@@ -21,10 +22,7 @@ export function setSafetyCarState(sim, deployed) {
     }
     sim.cars.forEach((car) => {
       car.desiredOffset = 0;
-      car.drsActive = false;
-      car.drsEligible = false;
-      car.drsZoneId = null;
-      car.drsZoneEnabled = false;
+      clearCurrentDrsState(car);
     });
   }
   sim.events.unshift({ type: next ? 'safety-car' : 'green-flag', at: sim.time });
@@ -63,10 +61,7 @@ export function setRedFlagState(sim, deployed) {
     sim.raceControl.frozenOrder = sim.orderedCars().map((car) => car.id);
     sim.cars.forEach((car) => {
       freezeVehicleMotion(car, { physicsMode: sim.physicsMode });
-      car.drsActive = false;
-      car.drsEligible = false;
-      car.drsZoneId = null;
-      car.drsZoneEnabled = false;
+      clearCurrentDrsState(car);
       car.canAttack = false;
     });
   } else {