mirrors/public-transport-enabler
1
0
Fork 0
mirror of https://gitlab.com/oeffi/public-transport-enabler.git synced 2025-07-16 17:39:49 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

more lines

Browse source 
git-svn-id: https://public-transport-enabler.googlecode.com/svn/trunk@69 0924bc21-9374-b0fa-ee44-9ff1593b38f0
This commit is contained in:
andreas.schildbach 2010-08-11 16:17:06 +00:00
parent f3c3c58c96
commit ff8066ff14
2 changed files with 33 additions and 16 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -676,6 +676,8 @@ public final class BahnProvider implements NetworkProvider
return "RDab" + number; return "RDab" + number;
if (type.equals("SDG")) // Sächsische Dampfeisenbahngesellschaft if (type.equals("SDG")) // Sächsische Dampfeisenbahngesellschaft
return "RSDG" + number; return "RSDG" + number;
if (type.equals("ARR")) // Ostfriesland
return "RARR" + number;
if (type.equals("VEN")) // Rhenus Veniro if (type.equals("VEN")) // Rhenus Veniro
return "RVEN" + number; return "RVEN" + number;
if (type.equals("KD")) // Koleje Dolnośląskie if (type.equals("KD")) // Koleje Dolnośląskie

47
src/de/schildbach/pte/MvvProvider.java
View file

@ -546,41 +546,56 @@ public class MvvProvider implements NetworkProvider
return P_STATION_NAME_WHITESPACE.matcher(name).replaceAll(" "); return P_STATION_NAME_WHITESPACE.matcher(name).replaceAll(" ");
} }
private static final Pattern P_NORMALIZE_LINE_TRAM = Pattern.compile("[12]\\d");
private static final Pattern P_NORMALIZE_LINE_NACHTTRAM = Pattern.compile("N[12]\\d");
private static final Pattern P_NORMALIZE_LINE_METROBUS = Pattern.compile("[56]\\d");
private static final Pattern P_NORMALIZE_LINE_STADTBUS = Pattern.compile("1\\d{2}");
private static final Pattern P_NORMALIZE_LINE_NACHTBUS = Pattern.compile("N[48]\\d");
private static final Pattern P_NORMALIZE_LINE_REGIONALBUS = Pattern.compile("\\d{3}\\w");
private String normalizeLine(final String product, final String line) private String normalizeLine(final String product, final String line)
{ {
if (product == null) if (product == null)
{ {
if (line.matches("\\d{2,4}") && Integer.parseInt(line) >= 30) if (P_NORMALIZE_LINE_METROBUS.matcher(line).matches())
return "B" + line; return "B" + line;
else if (line.matches("N4\\d")) if (P_NORMALIZE_LINE_STADTBUS.matcher(line).matches())
return "B" + line; return "B" + line;
else if (line.equals("N117")) // Ersatzbus für N17 if (P_NORMALIZE_LINE_NACHTBUS.matcher(line).matches())
return "B" + line;
if (line.equals("N117")) // Ersatzbus für N17
return "BN117"; return "BN117";
else if (line.equals("Schienenersatzverkehr")) if (P_NORMALIZE_LINE_REGIONALBUS.matcher(line).matches())
return "B" + line;
if (line.equals("Schienenersatzverkehr"))
return "BSEV"; return "BSEV";
else if (LINES.containsKey("T" + line)) if (P_NORMALIZE_LINE_TRAM.matcher(line).matches())
return "T" + line; return "T" + line;
else if (LINES.containsKey("S" + line)) if (P_NORMALIZE_LINE_NACHTTRAM.matcher(line).matches())
return "T" + line;
if (LINES.containsKey("S" + line))
return "S" + line; return "S" + line;
else if (LINES.containsKey("U" + line)) if (line.equals("S20/27"))
return "S" + line;
if (LINES.containsKey("U" + line))
return "U" + line; return "U" + line;
else if (line.startsWith("RE ")) if (line.startsWith("RE "))
return "R" + line; return "R" + line;
else if (line.startsWith("RB ")) if (line.startsWith("RB "))
return "R" + line; return "R" + line;
else if (line.startsWith("ALX ")) // Alex if (line.startsWith("ALX ")) // Alex
return "R" + line; return "R" + line;
else if (line.startsWith("BOB ")) // Bayerische Oberlandbahn if (line.startsWith("BOB ")) // Bayerische Oberlandbahn
return "R" + line; return "R" + line;
else if (line.startsWith("VBG ")) // Vogtlandbahn if (line.startsWith("VBG ")) // Vogtlandbahn
return "R" + line; return "R" + line;
else if (line.startsWith("ICE ")) if (line.startsWith("ICE "))
return "I" + line; return "I" + line;
else if (line.startsWith("IC ")) if (line.startsWith("IC "))
return "I" + line; return "I" + line;
else if (line.startsWith("EC ")) if (line.startsWith("EC "))
return "I" + line; return "I" + line;
else if (line.startsWith("CNL ")) if (line.startsWith("CNL "))
return "I" + line; return "I" + line;
throw new IllegalStateException("cannot normalize null product, line " + line); throw new IllegalStateException("cannot normalize null product, line " + line);