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

Fix route sort, color issues #123

Merged
merged 11 commits into from
Feb 5, 2020
Merged

Fix route sort, color issues #123

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
11 commits
Select commit Hold shift + click to select a range
12d9034
fix(RouteViewer): fix route sort, color issues
landonreed Jan 28, 2020
b940040
refactor: remove log statement
landonreed Jan 28, 2020
063439a
refactor(route-viewer): make route comparator tolerate all kinds of data
evansiroky Jan 28, 2020
0d49d08
refactor(itinerary): improve route comparator functions
evansiroky Jan 29, 2020
9186539
refactor: address PR comments
evansiroky Jan 30, 2020
8fa6088
Add route sort comparator for route type
evansiroky Feb 1, 2020
8e481e9
refactor: change order of some route types
evansiroky Feb 1, 2020
4fdc1d2
refactor: add alphabetic shortName comparator, always use integer sho…
evansiroky Feb 1, 2020
3a46a3d
refactor: rename a test and remove a test that's no longer needed
evansiroky Feb 5, 2020
f9f208d
test: add test case with alphanumeric shortNames
evansiroky Feb 5, 2020
316cc8d
Merge pull request #124 from opentripplanner/eas-route-sort-order
binh-dam-ibigroup Feb 5, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
91 changes: 91 additions & 0 deletions __tests__/util/__mocks__/itinerary.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,91 @@
{
"route1": {
"longName": "Across town",
"mode": "BUS",
"shortName": "10",
"sortOrder": 10
},
"route2": {
"longName": "Around town",
"mode": "BUS",
"shortName": "20",
"sortOrder": 2
},
"route3": {
"longName": "Around another town",
"mode": "BUS",
"shortName": "3",
"sortOrder": -999
},
"route4": {
"longName": "Loop route",
"mode": "BUS",
"shortName": "2",
"sortOrder": -999
},
"route5": {
"longName": "A-line",
"mode": "BUS",
"shortName": "A",
"sortOrder": -999
},
"route6": {
"longName": "B-line",
"mode": "BUS",
"shortName": "B",
"sortOrder": -999
},
"route7": {
"longName": "A meandering route",
"mode": "BUS",
"sortOrder": -999
},
"route8": {
"longName": "Zig-zagging route",
"mode": "BUS",
"shortName": "30",
"sortOrder": 2
},
"route9": {
"longName": "Express route",
"mode": "BUS",
"shortName": "30",
"sortOrder": 2
},
"route10": {
"longName": "Variation of express route",
"mode": "BUS",
"shortName": "30",
"sortOrder": 2
},
"route11": {
"longName": "Local route",
"mode": "BUS",
"shortName": "6",
"sortOrder": 2
},
"route12": {
"longName": "Intercity Train",
"mode": "RAIL",
"shortName": "IC",
"sortOrder": 2
},
"route13": {
"longName": "Yellow line Subway",
"mode": "SUBWAY",
"shortName": "Yellow",
"sortOrder": 2
},
"route14": {
"longName": "Xpress route C",
"mode": "BUS",
"shortName": "30C",
"sortOrder": 2
},
"route15": {
"longName": "Express route X",
"mode": "BUS",
"shortName": "30X",
"sortOrder": 2
}
}
247 changes: 247 additions & 0 deletions __tests__/util/__snapshots__/itinerary.js.snap
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,247 @@
// Jest Snapshot v1, https://goo.gl/fbAQLP

exports[`util > itinerary routeComparator should prioritize routes with integer shortNames over alphabetic shortNames 1`] = `
Array [
Object {
"longName": "A-line",
"mode": "BUS",
"shortName": "A",
"sortOrder": -999,
},
Object {
"longName": "Loop route",
"mode": "BUS",
"shortName": "2",
"sortOrder": -999,
},
]
`;

exports[`util > itinerary routeComparator should prioritize routes with shortNames over those with just longNames 1`] = `
Array [
Object {
"longName": "B-line",
"mode": "BUS",
"shortName": "B",
"sortOrder": -999,
},
Object {
"longName": "A meandering route",
"mode": "BUS",
"sortOrder": -999,
},
]
`;

