Pre-merge of Dev into Dev flex by br648 · Pull Request #24 · ibi-group/gtfs-lib

br648 · 2026-06-02T09:35:03Z

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

PR to allow testing of dev-flex with dev merged prior to actually merging dev into dev-flex.

Replaced endsWith with equals to avoid unwanted matches e.g. stop_areas.txt being used instead of areas.txt

… generic unit tests which uses

…ator with OS derived reference Test should now work on Linux

…atch what will be provided):

… and included id

…entities will be returned

… the route network table The route id is unique to the route table has well. This prevents duplicate key failures

… export to separate files

… test to include stop area ids

… a sub directory

…code character

…cations to check subdirectories

Merge stop areas into stops

miles-grant-ibigroup

Building fine!

br648 · 2026-06-05T06:47:58Z

@miles-grant-ibigroup are you happy this works OK with the UI dev-flex branch after you merged that?

miles-grant-ibigroup · 2026-06-05T08:48:49Z

@miles-grant-ibigroup are you happy this works OK with the UI dev-flex branch after you merged that?

There's definitely issues, but they all seem datatools-server related rather than gtfs-lib related.
The migration doesn't work, and the graphql endpoints are missing

binh-dam-ibigroup

Could you address the two places where the merge is not clean?

miles-grant-ibigroup · 2026-06-08T16:56:17Z

I believe these latest changes fix the table update script

binh-dam-ibigroup · 2026-06-08T19:43:47Z

        "error_id" : 2,
        "error_type" : "GEO_JSON_PARSING",
        "line_number" : null
