Skip to content

Commit 144e8d4

Browse files
michazmichaz
committed
Move parameter strings to where all the others are.
1 parent f94bdc6 commit 144e8d4

File tree

4 files changed

+70
-66
lines changed

4 files changed

+70
-66
lines changed

‎core/src/main/java/com/graphhopper/util/Parameters.java

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -185,4 +185,15 @@ public static final class NON_CH {
185185
*/
186186
public static final String MAX_NON_CH_POINT_DISTANCE = ROUTING_INIT_PREFIX + NON_CH_PREFIX + "max_waypoint_distance";
187187
}
188+
189+
public static final class PT {
190+
public static final String EARLIEST_DEPARTURE_TIME_HINT = "pt.earliest_departure_time";
191+
public static final String RANGE_QUERY_END_TIME = "pt.range_query_end_time";
192+
public static final String ARRIVE_BY = "pt.arrive_by";
193+
public static final String IGNORE_TRANSFERS = "pt.ignore_transfers";
194+
public static final String WALK_SPEED = "pt.walk_speed";
195+
public static final String MAX_WALK_DISTANCE_PER_LEG = "pt.max_walk_distance_per_leg";
196+
public static final String MAX_WALK_DISTANCE_PER_TRANSFER_LEG = "pt.max_walk_distance_per_transfer_leg";
197+
}
198+
188199
}

‎reader-gtfs/src/main/java/com/graphhopper/reader/gtfs/GraphHopperGtfs.java

Lines changed: 7 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -67,14 +67,6 @@ public static Factory createFactory(EncodingManager encodingManager, Translation
6767
return new Factory(encodingManager, translationMap, graphHopperStorage, locationIndex, gtfsStorage);
6868
}
6969

