Skip to content

Commit b535c1c

Browse files
committed
front: add start and destination icons in the scenario map
Signed-off-by: theocrsb <theo_crosbie@yahoo.fr>
1 parent 0cce373 commit b535c1c

File tree

8 files changed

+19
-7
lines changed

8 files changed

+19
-7
lines changed

front/src/applications/stdcm/components/StdcmForm/StdcmDestination.tsx

+1-1
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ import { useMemo, useState } from 'react';
22

33
import { useTranslation } from 'react-i18next';
44

5-
import DestinationIcon from 'assets/pictures/stdcm/destination.svg';
5+
import DestinationIcon from 'assets/pictures/mapMarkers/destination.svg';
66
import { useOsrdConfActions } from 'common/osrdContext';
77
import type { StdcmConfSliceActions } from 'reducers/osrdconf/stdcmConf';
88
import type { PathStep } from 'reducers/osrdconf/types';

front/src/applications/stdcm/components/StdcmForm/StdcmOrigin.tsx

+1-1
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ import { useMemo, useState } from 'react';
22

33
import { useTranslation } from 'react-i18next';
44

5-
import OriginIcon from 'assets/pictures/stdcm/start.svg';
5+
import OriginIcon from 'assets/pictures/mapMarkers/start.svg';
66
import { useOsrdConfActions } from 'common/osrdContext';
77
import type { StdcmConfSliceActions } from 'reducers/osrdconf/stdcmConf';
88
import type { PathStep } from 'reducers/osrdconf/types';

front/src/applications/stdcm/components/StdcmForm/StdcmVias.tsx

+1-1
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ import { useTranslation } from 'react-i18next';
66
import nextId from 'react-id-generator';
77
import { useSelector } from 'react-redux';
88

9-
import IntermediatePointIcon from 'assets/pictures/stdcm/intermediate-point.svg';
9+
import IntermediatePointIcon from 'assets/pictures/mapMarkers/intermediate-point.svg';
1010
import { useOsrdConfSelectors, useOsrdConfActions } from 'common/osrdContext';
1111
import type { StdcmConfSliceActions } from 'reducers/osrdconf/stdcmConf';
1212
import type { PathStep } from 'reducers/osrdconf/types';

front/src/modules/simulationResult/components/SimulationResultsMap/RenderItinerary.tsx

+13-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,8 @@
11
import type { Feature, LineString } from 'geojson';
2-
import { Source } from 'react-map-gl/maplibre';
2+
import { Marker, Source } from 'react-map-gl/maplibre';
33

4+
import destinationIcon from 'assets/pictures/mapMarkers/destination.svg';
5+
import originIcon from 'assets/pictures/mapMarkers/start.svg';
46
import OrderedLayer from 'common/Map/Layers/OrderedLayer';
57

68
interface RenderItineraryProps {
@@ -21,8 +23,15 @@ export default function RenderItinerary(props: RenderItineraryProps) {
2123
'line-color': '#158DCF',
2224
};
2325

26+
const startCoordinate = geojsonPath.geometry.coordinates[0];
27+
const endCoordinate =
28+
geojsonPath.geometry.coordinates[geojsonPath.geometry.coordinates.length - 1];
29+
2430
return (
2531
<Source type="geojson" data={geojsonPath}>
32+
<Marker longitude={startCoordinate[0]} latitude={startCoordinate[1]} anchor="bottom">
33+
<img src={originIcon} alt="origin" />
34+
</Marker>
2635
<OrderedLayer
2736
id="geojsonPathBackgroundLine"
2837
type="line"
@@ -31,6 +40,9 @@ export default function RenderItinerary(props: RenderItineraryProps) {
3140
layerOrder={layerOrder}
3241
/>
3342
<OrderedLayer id="geojsonPathLine" type="line" paint={paintLine} layerOrder={layerOrder} />
43+
<Marker longitude={endCoordinate[0]} latitude={endCoordinate[1]} anchor="bottom">
44+
<img src={destinationIcon} alt="destination" />
45+
</Marker>
3446
</Source>
3547
);
3648
}

front/src/modules/trainschedule/components/ManageTrainSchedule/ManageTrainScheduleMap/ItineraryMarkers.tsx

+3-3
Original file line numberDiff line numberDiff line change
@@ -7,10 +7,10 @@ import { Marker } from 'react-map-gl/maplibre';
77
import { useSelector } from 'react-redux';
88

99
import destinationSVG from 'assets/pictures/destination.svg';
10+
import stdcmDestination from 'assets/pictures/mapMarkers/destination.svg';
11+
import stdcmVia from 'assets/pictures/mapMarkers/intermediate-point.svg';
12+
import stdcmOrigin from 'assets/pictures/mapMarkers/start.svg';
1013
import originSVG from 'assets/pictures/origin.svg';
11-
import stdcmDestination from 'assets/pictures/stdcm/destination.svg';
12-
import stdcmVia from 'assets/pictures/stdcm/intermediate-point.svg';
13-
import stdcmOrigin from 'assets/pictures/stdcm/start.svg';
1414
import viaSVG from 'assets/pictures/via.svg';
1515
import { useOsrdConfSelectors } from 'common/osrdContext';
1616
import type { PathStep } from 'reducers/osrdconf/types';

0 commit comments

Comments
 (0)