From 029a64d7d6c83d667c187035459c96e25b51081d Mon Sep 17 00:00:00 2001 From: Andreas Schildbach Date: Tue, 15 Dec 2020 10:23:46 +0100 Subject: [PATCH] AbstractEfaProvider: Match more 'RE' lines. --- src/de/schildbach/pte/AbstractEfaProvider.java | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/src/de/schildbach/pte/AbstractEfaProvider.java b/src/de/schildbach/pte/AbstractEfaProvider.java index ca4a0dfa..f4db2b5d 100644 --- a/src/de/schildbach/pte/AbstractEfaProvider.java +++ b/src/de/schildbach/pte/AbstractEfaProvider.java @@ -888,7 +888,7 @@ public abstract class AbstractEfaProvider extends AbstractNetworkProvider { return result.get(); } - private static final Pattern P_LINE_RE = Pattern.compile("RE ?\\d+"); + private static final Pattern P_LINE_RE = Pattern.compile("RE ?\\d+[ab]?"); private static final Pattern P_LINE_RB = Pattern.compile("RB ?\\d+[ab]?"); private static final Pattern P_LINE_R = Pattern.compile("R ?\\d+"); private static final Pattern P_LINE_S = Pattern.compile("S ?\\d+"); @@ -1026,10 +1026,6 @@ public abstract class AbstractEfaProvider extends AbstractNetworkProvider { return new Line(id, network, Product.REGIONAL_TRAIN, "RE" + trainNum); if (trainType == null && trainNum != null && P_LINE_RE.matcher(trainNum).matches()) return new Line(id, network, Product.REGIONAL_TRAIN, trainNum); - if ("RE6a".equals(trainNum) && trainName == null) - return new Line(id, network, Product.REGIONAL_TRAIN, trainNum); - if ("RE19a".equals(trainNum) && trainName == null) - return new Line(id, network, Product.REGIONAL_TRAIN, trainNum); if ("RE3 / RB30".equals(trainNum) && trainType == null && trainName == null) return new Line(id, network, Product.REGIONAL_TRAIN, "RE3/RB30"); if ("Regionalexpress".equals(trainName))