predicted times for trips

This commit is contained in:
Andreas Schildbach 2012-08-10 11:04:09 +02:00
parent 3b01c1a941
commit 946289ec34

View file

@ -1753,8 +1753,8 @@ public abstract class AbstractHafasProvider extends AbstractNetworkProvider
if (connectionDetailsPartSize != 16) if (connectionDetailsPartSize != 16)
throw new IllegalStateException("unhandled connection details part size: " + connectionDetailsPartSize); throw new IllegalStateException("unhandled connection details part size: " + connectionDetailsPartSize);
/* final long predictedDepartureTime = */time(is, resDate, connectionDayOffset); final long predictedDepartureTime = time(is, resDate, connectionDayOffset);
/* final long predictedArrivalTime = */time(is, resDate, connectionDayOffset); final long predictedArrivalTime = time(is, resDate, connectionDayOffset);
final String predictedDeparturePosition = normalizePosition(strings.read(is)); final String predictedDeparturePosition = normalizePosition(strings.read(is));
final String predictedArrivalPosition = normalizePosition(strings.read(is)); final String predictedArrivalPosition = normalizePosition(strings.read(is));
@ -1827,10 +1827,11 @@ public abstract class AbstractHafasProvider extends AbstractNetworkProvider
final Line line = parseLineWithoutType(lineStr); final Line line = parseLineWithoutType(lineStr);
final Location direction = directionStr != null ? new Location(LocationType.ANY, 0, null, directionStr) : null; final Location direction = directionStr != null ? new Location(LocationType.ANY, 0, null, directionStr) : null;
part = new Connection.Trip(line, direction, plannedDepartureTime != 0 ? new Date(plannedDepartureTime) : null, null, part = new Connection.Trip(line, direction, plannedDepartureTime != 0 ? new Date(plannedDepartureTime) : null,
plannedDeparturePosition, predictedDeparturePosition, departure, plannedArrivalTime != 0 ? new Date( predictedDepartureTime != 0 ? new Date(predictedDepartureTime) : null, plannedDeparturePosition,
plannedArrivalTime) : null, null, plannedArrivalPosition, predictedArrivalPosition, arrival, predictedDeparturePosition, departure, plannedArrivalTime != 0 ? new Date(plannedArrivalTime) : null,
intermediateStops, null); predictedArrivalTime != 0 ? new Date(predictedArrivalTime) : null, plannedArrivalPosition, predictedArrivalPosition,
arrival, intermediateStops, null);
} }
else else
{ {