front: fix track offset nodes in NGE #13768
Open
+68
−17
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
When building an OSRD train path, we were unconditionally using the trigram from the NGE node's betriebspunktName field. This worked fine for OPs with a trigram, but fell apart for track offsets (and infrastructures without trigrams). Instead, reconstruct the PathItemLocation from the path_item_key stored in MacroEditorState.nodes. As a bonus, this makes it so path item location types are no longer changed to trigrams when editing a train from NGE: if a train was created with UICs from OSRD, editing it in NGE will retain UICs now. We still need to keep the old betriebspunktName-based logic for NGE JSON file imports. Signed-off-by: Simon Ser <[email protected]> Closes: #12618
Caracol3
reviewed
Oct 23, 2025
Comment on lines
256
to
257
| result.push(`trigram:${trigram}${ch ? `/${ch}` : ''}`); | ||
| result.push(`uic:${uic}${ch ? `/${ch}` : ''}`); |
There was a problem hiding this comment.
Can't we have a problem if op.extensions?.sncf and op.extensions?.identifier are null and then pass invalid keys like trigram:undefined and uic:undefined to parsePathKey() ?
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
2 participants
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
When building an OSRD train path, we were unconditionally using the trigram from the NGE node's betriebspunktName field. This worked fine for OPs with a trigram, but fell apart for track offsets (and infrastructures without trigrams).
Instead, reconstruct the PathItemLocation from the path_item_key stored in MacroEditorState.nodes.
As a bonus, this makes it so path item location types are no longer changed to trigrams when editing a train from NGE: if a train was created with UICs from OSRD, editing it in NGE will retain UICs now.
We still need to keep the old betriebspunktName-based logic for NGE JSON file imports.
Closes: #12618