Merge pull request #204 from opentripplanner/dev

Next release

Author: evansiroky

Diff for: __tests__/reducers/__snapshots__/create-otp-reducer.js.snap

@@ -17,21 +17,26 @@ Object {
     "transitOperators": Array [],
   },
   "currentQuery": Object {
+    "bannedRoutes": "",
     "bikeSpeed": 3.58,
     "companies": null,
     "date": "2019-08-04",
     "departArrive": "NOW",
     "endTime": "09:00",
     "from": null,
     "ignoreRealtimeUpdates": false,
+    "intermediatePlaces": Array [],
     "maxBikeDistance": 4828,
     "maxBikeTime": 20,
     "maxEScooterDistance": 4828,
     "maxWalkDistance": 1207,
     "maxWalkTime": 15,
     "mode": "WALK,TRAM,BUS,SUBWAY,FERRY,RAIL,GONDOLA",
+    "numItineraries": 3,
     "optimize": "QUICK",
     "optimizeBike": "SAFE",
+    "otherThanPreferredRoutesPenalty": 900,
+    "preferredRoutes": "",
     "routingType": "ITINERARY",
     "showIntermediateStops": true,
     "startTime": "07:00",
@@ -89,18 +94,23 @@ Object {
   "user": Object {
     "autoRefreshStopTimes": true,
     "defaults": Object {
+      "bannedRoutes": "",
       "bikeSpeed": 3.58,
       "companies": null,
       "endTime": "09:00",
       "ignoreRealtimeUpdates": false,
+      "intermediatePlaces": Array [],
       "maxBikeDistance": 4828,
       "maxBikeTime": 20,
       "maxEScooterDistance": 4828,
       "maxWalkDistance": 1207,
       "maxWalkTime": 15,
       "mode": "WALK,TRAM,BUS,SUBWAY,FERRY,RAIL,GONDOLA",
+      "numItineraries": 3,
       "optimize": "QUICK",
       "optimizeBike": "SAFE",
+      "otherThanPreferredRoutesPenalty": 900,
+      "preferredRoutes": "",
       "routingType": "ITINERARY",
       "showIntermediateStops": true,
       "startTime": "07:00",

Diff for: lib/actions/form.js

@@ -17,7 +17,7 @@ const {
   getDefaultQuery,
   getTripOptionsFromQuery,
   getUrlParams,
-  planParamsToQuery
+  planParamsToQueryAsync
 } = coreUtils.query
 
 export const settingQueryParam = createAction('SET_QUERY_PARAM')
@@ -70,7 +70,7 @@ export function parseUrlQueryString (params = getUrlParams()) {
     })
     const searchId = params.ui_activeSearch || coreUtils.storage.randId()
     // Convert strings to numbers/objects and dispatch
-    planParamsToQuery(planParams, getState().otp.config)
+    planParamsToQueryAsync(planParams, getState().otp.config)
       .then(query => dispatch(setQueryParam(query, searchId)))
   }
 }

Diff for: lib/actions/user.js

@@ -11,10 +11,8 @@ function getStateForNewUser (auth0User) {
     auth0UserId: auth0User.sub,
     email: auth0User.email,
     hasConsentedToTerms: false, // User must agree to terms.
-    isEmailVerified: auth0User.email_verified,
     notificationChannel: 'email',
     phoneNumber: '',
-    recentLocations: [],
     savedLocations: [],
     storeTripHistory: false // User must opt in.
   }

Diff for: package.json

@@ -28,7 +28,7 @@
   "homepage": "https://github.com/opentripplanner/otp-react-redux#readme",
   "dependencies": {
     "@opentripplanner/base-map": "^1.0.1",
-    "@opentripplanner/core-utils": "^1.2.0",
+    "@opentripplanner/core-utils": "^1.2.1",
     "@opentripplanner/endpoints-overlay": "^1.0.1",
     "@opentripplanner/from-to-location-picker": "^1.0.1",
     "@opentripplanner/geocoder": "^1.0.2",
@@ -44,7 +44,7 @@
     "@opentripplanner/stops-overlay": "^1.0.1",
     "@opentripplanner/transitive-overlay": "^1.0.2",
     "@opentripplanner/trip-details": "^1.1.1",
-    "@opentripplanner/trip-form": "^1.0.1",
+    "@opentripplanner/trip-form": "^1.0.2",
     "@opentripplanner/trip-viewer-overlay": "^1.0.1",
     "@opentripplanner/vehicle-rental-overlay": "^1.0.1",
     "bootstrap": "^3.3.7",