Skip to content

Commit a16abb4

Browse files
landonreedlandonreed
authored
Merge pull request #126 from opentripplanner/dev
Next Release
2 parents 30b71a3 + 3b7694a commit a16abb4

File tree

12 files changed

+1042
-289
lines changed

12 files changed

+1042
-289
lines changed

Diff for: ‎__tests__/util/__mocks__/itinerary.json

+91
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,91 @@
1+
{
2+
"route1": {
3+
"longName": "Across town",
4+
"mode": "BUS",
5+
"shortName": "10",
6+
"sortOrder": 10
7+
},
8+
"route2": {
9+
"longName": "Around town",
10+
"mode": "BUS",
11+
"shortName": "20",
12+
"sortOrder": 2
13+
},
14+
"route3": {
15+
"longName": "Around another town",
16+
"mode": "BUS",
17+
"shortName": "3",
18+
"sortOrder": -999
19+
},
20+
"route4": {
21+
"longName": "Loop route",
22+
"mode": "BUS",
23+
"shortName": "2",
24+
"sortOrder": -999
25+
},
26+
"route5": {
27+
"longName": "A-line",
28+
"mode": "BUS",
29+
"shortName": "A",
30+
"sortOrder": -999
31+
},
32+
"route6": {
33+
"longName": "B-line",
34+
"mode": "BUS",
35+
"shortName": "B",
36+
"sortOrder": -999
37+
},
38+
"route7": {
39+
"longName": "A meandering route",
40+
"mode": "BUS",
41+
"sortOrder": -999
42+
},
43+
"route8": {
44+
"longName": "Zig-zagging route",
45+
"mode": "BUS",
46+
"shortName": "30",
47+
"sortOrder": 2
48+
},
49+
"route9": {
50+
"longName": "Express route",
51+
"mode": "BUS",
52+
"shortName": "30",
53+
"sortOrder": 2
54+
},
55+
"route10": {
56+
"longName": "Variation of express route",
57+
"mode": "BUS",
58+
"shortName": "30",
59+
"sortOrder": 2
60+
},
61+
"route11": {
62+
"longName": "Local route",
63+
"mode": "BUS",
64+
"shortName": "6",
65+
"sortOrder": 2
66+
},
67+
"route12": {
68+
"longName": "Intercity Train",
69+
"mode": "RAIL",
70+
"shortName": "IC",
71+
"sortOrder": 2
72+
},
73+
"route13": {
74+
"longName": "Yellow line Subway",
75+
"mode": "SUBWAY",
76+
"shortName": "Yellow",
77+
"sortOrder": 2
78+
},
79+
"route14": {
80+
"longName": "Xpress route C",
81+
"mode": "BUS",
82+
"shortName": "30C",
83+
"sortOrder": 2
84+
},
85+
"route15": {
86+
"longName": "Express route X",
87+
"mode": "BUS",
88+
"shortName": "30X",
89+
"sortOrder": 2
90+
}
91+
}

Diff for: ‎__tests__/util/__snapshots__/itinerary.js.snap

