core: add blocks to v2 signal projection request

Author: Erashin

core/kt-osrd-sim-infra/src/main/kotlin/fr/sncf/osrd/sim_infra/api/LoadedSignalingInfra.kt

@@ -118,3 +118,9 @@ interface BlockInfra {
 fun InfraSigSystemManager.findSignalingSystemOrThrow(sigSystem: String): SignalingSystemId {
     return findSignalingSystem(sigSystem) ?: throw OSRDError.newSignalingError(sigSystem)
 }
+
+fun BlockInfra.convertBlockPath(blocks: List<String>): StaticIdxList<Block> {
+    val res = mutableStaticIdxArrayListOf<Block>()
+    for (block in blocks) res.add(getBlockFromName(block)!!)
+    return res
+}

core/src/main/java/fr/sncf/osrd/standalone_sim/ScheduleMetadataExtractor.kt

@@ -26,7 +26,6 @@ import fr.sncf.osrd.standalone_sim.result.ResultTrain.SignalSighting
 import fr.sncf.osrd.train.RollingStock
 import fr.sncf.osrd.train.StandaloneTrainSchedule
 import fr.sncf.osrd.utils.CurveSimplification
-import fr.sncf.osrd.utils.indexing.MutableStaticIdxArrayList
 import fr.sncf.osrd.utils.indexing.StaticIdxList
 import fr.sncf.osrd.utils.indexing.mutableStaticIdxArrayListOf
 import fr.sncf.osrd.utils.units.*
@@ -249,7 +248,7 @@ fun routingRequirements(
     // compute the signaling train state for each signal
     data class SignalingTrainStateImpl(override val speed: Speed) : SignalingTrainState
 
-    var signalingTrainStates = mutableMapOf<LogicalSignalId, SignalingTrainState>()
+    val signalingTrainStates = mutableMapOf<LogicalSignalId, SignalingTrainState>()
     for (i in 0 until blockPath.size) {
         val block = blockPath[i]
         val blockOffset = blockOffsets[i]
@@ -569,7 +568,7 @@ fun pathSignalsInRange(
 fun trainPathBlockOffset(
     infra: RawInfra,
     blockInfra: BlockInfra,
-    blockPath: MutableStaticIdxArrayList<Block>,
+    blockPath: StaticIdxList<Block>,
     chunkPath: ChunkPath
 ): Distance {
     val firstChunk = chunkPath.chunks[0]

core/src/main/kotlin/fr/sncf/osrd/api/api_v2/project_signals/SignalProjectionEndpointV2.kt

@@ -5,6 +5,7 @@ import fr.sncf.osrd.api.InfraManager
 import fr.sncf.osrd.api.pathfinding.makeChunkPath
 import fr.sncf.osrd.reporting.warnings.DiagnosticRecorderImpl
 import fr.sncf.osrd.signal_projection.projectSignals
+import fr.sncf.osrd.sim_infra.api.convertBlockPath
 import fr.sncf.osrd.sim_infra.api.convertRoutePath
 import org.takes.Request
 import org.takes.Response
@@ -29,6 +30,7 @@ class SignalProjectionEndpointV2(private val infraManager: InfraManager) : Take
 
             // Parse path
             val chunkPath = makeChunkPath(infra.rawInfra, request.trackSectionRanges)
+            val blockPath = infra.blockInfra.convertBlockPath(request.blocks)
             val routePath = infra.rawInfra.convertRoutePath(request.routes)
 
             val signalProjections = mutableMapOf<Long, List<SignalUpdate>>()
@@ -37,6 +39,7 @@ class SignalProjectionEndpointV2(private val infraManager: InfraManager) : Take
                     projectSignals(
                         infra,
                         chunkPath,
+                        blockPath,
                         routePath,
                         trainSimulation.signalSightings,
                         trainSimulation.zoneUpdates,

core/src/main/kotlin/fr/sncf/osrd/api/api_v2/project_signals/SignalProjectionRequest.kt

@@ -11,6 +11,7 @@ import fr.sncf.osrd.utils.json.UnitAdapterFactory
 import fr.sncf.osrd.utils.units.TimeDelta
 
 class SignalProjectionRequest(
+    val blocks: List<String>,
     @Json(name = "track_section_ranges") var trackSectionRanges: List<TrackRange>,
     var routes: List<String>,
     @Json(name = "train_simulations") var trainSimulations: Map<Long, TrainSimulation>,

core/src/main/kotlin/fr/sncf/osrd/signal_projection/SignalProjectionV2.kt

@@ -11,7 +11,6 @@ import fr.sncf.osrd.sim_infra.api.*
 import fr.sncf.osrd.sim_infra.impl.ChunkPath
 import fr.sncf.osrd.standalone_sim.*
 import fr.sncf.osrd.utils.indexing.StaticIdxList
-import fr.sncf.osrd.utils.indexing.mutableStaticIdxArrayListOf
 import fr.sncf.osrd.utils.units.*
 import java.awt.Color
 
@@ -20,6 +19,7 @@ data class SignalAspectChangeEventV2(val newAspect: String, val time: TimeDelta)
 fun projectSignals(
     fullInfra: FullInfra,
     chunkPath: ChunkPath,
+    blockPath: StaticIdxList<Block>,
     routePath: StaticIdxList<Route>,
     signalSightings: Collection<SignalSighting>,
     zoneUpdates: Collection<ZoneUpdate>,
@@ -50,11 +50,6 @@ fun projectSignals(
         value("aspect", "300VL")
     }
 
-    // Recover blocks from the route path
-    val detailedBlockPath = recoverBlockPath(simulator, fullInfra, routePath)
-    val blockPath = mutableStaticIdxArrayListOf<Block>()
-    for (block in detailedBlockPath) blockPath.add(block.block)
-
     val zoneMap = mutableMapOf<String, Int>()
     var zoneCount = 0
     for (block in blockPath) {