Skip to content

Vendor cyclist position fields (#611) alongside NewRoutes (#621) - #34

Merged
Peter-Ball merged 1 commit into
masterfrom
vendored-with-proposals
Aug 24, 2026
Merged

Peter-Ball merged 1 commit into
masterfrom
vendored-with-proposals

Conversation

@Peter-Ball

@Peter-Ball Peter-Ball commented Aug 20, 2026 •

Copy link
Copy Markdown

Cleaning out the claude slop (see the commit msg if you are interested)

This points us to a new branch on our fork that has both the new route and cyclist position proposals.

It carries some unrelated Alerts changes that we haven't pulled through yet.

Once both PRs are merged, we can delete the vendored-with-proposals branch and re-point towards master

Repoints the gtfs-spec submodule from the bare head of google/transit#621
to TransitApp/transit@vendored-with-proposals, which is upstream master
plus a merge commit per proposal we adopt early:

  #611  cyclist positions   VehiclePosition 12/13, CarriageDetails 6/7
  #621  NewRoutes           Route, FeedEntity.route, TripProperties.route_id

Previously the pin could only carry one in-flight proposal at a time,
since a submodule pin is a single commit and each PR head sits on its own
base. Pinning an integration branch lifts that limit and also recovers the
15 master commits both heads were missing (Alert.communication_period,
Alert.impact_period, Cause.SPECIAL_EVENT).

The pin stays fetchable through the existing .gitmodules URL: GitHub
serves any commit in a public fork network by SHA from the parent repo,
which is the same mechanism that made the previous pin work. No
.gitmodules change and no `git submodule sync` needed.

Node bindings regenerated (CJS + ESM + both .d.ts); version 1.11.0.
The diff against 1.10.0 is purely additive - no types removed.

Refreshing the branch: reset it to upstream master and re-merge each
still-open PR head. Never merge master into it - google/transit
squash-merges, so a landed PR arrives as a new commit that git will not
recognise as already applied.

Deleting it: once #611 and #621 have both landed upstream, repin gtfs-spec
to google/transit master and delete the branch.

Co-Authored-By: Claude Opus 5 <noreply@anthropic.com>
@Peter-Ball
Peter-Ball requested a review from gcamp August 20, 2026 20:00
@Peter-Ball Peter-Ball self-assigned this Aug 20, 2026
@Peter-Ball
Peter-Ball merged commit 3623ad0 into master Aug 24, 2026
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants