fix trainrun-section-card component

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

Author: louisgreiner

src/app/view/dialogs/trainrun-and-section-dialog/trainrunsection-card/trainrun-section-card.component.html

@@ -5,7 +5,7 @@
     data-testid="one-way-top-card"
   >
     <div class="OneWayCardBetriebspunkt">
-      <b>{{ startNode[1] }}</b> ({{ startNode[0] }})
+      <b>{{ leftNode.getBetriebspunktName() }}</b> ({{ leftNode.getFullName() }})
     </div>
     <div class="TrainFreqContainer">
       <svg class="renderer" width="96px" height="48px" viewBox="0 0 48 24">
@@ -31,7 +31,7 @@
       </svg>
     </div>
     <div class="OneWayCardBetriebspunkt">
-      <b>{{ endNode[1] }}</b> ({{ endNode[0] }})
+      <b>{{ rightNode.getBetriebspunktName() }}</b> ({{ rightNode.getFullName() }})
     </div>
   </div>
 
@@ -41,7 +41,7 @@
     data-testid="one-way-bottom-card"
   >
     <div class="OneWayCardBetriebspunkt">
-      <b>{{ startNode[1] }}</b> ({{ startNode[0] }})
+      <b>{{ leftNode.getBetriebspunktName() }}</b> ({{ leftNode.getFullName() }})
     </div>
     <div class="TrainFreqContainer">
       <svg class="renderer" width="96px" height="48px" viewBox="0 0 48 24">
@@ -67,7 +67,7 @@
       </svg>
     </div>
     <div class="OneWayCardBetriebspunkt">
-      <b>{{ endNode[1] }}</b> ({{ endNode[0] }})
+      <b>{{ rightNode.getBetriebspunktName() }}</b> ({{ rightNode.getFullName() }})
     </div>
   </div>
 </div>

src/app/view/dialogs/trainrun-and-section-dialog/trainrunsection-card/trainrun-section-card.component.ts

@@ -11,7 +11,6 @@ import {StaticDomTags} from "../../../editor-main-view/data-views/static.dom.tag
 import {ColorRefType} from "../../../../data-structures/technical.data.structures";
 import {TrainrunSectionTimesService} from "../../../../services/data/trainrun-section-times.service";
 import {LeftAndRightTimeStructure} from "../trainrunsection-tab/trainrun-section-tab.component";
