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

louisgreiner · 2025-10-27T15:57:22Z

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

+    );
+  }
+
+  static getSectionTravelTime(


Suggested change

static getSectionTravelTime(

static getSectionDistributedTravelTime(

louisgreiner · 2025-10-27T16:00:01Z

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

-      trsTimeStructure.travelTime = TrainrunsectionHelper.getTravelTime(
+      if (prevInitialTargetArrival !== null) {
+        // gérer les modulo 60 et positif
+        stopTime = (nextPair.trainrunSection.getSourceDeparture() - prevInitialTargetArrival) % 60;


to deal with negative stopTimes (dirty way):

Suggested change

stopTime = (nextPair.trainrunSection.getSourceDeparture() - prevInitialTargetArrival) % 60;

stopTime = (((nextPair.trainrunSection.getSourceDeparture() - prevInitialTargetArrival) % 60) + 60) % 60;

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

louisgreiner · 2025-11-03T13:26:07Z

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

-    expect(tt).toBe(1);
+  it("getLastSectionTravelTime -- 004", () => {
+    const tt = TrainrunsectionHelper.getLastSectionTravelTime(10, 2, 0);
+    expect(tt).toBe(20);


To fix the tests:

Chrome Headless 141.0.0.0 (Windows 10) TrainrunsectionHelper getLastSectionTravelTime -- 004 FAILED Expected 8 to be 20.

Suggested change

expect(tt).toBe(20);

expect(tt).toBe(8);

louisgreiner · 2025-11-03T14:04:15Z

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

+      if (prevInitialTargetArrival !== null) {
+        stopTime = MathUtils.mod60(nextPair.trainrunSection.getSourceDeparture() - prevInitialTargetArrival);
+        trsTimeStructure.leftDepartureTime = trsTimeStructure.rightArrivalTime + stopTime;
+        trsTimeStructure.leftArrivalTime = trsTimeStructure.rightDepartureTime + stopTime;


Suggested change

trsTimeStructure.leftArrivalTime = trsTimeStructure.rightDepartureTime + stopTime;

trsTimeStructure.leftArrivalTime = trsTimeStructure.rightDepartureTime - stopTime;

Since the train goes from:

left -> right then

left <- right

You can try on a non-stop chain with more than 1 collapsed node

reticulaire(3).json

Thanks, you're right !! :)

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

louisgreiner · 2025-11-04T13:32:22Z

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


extraHour is the rest of the euclidian division of travelTime / 60 ; this is used for recalculating the travel time using the departure/arrival times, which are % 60

303min of travelTime = 300min of "base"
say departure is 2' and arrival 5', travelTime = 5 - 2 + 300 = 303min

Then, you are right to add the stop time value to this one also

`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]>

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]>

…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]>

This commit needs to be droped before the merge. Signed-off-by: Clara Ni <[email protected]>

…ode is masked

louisgreiner reviewed Oct 27, 2025

View reviewed changes

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

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

clarani added 7 commits November 5, 2025 14:05

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

ff57644

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

wip: hide a node in the default DTO used in standalone mode

b9f46d2

This commit needs to be droped before the merge. Signed-off-by: Clara Ni <[email protected]>

fixup! feat: correctly update arrival/departure/travel times when a n…

5e4d17b

…ode is masked

fixup! feat: add stop time props in LeftAndRightTimeStructure

4206b78

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

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Uh oh!

front: handle times update on reduced nodes #590

front: handle times update on reduced nodes #590

Uh oh!

clarani commented Oct 24, 2025

Uh oh!

louisgreiner Oct 27, 2025

Uh oh!

louisgreiner Oct 27, 2025

Uh oh!

louisgreiner left a comment

Uh oh!

louisgreiner Nov 3, 2025

Uh oh!

louisgreiner Nov 3, 2025

Uh oh!

louisgreiner Nov 3, 2025

Uh oh!

clarani Nov 4, 2025 •

edited

Loading

Uh oh!

louisgreiner left a comment

Uh oh!

louisgreiner left a comment •

edited

Loading

Uh oh!

louisgreiner Nov 4, 2025

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

3 participants

	static getSectionTravelTime(
	static getSectionDistributedTravelTime(

	stopTime = (nextPair.trainrunSection.getSourceDeparture() - prevInitialTargetArrival) % 60;
	stopTime = (((nextPair.trainrunSection.getSourceDeparture() - prevInitialTargetArrival) % 60) + 60) % 60;

	trsTimeStructure.leftArrivalTime = trsTimeStructure.rightDepartureTime + stopTime;
	trsTimeStructure.leftArrivalTime = trsTimeStructure.rightDepartureTime - stopTime;

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!

louisgreiner Oct 27, 2025

Choose a reason for hiding this comment

Uh oh!

louisgreiner Oct 27, 2025

Choose a reason for hiding this comment

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 3, 2025

Choose a reason for hiding this comment

Uh oh!

louisgreiner Nov 3, 2025

Choose a reason for hiding this comment

Uh oh!

clarani Nov 4, 2025 • 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!

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!

louisgreiner Nov 4, 2025

Choose a reason for hiding this comment

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

3 participants

clarani Nov 4, 2025 •

edited

Loading

louisgreiner left a comment •

edited

Loading