wip: handle times updates when some node are reduced

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

Author: clarani

src/app/models/node.model.ts

@@ -322,7 +322,7 @@ export class Node {
     return currentMaxIndex;
   }
 
-  getIsCollapsed(): boolean {
+  collapsed(): boolean {
     return this.isCollapsed;
   }
 

src/app/sample-netzgrafik/netzgrafik_default.json

@@ -214,7 +214,8 @@
       },
       "symmetryAxis": null,
       "warnings": null,
-      "labelIds": []
+      "labelIds": [ ],
+      "isCollapsed": true
     },
     {
       "id": 9,

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

@@ -879,18 +879,32 @@ export class TrainrunSectionService implements OnDestroy {
     let summedTravelTime = 0;
 
     const iterator = this.trainrunService.getNonStopIterator(leftNode, trs);
+    let prevInitialTargetArrival: number = null;
+    let stopTime: number;
     while (iterator.hasNext()) {
+
       const nextPair = iterator.next();
 
-      const isRightNodeNonStop = nextPair.node.isNonStop(nextPair.trainrunSection);
-      trsTimeStructure.travelTime = TrainrunsectionHelper.getTravelTime(
+      if (prevInitialTargetArrival !== null) {
+        // gérer les modulo 60 et positif
+        stopTime = (nextPair.trainrunSection.getSourceDeparture() - prevInitialTargetArrival) % 60;
+        trsTimeStructure.leftDepartureTime = trsTimeStructure.rightArrivalTime + stopTime;
+        trsTimeStructure.leftArrivalTime = trsTimeStructure.rightDepartureTime + stopTime;
+      }
+      prevInitialTargetArrival = nextPair.trainrunSection.getTargetArrival();
+
+      const isFinalRightNode = !nextPair.node.isNonStop(nextPair.trainrunSection) && !nextPair.node.collapsed();
+      trsTimeStructure.travelTime = isFinalRightNode ?
+       TrainrunsectionHelper.getLastSectionTravelTime(
         newTotalTravelTime,
         summedTravelTime,
-        travelTimeFactor,
+        precision,
+      ) : TrainrunsectionHelper.getSectionTravelTime(
         nextPair.trainrunSection.getTravelTime(),
-        isRightNodeNonStop,
+        travelTimeFactor,
         precision,
       );
+
       trsTimeStructure.rightArrivalTime = TrainrunsectionHelper.getRightArrivalTime(
         trsTimeStructure,
         precision,
@@ -910,8 +924,6 @@ export class TrainrunSectionService implements OnDestroy {
         trsTimeStructure.travelTime,
       );
 
-      trsTimeStructure.leftDepartureTime = trsTimeStructure.rightArrivalTime;
-      trsTimeStructure.leftArrivalTime = trsTimeStructure.rightDepartureTime;
       summedTravelTime += trsTimeStructure.travelTime;
     }
 

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

@@ -75,7 +75,7 @@ export class TrainrunIterator {
 
 export class NonStopTrainrunIterator extends TrainrunIterator {
   public next(): TrainrunSectionNodePair {
-    if (!this.pointerElement.node.isNonStop(this.pointerElement.trainrunSection)) {
+    if (!this.pointerElement.node.isNonStop(this.pointerElement.trainrunSection) && !this.pointerElement.node.collapsed()) {
       // The trainrun has a stop and break the forward iteration
       this.currentElement = Object.assign({}, this.pointerElement);
       this.pointerElement = new TrainrunSectionNodePair(undefined, undefined);

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

@@ -99,22 +99,22 @@ describe("TrainrunsectionHelper", () => {
   });
 
   it("getTravelTime -- 001", () => {
-    const tt = TrainrunsectionHelper.getTravelTime(10, 10, 1, 12, false, 0);
+    const tt = TrainrunsectionHelper.getLastSectionTravelTime(10, 10, 1, 12, false, 0);
     expect(tt).toBe(1);
   });
 
   it("getTravelTime -- 002", () => {
-    const tt = TrainrunsectionHelper.getTravelTime(10, 10, 1, 12, true, 0);
+    const tt = TrainrunsectionHelper.getLastSectionTravelTime(10, 10, 1, 12, true, 0);
     expect(tt).toBe(12);
   });
 
   it("getTravelTime -- 003", () => {
-    const tt = TrainrunsectionHelper.getTravelTime(10, 10, 1, 12, false, 0);
+    const tt = TrainrunsectionHelper.getLastSectionTravelTime(10, 10, 1, 12, false, 0);
     expect(tt).toBe(1);
   });
 
   it("getTravelTime -- 004", () => {
-    const tt = TrainrunsectionHelper.getTravelTime(8, 10, 2, 12, false, 0);
+    const tt = TrainrunsectionHelper.getLastSectionTravelTime(8, 10, 2, 12, false, 0);
     expect(tt).toBe(1);
   });
 
@@ -217,22 +217,22 @@ describe("TrainrunsectionHelper", () => {
   });
 
   it("getTravelTime -- 2 -- 001", () => {
-    const tt = TrainrunsectionHelper.getTravelTime(10, 10, 1, 12, false, 0);
+    const tt = TrainrunsectionHelper.getLastSectionTravelTime(10, 10, 1, 12, false, 0);
     expect(tt).toBe(1);
   });
 
   it("getTravelTime -- 2 -- 002", () => {
-    const tt = TrainrunsectionHelper.getTravelTime(10, 10, 1, 12, true, 0);
+    const tt = TrainrunsectionHelper.getLastSectionTravelTime(10, 10, 1, 12, true, 0);
     expect(tt).toBe(12);
   });
 
   it("getTravelTime -- 2 -- 003", () => {
-    const tt = TrainrunsectionHelper.getTravelTime(10, 10, 1, 12, false, 0);
+    const tt = TrainrunsectionHelper.getLastSectionTravelTime(10, 10, 1, 12, false, 0);
     expect(tt).toBe(1);
   });
 
   it("getTravelTime -- 2 -- 004", () => {
-    const tt = TrainrunsectionHelper.getTravelTime(8, 10, 2, 12, false, 0);
+    const tt = TrainrunsectionHelper.getLastSectionTravelTime(8, 10, 2, 12, false, 0);
     expect(tt).toBe(1);
   });
 

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

@@ -39,25 +39,26 @@ export class TrainrunsectionHelper {
     };
   }
 
-  static getTravelTime(
+  static getLastSectionTravelTime(
     totalTravelTime: number,
     summedTravelTime: number,
-    travelTimeFactor: number,
+    precision = TrainrunSectionService.TIME_PRECISION,
+  ): number {
+    return Math.max(
+      MathUtils.round(totalTravelTime - summedTravelTime, precision),
+      1.0 / Math.pow(10, precision),
+    );
+  }
+
+  static getSectionTravelTime(
     trsTravelTime: number,
-    isRightNodeNonStopTransit: boolean,
+    travelTimeFactor: number,
     precision = TrainrunSectionService.TIME_PRECISION,
   ): number {
-    if (isRightNodeNonStopTransit) {
-      return Math.max(
-        MathUtils.round(trsTravelTime * travelTimeFactor, precision),
-        1.0 / Math.pow(10, precision),
-      );
-    } else {
-      return Math.max(
-        MathUtils.round(totalTravelTime - summedTravelTime, precision),
-        1.0 / Math.pow(10, precision),
-      );
-    }
+    return Math.max(
+      MathUtils.round(trsTravelTime * travelTimeFactor, precision),
+      1.0 / Math.pow(10, precision),
+    );
   }
 
   static getRightArrivalTime(