From a9e52a5e60bb43d36f22d21f17b54a62d8539d11 Mon Sep 17 00:00:00 2001 From: Andreas Schildbach Date: Sun, 30 Jun 2013 22:34:18 +0200 Subject: [PATCH] Lines --- enabler/src/de/schildbach/pte/AbstractEfaProvider.java | 4 ++++ enabler/src/de/schildbach/pte/AbstractHafasProvider.java | 2 ++ enabler/src/de/schildbach/pte/DsbProvider.java | 2 +- enabler/src/de/schildbach/pte/ZvvProvider.java | 2 ++ 4 files changed, 9 insertions(+), 1 deletion(-) diff --git a/enabler/src/de/schildbach/pte/AbstractEfaProvider.java b/enabler/src/de/schildbach/pte/AbstractEfaProvider.java index f990c4dc..d3a79d13 100644 --- a/enabler/src/de/schildbach/pte/AbstractEfaProvider.java +++ b/enabler/src/de/schildbach/pte/AbstractEfaProvider.java @@ -1099,6 +1099,8 @@ public abstract class AbstractEfaProvider extends AbstractNetworkProvider return "R" + symbol; if ("Westfalenbahn".equals(trainName)) return 'R' + symbol; + if ("Chiemseebahn".equals(trainName)) + return 'R' + symbol; if ("R".equals(trainType) || "Regionalzug".equals(trainName)) return "RR" + trainNum; if (trainType == null && trainNum != null && P_LINE_R.matcher(trainNum).matches()) @@ -1293,6 +1295,8 @@ public abstract class AbstractEfaProvider extends AbstractNetworkProvider if ("RT".equals(trainType) || "RegioTram".equals(trainName)) return "TRT" + trainNum; + if ("Bus".equals(trainType)) + return "B" + trainNum; if ("SEV".equals(trainType) || "SEV".equals(trainNum) || "SEV".equals(symbol) || "Ersatzverkehr".equals(trainName)) return "BSEV"; if ("Bus replacement".equals(trainName)) // GB diff --git a/enabler/src/de/schildbach/pte/AbstractHafasProvider.java b/enabler/src/de/schildbach/pte/AbstractHafasProvider.java index 84f6b996..b7856bc8 100644 --- a/enabler/src/de/schildbach/pte/AbstractHafasProvider.java +++ b/enabler/src/de/schildbach/pte/AbstractHafasProvider.java @@ -2658,6 +2658,8 @@ public abstract class AbstractHafasProvider extends AbstractNetworkProvider // Suburban Trains if (P_LINE_SBAHN.matcher(ucType).matches()) // Generic (Night) S-Bahn return 'S'; + if ("S-BAHN".equals(ucType)) + return 'S'; if ("BSB".equals(ucType)) // Breisgau S-Bahn return 'S'; if ("SWE".equals(ucType)) // Südwestdeutsche Verkehrs-AG, Ortenau-S-Bahn diff --git a/enabler/src/de/schildbach/pte/DsbProvider.java b/enabler/src/de/schildbach/pte/DsbProvider.java index 9755f641..7916c76d 100644 --- a/enabler/src/de/schildbach/pte/DsbProvider.java +++ b/enabler/src/de/schildbach/pte/DsbProvider.java @@ -193,7 +193,7 @@ public class DsbProvider extends AbstractHafasProvider if ("BYBUS".equals(ucType)) return 'B'; - if ("X-BUS".equals(ucType)) + if ("X-BUS".equals(ucType) || "X BUS".equals(ucType)) return 'B'; if ("HV-BUS".equals(ucType)) // Havnebus return 'B'; diff --git a/enabler/src/de/schildbach/pte/ZvvProvider.java b/enabler/src/de/schildbach/pte/ZvvProvider.java index a7e6acc6..b15eb43e 100644 --- a/enabler/src/de/schildbach/pte/ZvvProvider.java +++ b/enabler/src/de/schildbach/pte/ZvvProvider.java @@ -301,6 +301,8 @@ public class ZvvProvider extends AbstractHafasProvider if ("UNB".equals(ucType)) return '?'; + if ("UUU".equals(ucType)) + return '?'; if ("???".equals(ucType)) return '?';