fixed line colors in Berlin

git-svn-id: https://public-transport-enabler.googlecode.com/svn/trunk@410 0924bc21-9374-b0fa-ee44-9ff1593b38f0
This commit is contained in:
andreas.schildbach@gmail.com 2010-12-25 17:38:22 +00:00
parent 3e4af2deea
commit 265fb02bc5

View file

@ -359,7 +359,7 @@ public final class BvgProvider extends AbstractHafasProvider
arrivalTime = ParserUtils.addDays(arrivalTime, 1); arrivalTime = ParserUtils.addDays(arrivalTime, 1);
final String line = normalizeLine(ParserUtils.resolveEntities(mConFine.group(4))); final String line = normalizeLine(ParserUtils.resolveEntities(mConFine.group(4)));
final Connection connection = new Connection(AbstractHafasProvider.extractConnectionId(link), link, departureTime, arrivalTime, final Connection connection = new Connection(AbstractHafasProvider.extractConnectionId(link), link, departureTime, arrivalTime,
line, line != null ? LINES.get(line.charAt(0)) : null, 0, from.name, 0, to.name, null, null); line, line != null ? lineColors(line) : null, 0, from.name, 0, to.name, null, null);
connections.add(connection); connections.add(connection);
} }
else else
@ -462,7 +462,7 @@ public final class BvgProvider extends AbstractHafasProvider
final String arrival = ParserUtils.resolveEntities(mDetFine.group(10)); final String arrival = ParserUtils.resolveEntities(mDetFine.group(10));
parts.add(new Connection.Trip(line, line != null ? LINES.get(line) : null, 0, destination, departureTime, departurePosition, parts.add(new Connection.Trip(line, line != null ? lineColors(line) : null, 0, destination, departureTime, departurePosition,
departureId, departure, arrivalTime, arrivalPosition, arrivalId, arrival, null)); departureId, departure, arrivalTime, arrivalPosition, arrivalId, arrival, null));
if (firstDepartureTime == null) if (firstDepartureTime == null)
@ -603,7 +603,7 @@ public final class BvgProvider extends AbstractHafasProvider
final String destination = ParserUtils.resolveEntities(mDepFine.group(live ? 4 : 5)); final String destination = ParserUtils.resolveEntities(mDepFine.group(live ? 4 : 5));
final Departure dep = new Departure(plannedTime, predictedTime, line, line != null ? LINES.get(line) : null, null, position, final Departure dep = new Departure(plannedTime, predictedTime, line, line != null ? lineColors(line) : null, null, position,
destinationId, destination, null); destinationId, destination, null);
if (!departures.contains(dep)) if (!departures.contains(dep))
departures.add(dep); departures.add(dep);