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: centered the space time chart on the projected train #10833

Merged
merged 2 commits 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 @@ -215,7 +215,7 @@ const SimulationResults = ({
height={manchetteWithSpaceTimeChartHeight - MANCHETTE_HEIGHT_DIFF}
handleTrainDrag={handleTrainDrag}
onTrainClick={(trainId) => dispatch(updateSelectedTrainId(trainId))}
selectedProjection={trainIdUsedForProjection}
selectedProjectionId={trainIdUsedForProjection}
/>
)}
</div>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ import { useState } from 'react';

import { useSelector } from 'react-redux';

import { STDCM_TRAIN_ID } from 'applications/stdcm/consts';
import { STDCM_TRAIN_TIMETABLE_ID } from 'applications/stdcm/consts';
import useProjectedTrainsForStdcm from 'applications/stdcm/hooks/useProjectedTrainsForStdcm';
import type { StdcmSimulationOutputs } from 'applications/stdcm/types';
import { hasResults } from 'applications/stdcm/utils/simulationOutputUtils';
Expand All @@ -14,7 +14,6 @@ import ManchetteWithSpaceTimeChartWrapper, {
MANCHETTE_WITH_SPACE_TIME_CHART_DEFAULT_HEIGHT,
} from 'modules/simulationResult/components/ManchetteWithSpaceTimeChart/ManchetteWithSpaceTimeChart';
import SpeedSpaceChartContainer from 'modules/simulationResult/components/SpeedSpaceChart/SpeedSpaceChartContainer';
import { formatEditoastTrainIdToTrainScheduleId } from 'utils/trainId';

