This commit is contained in:
Andreas Schildbach 2014-02-27 23:25:29 +01:00
parent 710d074c47
commit 25d25fd839
10 changed files with 59 additions and 0 deletions

View file

@ -1128,6 +1128,8 @@ public abstract class AbstractEfaProvider extends AbstractNetworkProvider
return "IEST" + trainNum;
if ("EIC".equals(trainType)) // Ekspres InterCity, Polen
return "IEIC" + trainNum;
if ("MT".equals(trainType) && "Schnee-Express".equals(trainName))
return "IMT" + trainNum;
if ("Zug".equals(trainName))
return 'R' + symbol;

View file

@ -215,6 +215,9 @@ public final class BahnProvider extends AbstractHafasProvider
{
final String ucType = type.toUpperCase();
if ("MT".equals(ucType)) // Schnee-Express
return 'I';
if ("DZ".equals(ucType)) // Dampfzug
return 'R';

View file

@ -71,6 +71,8 @@ public class BayernProvider extends AbstractEfaProvider
{
if ("0".equals(mot))
{
if ("M".equals(trainType) && trainNum != null && trainName != null && trainName.endsWith("Meridian"))
return "RM" + trainNum;
if ("ZUG".equals(trainType) && trainNum != null)
return "R" + trainNum;
}

View file

@ -57,6 +57,8 @@ public class NvbwProvider extends AbstractEfaProvider
return "RRR" + trainNum;
if ("Meridian".equals(trainName) && symbol != null)
return "R" + symbol;
if ("BSB-Zug".equals(longName))
return "SBSB";
if ("Bay. Seenschifffahrt".equals(trainName) && symbol != null)
return "F" + symbol;
}

View file

@ -149,6 +149,9 @@ public class RtProvider extends AbstractHafasProvider
{
final String ucType = type.toUpperCase();
if ("ICD".equals(ucType)) // Intercity direkt Amsterdam-Breda
return 'I';
if ("E".equals(ucType)) // Romania, Croatia
return 'R';
if ("N".equals(ucType)) // Frankreich, Tours

View file

@ -117,6 +117,9 @@ public class TflProvider extends AbstractEfaProvider
else if ("London Overground".equals(trainName) || "=LO".equals(trainType))
return "SLO" + trainNum;
else if ("Underground".equals(trainName) && trainType == null && name != null)
return "U" + name;
}
else if ("3".equals(mot))
{

View file

@ -62,6 +62,19 @@ public class TlemProvider extends AbstractEfaProvider
return false;
}
@Override
protected String parseLine(final String mot, final String symbol, final String name, final String longName, final String trainType,
final String trainNum, final String trainName)
{
if ("0".equals(mot))
{
if ("Underground".equals(trainName) && trainType == null && name != null)
return "U" + name;
}
return super.parseLine(mot, symbol, name, longName, trainType, trainNum, trainName);
}
@Override
public List<Location> autocompleteStations(final CharSequence constraint) throws IOException
{

View file

@ -57,6 +57,19 @@ public class TlwmProvider extends AbstractEfaProvider
return false;
}
@Override
protected String parseLine(final String mot, final String symbol, final String name, final String longName, final String trainType,
final String trainNum, final String trainName)
{
if ("0".equals(mot))
{
if ("Metro".equals(trainName) && trainType == null && name != null)
return "U" + name;
}
return super.parseLine(mot, symbol, name, longName, trainType, trainNum, trainName);
}
@Override
public Collection<Product> defaultProducts()
{

View file

@ -62,6 +62,9 @@ public class VrrProvider extends AbstractEfaProvider
{
if (trainType == null && "RB67/71".equals(trainNum))
return 'R' + trainNum;
if (trainType == null && "SEV7".equals(trainNum))
return 'B' + trainNum;
}
else if ("11".equals(mot))
{

View file

@ -52,4 +52,19 @@ public class VvoProvider extends AbstractEfaProvider
return false;
}
@Override
protected String parseLine(final String mot, final String symbol, final String name, final String longName, final String trainType,
final String trainNum, final String trainName)
{
if ("0".equals(mot))
{
if ("Erfurter Bahn".equals(longName))
return "REB";
if ("Ostdeutsche Eisenbahn GmbH".equals(longName))
return "ROE";
}
return super.parseLine(mot, symbol, name, longName, trainType, trainNum, trainName);
}
}