wip

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

Author: louisgreiner

src/app/data-structures/business.data.structures.ts

@@ -117,11 +117,14 @@ export interface TrainrunSectionDto {
   targetNodeId: number; // reference to the node by Node.id
   targetPortId: number; // reference to the node by Node.id
 
+  sourceSymmetry: boolean; // binds sourceDeparture and sourceArrival times
+  targetSymmetry: boolean; // binds targetDeparture and targetArrival times
   sourceArrival: TimeLockDto; // declares the soruce arrival time
   sourceDeparture: TimeLockDto; // declares the soruce departure time
   targetArrival: TimeLockDto; // declares the target arrival time
   targetDeparture: TimeLockDto; // declares the target departure time
-  travelTime: TimeLockDto; // declares the travel arrival time
+  travelTime: TimeLockDto; // declares the travel time (forward direction)
+  backwardTravelTime: TimeLockDto; // declares the travel time in the opposite direction
 
   numberOfStops: number; // number of stops - not declared in detail (no node attached)
 
@@ -291,6 +294,7 @@ export interface FilterSettingDto {
   filterNoteLabels: number[]; // labels to filter out (labels only of type - LabelRef: note)
   filterTrainrunLabels: number[]; // labels to filter out (labels only of type - LabelRef: trainrun)
   filterTrainrunDirectionArrows: boolean; // flag for trainrun direction arrows (hide/show)
+  filterTrainrunSectionSymmetryArrows: boolean; // flag for trainrun section symmetry arrows (hide/show)
   filterArrivalDepartureTime: boolean; // flag for arrival and departure time filtering (hide/show)
   filterTravelTime: boolean; // flag for travel time filter (hide/show)
   filterTrainrunName: boolean; // flag for trainrun time filter (hide/show)
@@ -300,6 +304,7 @@ export interface FilterSettingDto {
   filterTrainrunFrequency: TrainrunFrequency[]; // list of frequency to filter out
   filterTrainrunTimeCategory: TrainrunTimeCategory[]; // list of time categroy to filter out
   filterTrainrunDirection: TrainrunDirection[]; // list of trainrun direction to filter out
+  filterTrainrunSectionSymmetry: boolean[]; // list of trainrun symmetry values (true/false) to filter out
   filterAllEmptyNodes: boolean; // flag to filter all empty nodes (hide/show)
   filterAllNonStopNodes: boolean; // flag to filter all only non-stop nodes (hide/show)
   filterNotes: boolean; // flag to filter notes (hide/show)

src/app/data-structures/technical.data.structures.ts

@@ -23,6 +23,7 @@ export enum TrainrunSectionText {
   TargetDeparture,
   TrainrunSectionName,
   TrainrunSectionTravelTime,
+  TrainrunSectionBackwardTravelTime,
   TrainrunSectionNumberOfStops,
 }
 
@@ -38,6 +39,7 @@ export interface TrainrunSectionTextPositions {
   [TrainrunSectionText.TargetDeparture]: PointDto;
   [TrainrunSectionText.TrainrunSectionName]: PointDto;
   [TrainrunSectionText.TrainrunSectionTravelTime]: PointDto;
+  [TrainrunSectionText.TrainrunSectionBackwardTravelTime]: PointDto;
   [TrainrunSectionText.TrainrunSectionNumberOfStops]: PointDto;
 }
 

src/app/models/filterSettings.model.ts

@@ -20,6 +20,7 @@ export class FilterSetting {
   public filterNoteLabels: number[];
   public filterTrainrunLabels: number[];
   public filterTrainrunDirectionArrows;
+  public filterTrainrunSectionSymmetryArrows;
   public filterArrivalDepartureTime;
   public filterTravelTime;
   public filterTrainrunName;
@@ -29,6 +30,7 @@ export class FilterSetting {
   public filterTrainrunFrequency: TrainrunFrequency[];
   public filterTrainrunTimeCategory: TrainrunTimeCategory[];
   public filterTrainrunDirection: TrainrunDirection[];
+  public filterTrainrunSectionSymmetry: boolean[];
   public filterAllEmptyNodes;
   public filterAllNonStopNodes;
   public filterNotes;
@@ -45,6 +47,7 @@ export class FilterSetting {
       filterNoteLabels,
       filterTrainrunLabels,
       filterTrainrunDirectionArrows,
+      filterTrainrunSectionSymmetryArrows,
       filterArrivalDepartureTime,
       filterTravelTime,
       filterTrainrunName,
@@ -54,6 +57,7 @@ export class FilterSetting {
       filterTrainrunFrequency,
       filterTrainrunTimeCategory,
       filterTrainrunDirection,
+      filterTrainrunSectionSymmetry,
       filterAllEmptyNodes,
       filterAllNonStopNodes,
       filterNotes,
@@ -68,6 +72,7 @@ export class FilterSetting {
       filterNoteLabels: [],
       filterTrainrunLabels: [],
       filterTrainrunDirectionArrows: true,
+      filterTrainrunSectionSymmetryArrows: true,
       filterArrivalDepartureTime: true,
       filterTravelTime: true,
       filterTrainrunName: true,
@@ -77,6 +82,7 @@ export class FilterSetting {
       filterTrainrunFrequency: null,
       filterTrainrunTimeCategory: null,
       filterTrainrunDirection: null,
+      filterTrainrunSectionSymmetry: null,
       filterAllEmptyNodes: false,
       filterAllNonStopNodes: false,
       filterNotes: false,
@@ -92,6 +98,7 @@ export class FilterSetting {
     this.filterNoteLabels = filterNoteLabels;
     this.filterTrainrunLabels = filterTrainrunLabels;
     this.filterTrainrunDirectionArrows = filterTrainrunDirectionArrows;
+    this.filterTrainrunSectionSymmetryArrows = filterTrainrunSectionSymmetryArrows;
     this.filterArrivalDepartureTime = filterArrivalDepartureTime;
     this.filterTravelTime = filterTravelTime;
     this.filterTrainrunName = filterTrainrunName;
@@ -101,6 +108,7 @@ export class FilterSetting {
     this.filterTrainrunFrequency = filterTrainrunFrequency;
     this.filterTrainrunTimeCategory = filterTrainrunTimeCategory;
     this.filterTrainrunDirection = filterTrainrunDirection;
+    this.filterTrainrunSectionSymmetry = filterTrainrunSectionSymmetry;
     this.filterAllEmptyNodes = filterAllEmptyNodes;
     this.filterAllNonStopNodes = filterAllNonStopNodes;
     this.filterNotes = filterNotes;
@@ -173,6 +181,7 @@ export class FilterSetting {
       this.filterNoteLabels.length === 0 &&
       this.filterTrainrunLabels.length === 0 &&
       this.filterTrainrunDirectionArrows === true &&
+      this.filterTrainrunSectionSymmetryArrows === true &&
       this.filterArrivalDepartureTime === true &&
       this.filterTravelTime === true &&
       this.filterTrainrunName === true &&
@@ -182,6 +191,7 @@ export class FilterSetting {
       this.filterTrainrunFrequency.length === frainrunFrequenciesLength &&
       this.filterTrainrunTimeCategory.length === trainrunTimeCategoryLength &&
       this.filterTrainrunDirection.length === Object.values(TrainrunDirection).length &&
+      this.filterTrainrunSectionSymmetry.length === 2 &&
       this.filterAllEmptyNodes === false &&
       this.filterAllNonStopNodes === false &&
       this.filterNotes === false &&
@@ -200,6 +210,7 @@ export class FilterSetting {
       filterNoteLabels: this.filterNoteLabels,
       filterTrainrunLabels: this.filterTrainrunLabels,
       filterTrainrunDirectionArrows: this.filterTrainrunDirectionArrows,
+      filterTrainrunSectionSymmetryArrows: this.filterTrainrunSectionSymmetryArrows,
       filterArrivalDepartureTime: this.filterArrivalDepartureTime,
       filterTravelTime: this.filterTravelTime,
       filterTrainrunName: this.filterTrainrunName,
@@ -209,6 +220,7 @@ export class FilterSetting {
       filterTrainrunFrequency: this.filterTrainrunFrequency,
       filterTrainrunTimeCategory: this.filterTrainrunTimeCategory,
       filterTrainrunDirection: this.filterTrainrunDirection,
+      filterTrainrunSectionSymmetry: this.filterTrainrunSectionSymmetry,
       filterAllEmptyNodes: this.filterAllEmptyNodes,
       filterAllNonStopNodes: this.filterAllNonStopNodes,
       filterNotes: this.filterNotes,

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

@@ -162,6 +162,7 @@ describe("TrainrunSection Model Test", () => {
     ts.setSourceDepartureLock(false);
     ts.setSourceArrivalLock(false);
     ts.setTravelTimeLock(false);
+    ts.setBackwardTravelTimeLock(false);
     expect(ts.getTargetDepartureLock()).toBe(false);
     expect(ts.getTargetArrivalLock()).toBe(false);
     expect(ts.getSourceDepartureLock()).toBe(false);
@@ -176,6 +177,7 @@ describe("TrainrunSection Model Test", () => {
     ts.setSourceDepartureLock(false);
     ts.setSourceArrivalLock(false);
     ts.setTravelTimeLock(false);
+    ts.setBackwardTravelTimeLock(false);
     ts.setTargetDepartureLock(true);
     expect(ts.getTargetDepartureLock()).toBe(true);
     expect(ts.getTargetArrivalLock()).toBe(false);
@@ -191,6 +193,7 @@ describe("TrainrunSection Model Test", () => {
     ts.setSourceDepartureLock(false);
     ts.setSourceArrivalLock(false);
     ts.setTravelTimeLock(false);
+    ts.setBackwardTravelTimeLock(false);
     ts.setTargetArrivalLock(true);
     expect(ts.getTargetDepartureLock()).toBe(false);
     expect(ts.getTargetArrivalLock()).toBe(true);
@@ -206,6 +209,7 @@ describe("TrainrunSection Model Test", () => {
     ts.setSourceDepartureLock(false);
     ts.setSourceArrivalLock(false);
     ts.setTravelTimeLock(false);
+    ts.setBackwardTravelTimeLock(false);
     ts.setSourceDepartureLock(true);
     expect(ts.getTargetDepartureLock()).toBe(false);
     expect(ts.getTargetArrivalLock()).toBe(false);
@@ -221,6 +225,7 @@ describe("TrainrunSection Model Test", () => {
     ts.setSourceDepartureLock(false);
     ts.setSourceArrivalLock(false);
     ts.setTravelTimeLock(false);
+    ts.setBackwardTravelTimeLock(false);
     ts.setSourceArrivalLock(true);
     expect(ts.getTargetDepartureLock()).toBe(false);
     expect(ts.getTargetArrivalLock()).toBe(false);
@@ -236,7 +241,9 @@ describe("TrainrunSection Model Test", () => {
     ts.setSourceDepartureLock(false);
     ts.setSourceArrivalLock(false);
     ts.setTravelTimeLock(false);
+    ts.setBackwardTravelTimeLock(false);
     ts.setTravelTimeLock(true);
+    ts.setBackwardTravelTimeLock(true);
     expect(ts.getTargetDepartureLock()).toBe(false);
     expect(ts.getTargetArrivalLock()).toBe(false);
     expect(ts.getSourceDepartureLock()).toBe(false);