feat(api): Consider modes when constructing profile API requests

Author: David Emory

lib/actions/api.js

@@ -9,6 +9,7 @@ if (typeof (fetch) === 'undefined') {
 }
 
 import { queryIsValid } from '../util/state'
+import { isTransit, isAccessMode, isCar } from '../util/itinerary'
 
 // Itinerary Query
 
@@ -113,6 +114,22 @@ export function profileTrip (customOtpQueryBuilder) {
 function constructProfileQuery (api, query) {
   const planEndpoint = `${api.host}${api.port ? ':' + api.port : ''}${api.path}/plan`
   const { mode, startTime, endTime, date } = query
+
+  const accessModes = []
+  const directModes = []
+  const transitModes = []
+
+  if (mode && mode.length > 0) {
+    mode.split(',').forEach(m => {
+      if (isTransit(m)) transitModes.push(m)
+      if (isAccessMode(m)) {
+        accessModes.push(m)
+        // make configurable whether direct-driving is considered
+        if (!isCar(m)) directModes.push(m)
+      }
+    })
+  }
+
   const params = {
     date,
     startTime,
@@ -125,9 +142,9 @@ function constructProfileQuery (api, query) {
       lat: query.to.lat,
       lon: query.to.lon
     },
-    accessModes: 'WALK,BICYCLE',
-    directModes: 'WALK,BICYCLE,BICYCLE_RENT',
-    transitModes: 'BUS,TRAM'
+    accessModes: accessModes.join(','),
+    directModes: directModes.join(','),
+    transitModes: transitModes.join(',')
   }
   const stringParams = qs.stringify(params)
   // TODO: set url hash based on params

lib/util/itinerary.js

@@ -21,11 +21,20 @@ export function isBicycle (mode) {
   return mode === 'BICYCLE'
 }
 
+export function isBicycleRent (mode) {
+  mode = mode || this.get('mode')
+  return mode === 'BICYCLE_RENT'
+}
+
 export function isCar (mode) {
   mode = mode || this.get('mode')
   return mode === 'CAR'
 }
 
+export function isAccessMode (mode) {
+  return isWalk(mode) || isBicycle(mode) || isBicycleRent(mode) || isCar(mode)
+}
+
 export function getMapColor (mode) {
   mode = mode || this.get('mode')
   if (mode === 'WALK') return '#444'