Readjust walking route departure and arrival time due to bus buffer t…

…ime (#274)

src/utils/ParseRouteUtils.js

@@ -359,15 +359,15 @@ function parseWalkingRoute(
 ): Object {
  try {
  const path = data.paths[0];
- let startDateMs = dateMs;
- let endDateMs = dateMs + path.time;
+ let startTimeMs = dateMs;
+ let endTimeMs = dateMs + path.time;
 
  if (isArriveBy) {
- startDateMs = dateMs - path.time;
- endDateMs = dateMs;
+ startTimeMs = dateMs - path.time;
+ endTimeMs = dateMs;
  }
- const departureTime = convertMillisecondsToISOString(startDateMs);
- const arrivalTime = convertMillisecondsToISOString(endDateMs);
+ const departureTime = convertMillisecondsToISOString(startTimeMs);
+ const arrivalTime = convertMillisecondsToISOString(endTimeMs);
  const totalDuration = getDifferenceInMinutes(departureTime, arrivalTime);
 
  const { startCoords, endCoords } = getStartEndCoords(path.points, path.points);
@@ -453,7 +453,13 @@ function parseWalkingRoute(
  * @param destinationName
  * @returns {Promise<Array<Object>>}
  */
-function parseRoutes(busRoutes: Array<Object>, originName: string, destinationName: string): Promise<Array<Object>> {
+function parseRoutes(
+ busRoutes: Array<Object>,
+ originName: string,
+ destinationName: string,
+ originalDepartureTimeMs: number,
+ isArriveByQuery: boolean,
+): Promise<Array<Object>> {
  return Promise.all(busRoutes.map(async (busRoute) => {
  try {
  // array containing legs of journey. e.g. walk, bus ride, walk
@@ -656,6 +662,39 @@ function parseRoutes(busRoutes: Array<Object>, originName: string, destinationNa
  stopName: destinationName,
  });
 
+ // Readjust the walking start and end times by accounting for the buffer
+ // times that were initially passed into Graphhopper to get routes
+ if (busRoute.transfers === -1) {
+ let startTimeMs = originalDepartureTimeMs;
+ let endTimeMs = originalDepartureTimeMs + busRoute.time;
+
+ if (isArriveByQuery) {
+ startTimeMs = originalDepartureTimeMs - busRoute.time;
+ endTimeMs = originalDepartureTimeMs;
+ }
+
+ const walkDepartureTime = convertMillisecondsToISOString(startTimeMs);
+ const walkArrivalTime = convertMillisecondsToISOString(endTimeMs);
+
+ directions[0].startTime = walkDepartureTime;
+ directions[0].endTime = walkArrivalTime;
+
+ return {
+ arrivalTime: walkArrivalTime,
+ boundingBox,
+ departureTime: walkDepartureTime,
+ directions,
+ endCoords,
+ endName: destinationName,
+ numberOfTransfers: busRoute.transfers,
+ routeSummary,
+ startCoords,
+ startName: originName,
+ totalDuration,
+ travelDistance,
+ };
+ }
+
  return {
  arrivalTime: arriveTime,
  boundingBox,

src/utils/RouteUtils.js

@@ -153,7 +153,10 @@ async function getParsedWalkingAndBusRoutes(
  };
  }
 
- const parsedRoutes = await ParseRouteUtils.parseRoutes(routes, originName, destinationName);
+ const departureTimeMs = GraphhopperUtils.getDepartureTime(departureTimeQuery, isArriveBy, 0);
+ const parsedRoutes = await ParseRouteUtils.parseRoutes(
+ routes, originName, destinationName, departureTimeMs, isArriveBy,
+ );
  let parsedWalkingRoute = parsedRoutes.find(route => route.numberOfTransfers === -1);
 
  // Make request to Ghopper walking service if the bus service doesn't provide walking directions