editoast: add `local_track_name` field to `OperationalPointPart` #14516

hamz2a · 2025-12-19T09:08:27Z

closes #14229

Changes

Add database migration
Add local_track_name string field to OperationalPointPart schema
Update Rust schemas in editoast
Update OpenAPI specification and generated TypeScript client
Update Python schemas in osrd_schemas and railjson_generator
Update RawInfraRJSParser and path_properties core endpoint

github-actions · 2025-12-19T09:08:49Z

⚠️ API changes

This Pull Request introduces some changes in the API:

please own it: notify or even prepare dedicated PR(s) to consumer projects

Changes in Schemas

Dear @hamz2a, please ensure the following:

changes should match in osrd_schemas and editoast schemas
the RailJSON version in osrd_schemas::infra.py and editoast schemas::infra::railjson.rs should match and be bumped on any change of infra schemas (same goes for rolling-stock between osrd_schemas::rolling_stock.py and editoast schemas::rolling_stock.rs)
the version of the Python package in osrd_schemas::pyproject.toml should be bumped on any change

flomonster

LGTM, just need to make small changes with the railjson version.

editoast/schemas/src/infra/railjson.rs

Khoyo · 2025-12-23T18:40:00Z

editoast/schemas/src/infra/operational_point.rs

    #[schema(inline)]
    pub track: Identifier,
    pub position: f64,
+    pub local_track_name: String,


This should be an Option<NonBlankString>.

Khoyo · 2025-12-23T18:40:57Z

core/kt-osrd-rjs-parser/src/main/kotlin/fr/sncf/osrd/RawInfraRJSParser.kt

                props["weight"] = weight
            }
            if (opPart.extensions?.sncf != null) props["kp"] = opPart.extensions!!.sncf!!.kp
+            if (opPart.localTrackName != null && opPart.localTrackName.isNotEmpty()) {


The isNotEmpty check should generate an infra loading warning.

https://github.com/OpenRailAssociation/osrd/compare/86896143a5ab48259c174b8579a78a00f8cbfedb..38d4830ac200427891475d6ec268ab9c03ca83ae#diff-9325fe5faad772881e72d6024d73bade0606de7420d369192dd9486480914c48L780

Khoyo · 2025-12-23T18:41:24Z

core/src/main/kotlin/fr/sncf/osrd/api/path_properties/PathPropResponseConverter.kt

            OperationalPointPartResponse(
                trackSectionName,
                opPartTrackSectionOffset.meters,
+                opPartProps["local_track_name"] ?: "",


Should be null instead of empty string

Khoyo · 2025-12-23T18:41:41Z

editoast/core_client/src/path_properties.rs

            part: OperationalPointPart {
                track: Identifier("T1".to_string()),
                position: 0.0,
+                local_track_name: "".to_string(),


Khoyo · 2025-12-23T18:43:36Z

...on/src/main/java/fr/sncf/osrd/railjson/schema/infra/trackranges/RJSOperationalPointPart.java

 @SuppressFBWarnings({"URF_UNREAD_PUBLIC_OR_PROTECTED_FIELD"})
 public class RJSOperationalPointPart extends RJSTrackObject {
+    @Json(name = "local_track_name")
+    public String localTrackName;


@Nullable

Khoyo · 2025-12-23T18:48:07Z

front/src/applications/operationalStudies/helpers/upsertMapWaypointsInOperationalPoints.ts

            },
          },
-          part: { track: location.track, position: location.offset },
+          part: { track: location.track, position: location.offset, local_track_name: '' },


Khoyo · 2025-12-23T18:48:16Z

front/src/applications/operationalStudies/hooks/usePathProjection.ts

      },
    },
-    part: { track: '', position: 0 },
+    part: { track: '', position: 0, local_track_name: '' },


Khoyo · 2025-12-23T18:48:33Z

front/src/applications/operationalStudies/hooks/usePathProjection.ts

+          part: matchedOp.parts.at(0) || {
+            track: '',
+            position: 0,
+            local_track_name: '',


Khoyo · 2025-12-23T18:51:30Z

python/railjson_generator/railjson_generator/schema/infra/operational_point.py


-    def add_part(self, track, offset):
-        op_part = OperationalPointPart(self, offset)
+    def add_part(self, track, offset, local_track_name):


local_track_name=None

Khoyo · 2025-12-23T18:52:44Z

python/railjson_generator/railjson_generator/schema/infra/operational_point.py

 class OperationalPointPart:
    operational_point: OperationalPoint
    position: float
+    local_track_name: str


Optional[str]

achrafmohye

the front LGTM :)