70-
public static final String EARLIEST_DEPARTURE_TIME_HINT = "earliestDepartureTime";
71-
public static final String RANGE_QUERY_END_TIME = "rangeQueryEndTime";
72-
public static final String ARRIVE_BY = "arriveBy";
73-
public static final String IGNORE_TRANSFERS = "ignoreTransfers";
74-
public static final String WALK_SPEED_KM_H = "walkSpeedKmH";
75-
public static final String MAX_WALK_DISTANCE_PER_LEG = "maxWalkDistancePerLeg";
76-
public static final String MAX_TRANSFER_DISTANCE_PER_LEG = "maxTransferDistancePerLeg";
77-
7870
private final TranslationMap translationMap;
7971
private final PtFlagEncoder flagEncoder;
8072
private final GraphHopperStorage graphHopperStorage;
@@ -101,13 +93,13 @@ private class RequestHandler {
10193

10294
RequestHandler(GHRequest request) {
10395
maxVisitedNodesForRequest = request.getHints().getInt(Parameters.Routing.MAX_VISITED_NODES, Integer.MAX_VALUE);
104-
initialTime = Duration.between(gtfsStorage.getStartDate().atStartOfDay(), LocalDateTime.parse(request.getHints().get(EARLIEST_DEPARTURE_TIME_HINT, "earliestDepartureTime is a required parameter"))).getSeconds();
105-
rangeQueryEndTime = request.getHints().has(RANGE_QUERY_END_TIME) ? Duration.between(gtfsStorage.getStartDate().atStartOfDay(), LocalDateTime.parse(request.getHints().get(RANGE_QUERY_END_TIME, ""))).getSeconds() : initialTime;
106-
arriveBy = request.getHints().getBool(ARRIVE_BY, false);
107-
ignoreTransfers = request.getHints().getBool(IGNORE_TRANSFERS, false);
108-
walkSpeedKmH = request.getHints().getDouble(WALK_SPEED_KM_H, 5.0);
109-
maxWalkDistancePerLeg = request.getHints().getDouble(MAX_WALK_DISTANCE_PER_LEG, Double.MAX_VALUE);
110-
maxTransferDistancePerLeg = request.getHints().getDouble(MAX_TRANSFER_DISTANCE_PER_LEG, Double.MAX_VALUE);
96+
initialTime = Duration.between(gtfsStorage.getStartDate().atStartOfDay(), LocalDateTime.parse(request.getHints().get(Parameters.PT.EARLIEST_DEPARTURE_TIME_HINT, Parameters.PT.EARLIEST_DEPARTURE_TIME_HINT+ " is a required parameter"))).getSeconds();
97+
rangeQueryEndTime = request.getHints().has(Parameters.PT.RANGE_QUERY_END_TIME) ? Duration.between(gtfsStorage.getStartDate().atStartOfDay(), LocalDateTime.parse(request.getHints().get(Parameters.PT.RANGE_QUERY_END_TIME, ""))).getSeconds() : initialTime;
98+
arriveBy = request.getHints().getBool(Parameters.PT.ARRIVE_BY, false);
99+
ignoreTransfers = request.getHints().getBool(Parameters.PT.IGNORE_TRANSFERS, false);
100+
walkSpeedKmH = request.getHints().getDouble(Parameters.PT.WALK_SPEED, 5.0);
101+
maxWalkDistancePerLeg = request.getHints().getDouble(Parameters.PT.MAX_WALK_DISTANCE_PER_LEG, Double.MAX_VALUE);
102+
maxTransferDistancePerLeg = request.getHints().getDouble(Parameters.PT.MAX_WALK_DISTANCE_PER_TRANSFER_LEG, Double.MAX_VALUE);
111103
weighting = createPtTravelTimeWeighting(flagEncoder, arriveBy, walkSpeedKmH);
112104
translation = translationMap.getWithFallBack(request.getLocale());
113105
if (request.getPoints().size() != 2) {

‎reader-gtfs/src/test/java/com/graphhopper/GraphHopperGtfsIT.java

Lines changed: 39 additions & 38 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@
33
import com.graphhopper.reader.gtfs.GraphHopperGtfs;
44
import com.graphhopper.util.Helper;
55
import com.graphhopper.util.Instruction;
6+
import com.graphhopper.util.Parameters;
67
import org.junit.AfterClass;
78
import org.junit.Assert;
89
import org.junit.BeforeClass;
@@ -46,8 +47,8 @@ public void testRoute1() {
4647
FROM_LAT, FROM_LON,
4748
TO_LAT, TO_LON
4849
);
49-
ghRequest.getHints().put(GraphHopperGtfs.EARLIEST_DEPARTURE_TIME_HINT, LocalDateTime.of(2007,1,1,0,0).toString());
50-
ghRequest.getHints().put(GraphHopperGtfs.MAX_WALK_DISTANCE_PER_LEG, 30);
50+
ghRequest.getHints().put(Parameters.PT.EARLIEST_DEPARTURE_TIME_HINT, LocalDateTime.of(2007,1,1,0,0).toString());
51+
ghRequest.getHints().put(Parameters.PT.MAX_WALK_DISTANCE_PER_LEG, 30);
5152
GHResponse route = graphHopper.route(ghRequest);
5253

5354
assertFalse(route.hasErrors());
@@ -63,8 +64,8 @@ public void testRoute1DoesNotGoAt654() {
6364
FROM_LAT, FROM_LON,
6465
TO_LAT, TO_LON
6566
);
66-
ghRequest.getHints().put(GraphHopperGtfs.EARLIEST_DEPARTURE_TIME_HINT, LocalDateTime.of(2007,1,1,6,54).toString());
67-
ghRequest.getHints().put(GraphHopperGtfs.MAX_WALK_DISTANCE_PER_LEG, 30);
67+
ghRequest.getHints().put(Parameters.PT.EARLIEST_DEPARTURE_TIME_HINT, LocalDateTime.of(2007,1,1,6,54).toString());
68+
ghRequest.getHints().put(Parameters.PT.MAX_WALK_DISTANCE_PER_LEG, 30);
6869
GHResponse route = graphHopper.route(ghRequest);
6970

7071
assertFalse(route.hasErrors());
@@ -80,8 +81,8 @@ public void testRoute1GoesAt744() {
8081
FROM_LAT, FROM_LON,
8182
TO_LAT, TO_LON
8283
);
83-
ghRequest.getHints().put(GraphHopperGtfs.EARLIEST_DEPARTURE_TIME_HINT, LocalDateTime.of(2007,1,1,7,44).toString());
84-
ghRequest.getHints().put(GraphHopperGtfs.IGNORE_TRANSFERS, "true");
84+
ghRequest.getHints().put(Parameters.PT.EARLIEST_DEPARTURE_TIME_HINT, LocalDateTime.of(2007,1,1,7,44).toString());
85+
ghRequest.getHints().put(Parameters.PT.IGNORE_TRANSFERS, "true");
8586

8687
GHResponse response = graphHopper.route(ghRequest);
8788

@@ -99,9 +100,9 @@ public void testRoute1ArriveBy() {
99100
FROM_LAT, FROM_LON,
100101
TO_LAT, TO_LON
101102
);
102-
ghRequest.getHints().put(GraphHopperGtfs.EARLIEST_DEPARTURE_TIME_HINT, LocalDateTime.of(2007,1,1,6, 49));
103-
ghRequest.getHints().put(GraphHopperGtfs.ARRIVE_BY, true);
104-
ghRequest.getHints().put(GraphHopperGtfs.MAX_WALK_DISTANCE_PER_LEG, 30);
103+
ghRequest.getHints().put(Parameters.PT.EARLIEST_DEPARTURE_TIME_HINT, LocalDateTime.of(2007,1,1,6, 49));
104+
ghRequest.getHints().put(Parameters.PT.ARRIVE_BY, true);
105+
ghRequest.getHints().put(Parameters.PT.MAX_WALK_DISTANCE_PER_LEG, 30);
105106

106107
GHResponse route = graphHopper.route(ghRequest);
107108

@@ -119,10 +120,10 @@ public void testRoute1ProfileEarliestArrival() {
119120
FROM_LAT, FROM_LON,
120121
TO_LAT, TO_LON
121122
);
122-
ghRequest.getHints().put(GraphHopperGtfs.EARLIEST_DEPARTURE_TIME_HINT, LocalDateTime.of(2007,1,1,0,0));
123-
ghRequest.getHints().put(GraphHopperGtfs.RANGE_QUERY_END_TIME, LocalDateTime.of(2007,1,1,13,0));
124-
ghRequest.getHints().put(GraphHopperGtfs.IGNORE_TRANSFERS, "true");
125-
ghRequest.getHints().put(GraphHopperGtfs.MAX_WALK_DISTANCE_PER_LEG, 30);
123+
ghRequest.getHints().put(Parameters.PT.EARLIEST_DEPARTURE_TIME_HINT, LocalDateTime.of(2007,1,1,0,0));
124+
ghRequest.getHints().put(Parameters.PT.RANGE_QUERY_END_TIME, LocalDateTime.of(2007,1,1,13,0));
125+
ghRequest.getHints().put(Parameters.PT.IGNORE_TRANSFERS, "true");
126+
ghRequest.getHints().put(Parameters.PT.MAX_WALK_DISTANCE_PER_LEG, 30);
126127

127128
GHResponse response = graphHopper.route(ghRequest);
128129
List<LocalTime> actualDepartureTimes = response.getAll().stream()
@@ -144,12 +145,12 @@ public void testRoute1ProfileLatestDeparture() {
144145
FROM_LAT, FROM_LON,
145146
TO_LAT, TO_LON
146147
);
147-
ghRequest.getHints().put(GraphHopperGtfs.EARLIEST_DEPARTURE_TIME_HINT, LocalDateTime.of(2007,1,2,13,00));
148-
ghRequest.getHints().put(GraphHopperGtfs.ARRIVE_BY, "true");
149-
ghRequest.getHints().put(GraphHopperGtfs.RANGE_QUERY_END_TIME, LocalDateTime.of(2007,1,2,11,0));
148+
ghRequest.getHints().put(Parameters.PT.EARLIEST_DEPARTURE_TIME_HINT, LocalDateTime.of(2007,1,2,13,00));
149+
ghRequest.getHints().put(Parameters.PT.ARRIVE_BY, "true");
150+
ghRequest.getHints().put(Parameters.PT.RANGE_QUERY_END_TIME, LocalDateTime.of(2007,1,2,11,0));
150151
// TODO: Find the problem with 1.1.2007
151-
ghRequest.getHints().put(GraphHopperGtfs.IGNORE_TRANSFERS, "true");
152-
ghRequest.getHints().put(GraphHopperGtfs.MAX_WALK_DISTANCE_PER_LEG, 30);
152+
ghRequest.getHints().put(Parameters.PT.IGNORE_TRANSFERS, "true");
153+
ghRequest.getHints().put(Parameters.PT.MAX_WALK_DISTANCE_PER_LEG, 30);
153154

154155
GHResponse response = graphHopper.route(ghRequest);
155156
List<LocalTime> actualDepartureTimes = response.getAll().stream()
@@ -191,8 +192,8 @@ public void testRoute5() {
191192
FROM_LAT, FROM_LON,
192193
TO_LAT, TO_LON
193194
);
194-
ghRequest.getHints().put(GraphHopperGtfs.EARLIEST_DEPARTURE_TIME_HINT, LocalDateTime.of(2007,1,1,0,0));
195-
ghRequest.getHints().put(GraphHopperGtfs.MAX_WALK_DISTANCE_PER_LEG, 30);
195+
ghRequest.getHints().put(Parameters.PT.EARLIEST_DEPARTURE_TIME_HINT, LocalDateTime.of(2007,1,1,0,0));
196+
ghRequest.getHints().put(Parameters.PT.MAX_WALK_DISTANCE_PER_LEG, 30);
196197
GHResponse route = graphHopper.route(ghRequest);
197198

198199
assertFalse(route.hasErrors());
@@ -225,8 +226,8 @@ public void testWeekendRouteWorksOnlyOnWeekend() {
225226
FROM_LAT, FROM_LON,
226227
TO_LAT, TO_LON
227228
);
228-
ghRequest.getHints().put(GraphHopperGtfs.EARLIEST_DEPARTURE_TIME_HINT, LocalDateTime.of(2007,1,1,0,0)); // Monday morning
229-
ghRequest.getHints().put(GraphHopperGtfs.MAX_WALK_DISTANCE_PER_LEG, 30);
229+
ghRequest.getHints().put(Parameters.PT.EARLIEST_DEPARTURE_TIME_HINT, LocalDateTime.of(2007,1,1,0,0)); // Monday morning
230+
ghRequest.getHints().put(Parameters.PT.MAX_WALK_DISTANCE_PER_LEG, 30);
230231

231232

232233
GHResponse route = graphHopper.route(ghRequest);
@@ -236,8 +237,8 @@ public void testWeekendRouteWorksOnlyOnWeekend() {
236237
FROM_LAT, FROM_LON,
237238
TO_LAT, TO_LON
238239
);
239-
ghRequest1.getHints().put(GraphHopperGtfs.EARLIEST_DEPARTURE_TIME_HINT, LocalDateTime.of(2007,1,6,0,0));
240-
ghRequest1.getHints().put(GraphHopperGtfs.MAX_WALK_DISTANCE_PER_LEG, 30);
240+
ghRequest1.getHints().put(Parameters.PT.EARLIEST_DEPARTURE_TIME_HINT, LocalDateTime.of(2007,1,6,0,0));
241+
ghRequest1.getHints().put(Parameters.PT.MAX_WALK_DISTANCE_PER_LEG, 30);
241242
GHResponse route1 = graphHopper.route(ghRequest1);
242243

243244
assertFalse(route1.hasErrors());
@@ -256,8 +257,8 @@ public void testBlockTrips() {
256257
FROM_LAT, FROM_LON,
257258
TO_LAT, TO_LON
258259
);
259-
ghRequest.getHints().put(GraphHopperGtfs.EARLIEST_DEPARTURE_TIME_HINT, LocalDateTime.of(2007,1,1,8,0));
260-
ghRequest.getHints().put(GraphHopperGtfs.MAX_WALK_DISTANCE_PER_LEG, 30);
260+
ghRequest.getHints().put(Parameters.PT.EARLIEST_DEPARTURE_TIME_HINT, LocalDateTime.of(2007,1,1,8,0));
261+
ghRequest.getHints().put(Parameters.PT.MAX_WALK_DISTANCE_PER_LEG, 30);
261262
GHResponse route = graphHopper.route(ghRequest);
262263
assertEquals("Only find one solution. If blocks wouldn't work, there would be two. (There is a slower alternative without transfer.)", 1, route.getAll().size());
263264
assertEquals("Expected travel time == scheduled travel time", time(1,20), route.getBest().getTime());
@@ -277,7 +278,7 @@ public void testTransferRules() {
277278
FROM_LAT, FROM_LON,
278279
TO1_LAT, TO1_LON
279280
);
280-
request.getHints().put(GraphHopperGtfs.EARLIEST_DEPARTURE_TIME_HINT, LocalDateTime.of(2007,1,6,7,30));
281+
request.getHints().put(Parameters.PT.EARLIEST_DEPARTURE_TIME_HINT, LocalDateTime.of(2007,1,6,7,30));
281282

282283
GHResponse response = graphHopper.route(request);
283284
assertEquals("Ignoring transfer rules (free walking): Will be there at 9.", time(1, 30), response.getBest().getTime());
@@ -286,8 +287,8 @@ public void testTransferRules() {
286287
FROM_LAT, FROM_LON,
287288
TO1_LAT, TO1_LON
288289
);
289-
request.getHints().put(GraphHopperGtfs.EARLIEST_DEPARTURE_TIME_HINT, LocalDateTime.of(2007,1,6,7,30));
290-
request.getHints().put(GraphHopperGtfs.MAX_TRANSFER_DISTANCE_PER_LEG, 0.0);
290+
request.getHints().put(Parameters.PT.EARLIEST_DEPARTURE_TIME_HINT, LocalDateTime.of(2007,1,6,7,30));
291+
request.getHints().put(Parameters.PT.MAX_WALK_DISTANCE_PER_TRANSFER_LEG, 0.0);
291292

292293
response = graphHopper.route(request);
293294
assertEquals("Transfer rule: 11 minutes. Will miss connection, and be there at 14.", time(6, 30), response.getBest().getTime());
@@ -296,7 +297,7 @@ public void testTransferRules() {
296297
FROM_LAT, FROM_LON,
297298
TO2_LAT, TO2_LON
298299
);
299-
request.getHints().put(GraphHopperGtfs.EARLIEST_DEPARTURE_TIME_HINT, LocalDateTime.of(2007,1,6,7,30));
300+
request.getHints().put(Parameters.PT.EARLIEST_DEPARTURE_TIME_HINT, LocalDateTime.of(2007,1,6,7,30));
300301

301302
response = graphHopper.route(request);
302303
assertEquals("Ignoring transfer rules (free walking): Will be there at 8:10.", time(0, 40), response.getBest().getTime());
@@ -305,8 +306,8 @@ public void testTransferRules() {
305306
FROM_LAT, FROM_LON,
306307
TO2_LAT, TO2_LON
307308
);
308-
request.getHints().put(GraphHopperGtfs.EARLIEST_DEPARTURE_TIME_HINT, LocalDateTime.of(2007,1,6,7,30));
309-
request.getHints().put(GraphHopperGtfs.MAX_TRANSFER_DISTANCE_PER_LEG, 0.0);
309+
request.getHints().put(Parameters.PT.EARLIEST_DEPARTURE_TIME_HINT, LocalDateTime.of(2007,1,6,7,30));
310+
request.getHints().put(Parameters.PT.MAX_WALK_DISTANCE_PER_TRANSFER_LEG, 0.0);
310311

311312
response = graphHopper.route(request);
312313
assertEquals("Will still be there at 8:10 because there is a route-specific exception for this route.", time(0, 40), response.getBest().getTime());
@@ -315,8 +316,8 @@ public void testTransferRules() {
315316
TO2_LAT, TO2_LON,
316317
FROM_LAT, FROM_LON
317318
);
318-
request.getHints().put(GraphHopperGtfs.EARLIEST_DEPARTURE_TIME_HINT, LocalDateTime.of(2007,1,6,12,05));
319-
request.getHints().put(GraphHopperGtfs.MAX_TRANSFER_DISTANCE_PER_LEG, 0.0);
319+
request.getHints().put(Parameters.PT.EARLIEST_DEPARTURE_TIME_HINT, LocalDateTime.of(2007,1,6,12,05));
320+
request.getHints().put(Parameters.PT.MAX_WALK_DISTANCE_PER_TRANSFER_LEG, 0.0);
320321

321322
response = graphHopper.route(request);
322323
assertEquals("Will take 1:15 because of a 'from route' exception with a longer transfer time.", time(1, 15), response.getBest().getTime());
@@ -329,8 +330,8 @@ private void assertTravelTimeIs(GraphHopperGtfs graphHopper, double from_lat, do
329330
from_lat, from_lon,
330331
to_lat, to_lon
331332
);
332-
ghRequest.getHints().put(GraphHopperGtfs.EARLIEST_DEPARTURE_TIME_HINT, earliestDepartureTime);
333-
ghRequest.getHints().put(GraphHopperGtfs.MAX_WALK_DISTANCE_PER_LEG, 30);
333+
ghRequest.getHints().put(Parameters.PT.EARLIEST_DEPARTURE_TIME_HINT, earliestDepartureTime);
334+
ghRequest.getHints().put(Parameters.PT.MAX_WALK_DISTANCE_PER_LEG, 30);
334335
GHResponse route = graphHopper.route(ghRequest);
335336

336337
assertFalse(route.hasErrors());
@@ -347,8 +348,8 @@ private void assertNoRoute(GraphHopperGtfs graphHopper, double from_lat, double
347348
from_lat, from_lon,
348349
to_lat, to_lon
349350
);
350-
ghRequest.getHints().put(GraphHopperGtfs.EARLIEST_DEPARTURE_TIME_HINT, LocalDateTime.of(2007,1,1,0,0).toString());
351-
ghRequest.getHints().put(GraphHopperGtfs.MAX_WALK_DISTANCE_PER_LEG, 30);
351+
ghRequest.getHints().put(Parameters.PT.EARLIEST_DEPARTURE_TIME_HINT, LocalDateTime.of(2007,1,1,0,0).toString());
352+
ghRequest.getHints().put(Parameters.PT.MAX_WALK_DISTANCE_PER_LEG, 30);
352353

353354
GHResponse route = graphHopper.route(ghRequest);
354355
Assert.assertTrue(route.getAll().isEmpty());

‎reader-gtfs/src/test/java/com/graphhopper/RealtimeIT.java

Lines changed: 13 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
import com.graphhopper.storage.GHDirectory;
88
import com.graphhopper.storage.GraphHopperStorage;
99
import com.graphhopper.util.Helper;
10-
import com.graphhopper.util.Instruction;
10+
import com.graphhopper.util.Parameters;
1111
import org.junit.BeforeClass;
1212
import org.junit.Test;
1313

@@ -45,9 +45,9 @@ public void testSkipDepartureStop() {
4545
);
4646

4747
// I want to go at 6:44
48-
ghRequest.getHints().put(GraphHopperGtfs.EARLIEST_DEPARTURE_TIME_HINT, LocalDateTime.of(2007,1,1,6,44).toString());
49-
ghRequest.getHints().put(GraphHopperGtfs.IGNORE_TRANSFERS, "true");
50-
ghRequest.getHints().put(GraphHopperGtfs.MAX_WALK_DISTANCE_PER_LEG, 30);
48+
ghRequest.getHints().put(Parameters.PT.EARLIEST_DEPARTURE_TIME_HINT, LocalDateTime.of(2007,1,1,6,44).toString());
49+
ghRequest.getHints().put(Parameters.PT.IGNORE_TRANSFERS, "true");
50+
ghRequest.getHints().put(Parameters.PT.MAX_WALK_DISTANCE_PER_LEG, 30);
5151

5252
// But the 6:00 departure of my line is going to skip my departure stop :-(
5353
final GtfsRealtime.FeedMessage.Builder feedMessageBuilder = GtfsRealtime.FeedMessage.newBuilder();
@@ -76,9 +76,9 @@ public void testSkipArrivalStop() {
7676
);
7777

7878
// I want to go at 6:44
79-
ghRequest.getHints().put(GraphHopperGtfs.EARLIEST_DEPARTURE_TIME_HINT, LocalDateTime.of(2007,1,1,6,44).toString());
80-
ghRequest.getHints().put(GraphHopperGtfs.IGNORE_TRANSFERS, "true");
81-
ghRequest.getHints().put(GraphHopperGtfs.MAX_WALK_DISTANCE_PER_LEG, 30);
79+
ghRequest.getHints().put(Parameters.PT.EARLIEST_DEPARTURE_TIME_HINT, LocalDateTime.of(2007,1,1,6,44).toString());
80+
ghRequest.getHints().put(Parameters.PT.IGNORE_TRANSFERS, "true");
81+
ghRequest.getHints().put(Parameters.PT.MAX_WALK_DISTANCE_PER_LEG, 30);
8282

8383
// But the 6:00 departure of my line is going to skip my arrival stop :-(
8484
final GtfsRealtime.FeedMessage.Builder feedMessageBuilder = GtfsRealtime.FeedMessage.newBuilder();
@@ -107,9 +107,9 @@ public void testSkipTransferStop() {
107107
);
108108

109109
// I want to go at 6:44
110-
ghRequest.getHints().put(GraphHopperGtfs.EARLIEST_DEPARTURE_TIME_HINT, LocalDateTime.of(2007,1,1,6,44).toString());
111-
ghRequest.getHints().put(GraphHopperGtfs.IGNORE_TRANSFERS, "true");
112-
ghRequest.getHints().put(GraphHopperGtfs.MAX_WALK_DISTANCE_PER_LEG, 30);
110+
ghRequest.getHints().put(Parameters.PT.EARLIEST_DEPARTURE_TIME_HINT, LocalDateTime.of(2007,1,1,6,44).toString());
111+
ghRequest.getHints().put(Parameters.PT.IGNORE_TRANSFERS, "true");
112+
ghRequest.getHints().put(Parameters.PT.MAX_WALK_DISTANCE_PER_LEG, 30);
113113

114114
// But the 6:00 departure of my line is going to skip my transfer stop :-(
115115
final GtfsRealtime.FeedMessage.Builder feedMessageBuilder = GtfsRealtime.FeedMessage.newBuilder();
@@ -136,9 +136,9 @@ public void testBlockTrips() {
136136
FROM_LAT, FROM_LON,
137137
TO_LAT, TO_LON
138138
);
139-
ghRequest.getHints().put(GraphHopperGtfs.EARLIEST_DEPARTURE_TIME_HINT, LocalDateTime.of(2007,1,1,8,0));
140-
ghRequest.getHints().put(GraphHopperGtfs.IGNORE_TRANSFERS, "true");
141-
ghRequest.getHints().put(GraphHopperGtfs.MAX_WALK_DISTANCE_PER_LEG, 30);
139+
ghRequest.getHints().put(Parameters.PT.EARLIEST_DEPARTURE_TIME_HINT, LocalDateTime.of(2007,1,1,8,0));
140+
ghRequest.getHints().put(Parameters.PT.IGNORE_TRANSFERS, "true");
141+
ghRequest.getHints().put(Parameters.PT.MAX_WALK_DISTANCE_PER_LEG, 30);
142142

143143
// My line does not stop at Bullfrog today. If this was a real transfer, I would not be
144144
// able to change lines there. But it is not a real transfer, so I can go on as planned.

0 commit comments

Comments
 (0)