-      }, {


We didn't add multiline or multipolygon support in the dev branch, did we?

MultiPolygon, Polygon and MultiLineString types aren't supported yet. See:

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

Line 86 in 6fa568a

private static String getGeometryType(String geometryType, List<String> errors) {

Okay, I see you opted to remove those tests.

binh-dam-ibigroup

Things seem to be working smoothly in dt-server!

…es to the table in order list

binh-dam-ibigroup · 2026-06-16T13:39:23Z

@br648 and @miles-grant-ibigroup FYI I'm trying to hunt a change that we made with Fares V2 on the dev branch that broke the GraphQL query for route details, patterns, ... from the feed summary page in DT.

Fix missing fare leg join rules table

Fix GraphQL Schema for Querying Trip Frequencies

br648 added 30 commits August 15, 2024 13:14

refactor(Initial fares v2 work):

07ecda4

refactor(GTFSTest): Addressed failing test

1d57cd6

refactor(Various new tests):

208ea3c

refactor(Entity.java): Updated zip sub directory file name check

5f0c806

Replaced endsWith with equals to avoid unwanted matches e.g. stop_areas.txt being used instead of areas.txt

refactor(Updated to extract the file name from path):

5dd609b

refactor(Refactored GraphQL classes to accom fares v2):

1d82b21

refactor(Update to include network_id in the route GraphQL obj):

1d95cf5

Merge branch 'dev' into feature/DT-448-fares-v2

3faaa1e

refactor(Replaced camel case with snake case for GrpahQL objs):

fbf5282

improvement(Added JDBC table writer tests for fares v2 entities): New…

7d41e00

… generic unit tests which uses

fix(JDBCTableWriterFaresV2Test.java): Replaced Windows new line separ…

62a7ed2

…ator with OS derived reference Test should now work on Linux

improvement(GTFSFaresV2Test): Removed superceded JDBC table writer tests

a2db1a7

improvement(Removed the id param from the create entities to closer m…

e96e834

…atch what will be provided):

improvement(Altered GraphQL test data): Similified fare product query…

2390130

… and included id

improvement(Removed child entities from GraphQL schema): Only parent …

2c256c9

…entities will be returned

improvement(Table.java): Reinstated key field is not unique check for…

518fcc2

… the route network table The route id is unique to the route table has well. This prevents duplicate key failures

Merge branch 'dev' into feature/DT-448-fares-v2

1cac512

feat(Merging stop areas into stops): import stop areas into stops and…

731dcf0

… export to separate files

improvement(A few minor changes with comments):

a3481b0

improvement(GraphQL updates): Removed stop areas. Added fares v2 stop…

2b1302c

… test to include stop area ids

improvement(Entry in zip subdirecotry): Allow for stop areas being in…

00b9d65

… a sub directory

improvement(Stop.java): Updated stop areas separator to a special uni…

dd97252

…code character

improvement(Stop.java): Corrected separator char

6117108

improvement(Checking for files in zip subdirectories): Updated all lo…

f3ef2c4

…cations to check subdirectories

improvement(Exporting): Added the functionality to export stop areas

8353334

improvement(Addressed PR feedback):

7299ed4

improvement(Stop export): Remove stop areas from stop export

9436984

improvement(Entity.java): Reinstated space

ff93df6

improvement(Addressed PR feedback): Streamlined writting to zip

77e3b61

Merge pull request #15 from ibi-group/merge-stop-areas

c3ba52d

Merge stop areas into stops

improvement(Addressed merge conflicts):

dae1fee

br648 assigned miles-grant-ibigroup Jun 2, 2026

miles-grant-ibigroup approved these changes Jun 3, 2026

View reviewed changes

miles-grant-ibigroup assigned br648 and unassigned miles-grant-ibigroup Jun 3, 2026

br648 assigned binh-dam-ibigroup and unassigned br648 Jun 5, 2026

binh-dam-ibigroup requested changes Jun 5, 2026

View reviewed changes

binh-dam-ibigroup assigned br648 and unassigned binh-dam-ibigroup Jun 5, 2026

improvement(Addressed PR feedback):

56a5d0a

br648 assigned binh-dam-ibigroup and unassigned br648 Jun 8, 2026

binh-dam-ibigroup reviewed Jun 8, 2026

View reviewed changes

binh-dam-ibigroup approved these changes Jun 8, 2026

View reviewed changes

binh-dam-ibigroup assigned br648 and unassigned binh-dam-ibigroup Jun 8, 2026

improvement(Fix missing table reference): Added the fare leg join rul…

63ca260

…es to the table in order list

binh-dam-ibigroup and others added 7 commits June 16, 2026 13:51

fix(GraphQLGtfsSchema): Add limit arg to frequencies type, update tests.

87c92b3

test: Update snapshots.

ec201f3

Merge pull request #25 from ibi-group/fix-missing-fare-table

31c2c41

Fix missing fare leg join rules table

Merge branch 'dev' into dev-flex-merge

9a3ac87

Merge branch 'dev-flex' into dev-flex-merge

8015a44

Merge pull request #27 from ibi-group/fix-trip-frequencies-schema

2fa406b

Fix GraphQL Schema for Querying Trip Frequencies

improvement(Fixed merge conflict): Updated expected graphQL output

926b910

br648 merged commit f6ddbfd into dev-flex Jul 15, 2026
2 checks passed

Uh oh!

Conversation

br648 commented Jun 2, 2026

Checklist

Description

Uh oh!

miles-grant-ibigroup left a comment

Choose a reason for hiding this comment

Uh oh!

br648 commented Jun 5, 2026

Uh oh!

miles-grant-ibigroup commented Jun 5, 2026

Uh oh!

binh-dam-ibigroup left a comment

Choose a reason for hiding this comment

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

miles-grant-ibigroup commented Jun 8, 2026

Uh oh!

binh-dam-ibigroup Jun 8, 2026

Choose a reason for hiding this comment

Uh oh!

br648 Jun 9, 2026

Choose a reason for hiding this comment

Uh oh!

binh-dam-ibigroup Jun 9, 2026

Choose a reason for hiding this comment

Uh oh!

binh-dam-ibigroup left a comment

Choose a reason for hiding this comment

Uh oh!

binh-dam-ibigroup commented Jun 16, 2026

Uh oh!

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

3 participants