git-svn-id: https://public-transport-enabler.googlecode.com/svn/trunk@267 0924bc21-9374-b0fa-ee44-9ff1593b38f0
This commit is contained in:
andreas.schildbach 2010-10-10 10:33:48 +00:00
parent 674e498df1
commit 5741c7bb44
2 changed files with 130 additions and 1 deletions

View file

@ -315,6 +315,10 @@ public abstract class AbstractEfaProvider implements NetworkProvider
return 'I' + str;
if (type.equals("RJ")) // railjet
return 'I' + str;
if (type.equals("OEC")) // ÖBB-EuroCity
return 'I' + str;
if (type.equals("OIC")) // ÖBB-InterCity
return 'I' + str;
if (type.equals("IR")) // Interregio
return 'R' + str;
@ -326,6 +330,8 @@ public abstract class AbstractEfaProvider implements NetworkProvider
return 'R' + str;
if (type.equals("R-Bahn")) // Regional-Express, VRR
return 'R' + str;
if (type.equals("REX")) // RegionalExpress, Österreich
return 'R' + str;
if (P_LINE_RE.matcher(type).matches())
return 'R' + str;
if (type.equals("RB")) // Regionalbahn
@ -338,6 +344,8 @@ public abstract class AbstractEfaProvider implements NetworkProvider
return 'R' + str;
if (type.equals("D")) // Schnellzug
return 'R' + str;
if (type.equals("S")) // ~Innsbruck
return 'R' + str;
if (type.equals("WFB")) // Westfalenbahn
return 'R' + str;
if (type.equals("NWB")) // NordWestBahn
@ -517,7 +525,7 @@ public abstract class AbstractEfaProvider implements NetworkProvider
return 'C' + name;
if (t == 9)
return 'F' + name;
if (t == 11)
if (t == 11 || t == -1)
return '?' + name;
throw new IllegalStateException("cannot normalize mot '" + mot + "' name '" + name + "' long '" + longName + "'");