diff --git a/enabler/src/de/schildbach/pte/AbstractEfaProvider.java b/enabler/src/de/schildbach/pte/AbstractEfaProvider.java index 9cea1ebc..3176b4ca 100644 --- a/enabler/src/de/schildbach/pte/AbstractEfaProvider.java +++ b/enabler/src/de/schildbach/pte/AbstractEfaProvider.java @@ -1675,6 +1675,7 @@ public abstract class AbstractEfaProvider extends AbstractNetworkProvider uri.append("&locationServerActive=1"); uri.append("&useRealtime=1"); uri.append("&useProxFootSearch=1"); // walk if it makes journeys quicker + uri.append("&nextDepsPerLeg=1"); // next departure in case previous was missed return uri.toString(); } @@ -2113,6 +2114,17 @@ public abstract class AbstractEfaProvider extends AbstractNetworkProvider XmlPullUtil.exit(pp, "genAttrList"); } + if (XmlPullUtil.test(pp, "nextDeps")) + { + XmlPullUtil.enter(pp, "nextDeps"); + while (XmlPullUtil.test(pp, "itdDateTime")) + { + processItdDateTime(pp, time); + final Date nextDepartureTime = time.getTime(); + } + XmlPullUtil.exit(pp, "nextDeps"); + } + final Line line = new Line(lineId, lineLabel, lineStyle(lineLabel), lineAttrs); parts.add(new Connection.Trip(line, destination, departureTargetTime != null ? departureTargetTime : departureTime, diff --git a/enabler/test/de/schildbach/pte/live/VvsProviderLiveTest.java b/enabler/test/de/schildbach/pte/live/VvsProviderLiveTest.java index d45a0fd4..2d3769c9 100644 --- a/enabler/test/de/schildbach/pte/live/VvsProviderLiveTest.java +++ b/enabler/test/de/schildbach/pte/live/VvsProviderLiveTest.java @@ -84,8 +84,9 @@ public class VvsProviderLiveTest extends AbstractProviderLiveTest @Test public void shortConnection() throws Exception { - final QueryConnectionsResult result = queryConnections(new Location(LocationType.STATION, 0, null, "Hauptwache"), null, new Location( - LocationType.STATION, 0, null, "Südbahnhof"), new Date(), true, ALL_PRODUCTS, WalkSpeed.NORMAL, Accessibility.NEUTRAL); + final QueryConnectionsResult result = queryConnections(new Location(LocationType.STATION, 5006118, 48782984, 9179846, "Stuttgart", + "Stuttgart, Hauptbahnhof"), null, new Location(LocationType.STATION, 5006024, 48782584, 9187098, "Stuttgart", "Staatsgalerie"), + new Date(), true, ALL_PRODUCTS, WalkSpeed.NORMAL, Accessibility.NEUTRAL); System.out.println(result); final QueryConnectionsResult laterResult = queryMoreConnections(result.context, true); System.out.println(laterResult);