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

Parse 'transfer' legs for mobile EFA.

Browse source
This commit is contained in:
Andreas Schildbach 2014-06-23 21:37:26 +02:00
parent 133c8c5525
commit 82674cef74
3 changed files with 22 additions and 0 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -1796,6 +1796,11 @@ public abstract class AbstractEfaProvider extends AbstractNetworkProvider
destination = null; destination = null;
line = Line.FOOTWAY; line = Line.FOOTWAY;
} }
else if ("105".equals(ty))
{
destination = null;
line = Line.TRANSFER;
}
else if ("98".equals(ty)) else if ("98".equals(ty))
{ {
destination = null; destination = null;
@ -3045,6 +3050,11 @@ public abstract class AbstractEfaProvider extends AbstractNetworkProvider
legs.add(new Trip.Individual(Trip.Individual.Type.WALK, departure.location, departure.getDepartureTime(), legs.add(new Trip.Individual(Trip.Individual.Type.WALK, departure.location, departure.getDepartureTime(),
arrival.location, arrival.getArrivalTime(), path, 0)); arrival.location, arrival.getArrivalTime(), path, 0));
} }
else if (lineDestination.line == Line.TRANSFER)
{
legs.add(new Trip.Individual(Trip.Individual.Type.TRANSFER, departure.location, departure.getDepartureTime(),
arrival.location, arrival.getArrivalTime(), path, 0));
}
else if (lineDestination.line == Line.SECURE_CONNECTION || lineDestination.line == Line.DO_NOT_CHANGE) else if (lineDestination.line == Line.SECURE_CONNECTION || lineDestination.line == Line.DO_NOT_CHANGE)
{ {
// ignore // ignore

1
enabler/src/de/schildbach/pte/dto/Line.java
View file

@ -42,6 +42,7 @@ public final class Line implements Serializable, Comparable<Line>
private static final String PRODUCT_ORDER = "IRSUTBPFC?"; private static final String PRODUCT_ORDER = "IRSUTBPFC?";
public static final Line FOOTWAY = new Line(null, null, null); public static final Line FOOTWAY = new Line(null, null, null);
public static final Line TRANSFER = new Line(null, null, null);
public static final Line SECURE_CONNECTION = new Line(null, null, null); public static final Line SECURE_CONNECTION = new Line(null, null, null);
public static final Line DO_NOT_CHANGE = new Line(null, null, null); public static final Line DO_NOT_CHANGE = new Line(null, null, null);

11
enabler/test/de/schildbach/pte/live/BayernProviderLiveTest.java
View file

@ -170,4 +170,15 @@ public class BayernProviderLiveTest extends AbstractProviderLiveTest
final QueryTripsResult laterResult = queryMoreTrips(result.context, true); final QueryTripsResult laterResult = queryMoreTrips(result.context, true);
System.out.println(laterResult); System.out.println(laterResult);
} }
@Test
public void tripBetweenPOIs() throws Exception
{
final QueryTripsResult result = queryTrips(new Location(LocationType.POI, null, 47710568, 12621970, null, "Ruhpolding, Seehaus"), null,
new Location(LocationType.POI, null, 47738372, 12630996, null, "Ruhpolding, Unternberg-Bahn"), new Date(), true, Product.ALL,
WalkSpeed.NORMAL, Accessibility.NEUTRAL);
System.out.println(result);
final QueryTripsResult laterResult = queryMoreTrips(result.context, true);
System.out.println(laterResult);
}
} }