From fbb0d374d8e29042a90d6071df25ae4a1e8cb5b3 Mon Sep 17 00:00:00 2001 From: Andreas Schildbach Date: Fri, 25 Oct 2019 21:53:25 +0200 Subject: [PATCH] AbstractEfaProvider: Move 'RE5 (RRX)' and 'RE11 (RRX)' lines to here. --- src/de/schildbach/pte/AbstractEfaProvider.java | 4 ++++ src/de/schildbach/pte/VrnProvider.java | 2 -- src/de/schildbach/pte/VrrProvider.java | 4 ---- 3 files changed, 4 insertions(+), 6 deletions(-) diff --git a/src/de/schildbach/pte/AbstractEfaProvider.java b/src/de/schildbach/pte/AbstractEfaProvider.java index 9ba0240c..81ec44a5 100644 --- a/src/de/schildbach/pte/AbstractEfaProvider.java +++ b/src/de/schildbach/pte/AbstractEfaProvider.java @@ -997,6 +997,10 @@ public abstract class AbstractEfaProvider extends AbstractNetworkProvider { return new Line(id, network, Product.REGIONAL_TRAIN, symbol); if ("R-Bahn".equals(trainName)) return new Line(id, network, Product.REGIONAL_TRAIN, symbol); + if ("RE5 (RRX)".equals(trainNum)) + return new Line(id, network, Product.REGIONAL_TRAIN, "RE5"); + if ("RE11 (RRX)".equals(trainNum)) + return new Line(id, network, Product.REGIONAL_TRAIN, "RE11"); if ("RB-Bahn".equals(trainName)) return new Line(id, network, Product.REGIONAL_TRAIN, symbol); if (trainType == null && "RB67/71".equals(trainNum)) diff --git a/src/de/schildbach/pte/VrnProvider.java b/src/de/schildbach/pte/VrnProvider.java index 4387f903..337f6ee8 100644 --- a/src/de/schildbach/pte/VrnProvider.java +++ b/src/de/schildbach/pte/VrnProvider.java @@ -52,8 +52,6 @@ public class VrnProvider extends AbstractEfaProvider { if ("0".equals(mot)) { if ("InterRegio".equals(longName) && symbol == null) return new Line(id, network, Product.REGIONAL_TRAIN, "IR"); - if ("RE11 (RRX)".equals(trainNum)) - return new Line(id, network, Product.REGIONAL_TRAIN, "RE11"); } if (name != null && name.startsWith("RNV Moonliner ")) diff --git a/src/de/schildbach/pte/VrrProvider.java b/src/de/schildbach/pte/VrrProvider.java index ae5571a5..3b416833 100644 --- a/src/de/schildbach/pte/VrrProvider.java +++ b/src/de/schildbach/pte/VrrProvider.java @@ -78,10 +78,6 @@ public class VrrProvider extends AbstractEfaProvider { return new Line(id, network, Product.REGIONAL_TRAIN, symbol); if ("NordWestBahn".equals(trainName) && symbol != null) return new Line(id, network, Product.REGIONAL_TRAIN, symbol); - if ("RE5 (RRX)".equals(trainNum)) - return new Line(id, network, Product.REGIONAL_TRAIN, "RE5"); - if ("RE11 (RRX)".equals(trainNum)) - return new Line(id, network, Product.REGIONAL_TRAIN, "RE11"); if (trainType == null && "SEV7".equals(trainNum)) return new Line(id, network, Product.BUS, trainNum);