exports[`util > itinerary routeComparator should prioritize routes with valid sortOrder 1`] = `
Array [
Object {
"longName": "Around town",
"mode": "BUS",
"shortName": "20",
"sortOrder": 2,
},
Object {
"longName": "Around another town",
"mode": "BUS",
"shortName": "3",
"sortOrder": -999,
},
]
`;

exports[`util > itinerary routeComparator should sort based off of route type 1`] = `
Array [
Object {
"longName": "Yellow line Subway",
"mode": "SUBWAY",
"shortName": "Yellow",
"sortOrder": 2,
},
Object {
"longName": "Intercity Train",
"mode": "RAIL",
"shortName": "IC",
"sortOrder": 2,
},
]
`;

exports[`util > itinerary routeComparator should sort routes based off of integer shortName 1`] = `
Array [
Object {
"longName": "Loop route",
"mode": "BUS",
"shortName": "2",
"sortOrder": -999,
},
Object {
"longName": "Around another town",
"mode": "BUS",
"shortName": "3",
"sortOrder": -999,
},
]
`;

exports[`util > itinerary routeComparator should sort routes based off of longNames 1`] = `
Array [
Object {
"longName": "Express route",
"mode": "BUS",
"shortName": "30",
"sortOrder": 2,
},
Object {
"longName": "Variation of express route",
"mode": "BUS",
"shortName": "30",
"sortOrder": 2,
},
]
`;

exports[`util > itinerary routeComparator should sort routes based off of shortNames 1`] = `
Array [
Object {
"longName": "A-line",
"mode": "BUS",
"shortName": "A",
"sortOrder": -999,
},
Object {
"longName": "B-line",
"mode": "BUS",
"shortName": "B",
"sortOrder": -999,
},
]
`;

exports[`util > itinerary routeComparator should sort routes based off of sortOrder 1`] = `
Array [
Object {
"longName": "Around town",
"mode": "BUS",
"shortName": "20",
"sortOrder": 2,
},
Object {
"longName": "Across town",
"mode": "BUS",
"shortName": "10",
"sortOrder": 10,
},
]
`;

exports[`util > itinerary routeComparator should sort routes on all of the criteria at once 1`] = `
Array [
Object {
"longName": "Yellow line Subway",
"mode": "SUBWAY",
"shortName": "Yellow",
"sortOrder": 2,
},
Object {
"longName": "Intercity Train",
"mode": "RAIL",
"shortName": "IC",
"sortOrder": 2,
},
Object {
"longName": "Local route",
"mode": "BUS",
"shortName": "6",
"sortOrder": 2,
},
Object {
"longName": "Around town",
"mode": "BUS",
"shortName": "20",
"sortOrder": 2,
},
Object {
"longName": "Express route",
"mode": "BUS",
"shortName": "30",
"sortOrder": 2,
},
Object {
"longName": "Variation of express route",
"mode": "BUS",
"shortName": "30",
"sortOrder": 2,
},
Object {
"longName": "Zig-zagging route",
"mode": "BUS",
"shortName": "30",
"sortOrder": 2,
},
Object {
"longName": "Xpress route C",
"mode": "BUS",
"shortName": "30C",
"sortOrder": 2,
},
Object {
"longName": "Express route X",
"mode": "BUS",
"shortName": "30X",
"sortOrder": 2,
},
Object {
"longName": "Across town",
"mode": "BUS",
"shortName": "10",
"sortOrder": 10,
},
Object {
"longName": "A-line",
"mode": "BUS",
"shortName": "A",
"sortOrder": -999,
},
Object {
"longName": "B-line",
"mode": "BUS",
"shortName": "B",
"sortOrder": -999,
},
Object {
"longName": "Loop route",
"mode": "BUS",
"shortName": "2",
"sortOrder": -999,
},
Object {
"longName": "Around another town",
"mode": "BUS",
"shortName": "3",
"sortOrder": -999,
},
Object {
"longName": "A meandering route",
"mode": "BUS",
"sortOrder": -999,
},
]
`;

exports[`util > itinerary routeComparator should sort routes with alphanumeric shortNames 1`] = `
Array [
Object {
"longName": "Xpress route C",
"mode": "BUS",
"shortName": "30C",
"sortOrder": 2,
},
Object {
"longName": "Express route X",
"mode": "BUS",
"shortName": "30X",
"sortOrder": 2,
},
]
`;
Loading