feat: modify node display #554

Math-R · 2025-10-07T12:50:12Z

Description

This PR implements the collapsed nodes functionality for the Netzgrafik editor, allowing intermediate nodes to be hidden while maintaining proper visual representation of train routes.

Features Implemented

1. Node Model Enhancement

Added isCollapsed field to Node model with getter/setter methods
Integrated collapsed state into node serialization/deserialization
Maintains backward compatibility with existing data

2. Visual Filtering System

NodesView: Filter out collapsed nodes from visual display
ConnectionsView: Hide connections associated with collapsed nodes
TransitionsView: Hide transitions for collapsed nodes
Collapsed nodes become completely invisible in the editor

3. Intelligent Section Grouping

TrainrunSectionService.groupTrainrunSectionsIntoChains(): Algorithm to group sections with collapsed intermediate nodes
Automatically detects chains like A→B→C→D where B,C are collapsed
Creates grouped objects with proper start/end node references

4. Direct Path Calculation

TrainrunSectionsView.createViewObjectForCollapsedChain(): Creates direct visual paths A→D bypassing collapsed nodes
Automatic routing that circumvents collapsed intermediate nodes
Proper port calculation for direct connections

User Experience

Nodes marked as collapsed become invisible
Train routes A→B→C→D (with B,C collapsed) display as direct A→D connections
Interface remains coherent and schedules are preserved
No impact on existing data or workflows

Technical Implementation

Zero breaking changes to existing data structures
Clean separation between data model and visual representation
Proper TypeScript typing throughout

Issues

Related to feature request for collapsed nodes functionality to simplify complex network display.

Checklist

This PR contains a description of the changes I'm making
I've read the Contribution Guidelines
Core functionality implemented and tested: Node filtering, section grouping, path calculation working
I've added tests for changes or features I've introduced (comprehensive tests planned for follow-up PR)
I documented any high-level concepts I'm introducing in documentation/ (documentation to be added in follow-up)
TypeScript compilation clean: No compilation errors
Backward compatibility preserved: No breaking changes to existing data
Ready for functional testing: Core collapsed nodes feature fully operational

Next Steps (Future PRs)

Node creation UI for collapsed nodes
Legacy file compatibility (numberOfStops conversion)
Comprehensive unit test suite
User documentation and examples
Port assignment optimization for parallel routing

aiAdrian · 2025-10-07T19:42:18Z

Thanks you for the new feature - would it be possible to get a live demo?

aiAdrian · 2025-10-07T19:50:16Z

I haven't done a full review yet, but at first glance I don't understand why:

TrainrunSectionViewObject → there's no change trigger for isCollapsed
NodeViewObject → there's no change trigger for isCollapsed

