core: remove TravelledPath type alias

Signed-off-by: Eloi Charpentier <[email protected]>

Author: eckter

core/envelope-sim/src/main/kotlin/fr/sncf/osrd/envelope_sim/EnvelopeSimContext.kt

@@ -2,7 +2,7 @@ package fr.sncf.osrd.envelope_sim
 
 import com.google.common.collect.RangeMap
 import fr.sncf.osrd.path.interfaces.PhysicsPath
-import fr.sncf.osrd.path.interfaces.TravelledPath
+import fr.sncf.osrd.path.interfaces.TrainPath
 import fr.sncf.osrd.utils.DistanceRangeSet
 import fr.sncf.osrd.utils.units.Offset
 import fr.sncf.osrd.utils.units.meters
@@ -29,18 +29,18 @@ constructor(
          * List of switch and buffer stop offsets on the path, up to the first switch/buffer stop
          * *after* the end of the path (or right at the end).
          */
-        val dangerPointOffsets: List<Offset<TravelledPath>>,
+        val dangerPointOffsets: List<Offset<TrainPath>>,
         /**
          * List of block-delimiting detectors (block entry/exit) offsets for every ETCS-block on the
          * path. Starts at the start of the path, can end after the end of the path.
          */
-        val detectorOffsets: List<Offset<TravelledPath>>,
+        val detectorOffsets: List<Offset<TrainPath>>,
     ) {
         /**
          * Returns the next danger point location: next buffer stop or switch, whichever is closest.
          * If there is any.
          */
-        private fun getDangerPoint(offset: Offset<TravelledPath>): Offset<TravelledPath>? {
+        private fun getDangerPoint(offset: Offset<TrainPath>): Offset<TrainPath>? {
             return dangerPointOffsets.firstOrNull { it >= offset }
         }
 
@@ -51,14 +51,14 @@ constructor(
          * infrastructure, hence we'll be conservative and place the danger point on the EoA (stop
          * location or signal).
          */
-        fun getMandatoryDangerPoint(signalOffset: Offset<TravelledPath>): Offset<TravelledPath> {
+        fun getMandatoryDangerPoint(signalOffset: Offset<TrainPath>): Offset<TrainPath> {
             val dangerPoint = getDangerPoint(signalOffset)
             return if (dangerPoint == null || dangerPoint - signalOffset > 200.meters) signalOffset
             else dangerPoint
         }
 
         /** Returns the next ETCS detector location. */
-        fun getNextDetector(offset: Offset<TravelledPath>): Offset<TravelledPath>? {
+        fun getNextDetector(offset: Offset<TrainPath>): Offset<TrainPath>? {
             return detectorOffsets.firstOrNull { it >= offset }
         }
     }

core/envelope-sim/src/main/kotlin/fr/sncf/osrd/envelope_sim/etcs/ETCSBrakingSimulator.kt

@@ -7,7 +7,7 @@ import fr.sncf.osrd.envelope_sim.EnvelopeSimContext
 import fr.sncf.osrd.envelope_sim.etcs.BrakingType.IND
 import fr.sncf.osrd.envelope_sim.etcs.BrakingType.PS
 import fr.sncf.osrd.envelope_sim.pipelines.increase
-import fr.sncf.osrd.path.interfaces.TravelledPath
+import fr.sncf.osrd.path.interfaces.TrainPath
 import fr.sncf.osrd.reporting.exceptions.OSRDError
 import fr.sncf.osrd.utils.arePositionsEqual
 import fr.sncf.osrd.utils.units.Offset
@@ -71,7 +71,7 @@ interface ETCSBrakingSimulator {
      */
     fun computeEoaLocations(
         envelope: Envelope,
-        offsets: List<Offset<TravelledPath>>,
+        offsets: List<Offset<TrainPath>>,
         areSignalsOnOffsetsRestrictive: List<Boolean>,
         eoaType: EoaType,
     ): List<EndOfAuthority>
@@ -85,7 +85,7 @@ typealias EOABrakingCurves = NavigableMap<EndOfAuthority, BrakingCurves>
 
 data class BrakingCurve(val brakingType: BrakingType, val brakingCurve: Envelope)
 
-data class LimitOfAuthority(val offset: Offset<TravelledPath>, val speed: Double) :
+data class LimitOfAuthority(val offset: Offset<TrainPath>, val speed: Double) :
     Comparable<LimitOfAuthority> {
     init {
         assert(speed > 0)
@@ -98,8 +98,8 @@ data class LimitOfAuthority(val offset: Offset<TravelledPath>, val speed: Double
 }
 
 data class EndOfAuthority(
-    val offsetEOA: Offset<TravelledPath>,
-    val offsetSVL: Offset<TravelledPath>?,
+    val offsetEOA: Offset<TrainPath>,
+    val offsetSVL: Offset<TrainPath>?,
     val usedCurveType: BrakingType,
     val eoaType: EoaType = EoaType.STOP,
 ) : Comparable<EndOfAuthority> {
@@ -211,7 +211,7 @@ class ETCSBrakingSimulatorImpl(override val context: EnvelopeSimContext) : ETCSB
         val cursor = EnvelopeCursor.backward(mrsp)
         val limitsOfAuthority = mutableListOf<LimitOfAuthority>()
         while (cursor.findPartTransition(::increase)) {
-            val offset = Offset<TravelledPath>(cursor.position.meters)
+            val offset = Offset<TrainPath>(cursor.position.meters)
             if (etcsRanges.contains(offset.distance)) {
                 limitsOfAuthority.add(LimitOfAuthority(offset, cursor.speed))
             }
@@ -222,7 +222,7 @@ class ETCSBrakingSimulatorImpl(override val context: EnvelopeSimContext) : ETCSB
 
     override fun computeEoaLocations(
         envelope: Envelope,
-        offsets: List<Offset<TravelledPath>>,
+        offsets: List<Offset<TrainPath>>,
         areSignalsOnOffsetsRestrictive: List<Boolean>,
         eoaType: EoaType,
     ): List<EndOfAuthority> {
@@ -267,7 +267,7 @@ class ETCSBrakingSimulatorImpl(override val context: EnvelopeSimContext) : ETCSB
 
     /** Compute the EoA for a simple stop. */
     private fun computeStopEoA(
-        stopOffset: Offset<TravelledPath>,
+        stopOffset: Offset<TrainPath>,
         isStopOnClosedSignal: Boolean,
     ): EndOfAuthority {
         return if (isStopOnClosedSignal) {
@@ -291,7 +291,7 @@ class ETCSBrakingSimulatorImpl(override val context: EnvelopeSimContext) : ETCSB
 
     /** Compute the EoA for a spacing conflict on a signal. */
     private fun computeSpacingConflictEoa(
-        signalOffset: Offset<TravelledPath>,
+        signalOffset: Offset<TrainPath>,
         isRouteDelimiter: Boolean,
         endPos: Double,
     ): EndOfAuthority? {
@@ -322,7 +322,7 @@ class ETCSBrakingSimulatorImpl(override val context: EnvelopeSimContext) : ETCSB
 
     /** Compute the EoA for a routing conflict on a signal. */
     private fun computeRoutingConflictEoa(
-        signalOffset: Offset<TravelledPath>,
+        signalOffset: Offset<TrainPath>,
         isRouteDelimiter: Boolean,
     ): EndOfAuthority? {
         return if (isRouteDelimiter) {

core/envelope-sim/src/main/kotlin/fr/sncf/osrd/envelope_sim/pipelines/MaxSpeedEnvelope.kt

@@ -15,7 +15,7 @@ import fr.sncf.osrd.envelope_sim.etcs.ETCSBrakingSimulatorImpl
 import fr.sncf.osrd.envelope_sim.etcs.EndOfAuthority
 import fr.sncf.osrd.envelope_sim.etcs.EoaType
 import fr.sncf.osrd.envelope_sim.overlays.EnvelopeDeceleration
-import fr.sncf.osrd.path.interfaces.TravelledPath
+import fr.sncf.osrd.path.interfaces.TrainPath
 import fr.sncf.osrd.railjson.schema.schedule.RJSTrainStop
 import fr.sncf.osrd.utils.units.Distance
 import fr.sncf.osrd.utils.units.Offset
@@ -30,7 +30,7 @@ import fr.sncf.osrd.utils.units.Offset
  * closed/open signal flag.
  */
 data class SimStop(
-    val offset: Offset<TravelledPath>,
+    val offset: Offset<TrainPath>,
     val rjsReceptionSignal: RJSTrainStop.RJSReceptionSignal,
 )
 
@@ -130,7 +130,7 @@ private fun addStopBrakingCurves(
 private fun addConstStopBrakingCurves(
     context: EnvelopeSimContext,
     curveWithDecelerations: Envelope,
-    stops: List<Offset<TravelledPath>>,
+    stops: List<Offset<TrainPath>>,
 ): Envelope {
     var envelope = curveWithDecelerations
     for (stop in stops) {

core/kt-osrd-path/src/main/kotlin/fr/sncf/osrd/path/interfaces/PathProperties.kt

@@ -9,13 +9,6 @@ import fr.sncf.osrd.utils.units.Offset
 
 data class TrackLocation(val trackId: TrackSectionId, val offset: Offset<TrackSection>)
 
-/**
- * A marker type for Length and Offset. In TravelledPath, start refers to the real start of the head
- * of the train.
- */
-// TODO path migration: remove TravelledPath entirely
-typealias TravelledPath = TrainPath
-
 @Suppress("INAPPLICABLE_JVM_NAME")
 interface PathProperties {
     fun getSlopes(): DistanceRangeMap<Double>
@@ -43,7 +36,7 @@ interface PathProperties {
 
     fun getLength(): Length<TrainPath>
 
-    fun getTrackLocationAtOffset(pathOffset: Offset<TravelledPath>): TrackLocation
+    fun getTrackLocationAtOffset(pathOffset: Offset<TrainPath>): TrackLocation
 
     fun <T> getRangeMapFromUndirected(
         getData: (chunkId: TrackChunkId) -> DistanceRangeMap<T>

core/src/main/kotlin/fr/sncf/osrd/api/CommonSchemas.kt

@@ -1,7 +1,7 @@
 package fr.sncf.osrd.api
 
 import com.squareup.moshi.Json
-import fr.sncf.osrd.path.interfaces.TravelledPath
+import fr.sncf.osrd.path.interfaces.TrainPath
 import fr.sncf.osrd.railjson.schema.common.graph.EdgeDirection
 import fr.sncf.osrd.sim_infra.api.TrackSection
 import fr.sncf.osrd.utils.DistanceRangeMap
@@ -25,13 +25,13 @@ data class TrackRange(
 data class RangeValues<valueT>(
     // List of `n` internal boundaries of the ranges along the path (excluding start and end
     // bounds).
-    @Json(name = "boundaries") val internalBoundaries: List<Offset<TravelledPath>> = listOf(),
+    @Json(name = "boundaries") val internalBoundaries: List<Offset<TrainPath>> = listOf(),
     // List of `n+1` values associated to the bounded intervals
     val values: List<valueT> = listOf(),
 ) {
     fun toDistanceRangeMap(
-        beginPos: Offset<TravelledPath>,
-        endPos: Offset<TravelledPath>,
+        beginPos: Offset<TrainPath>,
+        endPos: Offset<TrainPath>,
     ): DistanceRangeMap<valueT> {
         val boundaries = internalBoundaries.toMutableList()
         boundaries.add(0, beginPos)
@@ -58,14 +58,14 @@ class TrackLocation(val track: String, val offset: Offset<TrackSection>)
 class ZoneUpdate(
     val zone: String,
     val time: TimeDelta,
-    val position: Offset<TravelledPath>,
+    val position: Offset<TrainPath>,
     @Json(name = "is_entry") val isEntry: Boolean,
 )
 
 class SignalCriticalPosition(
     val signal: String,
     val time: TimeDelta,
-    val position: Offset<TravelledPath>,
+    val position: Offset<TrainPath>,
     val state: String,
 )
 

core/src/main/kotlin/fr/sncf/osrd/api/etcs/ETCSBrakingCurvesEndpoint.kt

@@ -15,7 +15,6 @@ import fr.sncf.osrd.envelope_sim.EnvelopeProfile
 import fr.sncf.osrd.envelope_sim.EnvelopeSimContext
 import fr.sncf.osrd.envelope_sim.etcs.*
 import fr.sncf.osrd.path.interfaces.TrainPath
-import fr.sncf.osrd.path.interfaces.TravelledPath
 import fr.sncf.osrd.signaling.etcs_level2.ETCS_LEVEL2
 import fr.sncf.osrd.sim_infra.api.*
 import fr.sncf.osrd.standalone_sim.buildSignalingRanges
@@ -139,7 +138,7 @@ class ETCSBrakingCurvesEndpoint(
     }
 
     private data class TravelledPathSignal(
-        val offset: Offset<TravelledPath>,
+        val offset: Offset<TrainPath>,
         val isRouteDelimiter: Boolean,
     ) : Comparable<TravelledPathSignal> {
         override fun compareTo(other: TravelledPathSignal): Int {
@@ -176,8 +175,8 @@ class ETCSBrakingCurvesEndpoint(
 
     private fun parseRawMrsp(
         rawMrsp: RangeValues<SpeedLimitProperty>,
-        endPos: Offset<TravelledPath>,
-        beginPos: Offset<TravelledPath> = Offset(Distance.ZERO),
+        endPos: Offset<TrainPath>,
+        beginPos: Offset<TrainPath> = Offset(Distance.ZERO),
     ): Envelope {
         val speedLimitDistanceRangeMap = rawMrsp.toDistanceRangeMap(beginPos, endPos)
         val mrspParts = mutableListOf<EnvelopePart>()

core/src/main/kotlin/fr/sncf/osrd/api/etcs/ETCSBrakingCurvesResponse.kt

@@ -5,7 +5,7 @@ import com.squareup.moshi.JsonAdapter
 import com.squareup.moshi.Moshi
 import com.squareup.moshi.kotlin.reflect.KotlinJsonAdapterFactory
 import fr.sncf.osrd.conflicts.ConflictType
-import fr.sncf.osrd.path.interfaces.TravelledPath
+import fr.sncf.osrd.path.interfaces.TrainPath
 import fr.sncf.osrd.utils.json.UnitAdapterFactory
 import fr.sncf.osrd.utils.units.Offset
 import fr.sncf.osrd.utils.units.TimeDelta
@@ -30,7 +30,7 @@ data class ETCSConflictCurves(
 )
 
 data class SimpleEnvelope(
-    val positions: List<Offset<TravelledPath>>,
+    val positions: List<Offset<TrainPath>>,
     val times: List<TimeDelta>, // Times are compared to the departure time
     val speeds: List<Double>,
 )

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

@@ -6,7 +6,7 @@ import com.squareup.moshi.Moshi
 import com.squareup.moshi.adapters.PolymorphicJsonAdapterFactory
 import com.squareup.moshi.kotlin.reflect.KotlinJsonAdapterFactory
 import fr.sncf.osrd.api.RangeValues
-import fr.sncf.osrd.path.interfaces.TravelledPath
+import fr.sncf.osrd.path.interfaces.TrainPath
 import fr.sncf.osrd.railjson.schema.geom.RJSLineString
 import fr.sncf.osrd.utils.json.UnitAdapterFactory
 import fr.sncf.osrd.utils.units.Offset
@@ -32,7 +32,7 @@ data class OperationalPointResponse(
     val id: String,
     val part: OperationalPointPartResponse,
     val extensions: OperationalPointExtensions?,
-    val position: Offset<TravelledPath>,
+    val position: Offset<TrainPath>,
     val weight: Long?,
 )
 

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

@@ -3,7 +3,6 @@ package fr.sncf.osrd.api.path_properties
 import com.google.common.collect.Range
 import fr.sncf.osrd.api.RangeValues
 import fr.sncf.osrd.path.interfaces.TrainPath
-import fr.sncf.osrd.path.interfaces.TravelledPath
 import fr.sncf.osrd.railjson.schema.geom.RJSLineString
 import fr.sncf.osrd.sim_infra.api.NeutralSection
 import fr.sncf.osrd.sim_infra.api.RawSignalingInfra
@@ -118,7 +117,7 @@ private fun <T> makeRangeValues(distanceRangeMap: DistanceRangeMap<T>): RangeVal
 }
 
 private fun <T> makeRangeValues(entries: List<DistanceRangeMap.RangeMapEntry<T>>): RangeValues<T> {
-    val boundaries = mutableListOf<Offset<TravelledPath>>()
+    val boundaries = mutableListOf<Offset<TrainPath>>()
     val values = mutableListOf<T>()
     for (entry in entries) {
         boundaries.add(Offset(entry.upper))

core/src/main/kotlin/fr/sncf/osrd/api/pathfinding/PathfindingBlockResponse.kt

@@ -8,7 +8,7 @@ import com.squareup.moshi.adapters.PolymorphicJsonAdapterFactory
 import com.squareup.moshi.kotlin.reflect.KotlinJsonAdapterFactory
 import fr.sncf.osrd.api.DirectionalTrackRange
 import fr.sncf.osrd.path.interfaces.JsonTrainPath
-import fr.sncf.osrd.path.interfaces.TravelledPath
+import fr.sncf.osrd.path.interfaces.TrainPath
 import fr.sncf.osrd.pathfinding.Pathfinding
 import fr.sncf.osrd.reporting.exceptions.OSRDError
 import fr.sncf.osrd.utils.json.UnitAdapterFactory
@@ -20,10 +20,10 @@ interface PathfindingBlockResponse
 
 class PathfindingBlockSuccess(
     val path: JsonTrainPath,
-    val length: Length<TravelledPath>,
+    val length: Length<TrainPath>,
 
     /** Offsets of the waypoints given as input */
-    @Json(name = "path_item_positions") val pathItemPositions: List<Offset<TravelledPath>>,
+    @Json(name = "path_item_positions") val pathItemPositions: List<Offset<TrainPath>>,
 ) : PathfindingBlockResponse {
     override fun equals(other: Any?): Boolean {
         if (this === other) return true
@@ -43,12 +43,12 @@ class PathfindingBlockSuccess(
 
 class NotFoundInBlocks(
     @Json(name = "track_section_ranges") val trackSectionRanges: List<DirectionalTrackRange>,
-    val length: Length<TravelledPath>,
+    val length: Length<TrainPath>,
 ) : PathfindingBlockResponse
 
 class NotFoundInRoutes(
     @Json(name = "track_section_ranges") val trackSectionRanges: List<DirectionalTrackRange>,
-    val length: Length<TravelledPath>,
+    val length: Length<TrainPath>,
 ) : PathfindingBlockResponse
 
 class NotFoundInTracks : PathfindingBlockResponse
@@ -66,9 +66,9 @@ data class IncompatibleConstraints(
     val incompatibleSignalingSystemRanges: List<RangeValue<String>>,
 )
 
-data class RangeValue<T>(val range: Pathfinding.Range<TravelledPath>, val value: T?) {
+data class RangeValue<T>(val range: Pathfinding.Range<TrainPath>, val value: T?) {
     @FromJson
-    fun fromJson(range: Pathfinding.Range<TravelledPath>): RangeValue<T> {
+    fun fromJson(range: Pathfinding.Range<TrainPath>): RangeValue<T> {
         return RangeValue(range, null)
     }
 }