-import {GeneralViewFunctions} from "../../../util/generalViewFunctions";
 
 @Component({
   selector: "sbb-trainrunsection-card",
@@ -23,14 +22,13 @@ export class TrainrunSectionCardComponent implements OnInit, AfterViewInit, OnDe
   @Input() trainrunDialogParameter: TrainrunDialogParameter;
   @Input() innerContentScaleFactor = "1.0";
 
-  public startNode: string[] = ["", ""];
-  public endNode: string[] = ["", ""];
+  public leftNode: Node;
+  public rightNode: Node;
   public frequencyLinePattern: LinePatternRefs;
   public categoryColorRef: ColorRefType;
   public timeCategoryLinePattern: LinePatternRefs;
   public chosenCard: "top" | "bottom";
 
-  private trainrunSectionHelper: TrainrunsectionHelper;
   private destroyed = new Subject<void>();
 
   public get nodesOrdered(): Node[] {
@@ -43,8 +41,6 @@ export class TrainrunSectionCardComponent implements OnInit, AfterViewInit, OnDe
     private changeDetection: ChangeDetectorRef,
     public trainrunSectionTimesService: TrainrunSectionTimesService,
   ) {
-    this.trainrunSectionHelper = new TrainrunsectionHelper(this.trainrunService);
-
     this.trainrunSectionTimesService.setOffset(0);
     this.trainrunService.trainruns.pipe(takeUntil(this.destroyed)).subscribe(() => {
       this.updateAllValues();
@@ -65,15 +61,19 @@ export class TrainrunSectionCardComponent implements OnInit, AfterViewInit, OnDe
     }
     const trainrunSection = this.trainrunService.getFirstTrainrunSection(selectedTrainrun);
 
-    this.trainrunSectionTimesService.setOffset(0);
+    this.leftNode = this.trainrunService.getLeftOrTopNodeWithTrainrunId(
+      trainrunSection.getTrainrunId(),
+    );
+    this.rightNode = this.trainrunService.getRightOrBottomNodeWithTrainrunId(
+      trainrunSection.getTrainrunId(),
+    );
 
-    // Initialize the selected trainrun as one-way, selecting the [source] → [target] card
+    this.trainrunSectionTimesService.setOffset(0);
     if (selectedTrainrun.isRoundTrip()) {
-      if (TrainrunsectionHelper.isTargetRightOrBottom(trainrunSection)) {
-        this.onTrainrunSectionCardClick("top");
-      } else {
-        this.onTrainrunSectionCardClick("bottom");
-      }
+      // Initialize round trip trainrun with top card
+      this.onTrainrunSectionCardClick("top");
+    } else {
+      this.chosenCard = this.trainrunService.isTrainrunTargetRightOrBottom() ? "top" : "bottom";
     }
 
     this.trainrunSectionTimesService.setTrainrunSection(trainrunSection);
@@ -82,19 +82,6 @@ export class TrainrunSectionCardComponent implements OnInit, AfterViewInit, OnDe
     this.timeCategoryLinePattern = selectedTrainrun.getTimeCategoryLinePatternRef();
     this.trainrunSectionTimesService.setHighlightTravelTimeElement(false);
     this.trainrunSectionTimesService.applyOffsetAndTransformTimeStructure();
-
-    const startNode = this.trainrunService.getStartNodeWithTrainrunId(
-      trainrunSection.getTrainrunId(),
-    );
-    this.startNode = [startNode.getFullName(), startNode.getBetriebspunktName()];
-    const endNode = this.trainrunService.getEndNodeWithTrainrunId(trainrunSection.getTrainrunId());
-    this.endNode = [endNode.getFullName(), endNode.getBetriebspunktName()];
-
-    if (!selectedTrainrun.isRoundTrip()) {
-      this.chosenCard = TrainrunsectionHelper.isTargetRightOrBottom(trainrunSection)
-        ? "top"
-        : "bottom";
-    }
   }
 
   ngOnDestroy() {
@@ -173,33 +160,15 @@ export class TrainrunSectionCardComponent implements OnInit, AfterViewInit, OnDe
       return;
     }
 
-    let trainrunSection = undefined;
-    let wantedSourceNode = undefined;
+    let trainrunSection = this.trainrunService.getFirstTrainrunSection(selectedTrainrun);
     if (selectedTrainrun.isRoundTrip()) {
-      const bothEndNodes = this.trainrunService.getBothEndNodesWithTrainrunId(
-        selectedTrainrun.getId(),
-      );
-      // direction top-left -> default
-      wantedSourceNode = GeneralViewFunctions.getLeftOrTopNode(
-        bothEndNodes.endNode1,
-        bothEndNodes.endNode2,
-      );
-      trainrunSection = wantedSourceNode.getStartTrainrunSection(selectedTrainrun.getId());
-    } else {
-      trainrunSection = this.trainrunService.getFirstTrainrunSection(selectedTrainrun);
-      // Get the left and right nodes to determine the cards order
-      const leftNode = this.trainrunSectionHelper.getNextStopLeftNode(
-        trainrunSection,
-        this.nodesOrdered,
-      );
-      const rightNode = this.trainrunSectionHelper.getNextStopRightNode(
-        trainrunSection,
-        this.nodesOrdered,
-      );
-      wantedSourceNode = position === "top" ? leftNode : rightNode;
+      // For a round trip trainrun, we want to choose the most top/left
+      // section as reference when switching to a one-way trainrun
+      trainrunSection = this.trainrunService.getLeftOrTopExtremitySection();
     }
 
-    if (wantedSourceNode !== trainrunSection.getSourceNode()) {
+    const referenceNode = position === "top" ? this.leftNode : this.rightNode;
+    if (referenceNode !== trainrunSection.getSourceNode()) {
       this.trainrunSectionService.invertTrainrunSectionsSourceAndTarget(
         trainrunSection.getTrainrunId(),
       );
@@ -217,8 +186,8 @@ export class TrainrunSectionCardComponent implements OnInit, AfterViewInit, OnDe
     const trainrunSections =
       this.trainrunSectionService.getAllTrainrunSectionsForTrainrun(selectedTrainrunId);
     const [startNode, endNode] = [
-      this.trainrunService.getStartNodeWithTrainrunId(selectedTrainrunId),
-      this.trainrunService.getEndNodeWithTrainrunId(selectedTrainrunId),
+      this.trainrunService.getLeftOrTopNodeWithTrainrunId(selectedTrainrunId),
+      this.trainrunService.getRightOrBottomNodeWithTrainrunId(selectedTrainrunId),
     ];
 
     // Try to find startNode → endNode