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

GTFS Flex Support #754

Merged
merged 121 commits into from
Jun 20, 2022
Merged

GTFS Flex Support #754

merged 121 commits into from
Jun 20, 2022

Conversation

miles-grant-ibigroup
Copy link
Contributor

@miles-grant-ibigroup miles-grant-ibigroup commented Jan 25, 2022 •
edited
Loading

Checklist

  • Appropriate branch selected (all PRs must first be merged to dev before they can be merged to master) (merging into flex-dev!)
  • Any modified or new methods or classes have helpful JSDoc 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

This PR adds support for the GTFS Flex Spec. Some features (most notably certain location geometry types) are missing or incomplete. Not all datatoosl features are compatible as yet.

philip-cline and others added 30 commits November 10, 2021 09:18
@philip-cline
feat(Editor): Wire up flex locations menu & add location_group_id dro…
7c861e4 
…pdown
@miles-grant-ibigroup
improvement: add flex property to feed sources
adbef65
@miles-grant-ibigroup
feat(gtfs.yml): add booking rules
52d2b46
@miles-grant-ibigroup
refactor: update booking_rule name to match server
8fcc7b0
@miles-grant-ibigroup
refactor(gtfs.yml): adjust booking_rule endpoint
d48ccf7
@miles-grant-ibigroup
refactor: improve booking rules UX
01a6b02
@miles-grant-ibigroup
style(gtfs.yml): reformat
48e5f91
@miles-grant-ibigroup
improvement(PatternStopCard): add booking rules
dd82ab6
@philip-cline
feat(EditorMap): Prelim work on flex location polygon editor
05f408e
@philip-cline
feat(Flex locations): Wire up initial flex location editing
448f507
@philip-cline
refactor(active.js): Add temp location saving
67e0ff2
@philip-cline
refactor(Feed Sources): Add flex flag
31e0485
@miles-grant-ibigroup
refactor(PatternStopCard): add booking rules
cdf43e5
@miles-grant-ibigroup
refactor(GeneralSettings): internationalize flex checkbox
ff44025
@miles-grant-ibigroup
chore(i18n): add flex strings
235861b
@miles-grant-ibigroup
refactor: improve booking rules UX
0097280
@philip-cline
feat(Saving locations): Prelim location saving
2bac182
@miles-grant-ibigroup
feat(PatternStopCard): add booking rules
39b319f
@miles-grant-ibigroup
feat(PatternStopCard): begin addressing booking rules FLEX TODOs
c38de55
@philip-cline
feat(Location saving): Hacks to allow saving of location meta data
b604652
@philip-cline
feat(Location saving): Added hacked prelim location saving
1cba5e4
@philip-cline
refactor(gtfs.yml): Add location spec
2b04831
@philip-cline
refactor(EntityListSecondaryActions): Fix spelling
922d601
@miles-grant-ibigroup
refactor: add a few flow types related to location
70edc71
@miles-grant-ibigroup
refactor: begin process of merging locations and stops in pattern editor
fc81180
@philip-cline
Merge branch 'flex-polygon-editor' of https://github.com/ibi-group/da…
58b156d 
…tatools-ui into flex-polygon-editor

merge updates
@philip-cline
refactor(Locations changes): Flow type location changes
04531b1
@philip-cline
refactor(Location types): Polish location types
a761ec8
@miles-grant-ibigroup
refactor: improve patternStop/patternLocation duality
17ff5b3
@miles-grant-ibigroup
refactor: move PatternStop to be true type union with PatternLocation
374d11f
@miles-grant-ibigroup miles-grant-ibigroup requested review from binh-dam-ibigroup and removed request for philip-cline June 14, 2022 18:27
@philip-cline
Copy link
Contributor

For some reason, I can't edit a route pattern in the editor, if I click on one the UI crashes.

These last two bugs should be fixed as of 2fb70ec

@binh-dam-ibigroup
Copy link
Contributor

One non-blocking thing is when you click on pattern stops in the pattern editor, the regular stops on the map get highlighted in blue (see screenshot below), but not the flex zones, and maybe they should be highlighted too when selected.
image

binh-dam-ibigroup
binh-dam-ibigroup approved these changes Jun 16, 2022
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.

That's a nice piece of work so far!

lib/editor/components/map/PolygonWithLabel.js Outdated Show resolved Hide resolved
@miles-grant-ibigroup miles-grant-ibigroup mentioned this pull request Jun 16, 2022
Open
@miles-grant-ibigroup miles-grant-ibigroup merged commit bc4f883 into dev-flex Jun 20, 2022
@miles-grant-ibigroup miles-grant-ibigroup deleted the flex-polygon-editor branch June 20, 2022 17:45
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@philip-cline philip-cline philip-cline approved these changes

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

@daniel-heppner-ibigroup daniel-heppner-ibigroup Awaiting requested review from daniel-heppner-ibigroup

Assignees

@philip-cline philip-cline

@daniel-heppner-ibigroup daniel-heppner-ibigroup

Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
5 participants
@miles-grant-ibigroup @binh-dam-ibigroup @philip-cline @demory @daniel-heppner-ibigroup