rename ambiguous start/end with extremity

Signed-off-by: Louis Greiner <[email protected]>

Author: louisgreiner

src/app/models/node.model.ts

@@ -423,7 +423,7 @@ export class Node {
     );
   }
 
-  getStartTrainrunSection(trainrunId: number, returnForwardStartNode = true): TrainrunSection {
+  getExtremityTrainrunSection(trainrunId: number, returnForwardStartNode = true): TrainrunSection {
     const portsForTrainrun = this.ports.filter(
       (port) => port.getTrainrunSection().getTrainrunId() === trainrunId,
     );

src/app/models/trainrunsection.model.spec.ts

@@ -582,9 +582,9 @@ describe("TrainrunSection Model Test", () => {
     const port2 = node2.addPort(PortAlignment.Right, ts2);
     node2.addTransitionAndComputeRouting(node2.getPort(port1), node2.getPort(port2), tr, true);
 
-    const ts001 = node1.getStartTrainrunSection(tr.getId());
-    const ts002 = node2.getStartTrainrunSection(tr.getId());
-    const ts003 = node3.getStartTrainrunSection(tr.getId());
+    const ts001 = node1.getExtremityTrainrunSection(tr.getId());
+    const ts002 = node2.getExtremityTrainrunSection(tr.getId());
+    const ts003 = node3.getExtremityTrainrunSection(tr.getId());
 
     expect(ts001).toBe(undefined);
     expect(ts002).toBe(undefined);

src/app/perlenkette/service/load-perlenkette.service.ts

@@ -127,7 +127,7 @@ export class LoadPerlenketteService implements OnDestroy {
       );
 
       if (startForwardNode) {
-        const startTrainrunSection = startForwardNode.getStartTrainrunSection(trainrun.getId());
+        const startTrainrunSection = startForwardNode.getExtremityTrainrunSection(trainrun.getId());
         if (startTrainrunSection === undefined) {
           return perlenketteItem;
         }

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

@@ -564,7 +564,7 @@ export class TrainrunService {
   }
 
   propagateTrainrunInitialConsecutiveTimes(trainrun: Trainrun) {
-    const startNode = this.getStartNodeWithTrainrunId(trainrun.getId());
+    const startNode = this.getLeftOrTopNodeWithTrainrunId(trainrun.getId());
     const ts = startNode.getTrainrunSection(trainrun);
     this.propagateConsecutiveTimesForTrainrun(ts.getId());
   }
@@ -603,7 +603,7 @@ export class TrainrunService {
 
       const propDataForward = this.propagateConsecutiveTimes(
         startForwardBackwardNode.startForwardNode,
-        startForwardBackwardNode.startForwardNode.getStartTrainrunSection(
+        startForwardBackwardNode.startForwardNode.getExtremityTrainrunSection(
           trainrunSection.getTrainrunId(),
           true,
         ),
@@ -621,7 +621,7 @@ export class TrainrunService {
 
       const propDataBackward = this.propagateConsecutiveTimes(
         startForwardBackwardNode.startBackwardNode,
-        startForwardBackwardNode.startBackwardNode.getStartTrainrunSection(
+        startForwardBackwardNode.startBackwardNode.getExtremityTrainrunSection(
           trainrunSection.getTrainrunId(),
           false,
         ),
@@ -637,12 +637,12 @@ export class TrainrunService {
     }
   }
 
-  getStartNodeWithTrainrunId(trainrunId: number): Node {
+  getLeftOrTopNodeWithTrainrunId(trainrunId: number): Node {
     const bothEndNodes = this.getBothEndNodesWithTrainrunId(trainrunId);
     return GeneralViewFunctions.getLeftOrTopNode(bothEndNodes.endNode1, bothEndNodes.endNode2);
   }
 
-  getEndNodeWithTrainrunId(trainrunId: number): Node {
+  getRightOrBottomNodeWithTrainrunId(trainrunId: number): Node {
     const bothEndNodes = this.getBothEndNodesWithTrainrunId(trainrunId);
     return GeneralViewFunctions.getRightOrBottomNode(bothEndNodes.endNode1, bothEndNodes.endNode2);
   }

src/app/streckengrafik/services/sg-1-load-trainrun-item.service.ts

@@ -1119,7 +1119,10 @@ export class Sg1LoadTrainrunItemService implements OnDestroy {
     let trainrunSectionGroup: TrainrunSectionGroup = undefined;
     let fromNode = node;
     let toNode = undefined;
-    const startTrainrunSection = node.getStartTrainrunSection(trainrunId, returnForwardStartNode);
+    const startTrainrunSection = node.getExtremityTrainrunSection(
+      trainrunId,
+      returnForwardStartNode,
+    );
     if (startTrainrunSection === undefined) {
       return {
         trainrunSectionGroups: trainrunSectionGroups,

src/app/view/editor-tools-view-component/editor-tools-view.component.ts

@@ -590,8 +590,8 @@ export class EditorToolsViewComponent {
         // Retrieve start -> end with:
         // start {startNode, startTrainrunSection}
         // end {iterator.current.node, iterator.current.trainrunSection}
-        const startNode = this.trainrunService.getStartNodeWithTrainrunId(trainrun.getId());
-        const startTrainrunSection = startNode.getStartTrainrunSection(trainrun.getId());
+        const startNode = this.trainrunService.getLeftOrTopNodeWithTrainrunId(trainrun.getId());
+        const startTrainrunSection = startNode.getExtremityTrainrunSection(trainrun.getId());
         const iterator = this.trainrunService.getIterator(startNode, startTrainrunSection);
         while (iterator.hasNext()) {
           iterator.next();

src/integration-testing/trainrunsection.service.test.spec.ts

@@ -281,8 +281,8 @@ describe("TrainrunSection Service Test", () => {
       trs.setTargetArrivalConsecutiveTime(undefined);
     });
     trainrunService.propagateInitialConsecutiveTimes();
-    const startNode = trainrunService.getStartNodeWithTrainrunId(2);
-    const startTrainrunSection = startNode.getStartTrainrunSection(2);
+    const startNode = trainrunService.getLeftOrTopNodeWithTrainrunId(2);
+    const startTrainrunSection = startNode.getExtremityTrainrunSection(2);
 
     expect(startTrainrunSection.getSourceDepartureConsecutiveTime()).toBe(0);
     expect(startTrainrunSection.getSourceArrivalConsecutiveTime()).toBe(180);
@@ -309,11 +309,11 @@ describe("TrainrunSection Service Test", () => {
       trs.setTargetDepartureConsecutiveTime(undefined);
       trs.setTargetArrivalConsecutiveTime(undefined);
     });
-    const startNode = trainrunService.getStartNodeWithTrainrunId(2);
-    const trainrunSection = startNode.getStartTrainrunSection(2);
+    const startNode = trainrunService.getLeftOrTopNodeWithTrainrunId(2);
+    const trainrunSection = startNode.getExtremityTrainrunSection(2);
     trainrunSection.setTravelTime(123);
     trainrunService.propagateInitialConsecutiveTimes();
-    const startTrainrunSection = startNode.getStartTrainrunSection(2);
+    const startTrainrunSection = startNode.getExtremityTrainrunSection(2);
 
     expect(startTrainrunSection.getSourceDepartureConsecutiveTime()).toBe(0);
     expect(startTrainrunSection.getSourceArrivalConsecutiveTime()).toBe(420);