fix(ports): adapt port indexes assignation for collapsed nodes sections chain

Important: the other Netzgrafik JSON files must be updated, either in the feature branch,
either here (but they might also change due to other PRs that will be merged afterwards
in the feature branch).

Signed-off-by: Louis Greiner <louis.greiner@proton.me>

Author: louisgreiner

src/app/models/node.model.ts

@@ -482,27 +482,27 @@ export class Node {
             a.getPositionAlignment() === PortAlignment.Right
           ) {
             if (
-              a.getOppositeNodePosition(this.getId()).getY() >
-              b.getOppositeNodePosition(this.getId()).getY()
+              a.getOppositeExpandedNodePosition(this.getId()).getY() >
+              b.getOppositeExpandedNodePosition(this.getId()).getY()
             ) {
               return 1;
             } else if (
-              a.getOppositeNodePosition(this.getId()).getY() ===
-              b.getOppositeNodePosition(this.getId()).getY()
+              a.getOppositeExpandedNodePosition(this.getId()).getY() ===
+              b.getOppositeExpandedNodePosition(this.getId()).getY()
             ) {
               return Node.orderPortsTrainCategory(a, b);
             } else {
               return -1;
             }
           } else {
             if (
-              a.getOppositeNodePosition(this.getId()).getX() >
-              b.getOppositeNodePosition(this.getId()).getX()
+              a.getOppositeExpandedNodePosition(this.getId()).getX() >
+              b.getOppositeExpandedNodePosition(this.getId()).getX()
             ) {
               return 1;
             } else if (
-              a.getOppositeNodePosition(this.getId()).getX() ===
-              b.getOppositeNodePosition(this.getId()).getX()
+              a.getOppositeExpandedNodePosition(this.getId()).getX() ===
+              b.getOppositeExpandedNodePosition(this.getId()).getX()
             ) {
               return Node.orderPortsTrainCategory(a, b);
             } else {

src/app/models/port.model.ts

@@ -1,6 +1,11 @@
 import {PortAlignment, PortDto} from "../data-structures/technical.data.structures";
 import {TrainrunSection} from "./trainrunsection.model";
 import {Vec2D} from "../utils/vec2D";
+import {
+  BackwardExpandedStopIterator,
+  ExpandedTrainrunIterator,
+  TrainrunIterator,
+} from "../services/util/trainrun.iterator";
 
 export class Port {
   private static currentId = 0;
@@ -67,18 +72,21 @@ export class Port {
     return this.trainrunSection;
   }
 
-  getOppositeNodePosition(fromNodeId: number): Vec2D {
-    if (this.getTrainrunSection().getSourceNodeId() === fromNodeId) {
-      return new Vec2D(
-        this.getTrainrunSection().getTargetNode().getPositionX(),
-        this.getTrainrunSection().getTargetNode().getPositionY(),
-      );
-    } else {
-      return new Vec2D(
-        this.getTrainrunSection().getSourceNode().getPositionX(),
-        this.getTrainrunSection().getSourceNode().getPositionY(),
-      );
+  getOppositeExpandedNodePosition(fromNodeId: number): Vec2D {
+    const trainrunSection = this.getTrainrunSection();
+    const isFromSourceNode = trainrunSection.getSourceNodeId() === fromNodeId;
+
+    const iterator = isFromSourceNode
+      ? new ExpandedTrainrunIterator(null, trainrunSection.getSourceNode(), trainrunSection)
+      : new BackwardExpandedStopIterator(null, trainrunSection.getTargetNode(), trainrunSection);
+    while (iterator.hasNext()) {
+      iterator.next();
     }
+
+    return new Vec2D(
+      iterator.current().node.getPositionX(),
+      iterator.current().node.getPositionY(),
+    );
   }
 
   getDto(): PortDto {

src/app/sample-netzgrafik/netzgrafik_demo_standalone_github.json

@@ -362,8 +362,8 @@
       "positionY": 96,
       "ports": [
         {"id": 1145, "trainrunSectionId": 565, "positionIndex": 0, "positionAlignment": 1},
-        {"id": 1167, "trainrunSectionId": 576, "positionIndex": 0, "positionAlignment": 2},
-        {"id": 1212, "trainrunSectionId": 598, "positionIndex": 1, "positionAlignment": 2},
+        {"id": 1212, "trainrunSectionId": 598, "positionIndex": 0, "positionAlignment": 2},
+        {"id": 1167, "trainrunSectionId": 576, "positionIndex": 1, "positionAlignment": 2},
         {"id": 1144, "trainrunSectionId": 740, "positionIndex": 2, "positionAlignment": 2},
         {"id": 1419, "trainrunSectionId": 702, "positionIndex": 0, "positionAlignment": 3}
       ],
@@ -968,8 +968,8 @@
         {"id": 1227, "trainrunSectionId": 606, "positionIndex": 0, "positionAlignment": 3},
         {"id": 1243, "trainrunSectionId": 614, "positionIndex": 1, "positionAlignment": 3},
         {"id": 1211, "trainrunSectionId": 757, "positionIndex": 2, "positionAlignment": 3},
-        {"id": 1143, "trainrunSectionId": 564, "positionIndex": 3, "positionAlignment": 3},
-        {"id": 1168, "trainrunSectionId": 576, "positionIndex": 4, "positionAlignment": 3}
+        {"id": 1168, "trainrunSectionId": 576, "positionIndex": 3, "positionAlignment": 3},
+        {"id": 1143, "trainrunSectionId": 564, "positionIndex": 4, "positionAlignment": 3}
       ],
       "transitions": [
         {"id": 247, "port1Id": 1142, "port2Id": 1143, "isNonStopTransit": false},
@@ -1635,8 +1635,8 @@
         {"id": 1094, "trainrunSectionId": 539, "positionIndex": 1, "positionAlignment": 1},
         {"id": 1102, "trainrunSectionId": 543, "positionIndex": 2, "positionAlignment": 1},
         {"id": 1098, "trainrunSectionId": 735, "positionIndex": 3, "positionAlignment": 1},
-        {"id": 1363, "trainrunSectionId": 674, "positionIndex": 0, "positionAlignment": 3},
-        {"id": 1361, "trainrunSectionId": 673, "positionIndex": 1, "positionAlignment": 3}
+        {"id": 1361, "trainrunSectionId": 673, "positionIndex": 0, "positionAlignment": 3},
+        {"id": 1363, "trainrunSectionId": 674, "positionIndex": 1, "positionAlignment": 3}
       ],
       "transitions": [
         {"id": 328, "port1Id": 1353, "port2Id": 1098, "isNonStopTransit": false},
@@ -1670,8 +1670,8 @@
       "positionX": -2560,
       "positionY": 288,
       "ports": [
-        {"id": 1379, "trainrunSectionId": 682, "positionIndex": 0, "positionAlignment": 2},
-        {"id": 1381, "trainrunSectionId": 683, "positionIndex": 1, "positionAlignment": 2},
+        {"id": 1381, "trainrunSectionId": 683, "positionIndex": 0, "positionAlignment": 2},
+        {"id": 1379, "trainrunSectionId": 682, "positionIndex": 1, "positionAlignment": 2},
         {"id": 1206, "trainrunSectionId": 595, "positionIndex": 0, "positionAlignment": 3},
         {"id": 1110, "trainrunSectionId": 547, "positionIndex": 1, "positionAlignment": 3}
       ],
@@ -1860,9 +1860,9 @@
       "positionX": -3520,
       "positionY": 544,
       "ports": [
-        {"id": 1421, "trainrunSectionId": 703, "positionIndex": 0, "positionAlignment": 2},
-        {"id": 1423, "trainrunSectionId": 704, "positionIndex": 1, "positionAlignment": 2},
-        {"id": 1425, "trainrunSectionId": 705, "positionIndex": 2, "positionAlignment": 2},
+        {"id": 1423, "trainrunSectionId": 704, "positionIndex": 0, "positionAlignment": 2},
+        {"id": 1425, "trainrunSectionId": 705, "positionIndex": 1, "positionAlignment": 2},
+        {"id": 1421, "trainrunSectionId": 703, "positionIndex": 2, "positionAlignment": 2},
         {"id": 1184, "trainrunSectionId": 752, "positionIndex": 0, "positionAlignment": 3},
         {"id": 1208, "trainrunSectionId": 596, "positionIndex": 1, "positionAlignment": 3},
         {"id": 1188, "trainrunSectionId": 586, "positionIndex": 2, "positionAlignment": 3}

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

@@ -232,7 +232,7 @@ export class TrainrunIterator {
       this.currentElement = this.pointerElement;
       this.pointerElement = new TrainrunSectionNodePair(undefined, undefined);
       // log the issue
-      this.logService.error(
+      this.logService?.error(
         $localize`:@@app.services.util.trainrun-iteration.error.infinity-loop:Iterator has detected an infinity loop. The iteration terminated early!`,
         new Error().stack,
       );
@@ -275,7 +275,7 @@ export class BackwardTrainrunIterator extends TrainrunIterator {
       this.currentElement = this.pointerElement;
       this.pointerElement = new TrainrunSectionNodePair(undefined, undefined);
       // log the issue
-      this.logService.error(
+      this.logService?.error(
         $localize`:@@app.services.util.trainrun-iteration.error.infinity-loop:Iterator has detected an infinity loop. The iteration terminated early!`,
         new Error().stack,
       );
@@ -331,3 +331,15 @@ export class ExpandedTrainrunIterator extends TrainrunIterator {
     return super.next();
   }
 }
+
+export class BackwardExpandedStopIterator extends BackwardTrainrunIterator {
+  public next(): TrainrunSectionNodePair {
+    if (!this.pointerElement.node.getIsCollapsed()) {
+      // The trainrun has a stop and break the backward iteration
+      this.currentElement = this.pointerElement;
+      this.pointerElement = new TrainrunSectionNodePair(undefined, undefined);
+      return this.currentElement;
+    }
+    return super.next();
+  }
+}