+247
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,247 @@
1+
// Jest Snapshot v1, https://goo.gl/fbAQLP
2+
3+
exports[`util > itinerary routeComparator should prioritize routes with integer shortNames over alphabetic shortNames 1`] = `
4+
Array [
5+
Object {
6+
"longName": "A-line",
7+
"mode": "BUS",
8+
"shortName": "A",
9+
"sortOrder": -999,
10+
},
11+
Object {
12+
"longName": "Loop route",
13+
"mode": "BUS",
14+
"shortName": "2",
15+
"sortOrder": -999,
16+
},
17+
]
18+
`;
19+
20+
exports[`util > itinerary routeComparator should prioritize routes with shortNames over those with just longNames 1`] = `
21+
Array [
22+
Object {
23+
"longName": "B-line",
24+
"mode": "BUS",
25+
"shortName": "B",
26+
"sortOrder": -999,
27+
},
28+
Object {
29+
"longName": "A meandering route",
30+
"mode": "BUS",
31+
"sortOrder": -999,
32+
},
33+
]
34+
`;
35+
36+
exports[`util > itinerary routeComparator should prioritize routes with valid sortOrder 1`] = `
37+
Array [
38+
Object {
39+
"longName": "Around town",
40+
"mode": "BUS",
41+
"shortName": "20",
42+
"sortOrder": 2,
43+
},
44+
Object {
45+
"longName": "Around another town",
46+
"mode": "BUS",
47+
"shortName": "3",
48+
"sortOrder": -999,
49+
},
50+
]
51+
`;
52+
53+
exports[`util > itinerary routeComparator should sort based off of route type 1`] = `
54+
Array [
55+
Object {
56+
"longName": "Yellow line Subway",
57+
"mode": "SUBWAY",
58+
"shortName": "Yellow",
59+
"sortOrder": 2,
60+
},
61+
Object {
62+
"longName": "Intercity Train",
63+
"mode": "RAIL",
64+
"shortName": "IC",
65+
"sortOrder": 2,
66+
},
67+
]
68+
`;
69+
70+
exports[`util > itinerary routeComparator should sort routes based off of integer shortName 1`] = `
71+
Array [
72+
Object {
73+
"longName": "Loop route",
74+
"mode": "BUS",
75+
"shortName": "2",
76+
"sortOrder": -999,
77+
},
78+
Object {
79+
"longName": "Around another town",
80+
"mode": "BUS",
81+
"shortName": "3",
82+
"sortOrder": -999,
83+
},
84+
]
85+
`;
86+
87+
exports[`util > itinerary routeComparator should sort routes based off of longNames 1`] = `
88+
Array [
89+
Object {
90+
"longName": "Express route",
91+
"mode": "BUS",
92+
"shortName": "30",
93+
"sortOrder": 2,
94+
},
95+
Object {
96+
"longName": "Variation of express route",
97+
"mode": "BUS",
98+
"shortName": "30",
99+
"sortOrder": 2,
100+
},
101+
]
102+
`;
103+
104+
exports[`util > itinerary routeComparator should sort routes based off of shortNames 1`] = `
105+
Array [
106+
Object {
107+
"longName": "A-line",
108+
"mode": "BUS",
109+
"shortName": "A",
110+
"sortOrder": -999,
111+
},
112+
Object {
113+
"longName": "B-line",
114+
"mode": "BUS",
115+
"shortName": "B",
116+
"sortOrder": -999,
117+
},
118+
]
119+
`;
120+
121+
exports[`util > itinerary routeComparator should sort routes based off of sortOrder 1`] = `
122+
Array [
123+
Object {
124+
"longName": "Around town",
125+
"mode": "BUS",
126+
"shortName": "20",
127+
"sortOrder": 2,
128+
},
129+
Object {
130+
"longName": "Across town",
131+
"mode": "BUS",
132+
"shortName": "10",
133+
"sortOrder": 10,
134+
},
135+
]
136+
`;
137+
138+
exports[`util > itinerary routeComparator should sort routes on all of the criteria at once 1`] = `
139+
Array [
140+
Object {
141+
"longName": "Yellow line Subway",
142+
"mode": "SUBWAY",
143+
"shortName": "Yellow",
144+
"sortOrder": 2,
145+
},
146+
Object {
147+
"longName": "Intercity Train",
148+
"mode": "RAIL",
149+
"shortName": "IC",
150+
"sortOrder": 2,
151+
},
152+
Object {
153+
"longName": "Local route",
154+
"mode": "BUS",
155+
"shortName": "6",
156+
"sortOrder": 2,
157+
},
158+
Object {
159+
"longName": "Around town",
160+
"mode": "BUS",
161+
"shortName": "20",
162+
"sortOrder": 2,
163+
},
164+
Object {
165+
"longName": "Express route",
166+
"mode": "BUS",
167+
"shortName": "30",
168+
"sortOrder": 2,
169+
},
170+
Object {
171+
"longName": "Variation of express route",
172+
"mode": "BUS",
173+
"shortName": "30",
174+
"sortOrder": 2,
175+
},
176+
Object {
177+
"longName": "Zig-zagging route",
178+
"mode": "BUS",
179+
"shortName": "30",
180+
"sortOrder": 2,
181+
},
182+
Object {
183+
"longName": "Xpress route C",
184+
"mode": "BUS",
185+
"shortName": "30C",
186+
"sortOrder": 2,
187+
},
188+
Object {
189+
"longName": "Express route X",
190+
"mode": "BUS",
191+
"shortName": "30X",
192+
"sortOrder": 2,
193+
},
194+
Object {
195+
"longName": "Across town",
196+
"mode": "BUS",
197+
"shortName": "10",
198+
"sortOrder": 10,
199+
},
200+
Object {
201+
"longName": "A-line",
202+
"mode": "BUS",
203+
"shortName": "A",
204+
"sortOrder": -999,
205+
},
206+
Object {
207+
"longName": "B-line",
208+
"mode": "BUS",
209+
"shortName": "B",
210+
"sortOrder": -999,
211+
},
212+
Object {
213+
"longName": "Loop route",
214+
"mode": "BUS",
215+
"shortName": "2",
216+
"sortOrder": -999,
217+
},
218+
Object {
219+
"longName": "Around another town",
220+
"mode": "BUS",
221+
"shortName": "3",
222+
"sortOrder": -999,
223+
},
224+
Object {
225+
"longName": "A meandering route",
226+
"mode": "BUS",
227+
"sortOrder": -999,
228+
},
229+
]
230+
`;
231+
232+
exports[`util > itinerary routeComparator should sort routes with alphanumeric shortNames 1`] = `
233+
Array [
234+
Object {
235+
"longName": "Xpress route C",
236+
"mode": "BUS",
237+
"shortName": "30C",
238+
"sortOrder": 2,
239+
},
240+
Object {
241+
"longName": "Express route X",
242+
"mode": "BUS",
243+
"shortName": "30X",
244+
"sortOrder": 2,
245+
},
246+
]
247+
`;

0 commit comments

Comments
 (0)