core: stdcm: set block to route map before other checks

OpenRailAssociation · Apr 23, 2024 · c23092b · c23092b
1 parent b86407f
commit c23092b
Showing 1 changed file with 2 additions and 2 deletions.
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
@@ -273,6 +273,8 @@ private class InfraExplorerImpl(
         var pathStarted = incrementalPath.pathStarted
 
         for (block in routeBlocks) {
+            blockRoutes.getOrPut(block) { mutableSetOf() }.add(route)
+            blocks.add(block)
             if (block == firstLocation?.edge) {
                 seenFirstBlock = true
             }
@@ -298,13 +300,11 @@ private class InfraExplorerImpl(
                         travelledPathEnd = Distance.ZERO
                     )
                 )
-                blockRoutes.getOrPut(block) { mutableSetOf() }.add(route)
                 pathStarted = true
                 if (endPath) break // Can't extend any further
             }
         }
         assert(seenFirstBlock)
-        blocks.addAll(routeBlocks)
         routes.add(route)
         for (i in 0 ..< nBlocksToSkip) moveForward()
         for (pathFragment in pathFragments) incrementalPath.extend(pathFragment)