mirrors/public-transport-enabler
1
0
Fork 0
mirror of https://gitlab.com/oeffi/public-transport-enabler.git synced 2025-07-18 08:19:51 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

parse next departures for connections

Browse source
This commit is contained in:
Andreas Schildbach 2012-08-12 01:15:13 +02:00
parent d37af7e32c
commit d190ced050
2 changed files with 15 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

12
enabler/src/de/schildbach/pte/AbstractEfaProvider.java
View file

@ -1675,6 +1675,7 @@ public abstract class AbstractEfaProvider extends AbstractNetworkProvider
uri.append("&locationServerActive=1"); uri.append("&locationServerActive=1");
uri.append("&useRealtime=1"); uri.append("&useRealtime=1");
uri.append("&useProxFootSearch=1"); // walk if it makes journeys quicker uri.append("&useProxFootSearch=1"); // walk if it makes journeys quicker
uri.append("&nextDepsPerLeg=1"); // next departure in case previous was missed
return uri.toString(); return uri.toString();
} }
@ -2113,6 +2114,17 @@ public abstract class AbstractEfaProvider extends AbstractNetworkProvider
XmlPullUtil.exit(pp, "genAttrList"); 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); final Line line = new Line(lineId, lineLabel, lineStyle(lineLabel), lineAttrs);
parts.add(new Connection.Trip(line, destination, departureTargetTime != null ? departureTargetTime : departureTime, parts.add(new Connection.Trip(line, destination, departureTargetTime != null ? departureTargetTime : departureTime,

5
enabler/test/de/schildbach/pte/live/VvsProviderLiveTest.java
View file

@ -84,8 +84,9 @@ public class VvsProviderLiveTest extends AbstractProviderLiveTest
@Test @Test
public void shortConnection() throws Exception public void shortConnection() throws Exception
{ {
final QueryConnectionsResult result = queryConnections(new Location(LocationType.STATION, 0, null, "Hauptwache"), null, new Location( final QueryConnectionsResult result = queryConnections(new Location(LocationType.STATION, 5006118, 48782984, 9179846, "Stuttgart",
LocationType.STATION, 0, null, "Südbahnhof"), new Date(), true, ALL_PRODUCTS, WalkSpeed.NORMAL, Accessibility.NEUTRAL); "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); System.out.println(result);
final QueryConnectionsResult laterResult = queryMoreConnections(result.context, true); final QueryConnectionsResult laterResult = queryMoreConnections(result.context, true);
System.out.println(laterResult); System.out.println(laterResult);