Merge branch 'update-core-utils-and-trip-form' of https://github.com/opentripplanner/otp-react-redux into update-core-utils-and-trip-form

Author: amy-corson-ibigroup

lib/actions/ui.js

@@ -95,14 +95,16 @@ export function setViewedRoute(payload) {
 
     dispatch(viewRoute(payload))
 
-    const path = getPathFromParts(
-      'route',
-      payload?.routeId,
-      // If a pattern is supplied, include pattern in path
-      payload?.patternId && 'pattern',
-      payload?.patternId
-    )
-    dispatch(routeTo(path))
+    if (payload?.routeId) {
+      const path = getPathFromParts(
+        'route',
+        payload?.routeId,
+        // If a pattern is supplied, include pattern in path
+        payload?.patternId && 'pattern',
+        payload?.patternId
+      )
+      dispatch(routeTo(path))
+    }
   }
 }
 
@@ -289,6 +291,7 @@ export function matchContentToUrl(map, location) {
 
           dispatch(setMainPanelContent(MainPanelContent.NEARBY_VIEW))
         }
+        dispatch(setViewedRoute(null))
         break
       case 'trip':
         dispatch(setViewedStop(null))