Flex spec v2 #7

br648 · 2024-07-11T09:05:38Z

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

Changes to migrate the dev-flex branch from flex version 1 to version 2.

…attern finding):

…g linked fields):

…stops and stop times.):

…some house keeping):

binh-dam-ibigroup

First round of comments for now with some cleanup suggestions, much more to come!

src/main/java/com/conveyal/gtfs/PatternBuilder.java

src/main/java/com/conveyal/gtfs/PatternFinder.java

src/main/java/com/conveyal/gtfs/error/NewGTFSErrorType.java

src/main/java/com/conveyal/gtfs/graphql/GraphQLGtfsSchema.java

binh-dam-ibigroup

Next round of comments and more to come!

src/main/java/com/conveyal/gtfs/loader/JdbcTableWriter.java

src/main/java/com/conveyal/gtfs/graphql/GraphQLGtfsSchema.java

src/main/java/com/conveyal/gtfs/validator/FlexValidator.java

src/main/java/com/conveyal/gtfs/validator/NewTripTimesValidator.java

src/main/java/com/conveyal/gtfs/validator/FlexValidator.java

binh-dam-ibigroup

Other round of comments. Next is for me to try running this thing.

src/main/java/com/conveyal/gtfs/validator/ReferencesTripValidator.java

src/test/java/com/conveyal/gtfs/dto/PatternStopWithFlexDTO.java

src/test/java/com/conveyal/gtfs/loader/JDBCTableWriterTest.java

src/test/java/com/conveyal/gtfs/validator/FlexValidatorTest.java

src/test/java/com/conveyal/gtfs/loader/JDBCTableWriterTest.java

src/main/java/com/conveyal/gtfs/error/NewGTFSErrorType.java

src/main/java/com/conveyal/gtfs/validator/FlexValidator.java

binh-dam-ibigroup

@br648 I am going to hand this over so you can make the changes per all previous comments.

Co-authored-by: Binh Dam <56846598+binh-dam-ibigroup@users.noreply.github.com>

…tor.java Co-authored-by: Binh Dam <56846598+binh-dam-ibigroup@users.noreply.github.com>

binh-dam-ibigroup

So far, there is a big typo in the validation messages that needs to be fixed.

src/main/java/com/conveyal/gtfs/error/NewGTFSErrorType.java

src/main/java/com/conveyal/gtfs/graphql/GraphQLGtfsSchema.java

…ern stop data

…ables are updated):

…s only if pattern reconcile too

src/test/resources/graphql/feedLocationGroupStops.txt

binh-dam-ibigroup

A few more typos and light refactorings then I will approve. I don't feel too strongly about extracting the JSON data out of the code file. The basic functionality seems to work with corresponding datatools server and UI branches.

src/main/java/com/conveyal/gtfs/error/NewGTFSErrorType.java

src/main/java/com/conveyal/gtfs/model/LocationGroupStop.java

src/main/java/com/conveyal/gtfs/model/Location.java

src/test/java/com/conveyal/gtfs/loader/JDBCTableWriterTest.java

src/main/java/com/conveyal/gtfs/graphql/GraphQLGtfsSchema.java

src/test/java/com/conveyal/gtfs/dto/PatternStopWithFlexDTO.java

…tter formatting

JymDyerIBI

👍 Buncha changes, all look good.

binh-dam-ibigroup

Please address the two minor fixes before merging.

src/main/java/com/conveyal/gtfs/model/LocationGroupStop.java

src/main/java/com/conveyal/gtfs/util/GeoJsonUtil.java

JymDyerIBI · 2024-10-21T16:30:50Z

Death, where is thy Sting? Last edit looks good.

…ob in DT

JymDyerIBI

Change looks good.

br648 added 9 commits May 9, 2024 14:54

refactor(Initial work to change from stop areas to location groups):

61752ec

refactor(Various changes to get GraphQL unit tests to pass):

e623aef

refactor(Many changes to accom flex v2):

57506da

refactor(Update to consider all halts and not just stops as part of p…

458639c

…attern finding):

refactor(Added FLEX_OPTIONAL to allow for missing fields when updatin…

0dd268b

…g linked fields):

refactor(Update to handle insert/update of flex and non-flex pattern …

20346cd

…stops and stop times.):

refactor(Updated flex validation to include checks on routes):

62099f9

refactor(Addition unit test regarding flex and proprietary files and …

7667a27

…some house keeping):

refactor(Updates and house keeping following review):

3b25aa1

br648 assigned binh-dam-ibigroup Aug 6, 2024

binh-dam-ibigroup requested changes Aug 6, 2024

View reviewed changes

binh-dam-ibigroup assigned br648 Aug 6, 2024

binh-dam-ibigroup reviewed Aug 12, 2024

View reviewed changes

binh-dam-ibigroup requested changes Aug 13, 2024

View reviewed changes

binh-dam-ibigroup reviewed Aug 16, 2024

View reviewed changes

src/main/java/com/conveyal/gtfs/error/NewGTFSErrorType.java Outdated Show resolved Hide resolved

binh-dam-ibigroup reviewed Aug 16, 2024

View reviewed changes

src/main/java/com/conveyal/gtfs/validator/FlexValidator.java Show resolved Hide resolved

binh-dam-ibigroup reviewed Aug 16, 2024

View reviewed changes

binh-dam-ibigroup removed their assignment Aug 16, 2024

br648 and others added 9 commits August 20, 2024 14:57

Update src/main/java/com/conveyal/gtfs/PatternFinder.java

238c919

