core: check offset when checking constraints in infra explorer for en…

…d location Signed-off-by: Erashin <[email protected]>
OpenRailAssociation · Oct 11, 2024 · 5a3a304 · 5a3a304
1 parent f8a85d8
commit 5a3a304
Showing 1 changed file with 5 additions and 1 deletion.
diff --git a/core/src/main/kotlin/fr/sncf/osrd/stdcm/infra_exploration/InfraExplorer.kt b/core/src/main/kotlin/fr/sncf/osrd/stdcm/infra_exploration/InfraExplorer.kt
@@ -288,12 +288,16 @@ private class InfraExplorerImpl(
                 nBlocksToSkip++
             } else {
                 // If a block cannot be explored, give up
+                val endLocation = stops.last().firstOrNull { it.edge == block }
                 val isRouteBlocked =
                     constraints.any { constraint ->
                         constraint.apply(block).any {
-                            if (firstLocation != null)
+                            if (firstLocation != null && firstLocation.edge == block)
                                 firstLocation.offset.distance >= it.start.distance &&
                                     firstLocation.offset.distance < it.end.distance
+                            else if (endLocation != null)
+                                endLocation.offset.distance >= it.start.distance &&
+                                    endLocation.offset.distance < it.end.distance
                             else true
                         }
                     }