-
+
- {
- dispatch(switchTrainScheduleV2Activated());
- resetStore();
- }}
- checked={trainScheduleV2Activated}
- />
-
- TrainSchedule V2
-
- {transformedData[tooltip.point.serieId] && (
+ {transformedCurve && (
= {
STANDARD: 'STANDARD',
- AC: 'AC',
+ AIR_CONDITIONING: 'AIR_CONDITIONING',
HEATING: 'HEATING',
};
diff --git a/front/src/modules/scenario/components/AddOrEditScenarioModal.tsx b/front/src/modules/scenario/components/AddOrEditScenarioModal.tsx
index 3e009edf9dc..7e2c37aece9 100644
--- a/front/src/modules/scenario/components/AddOrEditScenarioModal.tsx
+++ b/front/src/modules/scenario/components/AddOrEditScenarioModal.tsx
@@ -7,14 +7,9 @@ import { useTranslation } from 'react-i18next';
import { FaPlus } from 'react-icons/fa';
import { GiElectric } from 'react-icons/gi';
import { MdDescription, MdTitle } from 'react-icons/md';
-import { useSelector } from 'react-redux';
import { useNavigate, useParams } from 'react-router-dom';
-import {
- type ScenarioCreateForm,
- type ScenarioPatchForm,
- osrdEditoastApi,
-} from 'common/api/osrdEditoastApi';
+import { type ScenarioPatchForm, osrdEditoastApi } from 'common/api/osrdEditoastApi';
import ChipsSNCF from 'common/BootstrapSNCF/ChipsSNCF';
import InputSNCF from 'common/BootstrapSNCF/InputSNCF';
import { ConfirmModal } from 'common/BootstrapSNCF/ModalSNCF';
@@ -27,7 +22,6 @@ import TextareaSNCF from 'common/BootstrapSNCF/TextareaSNCF';
import { useInfraID, useOsrdConfActions } from 'common/osrdContext';
import { InfraSelectorModal } from 'modules/infra/components/InfraSelector';
import { setFailure, setSuccess } from 'reducers/main';
-import { getStdcmV2Activated, getTrainScheduleV2Activated } from 'reducers/user/userSelectors';
import { useAppDispatch } from 'store';
import { castErrorToFailure } from 'utils/error';
import useInputChange from 'utils/hooks/useInputChange';
@@ -73,9 +67,6 @@ export default function AddOrEditScenarioModal({
const navigate = useNavigate();
const infraID = useInfraID();
const { updateScenarioID } = useOsrdConfActions();
- const trainScheduleV2Activated = useSelector(getTrainScheduleV2Activated);
- const stdcmV2Activated = useSelector(getStdcmV2Activated);
- const useTrainScheduleV2 = trainScheduleV2Activated || stdcmV2Activated;
const [currentScenario, setCurrentScenario] = useState(scenario || emptyScenario);
@@ -93,19 +84,6 @@ export default function AddOrEditScenarioModal({
[urlStudyId, urlProjectId]
);
- // V1 endpoints
- const [deleteScenarioV1] =
- osrdEditoastApi.endpoints.deleteProjectsByProjectIdStudiesAndStudyIdScenariosScenarioId.useMutation(
- {}
- );
- const [patchScenarioV1] =
- osrdEditoastApi.endpoints.patchProjectsByProjectIdStudiesAndStudyIdScenariosScenarioId.useMutation(
- {}
- );
- const [postScenarioV1] =
- osrdEditoastApi.endpoints.postProjectsByProjectIdStudiesAndStudyIdScenarios.useMutation({});
-
- // v2 endpoints
const [postTimetableV2] = osrdEditoastApi.endpoints.postV2Timetable.useMutation({});
const [postScenarioV2] =
osrdEditoastApi.endpoints.postV2ProjectsByProjectIdStudiesAndStudyIdScenarios.useMutation({});
@@ -181,30 +159,21 @@ export default function AddOrEditScenarioModal({
if (!currentScenario.infra_id || hasErrors) {
setDisplayErrors(true);
} else if (projectId && studyId && currentScenario && currentScenario.name) {
- let postScenarioRequest;
const ids = { projectId, studyId };
- if (useTrainScheduleV2) {
- const timetable = await postTimetableV2({
- timetableForm: { electrical_profile_set_id: currentScenario.electrical_profile_set_id },
- }).unwrap();
- postScenarioRequest = postScenarioV2({
- ...ids,
- scenarioCreateFormV2: {
- description: currentScenario.description || '',
- infra_id: currentScenario.infra_id,
- name: currentScenario.name,
- tags: currentScenario.tags || [],
- timetable_id: timetable.id,
- },
- });
- } else {
- postScenarioRequest = postScenarioV1({
- ...ids,
- scenarioCreateForm: currentScenario as ScenarioCreateForm,
- });
- }
-
- postScenarioRequest
+ const timetable = await postTimetableV2({
+ timetableForm: { electrical_profile_set_id: currentScenario.electrical_profile_set_id },
+ }).unwrap();
+
+ postScenarioV2({
+ ...ids,
+ scenarioCreateFormV2: {
+ description: currentScenario.description || '',
+ infra_id: currentScenario.infra_id,
+ name: currentScenario.name,
+ tags: currentScenario.tags || [],
+ timetable_id: timetable.id,
+ },
+ })
.unwrap()
.then(({ id }) => {
dispatch(updateScenarioID(id));
@@ -224,22 +193,15 @@ export default function AddOrEditScenarioModal({
} else if (scenario && projectId && studyId && scenario.id) {
const ids = { projectId, studyId, scenarioId: scenario.id };
- const patchScenarioRequest = useTrainScheduleV2
- ? patchScenarioV2({
- ...ids,
- scenarioPatchFormV2: {
- description: currentScenario.description,
- infra_id: currentScenario.infra_id,
- name: currentScenario.name,
- tags: currentScenario.tags,
- },
- })
- : patchScenarioV1({
- ...ids,
- scenarioPatchForm: currentScenario,
- });
-
- patchScenarioRequest
+ patchScenarioV2({
+ ...ids,
+ scenarioPatchFormV2: {
+ description: currentScenario.description,
+ infra_id: currentScenario.infra_id,
+ name: currentScenario.name,
+ tags: currentScenario.tags,
+ },
+ })
.unwrap()
.then(() => {
dispatch(
@@ -257,9 +219,8 @@ export default function AddOrEditScenarioModal({
};
const removeScenario = () => {
- const deleteScenario = useTrainScheduleV2 ? deleteScenarioV2 : deleteScenarioV1;
if (projectId && studyId && scenario?.id) {
- deleteScenario({ projectId, studyId, scenarioId: scenario.id })
+ deleteScenarioV2({ projectId, studyId, scenarioId: scenario.id })
.unwrap()
.then(() => {
dispatch(updateScenarioID(undefined));
diff --git a/front/src/modules/scenario/components/ScenarioExplorer/ScenarioExplorer.tsx b/front/src/modules/scenario/components/ScenarioExplorer/ScenarioExplorer.tsx
index f0377726715..387ed6d7a74 100644
--- a/front/src/modules/scenario/components/ScenarioExplorer/ScenarioExplorer.tsx
+++ b/front/src/modules/scenario/components/ScenarioExplorer/ScenarioExplorer.tsx
@@ -1,4 +1,4 @@
-import React, { useEffect, useMemo, useState } from 'react';
+import React, { useEffect, useState } from 'react';
import cx from 'classnames';
import { useTranslation } from 'react-i18next';
@@ -11,10 +11,9 @@ import projectIcon from 'assets/pictures/views/projects.svg';
import studyIcon from 'assets/pictures/views/study.svg';
import { getDocument } from 'common/api/documentApi';
import { osrdEditoastApi } from 'common/api/osrdEditoastApi';
-import type { TrainScheduleSummary } from 'common/api/osrdEditoastApi';
import { useModal } from 'common/BootstrapSNCF/ModalSNCF';
import { useOsrdConfActions, useOsrdConfSelectors } from 'common/osrdContext';
-import { getStdcmV2Activated, getTrainScheduleV2Activated } from 'reducers/user/userSelectors';
+import { getStdcmV2Activated } from 'reducers/user/userSelectors';
import { useAppDispatch } from 'store';
import ScenarioExplorerModal, { type ScenarioExplorerProps } from './ScenarioExplorerModal';
@@ -31,9 +30,7 @@ const ScenarioExplorer = ({
const { getTimetableID } = useOsrdConfSelectors();
const timetableID = useSelector(getTimetableID);
const [imageUrl, setImageUrl] = useState();
- const trainScheduleV2Activated = useSelector(getTrainScheduleV2Activated);
const stdcmV2Activated = useSelector(getStdcmV2Activated);
- const useTrainScheduleV2 = trainScheduleV2Activated || stdcmV2Activated;
const { updateInfraID, updateTimetableID, updateScenarioID } = useOsrdConfActions();
const { data: projectDetails } = osrdEditoastApi.endpoints.getProjectsByProjectId.useQuery(
@@ -47,18 +44,6 @@ const ScenarioExplorer = ({
{ skip: !globalProjectId && !globalStudyId }
);
- const { data: scenarioV1 } =
- osrdEditoastApi.endpoints.getProjectsByProjectIdStudiesAndStudyIdScenariosScenarioId.useQuery(
- {
- projectId: globalProjectId as number,
- studyId: globalStudyId as number,
- scenarioId: globalScenarioId as number,
- },
- {
- skip: !globalProjectId || !globalStudyId || !globalScenarioId || useTrainScheduleV2,
- }
- );
-
const { currentData: scenarioV2, isSuccess: isScenarioSuccess } =
osrdEditoastApi.endpoints.getV2ProjectsByProjectIdStudiesAndStudyIdScenariosScenarioId.useQuery(
{
@@ -67,19 +52,14 @@ const ScenarioExplorer = ({
scenarioId: globalScenarioId as number,
},
{
- skip: !useTrainScheduleV2 || !globalProjectId || !globalStudyId || !globalScenarioId,
+ skip: !globalProjectId || !globalStudyId || !globalScenarioId,
refetchOnMountOrArgChange: true,
}
);
- const { data: timetable } = osrdEditoastApi.endpoints.getTimetableById.useQuery(
- { id: timetableID as number },
- { skip: !timetableID || useTrainScheduleV2 }
- );
-
const { data: timetableV2 } = osrdEditoastApi.endpoints.getV2TimetableById.useQuery(
{ id: timetableID as number },
- { skip: !useTrainScheduleV2 || !timetableID }
+ { skip: !timetableID }
);
const getProjectImage = async (imageId: number) => {
@@ -91,26 +71,14 @@ const ScenarioExplorer = ({
}
};
- const validTrainCount = (trains: TrainScheduleSummary[]): number => {
- const validTrains = trains.filter(
- (train) => train.invalid_reasons && train.invalid_reasons.length === 0
- );
- return validTrains.length;
- };
-
const v2TrainCount = (trainIds: number[]) => trainIds.length;
- const scenario = useMemo(
- () => (useTrainScheduleV2 ? scenarioV2 : scenarioV1),
- [useTrainScheduleV2, scenarioV2, scenarioV1]
- );
-
useEffect(() => {
- if (scenario) {
- dispatch(updateTimetableID(scenario.timetable_id));
- dispatch(updateInfraID(scenario.infra_id));
+ if (scenarioV2) {
+ dispatch(updateTimetableID(scenarioV2.timetable_id));
+ dispatch(updateInfraID(scenarioV2.infra_id));
}
- }, [scenario]);
+ }, [scenarioV2]);
useEffect(() => {
if (projectDetails?.image) {
@@ -124,7 +92,7 @@ const ScenarioExplorer = ({
if (!isScenarioSuccess && stdcmV2Activated) {
dispatch(updateScenarioID(undefined));
}
- }, [scenario, scenarioV2, isScenarioSuccess]);
+ }, [scenarioV2, isScenarioSuccess]);
return (
(globalScenarioId);
const [studiesList, setStudiesList] = useState();
const [scenariosList, setScenariosList] = useState();
- const trainScheduleV2Activated = useSelector(getTrainScheduleV2Activated);
- const stdcmV2Activated = useSelector(getStdcmV2Activated);
- const useTrainScheduleV2 = trainScheduleV2Activated || stdcmV2Activated;
const {
projectsList,
@@ -60,8 +55,6 @@ const ScenarioExplorerModal = ({
);
const [getStudiesList] = osrdEditoastApi.endpoints.getProjectsByProjectIdStudies.useLazyQuery();
- const [getScenariosList] =
- osrdEditoastApi.endpoints.getProjectsByProjectIdStudiesAndStudyIdScenarios.useLazyQuery();
const [getV2ScenariosList] =
osrdEditoastApi.endpoints.getV2ProjectsByProjectIdStudiesAndStudyIdScenarios.useLazyQuery();
@@ -87,29 +80,17 @@ const ScenarioExplorerModal = ({
useEffect(() => {
if (projectID && studyID && !isProjectsError) {
- if (useTrainScheduleV2) {
- getV2ScenariosList({
- projectId: projectID,
- studyId: studyID,
- ordering: 'LastModifiedDesc',
- pageSize: 1000,
- })
- .unwrap()
- .then(({ results }) => setScenariosList(results))
- .catch((error) => console.error(error));
- } else {
- getScenariosList({
- projectId: projectID,
- studyId: studyID,
- ordering: 'LastModifiedDesc',
- pageSize: 1000,
- })
- .unwrap()
- .then(({ results }) => setScenariosList(results))
- .catch((error) => console.error(error));
- }
+ getV2ScenariosList({
+ projectId: projectID,
+ studyId: studyID,
+ ordering: 'LastModifiedDesc',
+ pageSize: 1000,
+ })
+ .unwrap()
+ .then(({ results }) => setScenariosList(results))
+ .catch((error) => console.error(error));
}
- }, [projectID, studyID, useTrainScheduleV2, isProjectsError]);
+ }, [projectID, studyID, isProjectsError]);
return (
- {trainScheduleV2Activated ? (
-
- {isOnEditionMode
- ? editionModeTooltipLabel
- : transformedData[tooltip.point.serieId].mode}
+ {isOnEditionMode ? editionModeTooltipLabel : transformedCurve.mode}
- {transformedData[tooltip.point.serieId].comfort !== STANDARD_COMFORT_LEVEL && (
+ {transformedCurve.comfort !== STANDARD_COMFORT_LEVEL && (
- {comfort2pictogram(transformedData[tooltip.point.serieId].comfort)}
+ {/* TODO: remove this condition when getRollingStock endpoint returns comfort
+ with type Comfort instead of RollingStockComfortType */}
+ {comfort2pictogram(
+ transformedCurve.comfort === 'AC' ? 'AIR_CONDITIONING' : transformedCurve.comfort
+ )}
)}
diff --git a/front/src/modules/rollingStock/components/RollingStockSelector/RollingStockHelpers.tsx b/front/src/modules/rollingStock/components/RollingStockSelector/RollingStockHelpers.tsx
index 5272d1599b1..b6416973065 100644
--- a/front/src/modules/rollingStock/components/RollingStockSelector/RollingStockHelpers.tsx
+++ b/front/src/modules/rollingStock/components/RollingStockSelector/RollingStockHelpers.tsx
@@ -4,11 +4,7 @@ import { BiLockAlt } from 'react-icons/bi';
import { ImFire } from 'react-icons/im';
import { IoIosSnow } from 'react-icons/io';
-import type {
- LightRollingStock,
- RollingStockComfortType,
- RollingStock,
-} from 'common/api/osrdEditoastApi';
+import type { LightRollingStock, RollingStock, Comfort } from 'common/api/osrdEditoastApi';
const RollingStockUnit = ({ unit, detail }: { unit: string; detail: string }) => {
if (unit && unit !== 'US') {
@@ -73,9 +69,9 @@ export const RollingStockInfo = ({
);
};
-export function comfort2pictogram(comfort: RollingStockComfortType | undefined) {
+export function comfort2pictogram(comfort: Comfort | undefined) {
switch (comfort) {
- case 'AC':
+ case 'AIR_CONDITIONING':
return (
- {globalProjectId && projectDetails && studyDetails && scenario ? (
+ {globalProjectId && projectDetails && studyDetails && scenarioV2 ? (
diff --git a/front/src/modules/scenario/components/ScenarioExplorer/ScenarioExplorerModal.tsx b/front/src/modules/scenario/components/ScenarioExplorer/ScenarioExplorerModal.tsx
index 1df20071628..39063e7fe45 100644
--- a/front/src/modules/scenario/components/ScenarioExplorer/ScenarioExplorerModal.tsx
+++ b/front/src/modules/scenario/components/ScenarioExplorer/ScenarioExplorerModal.tsx
@@ -2,7 +2,6 @@ import React, { useEffect, useState } from 'react';
import { useTranslation } from 'react-i18next';
import { MdArrowRight } from 'react-icons/md';
-import { useSelector } from 'react-redux';
import projectsLogo from 'assets/pictures/views/projects.svg';
import scenarioExploratorLogo from 'assets/pictures/views/scenarioExplorator.svg';
@@ -16,7 +15,6 @@ import {
import ModalBodySNCF from 'common/BootstrapSNCF/ModalSNCF/ModalBodySNCF';
import ModalHeaderSNCF from 'common/BootstrapSNCF/ModalSNCF/ModalHeaderSNCF';
import { setFailure } from 'reducers/main';
-import { getStdcmV2Activated, getTrainScheduleV2Activated } from 'reducers/user/userSelectors';
import { useAppDispatch } from 'store';
import { castErrorToFailure } from 'utils/error';
@@ -41,9 +39,6 @@ const ScenarioExplorerModal = ({
const [scenarioID, setScenarioID] = useState
{displayImgProject && imageUrl && (
{t('infraLegend')}
-
@@ -178,28 +146,20 @@ const ScenarioExplorer = ({
{t('scenarioLegend')}
-
- {scenario.name}
+
+ {scenarioV2.name}
+
+
+
+ {timetableV2 && v2TrainCount(timetableV2.train_ids)}
+
{scenario.infra_name}
+ {scenarioV2.infra_name}
diff --git a/front/src/modules/simulationResult/components/TimeButtons.tsx b/front/src/modules/simulationResult/components/TimeButtons.tsx
index 87c0d9b99be..1bac6907362 100644
--- a/front/src/modules/simulationResult/components/TimeButtons.tsx
+++ b/front/src/modules/simulationResult/components/TimeButtons.tsx
@@ -2,13 +2,10 @@ import React, { useState } from 'react';
import { useTranslation } from 'react-i18next';
import { FaBackward, FaPause, FaPlay, FaStop } from 'react-icons/fa';
-import { useSelector } from 'react-redux';
import { convertDepartureTimeIntoSec } from 'applications/operationalStudies/utils';
-import type { SimulationReport } from 'common/api/osrdEditoastApi';
import InputSNCF from 'common/BootstrapSNCF/InputSNCF';
import { updateIsPlaying } from 'reducers/osrdsimulation/actions';
-import { getTrainScheduleV2Activated } from 'reducers/user/userSelectors';
import { useAppDispatch } from 'store';
import { datetime2time, sec2datetime, time2datetime } from 'utils/timeManipulation';
@@ -22,14 +19,12 @@ const factor2ms = (factor: number) => {
};
type TimeButtonsProps = {
- selectedTrain?: SimulationReport;
departureTime?: string;
};
-const TimeButtons = ({ selectedTrain, departureTime }: TimeButtonsProps) => {
+const TimeButtons = ({ departureTime }: TimeButtonsProps) => {
const dispatch = useAppDispatch();
const { t } = useTranslation('simulation');
- const trainScheduleV2Activated = useSelector(getTrainScheduleV2Activated);
const [playInterval, setPlayInterval] = useState(undefined);
const [playReverse, setPlayReverse] = useState(false);
@@ -57,12 +52,8 @@ const TimeButtons = ({ selectedTrain, departureTime }: TimeButtonsProps) => {
const stop = () => {
clearInterval(playInterval);
setPlayInterval(undefined);
- if (trainScheduleV2Activated) {
- if (departureTime)
- updateTimePositionV2(sec2datetime(convertDepartureTimeIntoSec(departureTime)));
- } else if (selectedTrain) {
- updateTimePosition(sec2datetime(selectedTrain.base.stops[0].time));
- }
+ if (departureTime)
+ updateTimePositionV2(sec2datetime(convertDepartureTimeIntoSec(departureTime)));
dispatch(updateIsPlaying(false));
};
@@ -84,11 +75,7 @@ const TimeButtons = ({ selectedTrain, departureTime }: TimeButtonsProps) => {
} else {
i += factor.steps;
}
- if (trainScheduleV2Activated) {
- updateTimePositionV2(new Date(i * 1000));
- } else {
- updateTimePosition(new Date(i * 1000));
- }
+ updateTimePositionV2(new Date(i * 1000));
}, factor.ms);
setPlayInterval(playIntervalLocal);
dispatch(updateIsPlaying(true));
diff --git a/front/src/modules/trainschedule/components/ManageTrainSchedule/ManageTrainScheduleMap/RenderPopup.tsx b/front/src/modules/trainschedule/components/ManageTrainSchedule/ManageTrainScheduleMap/RenderPopup.tsx
index b48e8172f58..8440c4e8e6d 100644
--- a/front/src/modules/trainschedule/components/ManageTrainSchedule/ManageTrainScheduleMap/RenderPopup.tsx
+++ b/front/src/modules/trainschedule/components/ManageTrainSchedule/ManageTrainScheduleMap/RenderPopup.tsx
@@ -15,12 +15,8 @@ import { calculateDistanceAlongTrack } from 'applications/editor/tools/utils';
import type { ManageTrainSchedulePathProperties } from 'applications/operationalStudies/types';
import { osrdEditoastApi } from 'common/api/osrdEditoastApi';
import { useOsrdConfActions, useOsrdConfSelectors } from 'common/osrdContext';
-import {
- setPointIti,
- setPointItiV2,
-} from 'modules/trainschedule/components/ManageTrainSchedule/ManageTrainScheduleMap/setPointIti';
+import { setPointItiV2 } from 'modules/trainschedule/components/ManageTrainSchedule/ManageTrainScheduleMap/setPointIti';
import type { PathStep } from 'reducers/osrdconf/types';
-import { getTrainScheduleV2Activated } from 'reducers/user/userSelectors';
type FeatureInfoClickType = {
displayPopup: boolean;
@@ -37,7 +33,6 @@ function RenderPopup({ pathProperties }: RenderPopupProps) {
const osrdConfActions = useOsrdConfActions();
const { t } = useTranslation(['operationalStudies/manageTrainSchedule']);
const featureInfoClick: FeatureInfoClickType = useSelector(getFeatureInfoClick);
- const trainScheduleV2Activated = useSelector(getTrainScheduleV2Activated);
const infraId = useSelector(getInfraID);
const [trackOffset, setTrackOffset] = useState(0);
@@ -74,7 +69,7 @@ function RenderPopup({ pathProperties }: RenderPopupProps) {
setTrackOffset(offset);
};
- if (trainScheduleV2Activated && featureInfoClick.displayPopup) {
+ if (featureInfoClick.displayPopup) {
calculateOffset();
}
}, [featureInfoClick]);
@@ -87,13 +82,6 @@ function RenderPopup({ pathProperties }: RenderPopupProps) {
)
return null;
- const properties = {
- ...featureInfoClick.feature.properties,
- coordinates: featureInfoClick.coordinates.slice(0, 2),
- };
-
- // TS2 section
- // TODO TS2: if !pathProperties, return null
const { properties: trackProperties } = featureInfoClick.feature;
const coordinates = featureInfoClick.coordinates.slice(0, 2);
@@ -128,67 +116,35 @@ function RenderPopup({ pathProperties }: RenderPopupProps) {
{featureInfoClick.feature.properties.extensions_sncf_line_name}
-
-
-
-
- ) : (
-
-
-
-
-
- )}
+
+
+
+
+
+
);
}
diff --git a/front/src/modules/trainschedule/components/ManageTrainSchedule/Map.tsx b/front/src/modules/trainschedule/components/ManageTrainSchedule/Map.tsx
index 1bac1d0d176..660c0e0b84c 100644
--- a/front/src/modules/trainschedule/components/ManageTrainSchedule/Map.tsx
+++ b/front/src/modules/trainschedule/components/ManageTrainSchedule/Map.tsx
@@ -43,13 +43,10 @@ import { computeBBoxViewport } from 'common/Map/WarpedMap/core/helpers';
import { useInfraID, useOsrdConfActions, useOsrdConfSelectors } from 'common/osrdContext';
import { LAYER_GROUPS_ORDER, LAYERS } from 'config/layerOrder';
import VirtualLayers from 'modules/simulationResult/components/SimulationResultsMap/VirtualLayers';
-import Itinerary from 'modules/trainschedule/components/ManageTrainSchedule/ManageTrainScheduleMap/Itinerary';
-import ItineraryMarkers from 'modules/trainschedule/components/ManageTrainSchedule/ManageTrainScheduleMap/ItineraryMarkers';
import RenderPopup from 'modules/trainschedule/components/ManageTrainSchedule/ManageTrainScheduleMap/RenderPopup';
import { updateViewport } from 'reducers/map';
import type { Viewport } from 'reducers/map';
import { getMap, getTerrain3DExaggeration } from 'reducers/map/selectors';
-import { getTrainScheduleV2Activated } from 'reducers/user/userSelectors';
import { useAppDispatch } from 'store';
import { getMapMouseEventNearestFeature } from 'utils/mapHelper';
@@ -74,7 +71,6 @@ const Map = ({
const infraID = useInfraID();
const terrain3DExaggeration = useSelector(getTerrain3DExaggeration);
const { viewport, mapSearchMarker, mapStyle, showOSM, layersSettings } = useSelector(getMap);
- const trainScheduleV2Activated = useSelector(getTrainScheduleV2Activated);
const [mapIsLoaded, setMapIsLoaded] = useState(false);
const [showLayers, setShowLayers] = useState(true);
@@ -376,22 +372,16 @@ const Map = ({
)}
- {trainScheduleV2Activated ? (
-
- ) => setStartTime(e.target.value)}
- value={startTime}
- isInvalid={!startTime}
- errorMsg={t('errorMessages.mandatoryField')}
- noMargin
- />
- ) : (
-
- ) => setDepartureTime(e.target.value)}
- value={departureTime}
- isInvalid={!departureTime}
- errorMsg={t('errorMessages.mandatoryField')}
- noMargin
- />
- )}
+
+ ) => setStartTime(e.target.value)}
+ value={startTime}
+ isInvalid={!startTime}
+ errorMsg={t('errorMessages.mandatoryField')}
+ noMargin
+ />