mirror of
https://gitlab.com/oeffi/public-transport-enabler.git
synced 2025-07-17 18:49:51 +00:00
destinations now are locations
git-svn-id: https://public-transport-enabler.googlecode.com/svn/trunk@934 0924bc21-9374-b0fa-ee44-9ff1593b38f0
This commit is contained in:
parent
c009e99d8c
commit
7fdd00a5ae
11 changed files with 53 additions and 55 deletions
|
@ -612,13 +612,13 @@ public abstract class AbstractHafasProvider extends AbstractNetworkProvider
|
|||
|
||||
final String position = platform != null ? "Gl. " + ParserUtils.resolveEntities(platform) : null;
|
||||
|
||||
final String destination;
|
||||
final String destinationName;
|
||||
if (dir != null)
|
||||
destination = dir.trim();
|
||||
destinationName = dir.trim();
|
||||
else if (targetLoc != null)
|
||||
destination = targetLoc.trim();
|
||||
destinationName = targetLoc.trim();
|
||||
else
|
||||
destination = null;
|
||||
destinationName = null;
|
||||
|
||||
final int destinationId;
|
||||
if (dirnr != null)
|
||||
|
@ -626,6 +626,9 @@ public abstract class AbstractHafasProvider extends AbstractNetworkProvider
|
|||
else
|
||||
destinationId = 0;
|
||||
|
||||
final Location destination = new Location(destinationId > 0 ? LocationType.STATION : LocationType.ANY, destinationId, null,
|
||||
destinationName);
|
||||
|
||||
final Line prodLine = parseLineAndType(prod);
|
||||
final Line line;
|
||||
if (classStr != null)
|
||||
|
@ -665,7 +668,7 @@ public abstract class AbstractHafasProvider extends AbstractNetworkProvider
|
|||
}
|
||||
|
||||
final Departure departure = new Departure(plannedTime.getTime(), predictedTime != null ? predictedTime.getTime() : null, line,
|
||||
position, destinationId, destination, capacity, message);
|
||||
position, destination, capacity, message);
|
||||
departures.add(departure);
|
||||
}
|
||||
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue