From bd47a2f23c40b35cb00e5cc140a159936ace8184 Mon Sep 17 00:00:00 2001 From: Andreas Schildbach Date: Sat, 5 Jan 2013 13:16:19 +0100 Subject: [PATCH] lines --- .../schildbach/pte/AbstractEfaProvider.java | 2 + .../src/de/schildbach/pte/MvvProvider.java | 21 +++++++ .../src/de/schildbach/pte/TflProvider.java | 57 +++++++++++++++++++ 3 files changed, 80 insertions(+) diff --git a/enabler/src/de/schildbach/pte/AbstractEfaProvider.java b/enabler/src/de/schildbach/pte/AbstractEfaProvider.java index 0ac46333..58a7d75b 100644 --- a/enabler/src/de/schildbach/pte/AbstractEfaProvider.java +++ b/enabler/src/de/schildbach/pte/AbstractEfaProvider.java @@ -1025,6 +1025,8 @@ public abstract class AbstractEfaProvider extends AbstractNetworkProvider return 'R' + str; if (type.equals("as")) // agilis-Schnellzug return 'R' + str; + if (type.equals("agilis")) // agilis + return 'R' + str; if (type.equals("agilis-Schnellzug")) // agilis-Schnellzug return 'R' + str; if (type.equals("TLX")) // Trilex (Vogtlandbahn) diff --git a/enabler/src/de/schildbach/pte/MvvProvider.java b/enabler/src/de/schildbach/pte/MvvProvider.java index c1567b2d..7c3e8e94 100644 --- a/enabler/src/de/schildbach/pte/MvvProvider.java +++ b/enabler/src/de/schildbach/pte/MvvProvider.java @@ -55,6 +55,27 @@ public class MvvProvider extends AbstractEfaProvider return false; } + @Override + protected String parseLine(final String mot, final String name, final String longName, final String noTrainName) + { + if ("0".equals(mot) && longName.equals("Hamburg-Köln-Express")) + return "I" + longName; + + else if ("0".equals(mot) && longName.equals("Erfurter Bahn Express")) + return "R" + longName; + else if ("0".equals(mot) && longName.equals("VIAS GmbH")) + return "R" + longName; + else if ("0".equals(mot) && longName.equals("Vogtlandbahn")) + return "R" + longName; + else if ("0".equals(mot) && longName.equals("Süd-Thüringen-Bahn")) + return "R" + longName; + else if ("0".equals(mot) && longName.equals("erixx - Der Heidesprinter")) + return "R" + longName; + + else + return super.parseLine(mot, name, longName, noTrainName); + } + private static final Map LINES = new HashMap(); static diff --git a/enabler/src/de/schildbach/pte/TflProvider.java b/enabler/src/de/schildbach/pte/TflProvider.java index f562abf1..0536f944 100644 --- a/enabler/src/de/schildbach/pte/TflProvider.java +++ b/enabler/src/de/schildbach/pte/TflProvider.java @@ -56,6 +56,63 @@ public class TflProvider extends AbstractEfaProvider return false; } + @Override + protected String parseLine(final String mot, final String name, final String longName, final String noTrainName) + { + if ("0".equals(mot) && "First Hull Trains".equals(noTrainName)) + return "I" + name; + + else if ("0".equals(mot) && "Southern".equals(noTrainName)) + return "R" + name; + else if ("0".equals(mot) && "Southeastern".equals(noTrainName)) + return "R" + name; + else if ("0".equals(mot) && "South West Trains".equals(noTrainName)) + return "R" + name; + else if ("0".equals(mot) && "Greater Anglia".equals(noTrainName)) + return "R" + name; + else if ("0".equals(mot) && "First Great Western".equals(noTrainName)) + return "R" + name; + else if ("0".equals(mot) && "First Capital Connect".equals(noTrainName)) + return "R" + name; + else if ("0".equals(mot) && "Northern Rail".equals(noTrainName)) + return "R" + name; + else if ("0".equals(mot) && "Chiltern Railways".equals(noTrainName)) + return "R" + name; + else if ("0".equals(mot) && "Heathrow Connect".equals(noTrainName)) + return "R" + name; + else if ("0".equals(mot) && "Heathrow Express".equals(noTrainName)) + return "R" + name; + else if ("0".equals(mot) && "Gatwick Express".equals(noTrainName)) + return "R" + name; + else if ("0".equals(mot) && "Merseyrail".equals(noTrainName)) + return "R" + name; + else if ("0".equals(mot) && "East Coast".equals(noTrainName)) + return "R" + name; + else if ("0".equals(mot) && "Cross Country".equals(noTrainName)) + return "R" + name; + else if ("0".equals(mot) && "East Midlands Trains".equals(noTrainName)) + return "R" + name; + else if ("0".equals(mot) && "Arriva Trains Wales".equals(noTrainName)) + return "R" + name; + else if ("0".equals(mot) && "First TransPennine Express".equals(noTrainName)) + return "R" + name; + else if ("0".equals(mot) && "ScotRail".equals(noTrainName)) + return "R" + name; + else if ("0".equals(mot) && "London Midland".equals(noTrainName)) + return "R" + name; + else if ("0".equals(mot) && "c2c".equals(noTrainName)) + return "R" + name; + else if ("0".equals(mot) && "Grand Central".equals(noTrainName)) + return "R" + name; + else if ("0".equals(mot) && "Virgin Trains".equals(noTrainName)) + return "R" + name; + else if ("0".equals(mot) && "Island Line".equals(noTrainName)) + return "R" + name; + + else + return super.parseLine(mot, name, longName, noTrainName); + } + private static final Map LINES = new HashMap(); static