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

Flex merge feeds #573

Merged
merged 16 commits into from
Feb 8, 2024
Merged

Flex merge feeds #573

merged 16 commits into from
Feb 8, 2024

Conversation

br648
Copy link
Contributor

@br648 br648 commented Nov 6, 2023 •
edited
Loading

Checklist

  • Appropriate branch selected (all PRs must first be merged to dev before they can be merged to master)
  • Any modified or new methods or classes have helpful JavaDoc and code is thoroughly commented
  • The description lists all applicable issues this PR seeks to resolve
  • The description lists any configuration setting(s) that differ from the default settings
  • All tests and CI builds passing

Description

Enhancement to feed merging to include flex specific (or flex touched) files:

areas.txt
booking_rules.txt
locations.geojson
stop_areas.txt
stop_times.txt

Matching GTFS-lib PR: ibi-group/gtfs-lib#1

br648 added 12 commits October 24, 2023 09:14
@br648
refactor(Initial work to merge flex feeds):
d5b3436
@br648
refactor(Fixed merge conflict): Merged dev-flex into branch
66a9b42
@br648
refactor(Added geojson merging):
42fa3a1
@br648
refactor(Corrected gtfs-lib reference):
93c3a3a
@br648
refactor(Updated location merging and removed flex items from stop ti…
c809e83 
…mes from test feeds): flex item
@br648
refactor(pom.xml): Removed commented out dependency
d619b10
@br648
refactor(Restored full flex feed files and bumped gtfs-lib version):
518dcbe
@br648
refactor(ExportSnapshotToGTFSJob.java): Temp fix for call to JdbcGtfs…
c13559d 
…Exporter until dev is merged co
@br648
Merge branch 'dev-flex' into flex-merge-feeds
80fd154
@br648
refactor(Fixed merge conflicts): Fixed conflicts with merging dev-fle…
2f93558 
…x into flex-merge-feeds
@br648
refactor(Updates around foreign ref checks):
52b194f
@br648
chore(Updated GTFS-lib reference to point at the new ibi group repo):
75ad524
binh-dam-ibigroup
binh-dam-ibigroup reviewed Nov 28, 2023
View reviewed changes
Copy link
Contributor

@binh-dam-ibigroup binh-dam-ibigroup left a comment

Choose a reason for hiding this comment

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

Here are my comments for now, awaiting the final gtfs-lib build number.

src/test/java/com/conveyal/datatools/manager/jobs/FlexMergeFeedsJobTest.java Outdated Show resolved Hide resolved
src/test/resources/com/conveyal/datatools/gtfs/fake-agency-with-flex-version-1/attributions.txt Outdated Show resolved Hide resolved
...test/resources/com/conveyal/datatools/gtfs/fake-agency-with-flex-version-1/booking_rules.txt Outdated Show resolved Hide resolved
src/test/resources/com/conveyal/datatools/gtfs/fake-agency-with-flex-version-1/feed_info.txt Outdated Show resolved Hide resolved
src/test/resources/com/conveyal/datatools/gtfs/fake-agency-with-flex-version-2/attributions.txt Outdated Show resolved Hide resolved
...test/resources/com/conveyal/datatools/gtfs/fake-agency-with-flex-version-2/booking_rules.txt Outdated Show resolved Hide resolved
src/test/resources/com/conveyal/datatools/gtfs/fake-agency-with-flex-version-2/translations.txt Outdated Show resolved Hide resolved
src/test/resources/com/conveyal/datatools/gtfs/fake-agency-with-flex-version-1/translations.txt Outdated Show resolved Hide resolved
@br648 br648 assigned binh-dam-ibigroup and unassigned br648 Nov 29, 2023
binh-dam-ibigroup
binh-dam-ibigroup approved these changes Nov 30, 2023
View reviewed changes
Copy link
Contributor

@binh-dam-ibigroup binh-dam-ibigroup left a comment

Choose a reason for hiding this comment

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

Changes look good. I'll go ahead and approve, but please update the gtfs-lib commit when available.

@br648 br648 removed their assignment Nov 30, 2023
@miles-grant-ibigroup miles-grant-ibigroup added the Awaiting GTFS-lib release Merge into dev once GTFS-lib has been released. label Jan 10, 2024
@miles-grant-ibigroup
Copy link
Contributor

Sorry I think I caused some merge conflicts by merging in dev

@br648 br648 removed the Awaiting GTFS-lib release Merge into dev once GTFS-lib has been released. label Feb 8, 2024
@br648 br648 assigned miles-grant-ibigroup and unassigned br648 Feb 8, 2024
miles-grant-ibigroup
miles-grant-ibigroup approved these changes Feb 8, 2024
View reviewed changes
Copy link
Contributor

@miles-grant-ibigroup miles-grant-ibigroup left a comment

Choose a reason for hiding this comment

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

All working. Thanks so much @br648

@miles-grant-ibigroup miles-grant-ibigroup merged commit e77c9a1 into dev-flex Feb 8, 2024
2 checks passed
@miles-grant-ibigroup miles-grant-ibigroup deleted the flex-merge-feeds branch February 8, 2024 17:37
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@miles-grant-ibigroup miles-grant-ibigroup miles-grant-ibigroup approved these changes

@binh-dam-ibigroup binh-dam-ibigroup binh-dam-ibigroup approved these changes

Assignees

@miles-grant-ibigroup miles-grant-ibigroup

Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
4 participants
@br648 @miles-grant-ibigroup @binh-dam-ibigroup @philip-cline