From 40b4a8a74ecdf36ee49b52f8205a4d545ce0dc5f Mon Sep 17 00:00:00 2001 From: Andreas Schildbach Date: Tue, 18 Jun 2019 14:34:59 +0200 Subject: [PATCH] AbstractEfaProvider: 'IRE1' line. --- enabler/src/de/schildbach/pte/AbstractEfaProvider.java | 2 ++ enabler/src/de/schildbach/pte/KvvProvider.java | 2 -- enabler/src/de/schildbach/pte/VrnProvider.java | 2 -- 3 files changed, 2 insertions(+), 4 deletions(-) diff --git a/enabler/src/de/schildbach/pte/AbstractEfaProvider.java b/enabler/src/de/schildbach/pte/AbstractEfaProvider.java index df948337..3a70bf77 100644 --- a/enabler/src/de/schildbach/pte/AbstractEfaProvider.java +++ b/enabler/src/de/schildbach/pte/AbstractEfaProvider.java @@ -979,6 +979,8 @@ public abstract class AbstractEfaProvider extends AbstractNetworkProvider { return new Line(id, network, Product.REGIONAL_TRAIN, "IR" + trainNum); if ("IRE".equals(trainType) || "Interregio-Express".equals(trainName)) return new Line(id, network, Product.REGIONAL_TRAIN, "IRE" + trainNum); + if ("IRE1".equals(trainNum) && trainName == null) + return new Line(id, network, Product.REGIONAL_TRAIN, trainNum); if ("InterRegioExpress".equals(trainName)) return new Line(id, network, Product.REGIONAL_TRAIN, "IRE" + trainNumStr); if ("RE".equals(trainType) || "Regional-Express".equals(trainName)) diff --git a/enabler/src/de/schildbach/pte/KvvProvider.java b/enabler/src/de/schildbach/pte/KvvProvider.java index 23b904b8..a8677bc7 100644 --- a/enabler/src/de/schildbach/pte/KvvProvider.java +++ b/enabler/src/de/schildbach/pte/KvvProvider.java @@ -53,8 +53,6 @@ public class KvvProvider extends AbstractEfaProvider { @Nullable String symbol, @Nullable String name, @Nullable String longName, final @Nullable String trainType, final @Nullable String trainNum, final @Nullable String trainName) { if ("0".equals(mot)) { - if ("IRE1".equals(trainNum) && trainName == null) - return new Line(id, network, Product.REGIONAL_TRAIN, trainNum); if (trainName != null && trainName.startsWith("TRILEX")) return new Line(id, network, Product.REGIONAL_TRAIN, trainName); } diff --git a/enabler/src/de/schildbach/pte/VrnProvider.java b/enabler/src/de/schildbach/pte/VrnProvider.java index d7539051..4387f903 100644 --- a/enabler/src/de/schildbach/pte/VrnProvider.java +++ b/enabler/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 ("IRE1".equals(trainNum) && trainName == null) - return new Line(id, network, Product.REGIONAL_TRAIN, trainNum); if ("RE11 (RRX)".equals(trainNum)) return new Line(id, network, Product.REGIONAL_TRAIN, "RE11"); }