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

individual legs have departure and arrival times, too

Browse source
This commit is contained in:
Andreas Schildbach 2013-06-13 12:11:14 +02:00
parent 3aab4006d5
commit 871b08f13a
4 changed files with 51 additions and 62 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -1937,7 +1937,6 @@ public abstract class AbstractEfaProvider extends AbstractNetworkProvider
final String productName = pp.getAttributeValue(null, "productName");
if ("IT".equals(partialRouteType) || "Fussweg".equals(productName) || "Taxi".equals(productName))
{
final int min = (int) (arrivalTime.getTime() - departureTime.getTime()) / 1000 / 60;
final Trip.Individual.Type type = "Taxi".equals(productName) ? Trip.Individual.Type.TRANSFER : Trip.Individual.Type.WALK;
XmlPullUtil.enter(pp, "itdMeansOfTransport");
@ -1959,11 +1958,12 @@ public abstract class AbstractEfaProvider extends AbstractNetworkProvider
final Trip.Individual lastIndividual = (Trip.Individual) legs.remove(legs.size() - 1);
if (path != null && lastIndividual.path != null)
path.addAll(0, lastIndividual.path);
legs.add(new Trip.Individual(lastIndividual.min + min, distance, type, lastIndividual.departure, arrivalLocation, path));
legs.add(new Trip.Individual(type, lastIndividual.departure, lastIndividual.departureTime, arrivalLocation, arrivalTime,
path, distance));
}
else
{
legs.add(new Trip.Individual(min, distance, type, departureLocation, arrivalLocation, path));
legs.add(new Trip.Individual(type, departureLocation, departureTime, arrivalLocation, arrivalTime, path, distance));
}
}
else if ("gesicherter Anschluss".equals(productName) || "nicht umsteigen".equals(productName)) // type97