fixed missing BUS

git-svn-id: https://public-transport-enabler.googlecode.com/svn/trunk@388 0924bc21-9374-b0fa-ee44-9ff1593b38f0
This commit is contained in:
andreas.schildbach@gmail.com 2010-12-12 12:07:32 +00:00
parent 0d2becaf70
commit b1e189eff5

View file

@ -81,8 +81,7 @@ public final class BahnProvider extends AbstractHafasProvider
{ {
final Matcher mMulti = P_MULTI_NAME.matcher(page); final Matcher mMulti = P_MULTI_NAME.matcher(page);
while (mMulti.find()) while (mMulti.find())
results results.add(new Location(LocationType.STATION, Integer.parseInt(mMulti.group(1)), 0, 0, ParserUtils.resolveEntities(mMulti.group(2))));
.add(new Location(LocationType.STATION, Integer.parseInt(mMulti.group(1)), 0, 0, ParserUtils.resolveEntities(mMulti.group(2))));
} }
return results; return results;
@ -488,8 +487,8 @@ public final class BahnProvider extends AbstractHafasProvider
{ {
if (mDepFine.group(8) == null) if (mDepFine.group(8) == null)
{ {
final Date plannedTime = ParserUtils.joinDateTime(ParserUtils.parseDate(mDepFine.group(2)), ParserUtils.parseTime(mDepFine final Date plannedTime = ParserUtils.joinDateTime(ParserUtils.parseDate(mDepFine.group(2)),
.group(1))); ParserUtils.parseTime(mDepFine.group(1)));
Date predictedTime = null; Date predictedTime = null;
if (mDepFine.group(3) != null) if (mDepFine.group(3) != null)
@ -813,6 +812,8 @@ public final class BahnProvider extends AbstractHafasProvider
if (type.equals("Schw")) // Schwebebahn, gilt als "Straßenbahn besonderer Bauart" if (type.equals("Schw")) // Schwebebahn, gilt als "Straßenbahn besonderer Bauart"
return "TSchw" + number; return "TSchw" + number;
if (type.equals("BUS"))
return "BBUS" + number;
if (type.startsWith("Bus")) if (type.startsWith("Bus"))
return "B" + type.substring(3) + number; return "B" + type.substring(3) + number;
if (type.equals("O")) // Salzburg if (type.equals("O")) // Salzburg
@ -851,9 +852,9 @@ public final class BahnProvider extends AbstractHafasProvider
if (type.equals("D")) if (type.equals("D"))
return "?D" + number; return "?D" + number;
throw new IllegalStateException("cannot normalize type " + type + " number " + number + " line " + line); throw new IllegalStateException("cannot normalize type '" + type + "' number '" + number + "' line '" + line + "'");
} }
throw new IllegalStateException("cannot normalize line " + line); throw new IllegalStateException("cannot normalize line '" + line + "'");
} }
} }