fix: search params use routeMkt-routeDirection for routeKey instead of routeLongName (#1396)

Co-authored-by: claude[bot] <41898282+claude[bot]@users.noreply.github.com>
Co-authored-by: Aviv <AvivAbachi@users.noreply.github.com>

Author: AvivAbachi

src/api/gtfsService.ts

@@ -83,7 +83,12 @@ export async function getStopsForRouteAsync(
     })
     await Promise.all(
       rideStops.map(async (rideStop) => {
-        if (!rideStop.gtfsStopId) return
+        if (
+          !rideStop.gtfsStopId ||
+          stops.find((b) => b.code === rideStop.gtfsStopCode?.toString())
+        ) {
+          return
+        }
         const stop = await GTFS_API.gtfsStopsGetGet({ id: rideStop.gtfsStopId })
         stops.push(fromGtfsStop(rideStop as GtfsRideStopPydanticModel, stop, rideRepresentative))
       }),

src/hooks/useAllRoutes.ts

@@ -48,12 +48,13 @@ type RouteItem = {
 
 function mapperRoutes(routes: GtfsRoutePydanticModel[]) {
   return routes
-    .map(({ id, routeShortName, routeLongName }) => {
+    .map(({ id, routeShortName, routeLongName, routeMkt, routeDirection }) => {
       const [start, end] = routeStartEnd(routeLongName)
       const [, routeLine, routeSuffix] = routeShortName?.match(/^(\d+)(.*)$/) ?? []
       const line = Number(routeLine)
       const suffix = line && routeSuffix ? routeSuffix : ''
-      return { id, line, suffix, start, end, routeKey: routeLongName || '' } as RouteItem
+      const routeKey = `${routeMkt}-${routeDirection}`
+      return { id, line, suffix, start, end, routeKey } as RouteItem
     })
     .sort((a, b) => a.line - b.line || a.suffix.localeCompare(b.suffix, 'he'))
 }

src/model/busRoute.ts

@@ -12,6 +12,7 @@ export type BusRoute = {
   routeIds: number[]
   lineRef: number
   routeAlternative: string
+  mkt: string
 }
 
 export function fromGtfsRoute(gtfsRoute: GtfsRoutePydanticModel): BusRoute {
@@ -21,12 +22,13 @@ export function fromGtfsRoute(gtfsRoute: GtfsRoutePydanticModel): BusRoute {
     date: gtfsRoute.date,
     operatorId: gtfsRoute.operatorRef.toString(),
     lineNumber: gtfsRoute.routeShortName!,
-    key: gtfsRoute.routeLongName!,
+    key: `${gtfsRoute.routeMkt}-${gtfsRoute.routeDirection}`,
     fromName: parts[0] || '',
     toName: parts[1] || '',
     direction: gtfsRoute.routeDirection!,
     routeIds: [gtfsRoute.id],
     lineRef: gtfsRoute.lineRef,
     routeAlternative: gtfsRoute.routeAlternative!,
+    mkt: gtfsRoute.routeMkt!,
   }
 }

src/pages/components/RouteSelector.stories.tsx

@@ -129,7 +129,7 @@ export const Default: Story = {}
 
 export const RoutesSelected: Story = {
   args: {
-    routeKey: 'הנדיב/המייסדים-זכרון יעקב<->הנדיב/המייסדים-זכרון יעקב-3#',
+    routeKey: '16001-3',
   },
 }
 

src/pages/lineProfile/LineProfile.tsx

@@ -42,9 +42,9 @@ const LineProfile = () => {
       operatorId: route.operatorRef.toString(),
       lineNumber: route.routeShortName,
       routes,
-      routeKey: route.routeLongName,
+      routeKey: `${route.routeMkt}-${route.routeDirection}`,
     }))
-    setRouteKey(route.routeLongName)
+    setRouteKey(`${route.routeMkt}-${route.routeDirection}`)
   }, [route?.id])
 
   const {
@@ -71,7 +71,7 @@ const LineProfile = () => {
       abortController.signal,
     )
       .then((routes) => {
-        const newRoute = routes?.find((r) => r.key === route.routeLongName)
+        const newRoute = routes?.find((r) => r.key === `${route.routeMkt}-${route.routeDirection}`)
         if (newRoute?.routeIds?.[0]) {
           navigate(`/profile/${newRoute.routeIds[0]}`)
         }