refactor(SimpleMap): Add checks for null itinerary

opentripplanner · Oct 1, 2024 · c5b622e · c5b622e
1 parent 650f390
commit c5b622e
Show file tree

Hide file tree

Showing 2 changed files with 15 additions and 15 deletions.
diff --git a/lib/components/app/trip-preview-layout.tsx b/lib/components/app/trip-preview-layout.tsx
@@ -40,11 +40,9 @@ const TripPreviewLayout = ({ monitoredTrip }: Props) => {
       header={previewTripText}
       itinerary={itinerary}
       mapElement={
-        itinerary && (
-          <MapContainer className="map-container percy-hide">
-            <SimpleMap itinerary={itinerary} />
-          </MapContainer>
-        )
+        <MapContainer className="map-container percy-hide">
+          <SimpleMap itinerary={itinerary} />
+        </MapContainer>
       }
       subTitle={monitoredTrip?.tripName}
       title={previewTripText}

diff --git a/lib/components/map/simple-map.tsx b/lib/components/map/simple-map.tsx
@@ -15,7 +15,7 @@ import { ComponentContext } from '../../util/contexts'
 
 interface Props {
   config: AppConfig
-  itinerary: Itinerary
+  itinerary?: Itinerary
 }
 
 function noop() {
@@ -37,7 +37,7 @@ const SimpleMap = ({ config, itinerary }: Props): JSX.Element => {
   } = config.map || {}
   const baseLayerUrls = baseLayers?.map((bl) => bl.url)
   const { disableFlexArc } = transitive || {}
-  const { legs } = itinerary
+  const { legs = [] } = itinerary || {}
 
   return (
     <BaseMap
@@ -55,14 +55,16 @@ const SimpleMap = ({ config, itinerary }: Props): JSX.Element => {
         toLocation={legs[legs.length - 1]?.to}
       />
       <GeolocateControl position="top-left" />
-      <TransitiveOverlay
-        transitiveData={itineraryToTransitive(itinerary, {
-          companies: config.companies,
-          disableFlexArc,
-          getRouteLabel: getTransitiveRouteLabel,
-          intl
-        })}
-      />
+      {itinerary && (
+        <TransitiveOverlay
+          transitiveData={itineraryToTransitive(itinerary, {
+            companies: config.companies,
+            disableFlexArc,
+            getRouteLabel: getTransitiveRouteLabel,
+            intl
+          })}
+        />
+      )}
 
       <NavigationControl
         position={navigationControlPosition || 'bottom-right'}