Rename operational point fields for the international format

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

@@ -751,19 +751,16 @@ fun parseRJSInfra(rjsInfra: RJSInfra): RawInfra {
             val trackSectionName = opPart.track
             val trackSectionOffset = Offset<TrackSection>(opPart.position.meters)
             val props = mutableMapOf<String, String>()
-            if (operationalPoint.extensions?.identifier != null) {
-                val identifier = operationalPoint.extensions!!.identifier!!
-                props["identifier"] = identifier.name
-                props["uic"] = identifier.uic.toString()
-            }
-            if (operationalPoint.extensions?.sncf != null) {
-                val sncf = operationalPoint.extensions!!.sncf!!
-                props["ci"] = sncf.ci.toString()
-                props["ch"] = sncf.ch
-                props["chShortLabel"] = sncf.chShortLabel
-                props["chLongLabel"] = sncf.chLongLabel
-                props["trigram"] = sncf.trigram
-            }
+            props["name"] = operationalPoint.name
+            props["uic"] = operationalPoint.uic.toString()
+            props["mainCode"] = operationalPoint.mainCode
+            props["countryCode"] = operationalPoint.countryCode
+            props["isPassengerStation"] = operationalPoint.isPassengerStation.toString()
+            if (operationalPoint.plc != null) props["plc"] = operationalPoint.plc!!
+            if (operationalPoint.secondaryCode != null)
+                props["secondaryCode"] = operationalPoint.secondaryCode!!
+            if (operationalPoint.secondaryName != null)
+                props["secondaryName"] = operationalPoint.secondaryName!!
             val weight = operationalPoint.weight
             if (weight != null) {
                 props["weight"] = weight

core/osrd-railjson/build.gradle

@@ -13,7 +13,6 @@ java {
 
 dependencies {
     // PLEASE ADD AND UPDATE DEPENDENCIES USING libs.versions.toml
-
     implementation project(':osrd-mp')
 
     // fast primitive collections

core/osrd-railjson/src/main/java/fr/sncf/osrd/railjson/schema/infra/RJSInfra.java

@@ -22,7 +22,7 @@ public class RJSInfra {
             .build()
             .adapter(RJSInfra.class);
 
-    public static final transient String CURRENT_VERSION = "3.5.2";
+    public static final transient String CURRENT_VERSION = "3.5.3";
 
     /** The version of the infra format used */
     public String version;

core/osrd-railjson/src/main/java/fr/sncf/osrd/railjson/schema/infra/RJSOperationalPoint.kt

@@ -0,0 +1,19 @@
+package fr.sncf.osrd.railjson.schema.infra
+
+import com.squareup.moshi.Json
+import fr.sncf.osrd.railjson.schema.common.Identified
+import fr.sncf.osrd.railjson.schema.infra.trackranges.RJSOperationalPointPart
+
+class RJSOperationalPoint(
+    override val id: String,
+    val parts: List<RJSOperationalPointPart>,
+    val weight: String?,
+    val name: String,
+    val uic: Long?,
+    val plc: String?,
+    @Json(name = "country_code") val countryCode: String,
+    @Json(name = "main_code") val mainCode: String,
+    @Json(name = "secondary_code") val secondaryCode: String?,
+    @Json(name = "is_passenger_station") val isPassengerStation: Boolean,
+    @Json(name = "secondary_name") val secondaryName: String?,
+) : Identified

core/settings.gradle

@@ -1,7 +1,7 @@
 pluginManagement {
     repositories {
         gradlePluginPortal()
-        maven { url "https://maven-central.storage-download.googleapis.com/maven2/" }
+        maven { url = "https://maven-central.storage-download.googleapis.com/maven2/" }
         mavenCentral()
     }
 }
@@ -30,7 +30,7 @@ dependencyResolutionManagement {
     versionCatalogs
     repositoriesMode.set(RepositoriesMode.FAIL_ON_PROJECT_REPOS)
     repositories {
-        maven { url "https://maven-central-eu.storage-download.googleapis.com/maven2/" }
+        maven { url = "https://maven-central-eu.storage-download.googleapis.com/maven2/" }
         mavenCentral()
     }
 }

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

@@ -31,9 +31,16 @@ class NonElectrified : Electrification
 data class OperationalPointResponse(
     val id: String,
     val part: OperationalPointPartResponse,
-    val extensions: OperationalPointExtensions?,
     val position: Offset<PhysicsPath>,
     val weight: Long?,
+    val name: String,
+    val uic: Long?,
+    val plc: String?,
+    @Json(name = "country_code") val countryCode: String,
+    @Json(name = "main_code") val mainCode: String,
+    @Json(name = "secondary_code") val secondaryCode: String?,
+    @Json(name = "is_passenger_station") val isPassengerStation: Boolean,
+    @Json(name = "secondary_name") val secondaryName: String?,
 )
 
 data class OperationalPointPartResponse(
@@ -43,21 +50,6 @@ data class OperationalPointPartResponse(
     val extensions: OperationalPointPartExtension?,
 )
 
-data class OperationalPointExtensions(
-    val sncf: OperationalPointSncfExtension?,
-    val identifier: OperationalPointIdentifierExtension?,
-)
-
-data class OperationalPointSncfExtension(
-    val ci: Long,
-    val ch: String,
-    @Json(name = "ch_short_label") val chShortLabel: String,
-    @Json(name = "ch_long_label") val chLongLabel: String,
-    val trigram: String,
-)
-
-data class OperationalPointIdentifierExtension(val name: String, val uic: Long)
-
 data class OperationalPointPartExtension(val sncf: OperationalPointPartSncfExtension?)
 
 data class OperationalPointPartSncfExtension(val kp: String)

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

@@ -84,31 +84,22 @@ private fun makeOperationalPoints(
                         OperationalPointPartSncfExtension(opPartProps["kp"]!!)
                     ),
             )
-        // If ci is null, then all its other values and the entire op sncf extension are null
-        val opSncfExtension =
-            if (opPartProps["ci"] == null) null
-            else
-                OperationalPointSncfExtension(
-                    opPartProps["ci"]!!.toLong(),
-                    opPartProps["ch"]!!,
-                    opPartProps["chShortLabel"]!!,
-                    opPartProps["chLongLabel"]!!,
-                    opPartProps["trigram"]!!,
-                )
-        // if name is null, uic and the op id extension are null
-        val opIdExtension =
-            if (opPartProps["identifier"] == null) null
-            else
-                OperationalPointIdentifierExtension(
-                    opPartProps["identifier"]!!,
-                    opPartProps["uic"]!!.toLong(),
-                )
-        val opExtensions =
-            if (opSncfExtension == null && opIdExtension == null) null
-            else OperationalPointExtensions(opSncfExtension, opIdExtension)
         val weight = if (opPartProps["weight"] == null) null else opPartProps["weight"]!!.toLong()
         val opResult =
-            OperationalPointResponse(operationalPointId, opPartResult, opExtensions, offset, weight)
+            OperationalPointResponse(
+                operationalPointId,
+                opPartResult,
+                offset,
+                weight,
+                opPartProps["name"]!!,
+                opPartProps["uic"]?.toLong(),
+                opPartProps["plc"],
+                opPartProps["countryCode"]!!,
+                opPartProps["mainCode"]!!,
+                opPartProps["secondaryCode"],
+                opPartProps["isPassengerStation"] == "true",
+                opPartProps["secondaryName"],
+            )
         res.add(opResult)
     }
     return res

core/src/test/kotlin/fr/sncf/osrd/pathfinding/PathPropEndpointTest.kt

@@ -59,22 +59,30 @@ class PathPropEndpointTest : ApiTest() {
                 OperationalPointResponse(
                     "West_station",
                     OperationalPointPartResponse("TA0", 700.0, "V1", null),
-                    OperationalPointExtensions(
-                        OperationalPointSncfExtension(22, "BV", "BV", "0", "WS"),
-                        OperationalPointIdentifierExtension("West_station", 8722),
-                    ),
                     Offset(650.meters),
                     null,
+                    "West_station",
+                    8722,
+                    null,
+                    "FR",
+                    "WS",
+                    "BV",
+                    true,
+                    "0",
                 ),
                 OperationalPointResponse(
                     "West_station",
                     OperationalPointPartResponse("TA1", 500.0, "V2", null),
-                    OperationalPointExtensions(
-                        OperationalPointSncfExtension(22, "BV", "BV", "0", "WS"),
-                        OperationalPointIdentifierExtension("West_station", 8722),
-                    ),
                     Offset(2450.meters),
                     null,
+                    "West_station",
+                    8722,
+                    null,
+                    "FR",
+                    "WS",
+                    "BV",
+                    true,
+                    "0",
                 ),
             )
         assertEquals(parsed.operationalPoints, oPs)

core/src/test/kotlin/fr/sncf/osrd/sim_infra_adapter/PathPropertiesTests.kt

@@ -7,8 +7,6 @@ import fr.sncf.osrd.path.implementations.buildTrainPathFromBlock
 import fr.sncf.osrd.railjson.schema.common.graph.ApplicableDirection
 import fr.sncf.osrd.railjson.schema.geom.RJSLineString
 import fr.sncf.osrd.railjson.schema.infra.RJSOperationalPoint
-import fr.sncf.osrd.railjson.schema.infra.RJSOperationalPointExtensions
-import fr.sncf.osrd.railjson.schema.infra.RJSOperationalPointSncfExtension
 import fr.sncf.osrd.railjson.schema.infra.trackranges.*
 import fr.sncf.osrd.railjson.schema.rollingstock.RJSLoadingGaugeType
 import fr.sncf.osrd.sim_infra.api.BlockId
@@ -105,7 +103,13 @@ class PathPropertiesTests {
                 "new_op_1",
                 listOf(RJSOperationalPointPart("ne.micro.foo_a", 200.0, "V1", null)),
                 null,
+                "new_op_1",
+                0,
+                null,
+                "FR",
+                "TRI",
                 null,
+                false,
                 null,
             )
         )
@@ -114,7 +118,13 @@ class PathPropertiesTests {
                 "new_op_2",
                 listOf(RJSOperationalPointPart("ne.micro.bar_a", 0.0, "V1", null)),
                 null,
+                "new_op_2",
+                0,
+                null,
+                "FR",
+                "TRI",
                 null,
+                false,
                 null,
             )
         )
@@ -172,12 +182,15 @@ class PathPropertiesTests {
                             ),
                         ),
                     ),
-                    RJSOperationalPointExtensions(
-                        RJSOperationalPointSncfExtension(0, "BV", "B", "0", "TRI"),
-                        null,
-                    ),
                     null,
+                    "point1",
+                    0,
                     null,
+                    "FR",
+                    "TRI",
+                    "0",
+                    false,
+                    "0",
                 ),
                 RJSOperationalPoint(
                     "point2",
@@ -193,8 +206,14 @@ class PathPropertiesTests {
                         RJSOperationalPointPart("TA1", 1_950.0, "V1", null),
                     ),
                     null,
+                    "point2",
+                    0,
                     null,
-                    null,
+                    "FR",
+                    "TRI",
+                    "0",
+                    false,
+                    "0",
                 ),
             )
         val infra = fullInfraFromRJS(rjsInfra, InfraMetadata("modified_small_infra"))