From b1e189eff5fe02756d83820ad3f81ee1bd419494 Mon Sep 17 00:00:00 2001 From: "andreas.schildbach@gmail.com" Date: Sun, 12 Dec 2010 12:07:32 +0000 Subject: [PATCH] fixed missing BUS git-svn-id: https://public-transport-enabler.googlecode.com/svn/trunk@388 0924bc21-9374-b0fa-ee44-9ff1593b38f0 --- src/de/schildbach/pte/BahnProvider.java | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) diff --git a/src/de/schildbach/pte/BahnProvider.java b/src/de/schildbach/pte/BahnProvider.java index 6e145b53..ffdde523 100644 --- a/src/de/schildbach/pte/BahnProvider.java +++ b/src/de/schildbach/pte/BahnProvider.java @@ -81,8 +81,7 @@ public final class BahnProvider extends AbstractHafasProvider { final Matcher mMulti = P_MULTI_NAME.matcher(page); while (mMulti.find()) - results - .add(new Location(LocationType.STATION, Integer.parseInt(mMulti.group(1)), 0, 0, ParserUtils.resolveEntities(mMulti.group(2)))); + results.add(new Location(LocationType.STATION, Integer.parseInt(mMulti.group(1)), 0, 0, ParserUtils.resolveEntities(mMulti.group(2)))); } return results; @@ -488,8 +487,8 @@ public final class BahnProvider extends AbstractHafasProvider { if (mDepFine.group(8) == null) { - final Date plannedTime = ParserUtils.joinDateTime(ParserUtils.parseDate(mDepFine.group(2)), ParserUtils.parseTime(mDepFine - .group(1))); + final Date plannedTime = ParserUtils.joinDateTime(ParserUtils.parseDate(mDepFine.group(2)), + ParserUtils.parseTime(mDepFine.group(1))); Date predictedTime = 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" return "TSchw" + number; + if (type.equals("BUS")) + return "BBUS" + number; if (type.startsWith("Bus")) return "B" + type.substring(3) + number; if (type.equals("O")) // Salzburg @@ -851,9 +852,9 @@ public final class BahnProvider extends AbstractHafasProvider if (type.equals("D")) 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 + "'"); } }