Merge pull request #47 from TransitApp/jsteelz/fix-patch-gtfs

Fix: patch_gtfs calling wrong function with wrong params, simpler itineraries arg in CLI

Author: jsteelz

gtfs_flex_to_gofs/__main__.py

@@ -52,7 +52,7 @@ def print_args_warnings(args):
     parser.add_argument(
         '--split-by-route', help='Split gofs by route', action='store_true')
     parser.add_argument(
-        '--itineraries', help='read from transit\'s itinerary_cells format', type=bool, default=False)
+        '--itineraries', help='read from transit\'s itinerary_cells format', action='store_true')
 
 
     args = parser.parse_args()

gtfs_flex_to_gofs/files/operation_rules.py

@@ -6,7 +6,6 @@
 from ..gofs_data import GofsTransfer
 from gtfs_loader.schema import PickupType, DropOffType
 
-from gtfs_flex_to_gofs.utils import get_locations_group, get_zones
 from enum import Enum
 
 FILENAME = 'operating_rules'

gtfs_flex_to_gofs/patch_gtfs.py

@@ -1,12 +1,11 @@
-from gtfs_flex_to_gofs.gofs_data import GofsData
 import gtfs_loader
 from .files import operation_rules
 
 
 def patch_gtfs(args, gtfs, itineraries=False):
     clean_up_gtfs(gtfs, itineraries)
 
-    is_empty = len(gtfs.itinerary_cells) == 0 if itineraries else len(gtfs.stop_times) == 0 
+    is_empty = len(gtfs.trips) == 0
 
     if not is_empty:
         gtfs_loader.patch(gtfs, args.gtfs_dir, args.out_gtfs_dir)
@@ -16,20 +15,22 @@ def patch_gtfs(args, gtfs, itineraries=False):
 
 
 def clean_up_gtfs(gtfs, itineraries=False):
+    trip_ids_to_remove = []
     for trip in gtfs.trips.values():
         stop_times = gtfs.itinerary_cells[trip.itinerary_index] if itineraries else gtfs.stop_times[trip.trip_id]
         if itineraries:
             for i, st in enumerate(stop_times):
                 st.start_pickup_drop_off_window = trip.start_pickup_drop_off_windows[i]
                 st.end_pickup_drop_off_window = trip.end_pickup_drop_off_windows[i]
 
-        type_of_trip = operation_rules.get_type_of_itinerary_trip(trip)
+        type_of_trip = operation_rules.get_type_of_trip(stop_times)
         if type_of_trip == operation_rules.TripType.OTHER:
                 print(f"WARNING : Trip {trip.trip_id} is not a normal gtfs trip, not microtransit and not deviated service only. We are not supproting this yet, it will be removed from the GTFS and not shown anywhere")
 
         if type_of_trip == operation_rules.TripType.OTHER or type_of_trip == operation_rules.TripType.PURE_MICROTRANSIT:
-            del gtfs.trips[trip.trip_id]
-            if itineraries and trip.itinerary_index in gtfs.itinerary_cells:
-                del gtfs.itinerary_cells[trip.itinerary_index]
-            else:
+            trip_ids_to_remove.append(trip.trip_id)
+            if not itineraries:
                 del gtfs.stop_times[trip.trip_id]
+
+    for trip_id in trip_ids_to_remove:
+        del gtfs.trips[trip_id]

pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "setuptools.build_meta"
 
 [project]
 name = "GTFS-flex-to-GOFS"
-version = "0.5.1"
+version = "0.5.2"
 description = "Convert GTFS Flex to GOFS"
 readme = "README.md"
 license = {text = "MIT"}