const SPEED_SPACE_CHART_HEIGHT = 521.5;
const HANDLE_TAB_RESIZE_HEIGHT = 20;
Expand Down Expand Up @@ -75,10 +74,11 @@ const StdcmDebugResults = ({ simulationOutputs }: StdcmDebugResultsProps) => {
<ManchetteWithSpaceTimeChartWrapper
operationalPoints={pathProperties.manchetteOperationalPoints}
projectPathTrainResult={projectedData.spaceTimeData}
selectedTrainScheduleId={formatEditoastTrainIdToTrainScheduleId(STDCM_TRAIN_ID)}
selectedTrainScheduleId={STDCM_TRAIN_TIMETABLE_ID}
workSchedules={workSchedules}
projectionLoaderData={projectedData.projectionLoaderData}
height={manchetteWithSpaceTimeChartHeight - MANCHETTE_HEIGHT_DIFF}
selectedProjectionId={STDCM_TRAIN_TIMETABLE_ID}
/>
</div>
</div>
Expand Down
3 changes: 3 additions & 0 deletions front/src/applications/stdcm/consts.ts
Original file line number Diff line number Diff line change
@@ -1,3 +1,5 @@
import { formatEditoastTrainIdToTrainScheduleId } from 'utils/trainId';

export const STDCM_REQUEST_STATUS = Object.freeze({
idle: 'IDLE',
pending: 'PENDING',
Expand All @@ -8,6 +10,7 @@ export const STDCM_REQUEST_STATUS = Object.freeze({
});

export const STDCM_TRAIN_ID = -10;
export const STDCM_TRAIN_TIMETABLE_ID = formatEditoastTrainIdToTrainScheduleId(STDCM_TRAIN_ID);

export const COMPOSITION_CODES_MAX_SPEEDS: Record<string, number | undefined> = {
MA80: 80,
Expand Down
9 changes: 6 additions & 3 deletions front/src/applications/stdcm/hooks/useStdcm.ts
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,11 @@ import { useTranslation } from 'react-i18next';
import nextId from 'react-id-generator';
import { useSelector } from 'react-redux';

import { STDCM_REQUEST_STATUS, STDCM_TRAIN_ID } from 'applications/stdcm/consts';
import {
STDCM_REQUEST_STATUS,
STDCM_TRAIN_ID,
STDCM_TRAIN_TIMETABLE_ID,
} from 'applications/stdcm/consts';
import type {
StdcmRequestStatus,
StdcmSuccessResponse,
Expand All @@ -24,7 +28,6 @@ import { getStdcmConf } from 'reducers/osrdconf/stdcmConf/selectors';
import { updateSelectedTrainId } from 'reducers/simulationResults';
import { useAppDispatch } from 'store';
import { castErrorToFailure } from 'utils/error';
import { formatEditoastTrainIdToTrainScheduleId } from 'utils/trainId';

import useStdcmResults from './useStdcmResults';
import { checkStdcmConf, formatStdcmPayload } from '../utils/formatStdcmConf';
Expand Down Expand Up @@ -122,7 +125,7 @@ const useStdcm = ({
train_name: 'stdcm',
};
setStdcmTrainResult(stdcmTrain);
dispatch(updateSelectedTrainId(formatEditoastTrainIdToTrainScheduleId(STDCM_TRAIN_ID)));
dispatch(updateSelectedTrainId(STDCM_TRAIN_TIMETABLE_ID));
} else if (response.status === 'conflicts') {
setStdcmResponse({
...response,
Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@
import type { TrainSpaceTimeData } from 'applications/operationalStudies/types';
import { formatEditoastTrainIdToTrainScheduleId } from 'utils/trainId';

import { STDCM_TRAIN_ID } from '../consts';
import { STDCM_TRAIN_TIMETABLE_ID } from '../consts';
import type { StdcmSuccessResponse } from '../types';

const formatStdcmTrainIntoSpaceTimeData = (
Expand All @@ -10,7 +9,7 @@ const formatStdcmTrainIntoSpaceTimeData = (
const { simulation, departure_time } = stdcmResponse;
// TODO Paced train : Adapt this to handle paced trains in issue https://github.com/OpenRailAssociation/osrd/issues/10615
return {
id: formatEditoastTrainIdToTrainScheduleId(STDCM_TRAIN_ID),
id: STDCM_TRAIN_TIMETABLE_ID,
name: 'stdcm',
spaceTimeCurves: [
{
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -64,7 +64,7 @@ type ManchetteWithSpaceTimeChartProps = {
) => Promise<void>;
height?: number;
onTrainClick?: (trainId: TrainId) => void;
selectedProjection?: TimetableItemId;
selectedProjectionId: TimetableItemId;
};

export const MANCHETTE_WITH_SPACE_TIME_CHART_DEFAULT_HEIGHT = 561;
Expand All @@ -82,7 +82,7 @@ const ManchetteWithSpaceTimeChartWrapper = ({
height = MANCHETTE_WITH_SPACE_TIME_CHART_DEFAULT_HEIGHT,
handleTrainDrag,
onTrainClick,
selectedProjection,
selectedProjectionId,
}: ManchetteWithSpaceTimeChartProps) => {
const dispatch = useAppDispatch();

Expand All @@ -98,14 +98,21 @@ const ManchetteWithSpaceTimeChartWrapper = ({

const [waypointsPanelIsOpen, setWaypointsPanelIsOpen] = useState(false);

const [minDepartureTime, setMinDepartureTime] = useState<number | null>(null);
const [originTime, setOriginTime] = useState<number | null>(null);
useEffect(() => {
const projectedTrains = projectPathTrainResult.filter(
(train) => train.spaceTimeCurves.length > 0
const trainUsedForProjection = projectPathTrainResult.find(
(train) => train.id === selectedProjectionId
);
const minTime = Math.min(...projectedTrains.map((p) => +p.departureTime));
setMinDepartureTime(minTime);
}, [selectedProjection, projectPathTrainResult.length]);
if (trainUsedForProjection) {
setOriginTime(+trainUsedForProjection.departureTime);
} else {
const projectedTrains = projectPathTrainResult.filter(
(train) => train.spaceTimeCurves.length > 0
);
const minTime = Math.min(...projectedTrains.map((p) => +p.departureTime));
setOriginTime(minTime);
}
}, [selectedProjectionId, projectPathTrainResult.length]);

const [tmpSelectedTrain, setTmpSelectedTrain] = useState(selectedTrainScheduleId);

Expand Down Expand Up @@ -421,14 +428,14 @@ const ManchetteWithSpaceTimeChartWrapper = ({
onClose={() => setShowSettingsPanel(false)}
/>
)}
{minDepartureTime !== null && (
{originTime !== null && (
<SpaceTimeChart
className="inset-0 absolute h-full"
height={height}
spaceOrigin={
(waypointsPanelData?.filteredWaypoints ?? operationalPoints).at(0)?.position || 0
}
timeOrigin={minDepartureTime}
timeOrigin={originTime}
{...spaceTimeChartProps}
onPan={onPanOverloaded}
onClick={handleClick}
Expand Down
Loading