adding missed columns necessary for no school escorting

ActivitySim · Mar 18, 2024 · d9392f3 · d9392f3
1 parent 4470dd4
commit d9392f3
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 0 deletions.
diff --git a/activitysim/abm/models/school_escorting.py b/activitysim/abm/models/school_escorting.py
@@ -674,6 +674,8 @@ def school_escorting(
             "depart",
             "purpose",
             "destination",
+            "escort_participants",
+            "chauf_tour_id",
         ]
         school_escort_trips = pd.DataFrame(columns=trip_cols)
 

diff --git a/activitysim/abm/models/util/school_escort_tours_trips.py b/activitysim/abm/models/util/school_escort_tours_trips.py
@@ -407,6 +407,9 @@ def merge_school_escort_trips_into_pipeline(state: workflow.State):
 
     # checking to see if there are school escort trips to merge in
     if len(school_escort_trips) == 0:
+        # if no trips, fill escorting columns with NA
+        trips[["escort_participants", "school_escort_direction", "school_escort_trip_id",]] = pd.NA
+        state.replace_table("trips", trips)
         return trips
 
     # want to remove stops if school escorting takes place on that half tour so we can replace them with the actual stops