Log locations

lib/content/message/predictions.ex

@@ -150,7 +150,13 @@ defmodule Content.Message.Predictions do
         " seconds_until_departure=",
         inspect(prediction.seconds_until_departure),
         " boarding_status=",
-        inspect(prediction.boarding_status)
+        inspect(prediction.boarding_status),
+        " vehicle_status=",
+        inspect(prediction.vehicle_status),
+        " vehicle_location_stop_id=",
+        inspect(prediction.vehicle_location_stop_id),
+        " vehicle_location_trip_id=",
+        inspect(prediction.vehicle_location_trip_id)
       ])
     end
 

lib/predictions/prediction.ex

@@ -14,7 +14,10 @@ defmodule Predictions.Prediction do
             stops_away: 0,
             boarding_status: nil,
             revenue_trip?: true,
-            vehicle_id: nil
+            vehicle_id: nil,
+            vehicle_status: nil,
+            vehicle_location_stop_id: nil,
+            vehicle_location_trip_id: nil
 
   @type trip_id :: String.t()
 
@@ -34,6 +37,9 @@ defmodule Predictions.Prediction do
           stops_away: integer(),
           boarding_status: String.t() | nil,
           revenue_trip?: boolean(),
-          vehicle_id: String.t() | nil
+          vehicle_id: String.t() | nil,
+          vehicle_status: nil,
+          vehicle_location_stop_id: nil,
+          vehicle_location_trip_id: nil
         }
 end

lib/predictions/predictions.ex

@@ -84,6 +84,15 @@ defmodule Predictions.Predictions do
         do: stop_time_update["passthrough_time"] - current_time_seconds,
         else: nil
 
+    vehicle_location = Engine.Locations.for_vehicle(vehicle_id)
+    vehicle_status = if not is_nil(vehicle_location), do: vehicle_location.status, else: "none"
+
+    vehicle_location_stop_id =
+      if not is_nil(vehicle_location), do: vehicle_location.stop_id, else: "none"
+
+    vehicle_location_trip_id =
+      if not is_nil(vehicle_location), do: vehicle_location.trip_id, else: "none"
+
     %Prediction{
       stop_id: stop_time_update["stop_id"],
       direction_id: direction_id,
@@ -101,7 +110,10 @@ defmodule Predictions.Predictions do
       stops_away: stop_time_update["stops_away"],
       boarding_status: stop_time_update["boarding_status"],
       revenue_trip?: revenue_trip?,
-      vehicle_id: vehicle_id
+      vehicle_id: vehicle_id,
+      vehicle_status: vehicle_status,
+      vehicle_location_stop_id: vehicle_location_stop_id,
+      vehicle_location_trip_id: vehicle_location_trip_id
     }
   end