front+editoast: remove route starting direction parameter

Author: Tristramg

editoast/openapi.yaml

@@ -4144,12 +4144,7 @@ paths:
                 ending:
                   $ref: '#/components/schemas/TrackLocation'
                 starting:
-                  allOf:
-                  - $ref: '#/components/schemas/TrackLocation'
-                  - properties:
-                      direction:
-                        $ref: '#/components/schemas/Direction'
-                    type: object
+                  $ref: '#/components/schemas/TrackLocation'
               type: object
         description: Starting and ending track location
       responses:

editoast/openapi_legacy.yaml

@@ -642,12 +642,7 @@ paths:
               type: object
               properties:
                 starting:
-                  allOf:
-                    - $ref: "#/components/schemas/TrackLocation"
-                    - type: object
-                      properties:
-                        direction:
-                          $ref: "#/components/schemas/Direction"
+                  $ref: "#/components/schemas/TrackLocation"
                 ending:
                   $ref: "#/components/schemas/TrackLocation"
       responses:

editoast/src/views/infra/pathfinding.rs

@@ -45,7 +45,6 @@ enum PathfindingViewErrors {
 struct PathfindingTrackLocationDirInput {
     track: Identifier,
     position: f64,
-    direction: Direction,
 }
 
 #[derive(Debug, Clone, Deserialize)]
@@ -128,11 +127,11 @@ struct PathfindingStep {
 }
 
 impl PathfindingStep {
-    fn new_init(track: String, position: f64, direction: Direction) -> Self {
+    fn new_init(track: String, position: f64) -> Self {
         Self {
             track,
             position,
-            direction,
+            direction: Direction::StartToStop, // Ignored for initial node
             switch_direction: None,
             found: false,
             starting_step: true,
@@ -185,7 +184,7 @@ fn compute_path(
     k: u8,
 ) -> Vec<PathfindingOutput> {
     let start = &input.starting;
-    let start = PathfindingStep::new_init(start.track.0.clone(), start.position, start.direction);
+    let start = PathfindingStep::new_init(start.track.0.clone(), start.position);
 
     let track_sections = infra_cache.track_sections();
     // Transform a length (in m) into a cost (in mm). This provide the Ord implementation for our cost using u64.
@@ -403,7 +402,6 @@ mod tests {
             starting: PathfindingTrackLocationDirInput {
                 track: "A".into(),
                 position: 30.0,
-                direction: Direction::StartToStop,
             },
             ending: PathfindingTrackLocationInput {
                 track: "C".into(),
@@ -427,7 +425,6 @@ mod tests {
             starting: PathfindingTrackLocationDirInput {
                 track: "A".into(),
                 position: 30.0,
-                direction: Direction::StopToStart,
             },
             ending: PathfindingTrackLocationInput {
                 track: "C".into(),

front/src/applications/editor/tools/routeEdition/components/EditRoutePath.tsx

@@ -42,13 +42,12 @@ export const EditRoutePathLeftPanel: FC<{ state: EditRoutePathState }> = ({ stat
   const infraID = useSelector(getInfraID);
   const [isSaving, setIsSaving] = useState(false);
   const [includeReleaseDetectors, setIncludeReleaseDetectors] = useState(true);
-  const { entryPoint, exitPoint, entryPointDirection } = state.routeState;
+  const { entryPoint, exitPoint } = state.routeState;
 
   const [postPathfinding] = osrdEditoastApi.endpoints.postInfraByIdPathfinding.useMutation();
 
   const searchCandidates = useCallback(async () => {
-    if (!entryPoint || !exitPoint || !entryPointDirection || state.optionsState.type === 'loading')
-      return;
+    if (!entryPoint || !exitPoint || state.optionsState.type === 'loading') return;
 
     setState({
       optionsState: { type: 'loading' },
@@ -57,7 +56,6 @@ export const EditRoutePathLeftPanel: FC<{ state: EditRoutePathState }> = ({ stat
     const payload = await getCompatibleRoutesPayload(
       infraID as number,
       entryPoint,
-      entryPointDirection,
       exitPoint,
       dispatch
     );
@@ -87,7 +85,7 @@ export const EditRoutePathLeftPanel: FC<{ state: EditRoutePathState }> = ({ stat
         })),
       },
     });
-  }, [entryPoint, entryPointDirection, exitPoint, infraID, setState, state.optionsState.type]);
+  }, [entryPoint, exitPoint, infraID, setState, state.optionsState.type]);
 
   const focusedOptionIndex =
     state.optionsState.type === 'options' ? state.optionsState.focusedOptionIndex : null;
@@ -108,12 +106,7 @@ export const EditRoutePathLeftPanel: FC<{ state: EditRoutePathState }> = ({ stat
         <button
           className="btn btn-primary btn-sm mr-2 d-block w-100 text-center"
           type="submit"
-          disabled={
-            !entryPoint ||
-            !entryPointDirection ||
-            !exitPoint ||
-            state.optionsState.type === 'loading'
-          }
+          disabled={!entryPoint || !exitPoint || state.optionsState.type === 'loading'}
         >
           <FiSearch /> {t('Editor.tools.routes-edition.search-routes')}
         </button>
@@ -222,7 +215,6 @@ export const EditRoutePathLeftPanel: FC<{ state: EditRoutePathState }> = ({ stat
                           id: '', // will be replaced by entityToCreateOperation
                           entry_point: omit(entryPoint, 'position'),
                           exit_point: omit(exitPoint, 'position'),
-                          entry_point_direction: entryPointDirection,
                           switches_directions: candidate.data.switches_directions,
                           release_detectors: includeReleaseDetectors
                             ? candidate.data.detectors

front/src/applications/editor/tools/routeEdition/components/Endpoints.tsx

@@ -1,13 +1,12 @@
-import Select from 'react-select';
-import React, { FC, useContext, useMemo } from 'react';
+import React, { FC, useContext } from 'react';
 import { BsArrowBarRight, BsBoxArrowInRight } from 'react-icons/bs';
 import { HiSwitchVertical } from 'react-icons/hi';
 import { FaFlagCheckered } from 'react-icons/fa';
 import { useTranslation } from 'react-i18next';
 import { useDispatch, useSelector } from 'react-redux';
 
 import { getInfraID } from 'reducers/osrdconf/selectors';
-import { BufferStopEntity, DetectorEntity, DIRECTIONS, WayPoint, WayPointEntity } from 'types';
+import { BufferStopEntity, DetectorEntity, WayPoint, WayPointEntity } from 'types';
 import EditorContext from 'applications/editor/context';
 import { getEntity } from 'applications/editor/data/api';
 import EntitySumUp from 'applications/editor/components/EntitySumUp';
@@ -20,20 +19,7 @@ export const EditEndpoints: FC<{ state: RouteState; onChange: (newState: RouteSt
   onChange,
 }) => {
   const { t } = useTranslation();
-  const { entryPoint, exitPoint, entryPointDirection } = state;
-
-  const options = useMemo(
-    () =>
-      DIRECTIONS.map((s) => ({
-        value: s,
-        label: t(`Editor.tools.routes-edition.directions.${s}`),
-      })),
-    [t]
-  );
-  const option = useMemo(
-    () => options.find((o) => o.value === entryPointDirection) || options[0],
-    [options, entryPointDirection]
-  );
+  const { entryPoint, exitPoint } = state;
 
   return (
     <>
@@ -45,22 +31,6 @@ export const EditEndpoints: FC<{ state: RouteState; onChange: (newState: RouteSt
         wayPoint={entryPoint}
         onChange={(wayPoint) => onChange({ ...state, entryPoint: wayPoint })}
       />
-      {entryPoint && (
-        <div className="d-flex flex-row align-items-baseline justify-content-center mb-2">
-          <span className="mr-2">{t('Editor.tools.routes-edition.start_direction')}</span>
-          <Select
-            value={option}
-            options={options}
-            onChange={(o) => {
-              if (o)
-                onChange({
-                  ...state,
-                  entryPointDirection: o.value,
-                });
-            }}
-          />
-        </div>
-      )}
       <div className="text-center">
         <button
           type="button"

front/src/applications/editor/tools/routeEdition/utils.ts

@@ -9,7 +9,6 @@ import { getEntities, getEntity, getMixedEntities } from 'applications/editor/da
 import { DEFAULT_COMMON_TOOL_STATE } from 'applications/editor/tools/commonToolState';
 import { RouteCandidate, RouteEditionState } from 'applications/editor/tools/routeEdition/types';
 import {
-  Direction,
   PartialButFor,
   RouteEntity,
   TrackRange,
@@ -220,7 +219,6 @@ export async function getRouteGeometries(
 export async function getCompatibleRoutesPayload(
   infra: number,
   entryPoint: WayPoint,
-  entryPointDirection: Direction,
   exitPoint: WayPoint,
   dispatch: Dispatch
 ) {
@@ -240,7 +238,6 @@ export async function getCompatibleRoutesPayload(
     starting: {
       track: entryPointEntity.properties.track as string,
       position: entryPointEntity.properties.position as number,
-      direction: entryPointDirection,
     },
     ending: {
       track: exitPointEntity.properties.track as string,

front/src/common/api/osrdEditoastApi.ts

@@ -905,9 +905,7 @@ export type PostInfraByIdPathfindingApiArg = {
   /** Starting and ending track location */
   body: {
     ending?: TrackLocation;
-    starting?: TrackLocation & {
-      direction?: Direction;
-    };
+    starting?: TrackLocation;
   };
 };
 export type GetInfraByIdRailjsonApiResponse =