Skip to content

Commit 7067369

Browse files
committed
Fixes missing EmpiricalDelayService imports after rebase
After rebasing onto otp/dev-2.x, the conflict resolution accidentally removed the EmpiricalDelayService import. This commit restores it and fixes the SpeedTest constructor call to match the updated DefaultServerRequestContext signature.
1 parent 9fdf4a9 commit 7067369

File tree

3 files changed

+14
-11
lines changed

3 files changed

+14
-11
lines changed

application/src/main/java/org/opentripplanner/standalone/configure/ConstructApplicationModule.java

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,7 @@
1111
import org.opentripplanner.apis.transmodel.configure.TransmodelSchema;
1212
import org.opentripplanner.astar.spi.TraverseVisitor;
1313
import org.opentripplanner.ext.carpooling.CarpoolingService;
14+
import org.opentripplanner.ext.empiricaldelay.EmpiricalDelayService;
1415
import org.opentripplanner.ext.geocoder.LuceneIndex;
1516
import org.opentripplanner.ext.interactivelauncher.api.LauncherRequestDecorator;
1617
import org.opentripplanner.ext.ridehailing.RideHailingService;

application/src/main/java/org/opentripplanner/standalone/server/DefaultServerRequestContext.java

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,7 @@
1010
import org.opentripplanner.apis.transmodel.configure.TransmodelSchema;
1111
import org.opentripplanner.astar.spi.TraverseVisitor;
1212
import org.opentripplanner.ext.carpooling.CarpoolingService;
13+
import org.opentripplanner.ext.empiricaldelay.EmpiricalDelayService;
1314
import org.opentripplanner.ext.flex.FlexParameters;
1415
import org.opentripplanner.ext.geocoder.LuceneIndex;
1516
import org.opentripplanner.ext.ridehailing.RideHailingService;

application/src/test/java/org/opentripplanner/transit/speed_test/SpeedTest.java

Lines changed: 12 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -128,23 +128,24 @@ public SpeedTest(
128128
TestServerContext.createStreetLimitationParametersService(),
129129
config.transitRoutingParams,
130130
new DefaultTransitService(timetableRepository),
131-
null,
132-
null,
131+
null, // TriasApiParameters
132+
null, // GtfsApiParameters
133133
VectorTileConfig.DEFAULT,
134134
TestServerContext.createVehicleParkingService(),
135135
TestServerContext.createVehicleRentalService(),
136136
VertexLinkerTestFactory.of(graph),
137137
TestServerContext.createViaTransferResolver(graph, transitService),
138138
TestServerContext.createWorldEnvelopeService(),
139-
null,
140-
null,
141-
null,
142-
null,
143-
null,
144-
null,
145-
null,
146-
null,
147-
null
139+
null, // CarpoolingService
140+
null, // ItineraryDecorator
141+
null, // EmpiricalDelayService
142+
null, // LuceneIndex
143+
null, // GraphQLSchema (gtfs)
144+
null, // GraphQLSchema (transmodel)
145+
null, // SorlandsbanenNorwayService
146+
null, // StopConsolidationService
147+
null, // TraverseVisitor
148+
null // TransmodelAPIParameters
148149
);
149150
// Creating raptor transit data should be integrated into the TimetableRepository, but for now
150151
// we do it manually here

0 commit comments

Comments
 (0)