fix(itinerary-page): scooter connections not showing up

stadtnavi · Dec 9, 2024 · fe61323 · fe61323
1 parent 7589f8c
commit fe61323
Show file tree

Hide file tree

Showing 3 changed files with 18 additions and 5 deletions.
diff --git a/app/component/ItineraryPage.js b/app/component/ItineraryPage.js
@@ -93,6 +93,8 @@ const streetHashes = [
   streetHash.bikeAndVehicle,
   streetHash.car,
   streetHash.parkAndRide,
+  streetHash.scooter,
+  streetHash.onDemandTaxi,
 ];
 const showVehiclesThresholdMinutes = 720;
 const emptyPlans = {

diff --git a/app/component/ItineraryPageUtils.js b/app/component/ItineraryPageUtils.js
@@ -19,7 +19,12 @@ import {
 import { getMapLayerOptions } from '../util/mapLayerUtils';
 import { streetHash } from '../util/path';
 
-export const noTransitHash = [streetHash.walk, streetHash.bike, streetHash.car];
+export const noTransitHash = [
+  streetHash.walk,
+  streetHash.bike,
+  streetHash.car,
+  streetHash.scooter,
+];
 
 /**
  * Returns the index of selected itinerary. Attempts to look for
@@ -69,7 +74,11 @@ export function getSelectedItineraryIndex(
 
 // this func is a bit fuzzy because it compares strings and numbers
 export function showDetailView(hash, secondHash, itineraries) {
-  if (hash === streetHash.bikeAndVehicle || hash === streetHash.parkAndRide) {
+  if (
+    hash === streetHash.bikeAndVehicle ||
+    hash === streetHash.parkAndRide ||
+    hash === streetHash.scooter
+  ) {
     // note that '0' < 1 in javascript, because strings are converted to numbers
     return secondHash < itineraries.length;
   }

diff --git a/app/component/TransitLeg.js b/app/component/TransitLeg.js
@@ -529,10 +529,12 @@ class TransitLeg extends React.Component {
                   to={
                     (alert.route &&
                       alert.route.gtfsId &&
+                      leg.route &&
+                      leg.trip &&
                       `/${PREFIX_ROUTES}/${leg.route.gtfsId}/${PREFIX_DISRUPTION}/${leg.trip.pattern.code}`) ||
-                    (alert.stop &&
-                      alert.stop.gtfsId &&
-                      `/${PREFIX_STOPS}/${alert.stop.gtfsId}/${PREFIX_DISRUPTION}/`)
+                    (alert.stop && alert.stop.gtfsId
+                      ? `/${PREFIX_STOPS}/${alert.stop.gtfsId}/${PREFIX_DISRUPTION}/`
+                      : '')
                   }
                   className="disruption-link"
                 >