It seems there's no change status (generateKey) related to isCollapsed. These objects are supposed to signal that something has changed so that a visual update can be triggered (i.e., only render what has changed to improve performance). I assume that if we don't explicitly trigger the update (mark the object as changed), it won't be updated (rendered).

  displayNodes(inputNodes: Node[]) {
    const nodes = inputNodes.filter(
      (n) =>
        this.editorView.doCullCheckPositionsInViewport([
          new Vec2D(n.getPositionX(), n.getPositionY()),
          new Vec2D(n.getPositionX() + n.getNodeWidth(), n.getPositionY()),
          new Vec2D(n.getPositionX(), n.getPositionY() + n.getNodeHeight()),
          new Vec2D(n.getPositionX() + n.getNodeWidth(), n.getPositionY() + n.getNodeHeight()),
        ]) && this.filterNodesToDisplay(n),
    );

    const group = this.nodeGroup
      .selectAll(StaticDomTags.NODE_ROOT_CONTAINER_DOM_REF)
      .data(this.createViewNodeDataObjects(nodes), (n: NodeViewObject) => n.key);

...

(see: https://github.com/OpenRailAssociation/netzgrafik-editor-frontend/blob/main/src/app/view/editor-main-view/data-views/nodes.view.ts#L106)

It would be very helpful if we could add some tests to verify that changes to isCollapsed and it's functionality are functioning as intended.

Even if this doesn't directly affect the visualization layer, it’s still important for the underlying service methods, especially in areas like data migration. The base functionality should be properly tested to ensure robustness and maintainability.

Synar · 2025-10-09T01:45:25Z

src/app/view/editor-main-view/data-views/connections.view.ts


    const node: Node = this.editorView.getNodeFromConnection(con);
+
+    // filter if node is collapsed - do not show connections for collapsed nodes


Tiny nit: why the comment here and not in transitions.view.ts?

louisgreiner · 2025-10-13T11:43:53Z

Context: This PR implements part of the 3 first sections of the implementation plan given here

louisgreiner

LGTM, not tested.

Maybe, instead of fully hiding the nodes when isCollapsed is true, you should display them as a "Dot", as it is shown here (mock-up from main issue). But maybe you've planned to do it in the next PR, ignore this comment if so.

louisgreiner · 2025-10-13T11:45:58Z

src/app/view/editor-main-view/data-views/nodes.view.ts


  filterNodesToDisplay(node: Node): boolean {
-    return this.editorView.isNodeVisible(node);
+    return this.editorView.isNodeVisible(node) && !node.getIsCollapsed();


Nit: isCollapsed() would be nice instead of getIsCollapsed()

louisgreiner · 2025-10-13T11:49:28Z

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

+  groupTrainrunSectionsIntoChains(trainrunSections: TrainrunSection[]): Array<{
+    sections: TrainrunSection[];
+    startNode: Node;
+    endNode: Node;
+  }> {


Nice function, very readable. I wonder if we could/should create a new type for the group object, if it will be reused elsewhere

Thanks for the suggestion, as I simplified it thanks to @emersion it's no longer necessary

emersion

Thanks for splitting the changes into small commits! Here are a few comments.

src/app/view/editor-main-view/data-views/trainrunsections.view.ts

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

Synar

Made a pass, nothing to add for now. I'll do another pass after you resolved @emersion's comments.

Math-R · 2025-10-16T13:10:45Z

I haven't done a full review yet, but at first glance I don't understand why:

TrainrunSectionViewObject → there's no change trigger for isCollapsed

NodeViewObject → there's no change trigger for isCollapsed

It seems there's no change status (generateKey) related to isCollapsed. These objects are supposed to signal that something has changed so that a visual update can be triggered (i.e., only render what has changed to improve performance). I assume that if we don't explicitly trigger the update (mark the object as changed), it won't be updated (rendered).
  displayNodes(inputNodes: Node[]) {
    const nodes = inputNodes.filter(
      (n) =>
        this.editorView.doCullCheckPositionsInViewport([
          new Vec2D(n.getPositionX(), n.getPositionY()),
          new Vec2D(n.getPositionX() + n.getNodeWidth(), n.getPositionY()),
          new Vec2D(n.getPositionX(), n.getPositionY() + n.getNodeHeight()),
          new Vec2D(n.getPositionX() + n.getNodeWidth(), n.getPositionY() + n.getNodeHeight()),
        ]) && this.filterNodesToDisplay(n),
    );

    const group = this.nodeGroup
      .selectAll(StaticDomTags.NODE_ROOT_CONTAINER_DOM_REF)
      .data(this.createViewNodeDataObjects(nodes), (n: NodeViewObject) => n.key);

... 
(see: https://github.com/OpenRailAssociation/netzgrafik-editor-frontend/blob/main/src/app/view/editor-main-view/data-views/nodes.view.ts#L106)

It would be very helpful if we could add some tests to verify that changes to isCollapsed and it's functionality are functioning as intended.

Even if this doesn't directly affect the visualization layer, it’s still important for the underlying service methods, especially in areas like data migration. The base functionality should be properly tested to ensure robustness and maintainability.

Sorry for the late answer. i'm not sure to completly understand your first point. And sure, I will add some test in the next commit

emersion

I haven't time to read this in full yet, sorry. Here are some comments still.

As mentioned in the implementation plan, I don't think keeping a TrainrunSectionViewObject.trainrunSection is great. I think replacing it with a trainrunSections: TrainrunSection[] field would ensure we never grab information from the first trainrun when we would need to grab it from the last, or from intermediate sections. For instance the target arrival time as mentioned below in comments, but applies to others as well.

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

src/app/view/editor-main-view/data-views/trainrunSectionViewObject.ts

emersion · 2025-10-17T14:55:40Z

src/app/view/editor-main-view/data-views/trainrunsections.view.ts

+    // Check if this section is part of a collapsed chain
+    const collapsedChainPath = this.getCollapsedChainNodePath(trainrunSection);
+
+    if (collapsedChainPath && collapsedChainPath.length >= 2) {


Do we really need to have two codepaths? I think the collapsed codepath should work when the full chain just has a single element too?

…vice

…nodes

- Add createViewObjectForCollapsedChain() static method to handle path routing between start/end nodes - Replace standard TrainrunSectionViewObject creation with custom method for collapsed chains - Path now correctly goes from first visible node to last visible node instead of using primary section's path

Signed-off-by: Simon Ser <[email protected]>

…hain Signed-off-by: Simon Ser <[email protected]>

TrainrunSectionViewObject will represent multiple trainrun sections soon. Add a helper to get the parent trainrun to reduce reliance on a single trainrun. Signed-off-by: Simon Ser <[email protected]>

This makes it clear that there isn't a single trainrun section per TrainrunSectionViewObject: a single TrainrunSectionViewObject can hold multiple sections. The full collapsed chain is stored. For now, blindly replace trainrunSection with trainrunSections[0], to be cleaned up in future commits. Signed-off-by: Simon Ser <[email protected]>

Signed-off-by: Simon Ser <[email protected]>

The TrainrunSectionViewObject already contains the full chain, no need to re-compute it. Signed-off-by: Simon Ser <[email protected]>

src/app/view/editor-main-view/data-views/trainrunsections.view.ts

clarani

Nice work, I left some small comments and some questions :) I didn't have the time to read all the files

clarani · 2025-11-06T10:58:55Z

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

+        if (visitedSections.has(pair.trainrunSection.getId())) {
+          break; // Already processed this section
+        }


Small question, this case should never happen right ?

Yes, normally this case should never happen, it's a relicat from previous development, but now we find the first section of the chain, thanks to the backward iterator.
But it can prevent infinite cycle if this iterator is changed in further development, maybe we can use this check to log an error and break to help and prevent regression in further development ?

Throwing an error sounds good to me.

clarani · 2025-11-06T11:02:25Z

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

    return new BackwardNonStopTrainrunIterator(this.logService, node, trainrunSection);
  }
+
+  public getExpandedIterator(node: Node, trainrunSection: TrainrunSection) {


I'm not sure this function is used anymore

True, good catch i'll remove it

clarani · 2025-11-06T11:03:45Z

src/app/view/editor-main-view/data-views/trainrunSectionViewObject.ts

+    key += "_SRC_" + d.getSourceNode().getPositionX() + "_" + d.getSourceNode().getPositionY();
+    key += "_TRG_" + d.getTargetNode().getPositionX() + "_" + d.getTargetNode().getPositionY();


❓ Why do you need to add these information in the key ?

i added thsi to the key, to refresh the path when boundaries nodes moves. Préviously when i was moving the arrival node, the TrS was in a disconnected visual state, until i also move the start node.

This has been dropped in #605.

clarani · 2025-11-06T11:14:03Z

src/app/view/editor-main-view/data-views/trainrunsections.view.ts

+      if (connectedSections.length === 1) {
+        currentSection = connectedSections[0];
+      } else {
+        break;
+      }


If I understand correctly, the goal here is to break if there is no connection (because we have reached the end of the chain). Then, it would be clearer to state this in the if condition:

Suggested change

if (connectedSections.length === 1) {

currentSection = connectedSections[0];

} else {

break;

}

if (connectedSections.length === 0) {

break;

} else {

currentSection = connectedSections[0];

}

Also, is it possible to have connectedSections.length > 1 ? is it normal to break right now if it is the case ?

No if you reach the end of the section there is only one connected section, the previous one, if there is 0 connectedSection is because you're not in a chain, if there is 2 you are between 2 sections

This code has been dropped in #605.

clarani · 2025-11-06T11:26:28Z

src/app/view/editor-main-view/data-views/trainrunsections.view.ts

+    const sourcePort =
+      startNode.getPortOfTrainrunSection(firstSection.getId()) ?? startNode.getPorts()[0];


If I understand correctly, if you don't find a port with the correct section id, you take the first one ? Is it a good behavior ?

Hmm yes it can end up using an already used port. I'm not sure of how to handle this one @louisgreiner ?

…Key() We were only using the first trainrun section's path here. Expose a getPath() method to get a view object's path. We need to call it from inside generateKey() so drop the static attribute. While at it, make the generateKey() helper function private because it shouldn't be called from elsewhere. Signed-off-by: Simon Ser <[email protected]>

Target arrival was included twice, and source arrival was missing. Signed-off-by: Simon Ser <[email protected]>

We were only grabbing metadata from the first section, but we need to make the key change when the last section changes. Signed-off-by: Simon Ser <[email protected]>

Instead, grab the path from TrainrunSectionViewObject.getPath(). We need to update a few functions to take the veiw object instead of the first trainrun section. Signed-off-by: Simon Ser <[email protected]>

This function overwrites a trainrun section's path. Instead, pick the right section (first or last) when computing path-related outputs. Signed-off-by: Simon Ser <[email protected]>

emersion · 2025-11-07T14:24:48Z

src/app/view/editor-main-view/data-views/trainrunsections.view.ts

+  /**
+   * Get the value to show for collapsed chains (with corrected times)
+   */
+  getTrainrunSectionValueToShowWithCollapsedSupport(


I'd like to merge this function with getTrainrunSectionValueToShow: the logic is very similar, just need to use the correct TrainrunSection from there instead of always picking the first one.

emersion · 2025-11-07T14:26:27Z

src/app/view/editor-main-view/data-views/trainrunsections.view.ts

+  /**
+   * Apply basic filtering to a path
+   */
+  private applyBasicFiltering(path: Vec2D[], ts: TrainrunSection): Vec2D[] {


Ditto: I'd like to drop this function and pick the trgNode from the last section in transformPath, instead of picking it from the first section.

emersion · 2025-11-07T14:28:59Z

src/app/view/editor-main-view/data-views/trainrunsections.view.ts

+  /**
+   * Version that works with TrainrunSectionViewObject for collapsed chains
+   */
+  static getAdditionPositioningValueForViewObject(


Ditto: I'd like to fold this into getAdditionPositioningValue

emersion · 2025-11-07T14:30:13Z

src/app/view/editor-main-view/data-views/trainrunsections.view.ts

+   * Version that works with TrainrunSectionViewObject to handle custom paths for collapsed chains
+   * This method needs access to the view instance to get the collapsed path
+   */
+  static translateAndRotateTextForViewObject(


Ditto for this function, as well as getTextPositionsForCollapsedChain, getAdditionPositioningValueForViewObjectWithCollapsedSupport and translateAndRotateTextForViewObjectWithCollapsedSupport. We shouldn't need to duplicate all of the logic here.

emersion · 2025-11-07T14:32:25Z

src/app/view/editor-main-view/data-views/trainrunSectionViewObject.ts

+      firstSection.getNumberOfStops() +
      "_" +
-      d.getTravelTime() +
+      firstSection.getTravelTime() +


Instead of picking the travel time of the first section, we should compute the total travel time of the whole chain.

We already have logic for this in getTrainrunSectionValueToShowWithCollapsedSupport, I think we can add a new TrainrunSectionViewObject.getTravelTime method to centralize it.

Math-R force-pushed the mrd/modify-node-display branch 4 times, most recently from 087bc7c to 185666b Compare October 7, 2025 16:41

Math-R marked this pull request as ready for review October 7, 2025 16:41

Math-R requested a review from aiAdrian as a code owner October 7, 2025 16:41

Math-R self-assigned this Oct 7, 2025

Math-R requested review from Synar, emersion and louisgreiner October 7, 2025 16:42

Synar reviewed Oct 9, 2025

View reviewed changes

louisgreiner approved these changes Oct 13, 2025

View reviewed changes

emersion reviewed Oct 13, 2025

View reviewed changes

src/app/view/editor-main-view/data-views/trainrunsections.view.ts Outdated Show resolved Hide resolved

src/app/services/data/trainrunsection.service.ts Outdated Show resolved Hide resolved

src/app/services/data/trainrunsection.service.ts Show resolved Hide resolved

Synar reviewed Oct 14, 2025

View reviewed changes

Math-R force-pushed the mrd/modify-node-display branch 3 times, most recently from c4cc009 to 6145bff Compare October 16, 2025 13:06

Math-R force-pushed the mrd/modify-node-display branch 2 times, most recently from a1d2b05 to fa9b231 Compare October 16, 2025 15:03

Math-R requested review from Synar, emersion and louisgreiner October 16, 2025 15:04

emersion reviewed Oct 17, 2025

View reviewed changes

Math-R force-pushed the mrd/modify-node-display branch from fa9b231 to 48fd522 Compare October 22, 2025 12:39

louisgreiner mentioned this pull request Oct 23, 2025

Backward and non-stop backward iterators #586

Merged

3 tasks

nodes: add the iscollapsed param to the node diplay filtering function

3b0bf7f

Math-R added 4 commits October 28, 2025 11:54

feat: add grouping function for collapsed nodes in TrainrunSectionSer…

04056e8

…vice

feat: implement TrainrunSection grouping in view layer for collapsed …

719f497

…nodes

fix : calc without temporal dto changes + avoid manual handroll

871f667

Math-R force-pushed the mrd/modify-node-display branch from 48fd522 to 871f667 Compare October 28, 2025 11:20

Math-R force-pushed the mrd/new-nodes-management-system branch from 066c751 to 84527fb Compare October 29, 2025 09:25

emersion mentioned this pull request Oct 31, 2025

Fixes for collapsed nodes support in main editor view #602

Merged

emersion added 7 commits November 4, 2025 14:55

fixup! fix start node in groupTrainrunSectionsIntoChains()

abf1f83

Signed-off-by: Simon Ser <[email protected]>

fixup! only create a single TrainrunSectionViewObject per collapsed c…

78e1a92

…hain Signed-off-by: Simon Ser <[email protected]>

Add TrainrunSectionViewObject.getTrainrun()

42b4f8d

TrainrunSectionViewObject will represent multiple trainrun sections soon. Add a helper to get the parent trainrun to reduce reliance on a single trainrun. Signed-off-by: Simon Ser <[email protected]>

fixup! simplify text nodes position computation

c43b300

Signed-off-by: Simon Ser <[email protected]>

fixup! drop unnecessary getCollapsedChainValueToShow() wrapper

b8df4bb

Signed-off-by: Simon Ser <[email protected]>

fixup! drop getAllSectionsInCollapsedChain()

7ade86b

The TrainrunSectionViewObject already contains the full chain, no need to re-compute it. Signed-off-by: Simon Ser <[email protected]>

emersion self-requested a review November 4, 2025 14:48

emersion mentioned this pull request Nov 5, 2025

Cleanups for collapsed nodes support in main editor view #605

Merged

emersion reviewed Nov 5, 2025

View reviewed changes

src/app/view/editor-main-view/data-views/trainrunsections.view.ts Outdated Show resolved Hide resolved

clarani reviewed Nov 6, 2025

View reviewed changes

emersion added 5 commits November 7, 2025 11:19

Fix missing source arrival in TrainrunSectionViewObject.generateKey()

1a466ae

Target arrival was included twice, and source arrival was missing. Signed-off-by: Simon Ser <[email protected]>

fixup! use last section in TrainrunSectionViewObject.generateKey()

6a3040c

We were only grabbing metadata from the first section, but we need to make the key change when the last section changes. Signed-off-by: Simon Ser <[email protected]>

fixup! drop TrainrunSectionsView.getCollapsedChainPath()

c2d19b1

Instead, grab the path from TrainrunSectionViewObject.getPath(). We need to update a few functions to take the veiw object instead of the first trainrun section. Signed-off-by: Simon Ser <[email protected]>

fixup! drop updateTrainrunSectionPathForCollapsedChain()

74da689

This function overwrites a trainrun section's path. Instead, pick the right section (first or last) when computing path-related outputs. Signed-off-by: Simon Ser <[email protected]>

emersion mentioned this pull request Nov 7, 2025

Key-related fixes for collapsed nodes support in main editor view #608

Open

emersion reviewed Nov 7, 2025

View reviewed changes

jacomyal mentioned this pull request Nov 10, 2025

feat: adds global nodes management form #613

Draft

5 tasks


		const node: Node = this.editorView.getNodeFromConnection(con);

		// filter if node is collapsed - do not show connections for collapsed nodes

		key += "_SRC_" + d.getSourceNode().getPositionX() + "_" + d.getSourceNode().getPositionY();
		key += "_TRG_" + d.getTargetNode().getPositionX() + "_" + d.getTargetNode().getPositionY();

		const sourcePort =
		startNode.getPortOfTrainrunSection(firstSection.getId()) ?? startNode.getPorts()[0];

feat: modify node display #554

Are you sure you want to change the base?

feat: modify node display #554

Uh oh!

Conversation

Math-R commented Oct 7, 2025 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Description

Features Implemented

1. Node Model Enhancement

2. Visual Filtering System

3. Intelligent Section Grouping

4. Direct Path Calculation

User Experience

Technical Implementation

Issues

Checklist

Next Steps (Future PRs)

Uh oh!

aiAdrian commented Oct 7, 2025 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

aiAdrian commented Oct 7, 2025 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

Choose a reason for hiding this comment

Uh oh!

louisgreiner commented Oct 13, 2025

Uh oh!

louisgreiner left a comment

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

emersion left a comment

Choose a reason for hiding this comment

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Synar left a comment • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Math-R commented Oct 16, 2025

Uh oh!

emersion left a comment

Choose a reason for hiding this comment

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Uh oh!

clarani left a comment • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Math-R commented Oct 7, 2025 •

edited

Loading

aiAdrian commented Oct 7, 2025 •

edited

Loading

aiAdrian commented Oct 7, 2025 •

edited

Loading

Synar left a comment •

edited

Loading

clarani left a comment •

edited

Loading

emersion Nov 7, 2025 •

edited

Loading