front: handle times update on reduced nodes #590

clarani · 2025-10-24T16:39:14Z

Description

This PR allows to handle times updates correctly when a node is collapsed.

I will add more details later.

Issues

OpenRailAssociation/osrd#13347

Checklist

This PR contains a description of the changes I'm making
I've read the Contribution Guidelines
I've added tests for changes or features I've introduced
I documented any high-level concepts I'm introducing in documentation/
CI is currently green and this is ready for review

src/app/services/util/trainrunsection.helper.ts

src/app/services/data/trainrunsection.service.ts

Signed-off-by: Clara Ni <[email protected]>

louisgreiner

The left (source) -> right (target) works

The left (target) <- right (source) not; I'm trying to find a solution if you don't find it first :-)

You can test with this also:
reticulaire(3).json

Also, do not forget to remove the last commit

louisgreiner · 2025-11-03T13:21:43Z

src/app/services/util/trainrun.iterator.ts


-export class NonStopTrainrunIterator extends TrainrunIterator {
+/** Iterate on the trainrun sections until we find a node which is a stop of the trainrun and not collapsed */
+export class NextVisibleStopIterator extends TrainrunIterator {


Should we name it NextExpandedStopIterator? To re-use the "expanded"/"collapsed" paradigm

src/app/services/util/trainrunsection.helper.spec.ts

src/app/services/data/trainrunsection.service.ts

louisgreiner

After further testing, happens this actually does not work for right times updates :/

louisgreiner

Great idea to add the stop time prop!

This makes the easy case work (rightIsTarget = true) but not the other situation still.

Also, I think you have forgotten to add the stop time stuff in onNodeLeftArrivalTimeChanged()? I quickly tried to test but I'm not sure of what I'm saying rn

ps: you have formatting issues, npm run format

src/app/services/data/trainrun-section-times.service.ts

`TrainrunsectionHelper.getTravelTime()` computes the new travel time of a trainrunSection, either by using the `travelTimeFactor` and the current travel time of the section, or by using the total trainrun travel time and the sum of the new travel times computed up to that point. This logic can be split into 2 independent functions, which will be used depending on whether the considered section is the last one to compute or not. Signed-off-by: Clara Ni <[email protected]>

clarani · 2025-11-05T15:24:19Z

@louisgreiner it's fixed !

louisgreiner

Nice ! Working smoothly.

I think you've forgot to add the stop stuff calculation in onNodeLeftArrivalTimeChanged(), since you've added it in the 3 other inputs. However, I can't produce a case that makes it bug.

Also, do not forget to remove the wip comment and we're good to go!

louisgreiner · 2025-11-06T09:17:18Z

src/app/services/data/trainrun-section-times.service.ts

      );
    } else if (!this.lockStructure.travelTimeLock && this.lockStructure.leftLock) {
-      const extraHour = this.timeStructure.travelTime - (this.timeStructure.travelTime % 60);
+      // pas sûre d'avoir compris comment fonctionnait l'extraHour


Suggested change

// pas sûre d'avoir compris comment fonctionnait l'extraHour

louisgreiner · 2025-11-06T09:18:17Z

src/app/services/util/trainrun.iterator.ts


-export class NonStopTrainrunIterator extends TrainrunIterator {
+/** Iterate on the trainrun sections until we find a node which is a stop of the trainrun and not collapsed */
+export class NextVisibleStopIterator extends TrainrunIterator {


Until now, a time structure has represented one or several trainrun sections without any stops, so it could be described by its departure and arrival times (right and left) and its travel time. Since we are now going to handle several trainrun sections that include stops, we need to add a new property to store the total stop time in the time structure. Signed-off-by: Clara Ni <[email protected]>

clarani · 2025-11-07T15:21:33Z

I think you've forgot to add the stop stuff calculation in onNodeLeftArrivalTimeChanged(), since you've added it in the 3 other inputs. However, I can't produce a case that makes it bug.

I have not forgotten it, I think I really don't need to do this modification since I only have to add the travel time in this special case (the stop time is not needed here) 😉

I have drop the last commit "wip" 👍

…masked The behavior is pretty much the same as when a node is a non-stop node, except when updating the travel time, because we need to take into account the stop times of the reduced nodes. Signed-off-by: Clara Ni <[email protected]>

…ion tab Signed-off-by: Clara Ni <[email protected]>

louisgreiner reviewed Oct 27, 2025

View reviewed changes

src/app/services/util/trainrunsection.helper.ts Outdated Show resolved Hide resolved

louisgreiner reviewed Oct 27, 2025

View reviewed changes

src/app/services/data/trainrunsection.service.ts Outdated Show resolved Hide resolved

emersion self-requested a review October 31, 2025 08:53

clarani changed the base branch from main to mrd/new-nodes-management-system October 31, 2025 15:25

clean: remove duplicated tests

74c4c41

Signed-off-by: Clara Ni <[email protected]>

clarani force-pushed the cni/13347-handle-times-update-on-reduced-nodes branch from 14aff1d to e5de33f Compare November 3, 2025 09:11

louisgreiner reviewed Nov 3, 2025

View reviewed changes

louisgreiner reviewed Nov 4, 2025

View reviewed changes

src/app/services/data/trainrun-section-times.service.ts Outdated Show resolved Hide resolved

clarani force-pushed the cni/13347-handle-times-update-on-reduced-nodes branch from fad0e73 to 48bc480 Compare November 5, 2025 12:59

clarani force-pushed the cni/13347-handle-times-update-on-reduced-nodes branch from 48bc480 to 4206b78 Compare November 5, 2025 13:09

clarani requested a review from louisgreiner November 5, 2025 15:24

louisgreiner reviewed Nov 6, 2025

View reviewed changes

clarani force-pushed the cni/13347-handle-times-update-on-reduced-nodes branch from 4206b78 to fae5b60 Compare November 7, 2025 15:20

clarani added 2 commits November 7, 2025 16:26

feat: display total stop duration of the trainrun section on the sect…

e991210

…ion tab Signed-off-by: Clara Ni <[email protected]>

clarani force-pushed the cni/13347-handle-times-update-on-reduced-nodes branch from fae5b60 to e991210 Compare November 7, 2025 15:26

clarani marked this pull request as ready for review November 7, 2025 15:28

clarani requested a review from aiAdrian as a code owner November 7, 2025 15:28

front: handle times update on reduced nodes #590

Are you sure you want to change the base?

front: handle times update on reduced nodes #590

Uh oh!

Conversation

clarani commented Oct 24, 2025

Description

Issues

Checklist

Uh oh!

Uh oh!

Uh oh!

louisgreiner left a comment

Choose a reason for hiding this comment

Uh oh!

louisgreiner Nov 3, 2025

Choose a reason for hiding this comment

Uh oh!

louisgreiner Nov 6, 2025

Choose a reason for hiding this comment

Uh oh!

clarani Nov 7, 2025

Choose a reason for hiding this comment

Uh oh!

Uh oh!

Uh oh!

louisgreiner left a comment

Choose a reason for hiding this comment

Uh oh!

louisgreiner left a comment • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Uh oh!

clarani commented Nov 5, 2025

Uh oh!

louisgreiner left a comment

Choose a reason for hiding this comment

Uh oh!

louisgreiner Nov 6, 2025

Choose a reason for hiding this comment

Uh oh!

clarani Nov 7, 2025

Choose a reason for hiding this comment

Uh oh!

louisgreiner Nov 6, 2025

Choose a reason for hiding this comment

Uh oh!

clarani commented Nov 7, 2025 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

3 participants

louisgreiner left a comment •

edited

Loading

clarani commented Nov 7, 2025 •

edited

Loading