mirror of
https://gitlab.com/oeffi/public-transport-enabler.git
synced 2025-07-14 08:40:29 +00:00
destination now location-based
git-svn-id: https://public-transport-enabler.googlecode.com/svn/trunk@413 0924bc21-9374-b0fa-ee44-9ff1593b38f0
This commit is contained in:
parent
b323557979
commit
188edafeaa
7 changed files with 31 additions and 32 deletions
|
@ -1176,8 +1176,10 @@ public abstract class AbstractEfaProvider implements NetworkProvider
|
|||
else
|
||||
{
|
||||
final String destinationIdStr = pp.getAttributeValue(null, "destID");
|
||||
final int destinationId = destinationIdStr.length() > 0 ? Integer.parseInt(destinationIdStr) : 0;
|
||||
final String destination = normalizeLocationName(pp.getAttributeValue(null, "destination"));
|
||||
final String destinationName = normalizeLocationName(pp.getAttributeValue(null, "destination"));
|
||||
final Location destination = destinationIdStr.length() > 0 ? new Location(LocationType.STATION,
|
||||
Integer.parseInt(destinationIdStr), 0, 0, destinationName) : new Location(LocationType.ANY, 0, 0, 0,
|
||||
destinationName);
|
||||
String line;
|
||||
if ("AST".equals(pp.getAttributeValue(null, "symbol")))
|
||||
line = "BAST";
|
||||
|
@ -1226,9 +1228,8 @@ public abstract class AbstractEfaProvider implements NetworkProvider
|
|||
intermediateStops.remove(intermediateStops.size() - 1);
|
||||
}
|
||||
|
||||
parts.add(new Connection.Trip(line, lineColors(line), destinationId, destination, departureTime.getTime(),
|
||||
departurePosition, departureId, departure, arrivalTime.getTime(), arrivalPosition, arrivalId, arrival,
|
||||
intermediateStops));
|
||||
parts.add(new Connection.Trip(line, lineColors(line), destination, departureTime.getTime(), departurePosition,
|
||||
departureId, departure, arrivalTime.getTime(), arrivalPosition, arrivalId, arrival, intermediateStops));
|
||||
}
|
||||
|
||||
XmlPullUtil.exit(pp, "itdPartialRoute");
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue