From c4939388a4e5910cf239914643d2a237ed3dba5d Mon Sep 17 00:00:00 2001 From: Andreas Schildbach Date: Sat, 15 Jun 2013 01:49:48 +0200 Subject: [PATCH] lines --- enabler/src/de/schildbach/pte/AbstractEfaProvider.java | 6 +++++- enabler/src/de/schildbach/pte/NvbwProvider.java | 2 ++ enabler/src/de/schildbach/pte/RmvProvider.java | 3 +++ enabler/src/de/schildbach/pte/VagfrProvider.java | 2 ++ 4 files changed, 12 insertions(+), 1 deletion(-) diff --git a/enabler/src/de/schildbach/pte/AbstractEfaProvider.java b/enabler/src/de/schildbach/pte/AbstractEfaProvider.java index aa574cc2..fb398b4b 100644 --- a/enabler/src/de/schildbach/pte/AbstractEfaProvider.java +++ b/enabler/src/de/schildbach/pte/AbstractEfaProvider.java @@ -969,7 +969,9 @@ public abstract class AbstractEfaProvider extends AbstractNetworkProvider return "RALX" + trainNum; if ("EX".equals(trainType) || "Fatra".equals(trainName)) return "REX" + trainNum; - if ("MEr".equals(trainType) || "metronom".equals(trainName)) + if ("ME".equals(trainType) || "metronom".equals(trainName)) + return "RME" + trainNum; + if ("MEr".equals(trainType)) return "RMEr" + trainNum; if ("AKN".equals(trainType) || "AKN Eisenbahn AG".equals(trainName)) return "RAKN" + trainNum; @@ -1014,6 +1016,8 @@ public abstract class AbstractEfaProvider extends AbstractNetworkProvider return "RSBS" + trainNum; if ("SB-".equals(trainType)) // Städtebahn Sachsen return "RSB" + trainNum; + if ("ag".equals(trainType)) // agilis + return "Rag" + trainNum; if ("agi".equals(trainType) || "agilis".equals(trainName)) return "Ragi" + trainNum; if ("as".equals(trainType) || "agilis-Schnellzug".equals(trainName)) diff --git a/enabler/src/de/schildbach/pte/NvbwProvider.java b/enabler/src/de/schildbach/pte/NvbwProvider.java index a8f3bd13..4e3940ab 100644 --- a/enabler/src/de/schildbach/pte/NvbwProvider.java +++ b/enabler/src/de/schildbach/pte/NvbwProvider.java @@ -53,6 +53,8 @@ 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/RmvProvider.java b/enabler/src/de/schildbach/pte/RmvProvider.java index 020a28c5..9f7a3333 100644 --- a/enabler/src/de/schildbach/pte/RmvProvider.java +++ b/enabler/src/de/schildbach/pte/RmvProvider.java @@ -252,6 +252,9 @@ public class RmvProvider extends AbstractHafasProvider if ("AT".equals(ucType)) // Anschluß Sammel Taxi, Anmeldung nicht erforderlich return 'B'; + if ("MOFA".equals(ucType)) // Mobilfalt-Fahrt + return 'P'; + final char t = super.normalizeType(type); if (t != 0) return t; diff --git a/enabler/src/de/schildbach/pte/VagfrProvider.java b/enabler/src/de/schildbach/pte/VagfrProvider.java index 588dbaae..fcca44f9 100644 --- a/enabler/src/de/schildbach/pte/VagfrProvider.java +++ b/enabler/src/de/schildbach/pte/VagfrProvider.java @@ -70,6 +70,8 @@ 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);