More fixes for phantom vehicles without trips

transitnownash · Jan 3, 2025 · 8ee765e · 8ee765e
1 parent 77fa254
commit 8ee765e
Show file tree

Hide file tree

Showing 6 changed files with 10 additions and 11 deletions.
diff --git a/src/components/TransitMap.js b/src/components/TransitMap.js
@@ -118,12 +118,7 @@ function TransitMap({
         {vehicleMarkers.length > 0 && (
           <LayersControl.Overlay checked={true} name="Vehicles">
             <LayerGroup>
-              {vehicleMarkers.map((item, _index) => {
-                if (!item.vehicle.trip) {
-                  console.warn('Vehicle without trip', item);
-                  return;
-                }
-
+              {vehicleMarkers.filter((i) => i.vehicle.trip).map((item, _index) => {
                 const route = getRouteDataById(item.vehicle.trip.route_id);
                 const routeAlerts = getRouteAlertsById(item.vehicle.trip.route_id);
                 const agency = getAgencyDataById(route ? route.agency_gid : {});

diff --git a/src/components/VehicleMarker.js b/src/components/VehicleMarker.js
@@ -21,7 +21,7 @@ function VehicleMarker({
   const marker = useRef(null);
 
   if (typeof route === 'undefined' || typeof route.route_gid === 'undefined') {
-    console.warn(`No matching route found for Trip #${vehiclePositionData.vehicle.trip.trip_id}`);
+    console.warn(`No matching route found for Trip #${vehiclePositionData.vehicle.trip?.trip_id}`);
     return (<></>);
   }
 

diff --git a/src/components/VehicleMarkerPopup.js b/src/components/VehicleMarkerPopup.js
@@ -106,7 +106,11 @@ function VehicleMarkerPopup({
                     );
                   })}
                   {tripStopTimes.length === 0 && (
-                    <div className="alert bg-info text-bg-info">No upcoming stops for this trip.</div>
+                    <tr>
+                      <td>
+                        <div className="alert bg-info text-bg-info">No upcoming stops for this trip.</div>
+                      </td>
+                    </tr>
                   )}
                 </tbody>
               </table>

diff --git a/src/controllers/Stop.js b/src/controllers/Stop.js
@@ -139,7 +139,7 @@ function Stops() {
   // Filter vehicle positions to relevant trips
   const filteredVehiclePositions = [];
   const tripsAtStop = trips.map((t) => t.trip_gid);
-  vehiclePositions.forEach((vp) => {
+  vehiclePositions.filter((v) => v.vehicle.trip).forEach((vp) => {
     if (tripsAtStop.includes(vp.vehicle.trip.trip_id)) {
       filteredVehiclePositions.push(vp);
     }

diff --git a/src/controllers/TransitRoute.js b/src/controllers/TransitRoute.js
@@ -139,7 +139,7 @@ function TransitRoute() {
   }
 
   // Filter vehicle positions to only those relevant to this route
-  const filteredVehiclePositions = vehicleMarkers.filter((v) => v.vehicle.trip.route_id === route.route_gid || v.vehicle.trip.route_id === route.route_short_name);
+  const filteredVehiclePositions = vehicleMarkers.filter((v) => v.vehicle.trip).filter((v) => v.vehicle.trip.route_id === route.route_gid || v.vehicle.trip.route_id === route.route_short_name);
   const routeAlerts = alerts.filter((a) => typeof a.alert.informed_entity !== 'undefined' && (a.alert.informed_entity[0].route_id === route.route_gid || a.alert.informed_entity[0].route_id === route.route_short_name));
 
   // Load in selected date

diff --git a/src/controllers/Trip.js b/src/controllers/Trip.js
@@ -151,7 +151,7 @@ function Trip() {
   const routeAlerts = alerts.filter((a) => typeof a.alert.informed_entity !== 'undefined' && a.alert.informed_entity[0].route_id === route.route_gid);
 
   // Filter vehicle markers
-  const filteredVehicleMarkers = vehicleMarkers.filter((v) => v.vehicle.trip.trip_id === trip.trip_gid);
+  const filteredVehicleMarkers = vehicleMarkers.filter((v) => v.vehicle.trip?.trip_id === trip.trip_gid);
 
   // Filter updates to this trip, key stop time updates by sequence
   const filteredTripUpdates = tripUpdates.filter((i) => i.id === trip.trip_gid);