Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

front: use Map instead of Record for train summaries/projections #10808

Merged
merged 1 commit into from
Feb 18, 2025
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ import { isScheduledPointsNotHonored, isTooFast } from '../utils';

const formatTrainScheduleSummaries = (
trainIds: TrainId[],
rawSummaries: Record<TrainScheduleId, SimulationSummaryResult>,
rawSummaries: Map<TrainScheduleId, SimulationSummaryResult>,
rawTrainSchedules: Map<TrainScheduleId, TrainScheduleResultWithTrainId>,
rollingStocks: LightRollingStockWithLiveries[]
): Map<TrainId, TrainScheduleWithDetails> => {
Expand All @@ -31,7 +31,7 @@ const formatTrainScheduleSummaries = (
const trainScheduleWithDetails = relevantTrainSchedules.map((trainSchedule) => {
const rollingStock = rollingStocks.find((rs) => rs.name === trainSchedule.rolling_stock_name);

const trainSummary = rawSummaries[trainSchedule.id];
const trainSummary = rawSummaries.get(trainSchedule.id);

if (!trainSummary) return null;

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -8,30 +8,24 @@ import type {

const upsertNewProjectedTrains = (
projectedTrains: Map<TrainId, TrainSpaceTimeData>,
projectedTrainsToUpsert: Record<TrainScheduleId, ProjectPathTrainResult>,
projectedTrainsToUpsert: Map<TrainScheduleId, ProjectPathTrainResult>,
trainSchedulesById: Map<TrainScheduleId, TrainScheduleResultWithTrainId>
) => {
const newProjectedTrains = new Map(projectedTrains);

// For each key (train id) in projectPathTrainResult, we either add it or update it in the state
Object.entries(projectedTrainsToUpsert).forEach(([trainIdKey, trainData]) => {
if (!trainData) {
console.error(`Train ${trainIdKey} not found in the projectedTrainsToUpsert`);
return;
}

// trainIdKey is in format TrainScheduleId but Object.entries tells typescript it's a string
const matchingTrain = trainSchedulesById.get(trainIdKey as TrainScheduleId);
for (const [trainIdKey, trainData] of projectedTrainsToUpsert) {
const matchingTrain = trainSchedulesById.get(trainIdKey);
const projectedTrain = {
id: trainIdKey as TrainScheduleId,
id: trainIdKey,
name: matchingTrain?.train_name || 'Train name not found',
departureTime: new Date(trainData.departure_time),
spaceTimeCurves: trainData.space_time_curves,
signalUpdates: trainData.signal_updates,
};

newProjectedTrains.set(trainIdKey as TrainScheduleId, projectedTrain);
});
newProjectedTrains.set(trainIdKey, projectedTrain);
}

return newProjectedTrains;
};
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -81,10 +81,10 @@ const useLazyLoadTrains = ({
}).unwrap();

// TODO Paced train : Adapt this for the add paced train issue : https://github.com/OpenRailAssociation/osrd/issues/10615
const formattedRawSummaries: { [key: TrainScheduleId]: SimulationSummaryResult } = {};
const formattedRawSummaries: Map<TrainScheduleId, SimulationSummaryResult> = new Map();
for (const [editoastTrainId, trainSummary] of Object.entries(rawSummaries)) {
const trainId = formatEditoastTrainIdToTrainScheduleId(Number(editoastTrainId));
formattedRawSummaries[trainId] = trainSummary;
formattedRawSummaries.set(trainId, trainSummary);
}

// the two rtk-query calls postTrainSchedule & postTrainScheduleSimulationSummary
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -250,10 +250,10 @@ const useScenarioData = (
}).unwrap();

// TODO Paced train : Adapt this for the add paced train issue : https://github.com/OpenRailAssociation/osrd/issues/10615
const formattedRawSummaries: { [key: TrainScheduleId]: SimulationSummaryResult } = {};
const formattedRawSummaries: Map<TrainScheduleId, SimulationSummaryResult> = new Map();
for (const [_editoastTrainId, trainSummary] of Object.entries(rawSummaries)) {
const formattedTrainId = formatEditoastTrainIdToTrainScheduleId(Number(_editoastTrainId));
formattedRawSummaries[formattedTrainId] = trainSummary;
formattedRawSummaries.set(formattedTrainId, trainSummary);
}

const summaries = formatTrainScheduleSummaries(
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -94,10 +94,10 @@ const useLazyProjectTrains = ({
},
}).unwrap();

const formattedRawProjectedTrains: { [key: TrainScheduleId]: ProjectPathTrainResult } = {};
const formattedRawProjectedTrains: Map<TrainScheduleId, ProjectPathTrainResult> = new Map();
for (const [editoastTrainId, projectedTrain] of Object.entries(rawProjectedTrains)) {
const trainId = formatEditoastTrainIdToTrainScheduleId(Number(editoastTrainId));
formattedRawProjectedTrains[trainId] = projectedTrain;
formattedRawProjectedTrains.set(trainId, projectedTrain);
}

setProjectedTrainsById((prevTrains) => {
Expand Down
Loading