File tree Expand file tree Collapse file tree
Expand file tree Collapse file tree Original file line number Diff line number Diff line change @@ -7,7 +7,11 @@ import {
77 useGetStopInfoForEditingOnMapQuery ,
88} from '../../../../generated/graphql' ;
99import { RequiredNonNullableKeys } from '../../../../types' ;
10- import { getGeometryPoint , requireValue } from '../../../../utils' ;
10+ import {
11+ getGeometryPoint ,
12+ parseVehicleMode ,
13+ requireValue ,
14+ } from '../../../../utils' ;
1115import { StopFormState } from '../types' ;
1216import {
1317 RawName ,
@@ -135,6 +139,8 @@ function parseResult(
135139 quayId : requireValue ( rawQuay . netexId ) ,
136140 stopId : requireValue ( rawQuay . stopPoint . id ) ,
137141 stopArea : requireValue ( parseStopFormStopAreaInfo ( rawQuay . stopPlace ) ) ,
142+ vehicleMode :
143+ parseVehicleMode ( rawQuay . stopPlace ?. transportMode ) ?? undefined ,
138144
139145 latitude : requireValue ( point ?. latitude ) ,
140146 longitude : requireValue ( point ?. longitude ) ,
Original file line number Diff line number Diff line change @@ -3,7 +3,6 @@ import compact from 'lodash/compact';
33import { useMemo } from 'react' ;
44import {
55 MapStopMinimalDetailsFragment ,
6- ReusableComponentsVehicleModeEnum ,
76 StopsDatabaseQuayNewestVersionBoolExp ,
87 useGetMapStopsQuery ,
98} from '../../../generated/graphql' ;
@@ -12,6 +11,7 @@ import { Viewport } from '../../../redux/types';
1211import { parseDate } from '../../../time' ;
1312import { Priority } from '../../../types/enums' ;
1413import { StopPlaceState } from '../../../types/stop-registry' ;
14+ import { parseVehicleMode } from '../../../utils' ;
1515import { useMapDataLayerSimpleQueryLoader } from '../../common/hooks/useLoader' ;
1616import { filtersAndResultSelectionToQueryVariables } from '../../stop-registry/search/by-stop/filtersToQueryVariables' ;
1717import { mapCompactOrNull } from '../../stop-registry/utils' ;
@@ -115,9 +115,8 @@ function mapRawStopToMapStop(
115115 return null ;
116116 }
117117
118- const vehicleMode = rawStop . stop_place ?. transport_mode ?. toLowerCase ( ) as
119- | ReusableComponentsVehicleModeEnum
120- | undefined ;
118+ const vehicleMode =
119+ parseVehicleMode ( rawStop . stop_place ?. transport_mode ) ?? undefined ;
121120
122121 return {
123122 label : rawStop . label ,
Original file line number Diff line number Diff line change @@ -2,6 +2,7 @@ import { useCallback } from 'react';
22import { ReusableComponentsVehicleModeEnum } from '../../../../generated/graphql' ;
33import { useAppSelector } from '../../../../hooks' ;
44import { FilterType , selectMapFilter } from '../../../../redux' ;
5+ import { parseVehicleMode } from '../../../../utils' ;
56import { MapStop } from '../../types' ;
67import { useVisibleRouteStops } from './useVisibleRouteStops' ;
78
@@ -16,7 +17,7 @@ export function useFilterStopsByVehicleMode(
1617 return useCallback (
1718 ( stops : ReadonlyArray < MapStop > ) : ReadonlyArray < MapStop > =>
1819 stops . filter ( ( stop ) => {
19- const vehicleMode = getStopVehicleMode ( stop ) ;
20+ const vehicleMode = parseVehicleMode ( getStopVehicleMode ( stop ) ) ;
2021 const isStopInVisibleRoutes = visibleRouteStopLabels . includes (
2122 stop . label ,
2223 ) ;
You can’t perform that action at this time.
0 commit comments