Co-authored-by: Binh Dam <56846598+binh-dam-ibigroup@users.noreply.github.com>

Update src/main/java/com/conveyal/gtfs/error/NewGTFSErrorType.java

e03527d

Co-authored-by: Binh Dam <56846598+binh-dam-ibigroup@users.noreply.github.com>

Update src/main/java/com/conveyal/gtfs/loader/JdbcTableWriter.java

df99d50

Co-authored-by: Binh Dam <56846598+binh-dam-ibigroup@users.noreply.github.com>

Update src/main/java/com/conveyal/gtfs/validator/FlexValidator.java

37b613b

Co-authored-by: Binh Dam <56846598+binh-dam-ibigroup@users.noreply.github.com>

Update src/main/java/com/conveyal/gtfs/loader/JdbcTableWriter.java

074afd1

Co-authored-by: Binh Dam <56846598+binh-dam-ibigroup@users.noreply.github.com>

Update src/main/java/com/conveyal/gtfs/validator/FlexValidator.java

a45ff11

Co-authored-by: Binh Dam <56846598+binh-dam-ibigroup@users.noreply.github.com>

Update src/main/java/com/conveyal/gtfs/validator/ReferencesTripValida…

69d8140

…tor.java Co-authored-by: Binh Dam <56846598+binh-dam-ibigroup@users.noreply.github.com>

refactor(Addressed PR feedback part 1):

cf15ca1

refactor(Various updates to address PR feedback):

c1b51eb

br648 assigned binh-dam-ibigroup and unassigned br648 Aug 30, 2024

binh-dam-ibigroup reviewed Sep 3, 2024

View reviewed changes

src/main/java/com/conveyal/gtfs/error/NewGTFSErrorType.java Outdated Show resolved Hide resolved

src/main/java/com/conveyal/gtfs/graphql/GraphQLGtfsSchema.java Outdated Show resolved Hide resolved

src/main/java/com/conveyal/gtfs/graphql/GraphQLGtfsSchema.java Outdated Show resolved Hide resolved

br648 added 5 commits September 4, 2024 09:11

refactor(PR feedback): Addressed typos and removed commented code.

0f8adce

refactor(Added another pattern reconciliation test):

16fecc1

refactor(JDBCTableWriterTest.java): Added required pattern id to patt…

abd7b9d

…ern stop data

refactor(Moved pattern reconcile to always be triggered after child t…

7c9a09c

…ables are updated):

refactor(JdbcTableWriter.java): Refactor to update pattern frequencie…

26824f5

…s only if pattern reconcile too

br648 assigned JymDyerIBI and unassigned binh-dam-ibigroup Sep 18, 2024

JymDyerIBI reviewed Oct 9, 2024

View reviewed changes

src/test/resources/graphql/feedLocationGroupStops.txt Outdated Show resolved Hide resolved

refactor(Changed the graphql files to have a graphql extension):

4458ca1

binh-dam-ibigroup requested changes Oct 11, 2024

View reviewed changes

binh-dam-ibigroup assigned br648 and unassigned JymDyerIBI Oct 11, 2024

br648 added 2 commits October 16, 2024 08:04

refactor(Addressed PR feedback):

2ce3840

refactor(LocationGroupStop.java): Replaced <p> tags with <pre> for be…

863ec45

…tter formatting

br648 assigned binh-dam-ibigroup and unassigned br648 Oct 16, 2024

JymDyerIBI approved these changes Oct 18, 2024

View reviewed changes

binh-dam-ibigroup approved these changes Oct 18, 2024

View reviewed changes

src/main/java/com/conveyal/gtfs/model/LocationGroupStop.java Outdated Show resolved Hide resolved

src/main/java/com/conveyal/gtfs/util/GeoJsonUtil.java Outdated Show resolved Hide resolved

binh-dam-ibigroup assigned br648 and unassigned binh-dam-ibigroup Oct 18, 2024

refactor(Addressed PR feedback):

43bd72f

refactor(GeoJsonUtil.java): Reinstated methods required by MergeFeedJ…

c990844

…ob in DT

br648 merged commit a0b5eef into dev-flex Oct 22, 2024
2 checks passed

JymDyerIBI reviewed Oct 23, 2024

View reviewed changes

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Flex spec v2 #7

Flex spec v2 #7

br648 commented Jul 11, 2024

binh-dam-ibigroup left a comment

binh-dam-ibigroup left a comment

binh-dam-ibigroup left a comment

binh-dam-ibigroup left a comment

binh-dam-ibigroup left a comment

binh-dam-ibigroup left a comment

JymDyerIBI left a comment

binh-dam-ibigroup left a comment

JymDyerIBI commented Oct 21, 2024

JymDyerIBI left a comment

Flex spec v2 #7

Flex spec v2 #7

Conversation

br648 commented Jul 11, 2024

Checklist

Description

binh-dam-ibigroup left a comment

Choose a reason for hiding this comment

binh-dam-ibigroup left a comment

Choose a reason for hiding this comment

binh-dam-ibigroup left a comment

Choose a reason for hiding this comment

binh-dam-ibigroup left a comment

Choose a reason for hiding this comment

binh-dam-ibigroup left a comment

Choose a reason for hiding this comment

binh-dam-ibigroup left a comment

Choose a reason for hiding this comment

JymDyerIBI left a comment

Choose a reason for hiding this comment

binh-dam-ibigroup left a comment

Choose a reason for hiding this comment

JymDyerIBI commented Oct 21, 2024

JymDyerIBI left a comment

Choose a reason for hiding this comment