Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Set pickup/drop_off _type on in-seat transfers #21

Merged
merged 4 commits into from
Mar 20, 2024
Merged

Set pickup/drop_off _type on in-seat transfers #21

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
abd6e13
Set pickup/drop_off _type on in-seat transfers
jsteelz Mar 20, 2024
9318293
Add test case to make sure that pickup_type and dropoff_type are corr…
jsteelz Mar 20, 2024
5e029b9
PR comments
jsteelz Mar 20, 2024
f8aa321
more PR comments
jsteelz Mar 20, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 3 additions & 1 deletion blocks_to_transfers/__main__.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
import json
import sys
import gtfs_loader
from . import convert_blocks, config, service_days, classify_transfers, simplify_fix, simplify_linear, simplify_export, logs, runtime_config
from . import convert_blocks, config, service_days, classify_transfers, simplify_fix, simplify_linear, simplify_export, logs, runtime_config, set_pickup_drop_off


def process(in_dir,
Expand All @@ -27,6 +27,8 @@ def process(in_dir,
output_graph = graph
simplify_export.export_visit(output_graph)

set_pickup_drop_off.set_pickup_drop_off(gtfs)

if remove_existing_files:
shutil.rmtree(out_dir, ignore_errors=True)

Expand Down
22 changes: 22 additions & 0 deletions blocks_to_transfers/set_pickup_drop_off.py
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,22 @@
from gtfs_loader.schema import TransferType, PickupType

def set_pickup_drop_off(gtfs):
from_trip_ids_to_set = set()
to_trip_ids_to_set = set()
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

These variables have now become unused,

for from_trip_id, transfers in gtfs.transfers.items():
for transfer in transfers:
transfer_type = transfer.transfer_type
to_trip_id = transfer.to_trip_id

if not (from_trip_id and to_trip_id):
continue
Comment on lines +9 to +10
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Suggested change
if not (from_trip_id and to_trip_id):
continue
if not (from_trip_id and to_trip_id):
continue

I'm not a stickler for it but I usually leave a blank line between different if blocks

if transfer_type in TransferType and transfer_type != TransferType.IN_SEAT:
continue

from_trip_ids_to_set.add(from_trip_id)
to_trip_ids_to_set.add(to_trip_id)

for trip_id in from_trip_ids_to_set:
gtfs.stop_times.get(trip_id)[-1].pickup_type = PickupType.REGULARLY_SCHEDULED
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I don't think it's necessary to use a set to collect trip_ids. You can directly manipulate gtfs.stop_times[from_trip_id] or to_trip_id in the innermost loop.

Regardless, .get(trip_id) should be replaced with [trip_id] this is because .get returns None for unset keys, and will then lead to an exception when you try to operate on it. The brackets will immediately raise an exception indicating that trip_id wasn't found, which is actually the underlying issue.

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

✅

for trip_id in to_trip_ids_to_set:
gtfs.stop_times.get(trip_id)[0].drop_off_type = PickupType.REGULARLY_SCHEDULED
2 changes: 1 addition & 1 deletion setup.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
import dependency_info

setup(name='GTFS-blocks-to-transfers',
version='1.5.3',
version='1.6.0',
description='Convert GTFS blocks to trip-to-trip transfers',
url='https://github.com/TransitApp/GTFS-blocks-to-transfers',
author='Nicholas Paun',
Expand Down
32 changes: 16 additions & 16 deletions tests/test_full_loops/expected_standard/stop_times.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,16 +1,16 @@
trip_id,stop_sequence,stop_id,arrival_time,departure_time,start_pickup_drop_off_window,end_pickup_drop_off_window,pickup_type,drop_off_type,mean_duration_factor,mean_duration_offset,safe_duration_factor,safe_duration_offset
trip_1,0,junction,22:00:00,22:00:00,,,0,0,,,,
trip_1,1,slocan-park,22:01:00,22:01:00,,,0,0,,,,
trip_1,2,slocan-city,22:02:00,22:02:00,,,0,0,,,,
trip_1,3,nelson-tc,22:03:00,22:03:00,,,0,0,,,,
trip_1,4,junction,22:04:00,22:04:00,,,0,0,,,,
trip_2,0,junction,22:04:00,22:04:00,,,0,0,,,,
trip_2,1,slocan-park,22:05:00,22:05:00,,,0,0,,,,
trip_2,2,slocan-city,22:06:00,22:06:00,,,0,0,,,,
trip_2,3,nelson-tc,22:07:00,22:07:00,,,0,0,,,,
trip_2,4,junction,22:08:00,22:08:00,,,0,0,,,,
trip_3,0,junction,22:08:00,22:08:00,,,0,0,,,,
trip_3,1,slocan-park,22:09:00,22:09:00,,,0,0,,,,
trip_3,2,slocan-city,22:10:00,22:10:00,,,0,0,,,,
trip_3,3,nelson-tc,22:11:00,22:11:00,,,0,0,,,,
trip_3,4,junction,22:12:00,22:12:00,,,0,0,,,,
trip_id,stop_sequence,stop_id,arrival_time,departure_time,pickup_type,drop_off_type,start_pickup_drop_off_window,end_pickup_drop_off_window,mean_duration_factor,mean_duration_offset,safe_duration_factor,safe_duration_offset
trip_1,0,junction,22:00:00,22:00:00,0,1,,,,,,
trip_1,1,slocan-park,22:01:00,22:01:00,0,0,,,,,,
trip_1,2,slocan-city,22:02:00,22:02:00,0,0,,,,,,
trip_1,3,nelson-tc,22:03:00,22:03:00,0,0,,,,,,
trip_1,4,junction,22:04:00,22:04:00,0,0,,,,,,
trip_2,0,junction,22:04:00,22:04:00,0,0,,,,,,
trip_2,1,slocan-park,22:05:00,22:05:00,0,0,,,,,,
trip_2,2,slocan-city,22:06:00,22:06:00,0,0,,,,,,
trip_2,3,nelson-tc,22:07:00,22:07:00,0,0,,,,,,
trip_2,4,junction,22:08:00,22:08:00,0,0,,,,,,
trip_3,0,junction,22:08:00,22:08:00,0,0,,,,,,
trip_3,1,slocan-park,22:09:00,22:09:00,0,0,,,,,,
trip_3,2,slocan-city,22:10:00,22:10:00,0,0,,,,,,
trip_3,3,nelson-tc,22:11:00,22:11:00,0,0,,,,,,
trip_3,4,junction,22:12:00,22:12:00,1,0,,,,,,
32 changes: 16 additions & 16 deletions tests/test_full_loops/input/stop_times.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,16 +1,16 @@
trip_id,stop_sequence,stop_id,arrival_time,departure_time
trip_1,0,junction,22:00:00,22:00:00
trip_1,1,slocan-park,22:01:00,22:01:00
trip_1,2,slocan-city,22:02:00,22:02:00
trip_1,3,nelson-tc,22:03:00,22:03:00
trip_1,4,junction,22:04:00,22:04:00
trip_2,0,junction,22:04:00,22:04:00
trip_2,1,slocan-park,22:05:00,22:05:00
trip_2,2,slocan-city,22:06:00,22:06:00
trip_2,3,nelson-tc,22:07:00,22:07:00
trip_2,4,junction,22:08:00,22:08:00
trip_3,0,junction,22:08:00,22:08:00
trip_3,1,slocan-park,22:09:00,22:09:00
trip_3,2,slocan-city,22:10:00,22:10:00
trip_3,3,nelson-tc,22:11:00,22:11:00
trip_3,4,junction,22:12:00,22:12:00
trip_id,stop_sequence,stop_id,arrival_time,departure_time,pickup_type,drop_off_type
trip_1,0,junction,22:00:00,22:00:00,0,1
trip_1,1,slocan-park,22:01:00,22:01:00,0,0
trip_1,2,slocan-city,22:02:00,22:02:00,0,0
trip_1,3,nelson-tc,22:03:00,22:03:00,0,0
trip_1,4,junction,22:04:00,22:04:00,1,0
trip_2,0,junction,22:04:00,22:04:00,0,1
trip_2,1,slocan-park,22:05:00,22:05:00,0,0
trip_2,2,slocan-city,22:06:00,22:06:00,0,0
trip_2,3,nelson-tc,22:07:00,22:07:00,0,0
trip_2,4,junction,22:08:00,22:08:00,1,0
trip_3,0,junction,22:08:00,22:08:00,0,1
trip_3,1,slocan-park,22:09:00,22:09:00,0,0
trip_3,2,slocan-city,22:10:00,22:10:00,0,0
trip_3,3,nelson-tc,22:11:00,22:11:00,0,0
trip_3,4,junction,22:12:00,22:12:00,1,0
Loading