Merge branch 'remove-1-2-parallel' into percy

lib/actions/api.js

@@ -25,9 +25,6 @@ const { getRoutingParams, getTripOptionsFromQuery, getUrlParams } =
   coreUtils.query
 const { randId } = coreUtils.storage
 
-// set actions variable that can be set to v2Actions if v2 server is set
-let actions = v1Actions
-
 // Generic API actions
 
 /*
@@ -91,6 +88,24 @@ function getActiveItinerary(state) {
   return activeItinerary
 }
 
+/**
+ * Dispatches a method from either v1actions or v2actions, depending on
+ * which version of OTP is specified in the config.
+ * @param {*} methodName    the method to execute
+ * @param  {...any} params  varargs of params to send to the action
+ */
+function executeOTPAction(methodName, ...params) {
+  return function (dispatch, getState) {
+    const state = getState()
+    const { api } = state.otp.config
+    return dispatch(
+      api?.v2
+        ? v2Actions[methodName](...params)
+        : v1Actions[methodName](...params)
+    )
+  }
+}
+
 /**
  * Send a routing query to the OTP backend.
  *
@@ -248,7 +263,6 @@ function getOtpFetchOptions(state, includeToken = false) {
   let apiBaseUrl, apiKey, token
 
   const { api, persistence } = state.otp.config
-  if (api.v2) actions = v2Actions
   if (persistence && persistence.otp_middleware) {
     // Prettier does not understand the syntax on this line
     // eslint-disable-next-line prettier/prettier
@@ -350,7 +364,8 @@ export function vehicleRentalQuery(
   errorAction = vehicleRentalError,
   options = {}
 ) {
-  return actions.vehicleRentalQuery(
+  return executeOTPAction(
+    'vehicleRentalQuery',
     params,
     responseAction,
     errorAction,
@@ -363,7 +378,7 @@ export const findStopResponse = createAction('FIND_STOP_RESPONSE')
 export const findStopError = createAction('FIND_STOP_ERROR')
 
 export function fetchStopInfo(stop) {
-  return actions.fetchStopInfo(stop)
+  return executeOTPAction('fetchStopInfo', stop)
 }
 
 // Single trip lookup query
@@ -372,7 +387,7 @@ export const findTripResponse = createAction('FIND_TRIP_RESPONSE')
 export const findTripError = createAction('FIND_TRIP_ERROR')
 
 export function findTrip(params) {
-  return actions.findTrip(params)
+  return executeOTPAction('findTrip', params)
 }
 
 // Stops for trip query
@@ -545,20 +560,11 @@ export const findRouteResponse = createAction('FIND_ROUTE_RESPONSE')
 export const findRouteError = createAction('FIND_ROUTE_ERROR')
 
 export function findRoute(params) {
-  return function (dispatch, getState) {
-    const state = getState()
-    const { api } = state.otp.config
-    // Because findRoute is sometimes called from strange places,
-    // we must explicitly check for V2 as we can not rely on
-    // the check having already happened
-    if (api.v2) actions = v2Actions
-
-    return dispatch(actions.findRoute(params))
-  }
+  return executeOTPAction('findRoute', params)
 }
 
 export function findPatternsForRoute(params) {
-  return actions.findPatternsForRoute(params)
+  return executeOTPAction('findPatternsForRoute', params)
 }
 
 // Geometry for Pattern lookup query
@@ -768,7 +774,7 @@ export const receivedVehiclePositionsError = createAction(
 )
 
 export function getVehiclePositionsForRoute(routeId) {
-  return actions.getVehiclePositionsForRoute(routeId)
+  return executeOTPAction('getVehiclePositionsForRoute', routeId)
 }
 
 const throttledUrls = {}

lib/actions/apiV1.js

@@ -54,9 +54,8 @@ export function vehicleRentalQuery(
   return createQueryAction(endpoint, responseAction, errorAction, options)
 }
 
-function findNearbyAmenities(params, stopId) {
+function findNearbyAmenities({ lat, lon, radius = 300 }, stopId) {
   return function (dispatch, getState) {
-    const { lat, lon, radius } = params
     const bounds = L.latLng(lat, lon).toBounds(radius)
     const { lat: low, lng: left } = bounds.getSouthWest()
     const { lat: up, lng: right } = bounds.getNorthEast()
@@ -109,8 +108,8 @@ function findNearbyAmenities(params, stopId) {
   }
 }
 
-export function findStop(params) {
-  return createQueryAction(
+export const findStop = (params) =>
+  createQueryAction(
     `index/stops/${params.stopId}`,
     findStopResponse,
     findStopError,
@@ -123,32 +122,33 @@ export function findStop(params) {
       serviceId: 'stops'
     }
   )
-}
 
 const fetchStopInfo = (stop) =>
   async function (dispatch, getState) {
     await dispatch(findStop({ stopId: stop.stopId }))
     const state = getState()
-    const { nearbyRadius: radius } = state.otp.config.stopViewer
+    const { nearbyRadius } = state.otp?.config?.stopViewer
     const fetchedStop = state.otp.transitIndex.stops?.[stop?.stopId]
     // TODO: stop not found message
     if (!fetchedStop) return
 
     const { lat, lon } = fetchedStop
-    if (radius > 0) {
+    if (nearbyRadius > 0) {
       dispatch(
         findNearbyStops(
           {
             includeRoutes: true,
             includeStopTimes: true,
             lat,
             lon,
-            radius
+            nearbyRadius
           },
           stop.stopId
         )
       )
-      dispatch(findNearbyAmenities({ lat, lon, radius }, stop.stopId))
+      dispatch(
+        findNearbyAmenities({ lat, lon, radius: nearbyRadius }, stop.stopId)
+      )
       dispatch(zoomToStop(fetchedStop))
     }
   }
@@ -168,8 +168,8 @@ const getVehiclePositionsForRoute = (routeId) =>
     }
   )
 
-export function findPatternsForRoute(params) {
-  return createQueryAction(
+export const findPatternsForRoute = (params) =>
+  createQueryAction(
     `index/routes/${params.routeId}/patterns?includeGeometry=true`,
     findPatternsForRouteResponse,
     findPatternsForRouteError,
@@ -205,10 +205,9 @@ export function findPatternsForRoute(params) {
       }
     }
   )
-}
 
-export function findRoute(params) {
-  return createQueryAction(
+export const findRoute = (params) =>
+  createQueryAction(
     `index/routes/${params.routeId}`,
     findRouteResponse,
     findRouteError,
@@ -221,7 +220,6 @@ export function findRoute(params) {
       }
     }
   )
-}
 
 export default {
   fetchStopInfo,

lib/actions/apiV2.js

@@ -1,3 +1,5 @@
+import clone from 'clone'
+
 import {
   createQueryAction,
   findGeometryForTrip,
@@ -73,7 +75,8 @@ const findTrip = (params) =>
           tripBikesAllowed: bikesAllowed
 
           stops {
-			      gtfsId: id
+			      id: gtfsId
+			      stopId: gtfsId
 			      code
 			      name
 			      lat
@@ -105,14 +108,14 @@ const findTrip = (params) =>
     }
   )
 
-export function vehicleRentalQuery(
+export const vehicleRentalQuery = (
   params,
   responseAction,
   errorAction,
   options
-) {
+) =>
   // TODO: ErrorsByNetwork is missing
-  return createGraphQLQueryAction(
+  createGraphQLQueryAction(
     `{
     rentalVehicles {
       vehicleId
@@ -153,7 +156,6 @@ export function vehicleRentalQuery(
       }
     }
   )
-}
 
 const stopTimeGraphQLQuery = `
 stopTimes: stoptimesForPatterns(numberOfDepartures: 3) {
@@ -255,6 +257,9 @@ const findNearbyAmenities = ({ lat, lon, radius = 300, stopId }) => {
             id
             lat
             lon
+            ...on VehicleRentalStation {
+              network
+            }
           }
           distance
         }
@@ -267,6 +272,9 @@ const findNearbyAmenities = ({ lat, lon, radius = 300, stopId }) => {
             id
             lat
             lon
+            ...on RentalVehicle {
+              network
+            }
           }
           distance
         }
@@ -308,7 +316,9 @@ const findNearbyAmenities = ({ lat, lon, radius = 300, stopId }) => {
                 lat: edge.node?.place?.lat,
                 lon: edge.node?.place?.lon,
                 name: edge.node?.place?.id || '',
-                networks: ['null']
+                networks: [edge.node?.place?.network || 'null'],
+                x: edge.node?.place?.lon,
+                y: edge.node?.place?.lat
               }
             })
           },
@@ -321,7 +331,9 @@ const findNearbyAmenities = ({ lat, lon, radius = 300, stopId }) => {
                 lat: edge.node?.place?.lat,
                 lon: edge.node?.place?.lon,
                 name: edge.node?.place?.id || '',
-                networks: ['null']
+                networks: ['null'],
+                x: edge.node?.place?.lon,
+                y: edge.node?.place?.lat
               }
             }
           ),
@@ -335,7 +347,9 @@ const findNearbyAmenities = ({ lat, lon, radius = 300, stopId }) => {
                 lat: edge.node?.place?.lat,
                 lon: edge.node?.place?.lon,
                 name: edge.node?.place?.id || '',
-                networks: ['null']
+                networks: [edge.node?.place?.network || 'null'],
+                x: edge.node?.place?.lon,
+                y: edge.node?.place?.lat
               }
             })
           }
@@ -347,7 +361,10 @@ const findNearbyAmenities = ({ lat, lon, radius = 300, stopId }) => {
 
 const fetchStopInfo = (stop) => {
   const { stopId } = stop
-  if (!stopId) return {}
+  if (!stopId)
+    return function (dispatch, getState) {
+      console.warn("No stopId passed, can't fetch stop!")
+    }
 
   return createGraphQLQueryAction(
     `{
@@ -366,7 +383,7 @@ const fetchStopInfo = (stop) => {
           return findStopError(payload.errors)
         }
         const { stop } = payload?.data
-        if (!stop) return findStopError()
+        if (!stop || !stop.lat || !stop.lon) return findStopError()
 
         // Fetch nearby stops and amenities
         // TODO: add radius from config
@@ -411,14 +428,13 @@ const fetchStopInfo = (stop) => {
   )
 }
 
-const getVehiclePositionsForRoute = () => {
-  return function (dispatch, getState) {
+const getVehiclePositionsForRoute = () =>
+  function (dispatch, getState) {
     console.warn('OTP2 does not yet support vehicle positions for route!')
   }
-}
 
-export function findRoute(params) {
-  return function (dispatch, getState) {
+export const findRoute = (params) =>
+  function (dispatch, getState) {
     const { routeId } = params
     if (!routeId) return
 
@@ -481,8 +497,9 @@ export function findRoute(params) {
             const { route } = payload?.data
             if (!route) return
 
+            const newRoute = clone(route)
             const routePatterns = {}
-            route.patterns.forEach((pattern) => {
+            newRoute.patterns.forEach((pattern) => {
               const patternStops = pattern.stops.map((stop) => {
                 const color =
                   stop.routes?.length > 0 && `#${stop.routes[0].color}`
@@ -496,20 +513,19 @@ export function findRoute(params) {
                 stops: patternStops
               }
             })
-            route.patterns = routePatterns
+            newRoute.patterns = routePatterns
             // TODO: avoid explicit behavior shift like this
-            route.v2 = true
+            newRoute.v2 = true
 
-            return route
+            return newRoute
           }
         }
       )
     )
   }
-}
 
-export function findPatternsForRoute(params) {
-  return function (dispatch, getState) {
+export const findPatternsForRoute = (params) =>
+  function (dispatch, getState) {
     const state = getState()
     const { routeId } = params
     const route = state?.otp?.transitIndex?.routes?.[routeId]
@@ -521,7 +537,6 @@ export function findPatternsForRoute(params) {
       return dispatch(findRoute(params))
     }
   }
-}
 
 export default {
   fetchStopInfo,

lib/actions/ui.js

@@ -174,9 +174,9 @@ export function matchContentToUrl(location) {
       case 'route':
         if (id) {
           // This is a bit of a hack to check if the route details have been grabbed
-          // agencyName will only be populated if route details are repsent
+          // bikesAllowed will only be populated if route details are present
           // Moving away from manual requests should help resolve this
-          if (!state.otp.transitIndex?.routes?.[id]?.agencyName) {
+          if (!state.otp.transitIndex?.routes?.[id]?.bikesAllowed) {
             dispatch(findRoute({ routeId: id }))
           }
           // Check for pattern "submatch"