From cba6059e59d12b109d07b74e7be95897583c3b18 Mon Sep 17 00:00:00 2001 From: Andreas Schildbach Date: Sat, 21 Sep 2013 16:45:31 +0200 Subject: [PATCH] Lines --- enabler/src/de/schildbach/pte/AbstractEfaProvider.java | 4 ++++ enabler/src/de/schildbach/pte/DsbProvider.java | 2 ++ enabler/src/de/schildbach/pte/NvbwProvider.java | 2 -- enabler/src/de/schildbach/pte/VagfrProvider.java | 2 -- 4 files changed, 6 insertions(+), 4 deletions(-) diff --git a/enabler/src/de/schildbach/pte/AbstractEfaProvider.java b/enabler/src/de/schildbach/pte/AbstractEfaProvider.java index 765374ca..395dc018 100644 --- a/enabler/src/de/schildbach/pte/AbstractEfaProvider.java +++ b/enabler/src/de/schildbach/pte/AbstractEfaProvider.java @@ -1269,6 +1269,8 @@ public abstract class AbstractEfaProvider extends AbstractNetworkProvider return "Rerx" + trainNum; if ("SWEG-Zug".equals(trainName)) // Südwestdeutschen Verkehrs-Aktiengesellschaft return "RSWEG" + trainNum; + if ("SWEG-Zug".equals(longName)) + return "RSWEG"; if ("ÖBB".equals(trainType) || "ÖBB".equals(trainName)) return "RÖBB" + trainNum; if ("CAT".equals(trainType)) // City Airport Train Wien @@ -1311,6 +1313,8 @@ public abstract class AbstractEfaProvider extends AbstractNetworkProvider return "RWTB" + trainNum; if ("DB".equals(trainType) || "DB Regio".equals(trainName)) return "RDB" + trainNum; + if ("EZ".equals(trainType)) // ÖBB Erlebniszug + return "REZ" + trainNum; if ("BSB-Zug".equals(trainName)) // Breisgau-S-Bahn return 'S' + trainNum; diff --git a/enabler/src/de/schildbach/pte/DsbProvider.java b/enabler/src/de/schildbach/pte/DsbProvider.java index ac188f76..88f7863b 100644 --- a/enabler/src/de/schildbach/pte/DsbProvider.java +++ b/enabler/src/de/schildbach/pte/DsbProvider.java @@ -165,6 +165,8 @@ public class DsbProvider extends AbstractHafasProvider if ("ICL".equals(ucType)) return 'I'; + if ("IB".equals(ucType)) + return 'I'; if ("ØR".equals(ucType)) return 'R'; diff --git a/enabler/src/de/schildbach/pte/NvbwProvider.java b/enabler/src/de/schildbach/pte/NvbwProvider.java index 25f91aca..16ae0b4a 100644 --- a/enabler/src/de/schildbach/pte/NvbwProvider.java +++ b/enabler/src/de/schildbach/pte/NvbwProvider.java @@ -53,8 +53,6 @@ public class NvbwProvider extends AbstractEfaProvider { if ("0".equals(mot)) { - if ("SWEG-Zug".equals(longName)) - return "RSWEG"; if ("RR".equals(trainType)) return "RRR" + trainNum; } diff --git a/enabler/src/de/schildbach/pte/VagfrProvider.java b/enabler/src/de/schildbach/pte/VagfrProvider.java index c9fcb5d9..538ace76 100644 --- a/enabler/src/de/schildbach/pte/VagfrProvider.java +++ b/enabler/src/de/schildbach/pte/VagfrProvider.java @@ -70,8 +70,6 @@ public class VagfrProvider extends AbstractEfaProvider { if ("BSB-Zug".equals(longName)) return "SBSB"; - if ("SWEG-Zug".equals(longName)) - return "RSWEG"; } return super.parseLine(mot, symbol, name, longName, trainType, trainNum, trainName);