mirrors/public-transport-enabler
1
0
Fork 0
mirror of https://gitlab.com/oeffi/public-transport-enabler.git synced 2025-07-18 16:29:51 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

AbstractEfaProvider: Match more 'RE' lines.

Browse source
This commit is contained in:
Andreas Schildbach 2020-12-15 10:23:46 +01:00
parent 811f58887c
commit 029a64d7d6
1 changed files with 1 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

6
src/de/schildbach/pte/AbstractEfaProvider.java
View file

@ -888,7 +888,7 @@ public abstract class AbstractEfaProvider extends AbstractNetworkProvider {
return result.get(); 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_RB = Pattern.compile("RB ?\\d+[ab]?");
private static final Pattern P_LINE_R = Pattern.compile("R ?\\d+"); private static final Pattern P_LINE_R = Pattern.compile("R ?\\d+");
private static final Pattern P_LINE_S = Pattern.compile("S ?\\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); return new Line(id, network, Product.REGIONAL_TRAIN, "RE" + trainNum);
if (trainType == null && trainNum != null && P_LINE_RE.matcher(trainNum).matches()) if (trainType == null && trainNum != null && P_LINE_RE.matcher(trainNum).matches())
return new Line(id, network, Product.REGIONAL_TRAIN, trainNum); 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) if ("RE3 / RB30".equals(trainNum) && trainType == null && trainName == null)
return new Line(id, network, Product.REGIONAL_TRAIN, "RE3/RB30"); return new Line(id, network, Product.REGIONAL_TRAIN, "RE3/RB30");
if ("Regionalexpress".equals(trainName)) if ("Regionalexpress".equals(trainName))