shenriotpro · 2025-12-24T13:56:37Z

python/osrd_schemas/osrd_schemas/infra.py

    """

-    pass
+    local_track_name: Optional[str] = Field(


I don't think it's supposed to be optional

also you should probably use Identifier, so we get reasonable lengths

I don't think it's supposed to be optional

@Khoyo wdyt ?

shenriotpro · 2025-12-24T13:57:36Z

python/railjson_generator/railjson_generator/schema/infra/infra.py

    neutral_sections: List[NeutralSection] = field(default_factory=list)

-    VERSION = "3.4.13"
+    VERSION = "3.4.14"


you probably should update the packages version as well

thanks, same for osrd_schemas

Signed-off-by: hamz2a <atrari.hamza@gmail.com>

hamz2a requested a review from a team as a code owner December 19, 2025 09:08

github-actions bot added area:railjson Work on Proposed Unified Rail Assets Data Exchange Format area:front Work on Standard OSRD Interface modules area:editoast Work on Editoast Service kind:api-change labels Dec 19, 2025

hamz2a force-pushed the hai/editoast-add-local-track-name-to-operational-point-part branch from ac27cd3 to 73606b2 Compare December 19, 2025 09:11

hamz2a marked this pull request as draft December 19, 2025 09:30

hamz2a force-pushed the hai/editoast-add-local-track-name-to-operational-point-part branch from 73606b2 to ac86618 Compare December 19, 2025 09:36

github-actions bot added the area:integration-tests Work on Integration test, by nature related to different services label Dec 19, 2025

hamz2a force-pushed the hai/editoast-add-local-track-name-to-operational-point-part branch 2 times, most recently from 9bbc80d to aca5389 Compare December 19, 2025 11:01

flomonster approved these changes Dec 19, 2025

View reviewed changes

editoast/schemas/src/infra/railjson.rs Outdated Show resolved Hide resolved

hamz2a force-pushed the hai/editoast-add-local-track-name-to-operational-point-part branch 3 times, most recently from 670a44d to edce075 Compare December 19, 2025 14:21

github-actions bot added the area:core Work on Core Service label Dec 19, 2025

hamz2a force-pushed the hai/editoast-add-local-track-name-to-operational-point-part branch from edce075 to 162540d Compare December 19, 2025 14:35

hamz2a marked this pull request as ready for review December 19, 2025 14:37

hamz2a requested review from a team as code owners December 19, 2025 14:37

hamz2a requested a review from eckter December 19, 2025 14:37

hamz2a force-pushed the hai/editoast-add-local-track-name-to-operational-point-part branch 7 times, most recently from 2ff4d92 to 41eea92 Compare December 23, 2025 13:27

hamz2a force-pushed the hai/editoast-add-local-track-name-to-operational-point-part branch 3 times, most recently from acc3540 to 8689614 Compare December 23, 2025 14:44

Khoyo reviewed Dec 23, 2025

View reviewed changes

hamz2a force-pushed the hai/editoast-add-local-track-name-to-operational-point-part branch 3 times, most recently from 7190e1c to c4fb6a1 Compare December 24, 2025 10:38

hamz2a requested review from Khoyo and shenriotpro December 24, 2025 11:09

achrafmohye approved these changes Dec 24, 2025

View reviewed changes

shenriotpro reviewed Dec 24, 2025

View reviewed changes

hamz2a force-pushed the hai/editoast-add-local-track-name-to-operational-point-part branch from c4fb6a1 to d319802 Compare December 24, 2025 14:22

editoast: add local_track_name field to OperationalPointPart

291b59c

Signed-off-by: hamz2a <atrari.hamza@gmail.com>

hamz2a force-pushed the hai/editoast-add-local-track-name-to-operational-point-part branch from d319802 to 291b59c Compare December 24, 2025 14:33

editoast: add local_track_name field to OperationalPointPart #14516

Are you sure you want to change the base?

editoast: add local_track_name field to OperationalPointPart #14516

Conversation

hamz2a commented Dec 19, 2025 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Changes

Uh oh!

github-actions bot commented Dec 19, 2025

⚠️ API changes

Changes in Schemas

Uh oh!

flomonster left a comment

Choose a reason for hiding this comment

Uh oh!

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!

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!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

achrafmohye 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!

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!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

editoast: add `local_track_name` field to `OperationalPointPart` #14516

editoast: add `local_track_name` field to `OperationalPointPart` #14516

hamz2a commented Dec 19, 2025 •

edited

Loading