From 28fc8bdd36f776734c12f584a6adf3a99211f835 Mon Sep 17 00:00:00 2001 From: "andreas.schildbach@gmail.com" Date: Sat, 15 Oct 2011 21:13:59 +0000 Subject: [PATCH] lines that follow pattern BusW/540 git-svn-id: https://public-transport-enabler.googlecode.com/svn/trunk@828 0924bc21-9374-b0fa-ee44-9ff1593b38f0 --- src/de/schildbach/pte/AbstractHafasProvider.java | 6 ++++++ src/de/schildbach/pte/BahnProvider.java | 4 ---- src/de/schildbach/pte/BvgProvider.java | 5 ----- 3 files changed, 6 insertions(+), 9 deletions(-) diff --git a/src/de/schildbach/pte/AbstractHafasProvider.java b/src/de/schildbach/pte/AbstractHafasProvider.java index ff49e2aa..b5db1cf5 100644 --- a/src/de/schildbach/pte/AbstractHafasProvider.java +++ b/src/de/schildbach/pte/AbstractHafasProvider.java @@ -1749,11 +1749,17 @@ public abstract class AbstractHafasProvider extends AbstractNetworkProvider } } + private static final Pattern P_LINE_BUS_SPECIAL = Pattern.compile("Bus([A-Z]/[\\dA-Z]+)"); + protected Line normalizeLine(final String line) { if (line == null || line.length() == 0) return null; + final Matcher mBusSpecial = P_LINE_BUS_SPECIAL.matcher(line); + if (mBusSpecial.matches()) + return newLine('B' + mBusSpecial.group(1)); + final Matcher m = P_NORMALIZE_LINE.matcher(line); if (m.matches()) { diff --git a/src/de/schildbach/pte/BahnProvider.java b/src/de/schildbach/pte/BahnProvider.java index 2e69455a..b45f7c6f 100644 --- a/src/de/schildbach/pte/BahnProvider.java +++ b/src/de/schildbach/pte/BahnProvider.java @@ -567,7 +567,6 @@ public final class BahnProvider extends AbstractHafasProvider return 0; } - private static final Pattern P_LINE_BUS_SPECIAL = Pattern.compile("Bus([A-Z]/[\\dA-Z]+)"); private static final Pattern P_LINE_RUSSIA = Pattern .compile("\\d{3}(?:AJ|BJ|DJ|FJ|GJ|IJ|KJ|LJ|NJ|MJ|OJ|RJ|SJ|TJ|VJ|ZJ|CH|KH|ZH|EI|JA|JI|MZ|SH|PC|Y)"); private static final Pattern P_LINE_NUMBER = Pattern.compile("\\d{2,5}"); @@ -578,9 +577,6 @@ public final class BahnProvider extends AbstractHafasProvider if ("Schw-B".equals(line)) // Schwebebahn, gilt als "Straßenbahn besonderer Bauart" return newLine('T' + line); - if (P_LINE_BUS_SPECIAL.matcher(line).matches()) - return newLine('B' + line); - if (P_LINE_RUSSIA.matcher(line).matches()) return newLine('R' + line); diff --git a/src/de/schildbach/pte/BvgProvider.java b/src/de/schildbach/pte/BvgProvider.java index 167e4c7a..a51df564 100644 --- a/src/de/schildbach/pte/BvgProvider.java +++ b/src/de/schildbach/pte/BvgProvider.java @@ -894,7 +894,6 @@ public final class BvgProvider extends AbstractHafasProvider private static final Pattern P_LINE_REGIONAL = Pattern.compile("Zug\\s+(\\d+)"); private static final Pattern P_LINE_TRAM = Pattern.compile("Tram?\\s+([\\dA-Z/-]+)"); private static final Pattern P_LINE_BUS = Pattern.compile("Bus\\s+([\\dA-Z/-]+)"); - private static final Pattern P_LINE_BUS_SPECIAL = Pattern.compile("Bus([A-F]/\\d+)"); private static final Pattern P_LINE_FERRY = Pattern.compile("F\\d+|WT"); private static final Pattern P_LINE_NUMBER = Pattern.compile("\\d{4,}"); @@ -916,10 +915,6 @@ public final class BvgProvider extends AbstractHafasProvider if (P_LINE_FERRY.matcher(line).matches()) return newLine('F' + line); - final Matcher mBusSpecial = P_LINE_BUS_SPECIAL.matcher(line); - if (mBusSpecial.matches()) - return newLine('B' + mBusSpecial.group(1)); - if (P_LINE_NUMBER.matcher(line).matches()) return newLine('R' + line);