Merge pull request #990 from opentripplanner/alert-on-forbidden-combo

Alert if user clicks Plan Trip with invalid mode selection

i18n/en-US.yml

@@ -234,6 +234,9 @@ components:
     modeSelectorLabel: Select a transit mode
   BatchSettings:
     destination: destination
+    invalidModeSelection: >-
+      Cannot plan a trip using the selected modes. Try including transit in your
+      mode selection.
     origin: origin
     planTripTooltip: Plan trip
     validationMessage: "Please define the following fields to plan a trip: {issues}"

i18n/fr.yml

@@ -245,6 +245,9 @@ components:
     modeSelectorLabel: Sélectionnez un mode de transport
   BatchSettings:
     destination: destination
+    invalidModeSelection: >-
+      Impossible de planifier un trajet avec les modes sélectionnés. Réessayez
+      en ajoutant les transports publics.
     origin: point de départ
     planTripTooltip: Planifier le trajet
     validationMessage: >-

lib/actions/api-constants.ts

@@ -0,0 +1,5 @@
+export const RoutingQueryCallResult = {
+  INVALID_MODE_SELECTION: 2,
+  INVALID_QUERY: 1,
+  SUCCESS: 0
+}

lib/actions/apiV2.js

@@ -41,6 +41,7 @@ import {
   updateOtpUrlParams
 } from './api'
 import { rememberPlace } from './user'
+import { RoutingQueryCallResult } from './api-constants'
 import { setItineraryView } from './ui'
 import { zoomToPlace } from './map'
 
@@ -800,7 +801,7 @@ export function routingQuery(searchId = null, updateSearchInReducer) {
     // Don't permit a routing query if the query is invalid
     if (!queryIsValid(state)) {
       console.warn('Query is invalid. Aborting routing query', currentQuery)
-      return
+      return RoutingQueryCallResult.INVALID_QUERY
     }
 
     const {
@@ -968,6 +969,10 @@ export function routingQuery(searchId = null, updateSearchInReducer) {
     if (isNewSearch || params.ui_activeSearch !== searchId) {
       dispatch(updateOtpUrlParams(state, searchId))
     }
+
+    return combinations.length === 0
+      ? RoutingQueryCallResult.INVALID_MODE_SELECTION
+      : RoutingQueryCallResult.SUCCESS
   }
 }
 

lib/components/form/batch-settings.tsx

@@ -26,6 +26,7 @@ import { ComponentContext } from '../../util/contexts'
 import { generateModeSettingValues } from '../../util/api'
 import { getActiveSearch, hasValidLocation } from '../../util/state'
 import { getFormattedMode } from '../../util/i18n'
+import { RoutingQueryCallResult } from '../../actions/api-constants'
 import { StyledIconWrapper } from '../util/styledIcon'
 
 import {
@@ -165,7 +166,16 @@ function BatchSettings({
 
     // Plan trip.
     updateQueryTimeIfLeavingNow()
-    routingQuery()
+    const routingQueryResult = routingQuery()
+
+    // If mode combination is not valid (i.e. produced no query), alert the user.
+    if (routingQueryResult === RoutingQueryCallResult.INVALID_MODE_SELECTION) {
+      window.alert(
+        intl.formatMessage({
+          id: 'components.BatchSettings.invalidModeSelection'
+        })
+      )
+    }
   }, [
     currentQuery,
     intl,