core: stdcm: explicitely output route path

OpenRailAssociation · Jan 24, 2025 · 1bdb452 · 1bdb452
1 parent 1fe7f70
commit 1bdb452
Show file tree

Hide file tree

Showing 5 changed files with 16 additions and 9 deletions.
diff --git a/core/kt-osrd-utils/src/main/kotlin/fr/sncf/osrd/utils/Extensions.kt b/core/kt-osrd-utils/src/main/kotlin/fr/sncf/osrd/utils/Extensions.kt
@@ -0,0 +1,11 @@
+package fr.sncf.osrd.utils
+
+import fr.sncf.osrd.utils.indexing.StaticIdx
+import fr.sncf.osrd.utils.indexing.StaticIdxList
+import fr.sncf.osrd.utils.indexing.mutableStaticIdxArrayListOf
+
+fun <T> List<StaticIdx<T>>.toIdxList(): StaticIdxList<T> {
+    val res = mutableStaticIdxArrayListOf<T>()
+    res.addAll(this)
+    return res
+}
diff --git a/core/src/main/kotlin/fr/sncf/osrd/api/api_v2/stdcm/STDCMEndpointV2.kt b/core/src/main/kotlin/fr/sncf/osrd/api/api_v2/stdcm/STDCMEndpointV2.kt
@@ -25,7 +25,6 @@ import fr.sncf.osrd.sim_infra.api.Block
 import fr.sncf.osrd.sim_infra.api.DirTrackChunkId
 import fr.sncf.osrd.sim_infra.api.SpeedLimitProperty
 import fr.sncf.osrd.sim_infra.impl.TemporarySpeedLimitManager
-import fr.sncf.osrd.sim_infra.utils.chunksToRoutes
 import fr.sncf.osrd.standalone_sim.makeElectricalProfiles
 import fr.sncf.osrd.standalone_sim.makeMRSPResponse
 import fr.sncf.osrd.standalone_sim.result.ElectrificationRange
@@ -42,6 +41,7 @@ import fr.sncf.osrd.utils.Direction
 import fr.sncf.osrd.utils.DistanceRangeMap
 import fr.sncf.osrd.utils.DistanceRangeMap.RangeMapEntry
 import fr.sncf.osrd.utils.distanceRangeMapOf
+import fr.sncf.osrd.utils.toIdxList
 import fr.sncf.osrd.utils.units.*
 import io.opentelemetry.api.trace.SpanKind
 import io.opentelemetry.instrumentation.annotations.WithSpan
@@ -177,7 +177,7 @@ class STDCMEndpointV2(private val infraManager: InfraManager) : Take {
                 path.trainPath,
                 path.chunkPath,
                 infra,
-                infra.blockInfra.chunksToRoutes(infra.rawInfra, path.chunkPath.chunks),
+                path.routePath.toIdxList(),
                 rollingStock,
                 parseSimulationScheduleItems(path.stopResults),
                 listOf(),

diff --git a/core/src/main/kotlin/fr/sncf/osrd/stdcm/STDCMResult.kt b/core/src/main/kotlin/fr/sncf/osrd/stdcm/STDCMResult.kt
@@ -5,6 +5,7 @@ import fr.sncf.osrd.envelope_sim.PhysicsPath
 import fr.sncf.osrd.graph.PathfindingResultId
 import fr.sncf.osrd.sim_infra.api.Block
 import fr.sncf.osrd.sim_infra.api.PathProperties
+import fr.sncf.osrd.sim_infra.api.RouteId
 import fr.sncf.osrd.sim_infra.impl.ChunkPath
 import fr.sncf.osrd.train.TrainStop
 
@@ -18,6 +19,7 @@ data class STDCMResult(
     val trainPath: PathProperties,
     val chunkPath: ChunkPath,
     val physicsPath: PhysicsPath,
+    val routePath: List<RouteId>,
     val departureTime: Double,
     val stopResults: List<TrainStop>
 )
diff --git a/core/src/main/kotlin/fr/sncf/osrd/stdcm/graph/STDCMPostProcessing.kt b/core/src/main/kotlin/fr/sncf/osrd/stdcm/graph/STDCMPostProcessing.kt
@@ -98,6 +98,7 @@ class STDCMPostProcessing(private val graph: STDCMGraph) {
                 trainPath,
                 chunkPath,
                 physicsPath,
+                routes,
                 updatedTimeData.departureTime,
 
                 // Allow us to display OP, a hack that will be fixed

diff --git a/core/src/test/kotlin/fr/sncf/osrd/utils/Helpers.kt b/core/src/test/kotlin/fr/sncf/osrd/utils/Helpers.kt
@@ -26,7 +26,6 @@ import fr.sncf.osrd.utils.indexing.MutableDirStaticIdxArrayList
 import fr.sncf.osrd.utils.indexing.MutableStaticIdxArrayList
 import fr.sncf.osrd.utils.indexing.StaticIdx
 import fr.sncf.osrd.utils.indexing.StaticIdxList
-import fr.sncf.osrd.utils.indexing.mutableStaticIdxArrayListOf
 import fr.sncf.osrd.utils.moshi.MoshiUtils
 import fr.sncf.osrd.utils.units.Offset
 import java.io.File
@@ -188,9 +187,3 @@ object Helpers {
         return buildChunkPath(infra, chunks, startOffset!!, endOffset!!)
     }
 }
-
-fun <T> List<StaticIdx<T>>.toIdxList(): StaticIdxList<T> {
-    val res = mutableStaticIdxArrayListOf<T>()
-    res.addAll(this)
-    return res
-}