Skip to content

Commit f3990db

Browse files
leonardehrenfriedleonardehrenfried
committed
Introduce more constants, use PSC instead of TRIMET
1 parent 12e27a3 commit f3990db

1 file changed

Lines changed: 38 additions & 34 deletions

File tree

‎application/src/ext/java/org/opentripplanner/ext/fares/service/gtfs/v2/custom/OregonHopFareFactory.java‎

Lines changed: 38 additions & 34 deletions
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,11 @@ public class OregonHopFareFactory extends DefaultFareServiceFactory {
3939

4040
// leg group ids
4141
static final FeedScopedId LG_TRIMET_TRIMET = trimetId("TRIMET");
42+
static final FeedScopedId LG_TRIMET_PSC = trimetId("PSC");
4243
static final FeedScopedId LG_CTRAN_REGIONAL = ctranId("REGIONAL");
44+
static final FeedScopedId LG_CTRAN_EXPRESS = ctranId("EXPRESS");
45+
static final FeedScopedId LG_CTRAN_LOCAL = ctranId("LOCAL");
46+
static final FeedScopedId LG_CTRAN_FLEX_LOCAL = FeedScopedId.parse("CTRAN_FLEX:LOCAL");
4347

4448
// rider categories
4549
static final RiderCategory CATEGORY_YOUTH = RiderCategory.of(ctranId("YOUTH"))
@@ -106,7 +110,7 @@ public FareService makeFareService() {
106110
defaultTransfer()
107111
.withId(ctranId("trimet-to-ctran-local"))
108112
.withFromLegGroup(LG_TRIMET_TRIMET)
109-
.withToLegGroup(ctranId("LOCAL"))
113+
.withToLegGroup(LG_CTRAN_LOCAL)
110114
.withFareProducts(
111115
generateHopFareProducts(
112116
ADULT_CTRAN_LOCAL,
@@ -123,7 +127,7 @@ public FareService makeFareService() {
123127
defaultTransfer()
124128
.withId(ctranId("trimet-to-ctran-flex"))
125129
.withFromLegGroup(LG_TRIMET_TRIMET)
126-
.withToLegGroup(FeedScopedId.parse("CTRAN_FLEX:LOCAL"))
130+
.withToLegGroup(LG_CTRAN_FLEX_LOCAL)
127131
.withFareProducts(
128132
generateHopFareProducts(
129133
ADULT_CTRAN_LOCAL,
@@ -141,7 +145,7 @@ public FareService makeFareService() {
141145
FareTransferRule.of()
142146
.withId(ctranId("trimet-to-ctran-express"))
143147
.withFromLegGroup(LG_TRIMET_TRIMET)
144-
.withToLegGroup(ctranId("EXPRESS"))
148+
.withToLegGroup(LG_CTRAN_EXPRESS)
145149
.withTransferCount(FareTransferRule.UNLIMITED_TRANSFERS)
146150
.withTimeLimit(TimeLimitType.DEPARTURE_TO_DEPARTURE, Duration.ofMinutes(180))
147151
.withFareProducts(
@@ -161,7 +165,7 @@ public FareService makeFareService() {
161165
this.fareTransferRules.add(
162166
defaultTransfer()
163167
.withId(ctranId("psc-to-ctran-regional"))
164-
.withFromLegGroup(trimetId("PSC"))
168+
.withFromLegGroup(LG_TRIMET_PSC)
165169
.withFareProducts(
166170
generateHopFareProducts(
167171
ADULT_CTRAN_REGIONAL,
@@ -177,8 +181,8 @@ public FareService makeFareService() {
177181
this.fareTransferRules.add(
178182
defaultTransfer()
179183
.withId(ctranId("psc-to-ctran-local"))
180-
.withFromLegGroup(trimetId("PSC"))
181-
.withToLegGroup(ctranId("LOCAL"))
184+
.withFromLegGroup(LG_TRIMET_PSC)
185+
.withToLegGroup(LG_CTRAN_LOCAL)
182186
.withFareProducts(
183187
generateHopFareProducts(
184188
ADULT_CTRAN_LOCAL,
@@ -194,8 +198,8 @@ public FareService makeFareService() {
194198
this.fareTransferRules.add(
195199
defaultTransfer()
196200
.withId(ctranId("psc-to-ctran-flex"))
197-
.withFromLegGroup(trimetId("PSC"))
198-
.withToLegGroup(FeedScopedId.parse("CTRAN_FLEX:LOCAL"))
201+
.withFromLegGroup(LG_TRIMET_PSC)
202+
.withToLegGroup(LG_CTRAN_FLEX_LOCAL)
199203
.withFareProducts(
200204
generateHopFareProducts(
201205
ADULT_CTRAN_LOCAL,
@@ -211,8 +215,8 @@ public FareService makeFareService() {
211215
this.fareTransferRules.add(
212216
defaultTransfer()
213217
.withId(ctranId("psc-to-ctran-express"))
214-
.withFromLegGroup(LG_TRIMET_TRIMET)
215-
.withToLegGroup(ctranId("EXPRESS"))
218+
.withFromLegGroup(LG_TRIMET_PSC)
219+
.withToLegGroup(LG_CTRAN_EXPRESS)
216220
.withFareProducts(
217221
generateHopFareProducts(
218222
CTRAN_EXP,
@@ -248,7 +252,7 @@ public FareService makeFareService() {
248252
defaultTransfer()
249253
.withId(trimetId("ctran-local-to-trimet"))
250254
.withToLegGroup(LG_TRIMET_TRIMET)
251-
.withFromLegGroup(ctranId("LOCAL"))
255+
.withFromLegGroup(LG_CTRAN_LOCAL)
252256
.withFareProducts(
253257
generateHopFareProducts(
254258
ADULT_TRIMET,
@@ -265,7 +269,7 @@ public FareService makeFareService() {
265269
defaultTransfer()
266270
.withId(trimetId("ctran-flex-to-trimet"))
267271
.withToLegGroup(LG_TRIMET_TRIMET)
268-
.withFromLegGroup(FeedScopedId.parse("CTRAN_FLEX:LOCAL"))
272+
.withFromLegGroup(LG_CTRAN_FLEX_LOCAL)
269273
.withFareProducts(
270274
generateHopFareProducts(
271275
ADULT_TRIMET,
@@ -283,15 +287,15 @@ public FareService makeFareService() {
283287
FareTransferRule.of()
284288
.withId(trimetId("ctran-express-to-trimet"))
285289
.withToLegGroup(LG_TRIMET_TRIMET)
286-
.withFromLegGroup(ctranId("EXPRESS"))
290+
.withFromLegGroup(LG_CTRAN_EXPRESS)
287291
.build()
288292
);
289293

290294
// C-TRAN to PSC
291295
this.fareTransferRules.add(
292296
defaultTransfer()
293297
.withId(trimetId("ctran-regional-to-psc"))
294-
.withToLegGroup(trimetId("PSC"))
298+
.withToLegGroup(LG_TRIMET_PSC)
295299
.withFromLegGroup(LG_CTRAN_REGIONAL)
296300
.withFareProducts(
297301
generateHopFareProducts(
@@ -308,8 +312,8 @@ public FareService makeFareService() {
308312
this.fareTransferRules.add(
309313
defaultTransfer()
310314
.withId(trimetId("ctran-local-to-psc"))
311-
.withToLegGroup(trimetId("PSC"))
312-
.withFromLegGroup(ctranId("LOCAL"))
315+
.withToLegGroup(LG_TRIMET_PSC)
316+
.withFromLegGroup(LG_CTRAN_LOCAL)
313317
.withFareProducts(
314318
generateHopFareProducts(
315319
ADULT_STREETCAR,
@@ -325,8 +329,8 @@ public FareService makeFareService() {
325329
this.fareTransferRules.add(
326330
defaultTransfer()
327331
.withId(trimetId("ctran-flex-to-psc"))
328-
.withToLegGroup(trimetId("PSC"))
329-
.withFromLegGroup(FeedScopedId.parse("CTRAN_FLEX:LOCAL"))
332+
.withToLegGroup(LG_TRIMET_PSC)
333+
.withFromLegGroup(LG_CTRAN_FLEX_LOCAL)
330334
.withFareProducts(
331335
generateHopFareProducts(
332336
ADULT_STREETCAR,
@@ -343,69 +347,69 @@ public FareService makeFareService() {
343347
this.fareTransferRules.add(
344348
defaultTransfer()
345349
.withId(trimetId("ctran-express-to-psc"))
346-
.withToLegGroup(trimetId("PSC"))
347-
.withFromLegGroup(ctranId("EXPRESS"))
350+
.withToLegGroup(LG_TRIMET_PSC)
351+
.withFromLegGroup(LG_CTRAN_EXPRESS)
348352
.build()
349353
);
350354

351355
// The C-TRAN Data fails to include unlimited free transfers. This corrects the data. TODO: is this correct?
352356
this.fareTransferRules.add(
353357
defaultTransfer()
354358
.withId(ctranId("EXP_TO_LOCAL_UNLIMITED"))
355-
.withFromLegGroup(ctranId("EXPRESS"))
356-
.withToLegGroup(ctranId("LOCAL"))
359+
.withFromLegGroup(LG_CTRAN_EXPRESS)
360+
.withToLegGroup(LG_CTRAN_LOCAL)
357361
.build()
358362
);
359363
this.fareTransferRules.add(
360364
defaultTransfer()
361365
.withId(ctranId("EXP_TO_REGIONAL_UNLIMITED"))
362-
.withFromLegGroup(ctranId("EXPRESS"))
366+
.withFromLegGroup(LG_CTRAN_EXPRESS)
363367
.withToLegGroup(LG_CTRAN_REGIONAL)
364368
.build()
365369
);
366370
this.fareTransferRules.add(
367371
defaultTransfer()
368372
.withId(ctranId("REGIONAL_TO_LOCAL_UNLIMITED"))
369373
.withFromLegGroup(LG_CTRAN_REGIONAL)
370-
.withToLegGroup(ctranId("LOCAL"))
374+
.withToLegGroup(LG_CTRAN_LOCAL)
371375
.build()
372376
);
373377

374378
// CTRAN to CTRAN Flex transfers
375379
this.fareTransferRules.add(
376380
defaultTransfer()
377381
.withId(ctranId("LOCAL_TO_FLEX"))
378-
.withFromLegGroup(ctranId("LOCAL"))
379-
.withToLegGroup(FeedScopedId.parse("CTRAN_FLEX:LOCAL"))
382+
.withFromLegGroup(LG_CTRAN_LOCAL)
383+
.withToLegGroup(LG_CTRAN_FLEX_LOCAL)
380384
.build()
381385
);
382386
this.fareTransferRules.add(
383387
defaultTransfer()
384388
.withId(ctranId("REGIONAL_TO_FLEX"))
385389
.withFromLegGroup(LG_CTRAN_REGIONAL)
386-
.withToLegGroup(FeedScopedId.parse("CTRAN_FLEX:LOCAL"))
390+
.withToLegGroup(LG_CTRAN_FLEX_LOCAL)
387391
.build()
388392
);
389393
this.fareTransferRules.add(
390394
defaultTransfer()
391395
.withId(ctranId("EXPRESS_TO_FLEX"))
392-
.withFromLegGroup(ctranId("EXPRESS"))
393-
.withToLegGroup(FeedScopedId.parse("CTRAN_FLEX:LOCAL"))
396+
.withFromLegGroup(LG_CTRAN_EXPRESS)
397+
.withToLegGroup(LG_CTRAN_FLEX_LOCAL)
394398
.build()
395399
);
396400

397401
// CTRAN Flex to CTRAN transfers
398402
this.fareTransferRules.add(
399403
defaultTransfer()
400404
.withId(ctranId("FLEX_TO_LOCAL"))
401-
.withFromLegGroup(FeedScopedId.parse("CTRAN_FLEX:LOCAL"))
402-
.withToLegGroup(ctranId("LOCAL"))
405+
.withFromLegGroup(LG_CTRAN_FLEX_LOCAL)
406+
.withToLegGroup(LG_CTRAN_LOCAL)
403407
.build()
404408
);
405409
this.fareTransferRules.add(
406410
defaultTransfer()
407411
.withId(ctranId("FLEX_TO_REGIONAL"))
408-
.withFromLegGroup(FeedScopedId.parse("CTRAN_FLEX:LOCAL"))
412+
.withFromLegGroup(LG_CTRAN_FLEX_LOCAL)
409413
.withToLegGroup(LG_CTRAN_REGIONAL)
410414
.withFareProducts(
411415
generateHopFareProducts(
@@ -422,8 +426,8 @@ public FareService makeFareService() {
422426
this.fareTransferRules.add(
423427
defaultTransfer()
424428
.withId(ctranId("FLEX_TO_EXPRESS"))
425-
.withFromLegGroup(FeedScopedId.parse("CTRAN_FLEX:LOCAL"))
426-
.withToLegGroup(ctranId("EXPRESS"))
429+
.withFromLegGroup(LG_CTRAN_FLEX_LOCAL)
430+
.withToLegGroup(LG_CTRAN_EXPRESS)
427431
.withFareProducts(
428432
generateHopFareProducts(
429433
CTRAN_EXP,

0 commit comments

Comments
 (0)