mirrors/public-transport-enabler
1
0
Fork 0
mirror of https://gitlab.com/oeffi/public-transport-enabler.git synced 2025-07-10 21:18:47 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

lines that follow pattern BusW/540

Browse source 
git-svn-id: https://public-transport-enabler.googlecode.com/svn/trunk@828 0924bc21-9374-b0fa-ee44-9ff1593b38f0
This commit is contained in:
andreas.schildbach@gmail.com 2011-10-15 21:13:59 +00:00
parent 442cab8fe8
commit 28fc8bdd36
3 changed files with 6 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

6
src/de/schildbach/pte/AbstractHafasProvider.java
View file

@ -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) protected Line normalizeLine(final String line)
{ {
if (line == null || line.length() == 0) if (line == null || line.length() == 0)
return null; 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); final Matcher m = P_NORMALIZE_LINE.matcher(line);
if (m.matches()) if (m.matches())
{ {

4
src/de/schildbach/pte/BahnProvider.java
View file

@ -567,7 +567,6 @@ public final class BahnProvider extends AbstractHafasProvider
return 0; 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 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)"); .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}"); 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" if ("Schw-B".equals(line)) // Schwebebahn, gilt als "Straßenbahn besonderer Bauart"
return newLine('T' + line); return newLine('T' + line);
if (P_LINE_BUS_SPECIAL.matcher(line).matches())
return newLine('B' + line);
if (P_LINE_RUSSIA.matcher(line).matches()) if (P_LINE_RUSSIA.matcher(line).matches())
return newLine('R' + line); return newLine('R' + line);

5
src/de/schildbach/pte/BvgProvider.java
View file

@ -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_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_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 = 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_FERRY = Pattern.compile("F\\d+|WT");
private static final Pattern P_LINE_NUMBER = Pattern.compile("\\d{4,}"); 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()) if (P_LINE_FERRY.matcher(line).matches())
return newLine('F' + line); 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()) if (P_LINE_NUMBER.matcher(line).matches())
return newLine('R' + line); return newLine('R' + line);