mirror of
https://gitlab.com/oeffi/public-transport-enabler.git
synced 2025-07-07 19:38:49 +00:00
AbstractEfaProvider: 'RB' line
This commit is contained in:
parent
a16e53952e
commit
dad6f92556
2 changed files with 2 additions and 2 deletions
|
@ -1051,6 +1051,8 @@ public abstract class AbstractEfaProvider extends AbstractNetworkProvider {
|
||||||
return new Line(id, network, Product.REGIONAL_TRAIN, "REX" + trainNum);
|
return new Line(id, network, Product.REGIONAL_TRAIN, "REX" + trainNum);
|
||||||
if (("RB".equals(trainType) || "Regionalbahn".equals(trainName)) && trainNum != null)
|
if (("RB".equals(trainType) || "Regionalbahn".equals(trainName)) && trainNum != null)
|
||||||
return new Line(id, network, Product.REGIONAL_TRAIN, "RB" + trainNum);
|
return new Line(id, network, Product.REGIONAL_TRAIN, "RB" + trainNum);
|
||||||
|
if ("RB".equals(trainNum) && trainName == null)
|
||||||
|
return new Line(id, network, Product.REGIONAL_TRAIN, "RB");
|
||||||
if (trainType == null && trainNum != null && P_LINE_RB.matcher(trainNum).matches())
|
if (trainType == null && trainNum != null && P_LINE_RB.matcher(trainNum).matches())
|
||||||
return new Line(id, network, Product.REGIONAL_TRAIN, trainNum);
|
return new Line(id, network, Product.REGIONAL_TRAIN, trainNum);
|
||||||
if ("Abellio-Zug".equals(trainName))
|
if ("Abellio-Zug".equals(trainName))
|
||||||
|
|
|
@ -83,8 +83,6 @@ public class NvbwProvider extends AbstractEfaProvider {
|
||||||
return new Line(id, network, null, "Zug");
|
return new Line(id, network, null, "Zug");
|
||||||
if ("DB".equals(trainName) && trainNum == null)
|
if ("DB".equals(trainName) && trainNum == null)
|
||||||
return new Line(id, network, null, "DB");
|
return new Line(id, network, null, "DB");
|
||||||
if ("RB".equals(trainNum) && trainType == null)
|
|
||||||
return new Line(id, network, null, "RB");
|
|
||||||
} else if ("1".equals(mot)) {
|
} else if ("1".equals(mot)) {
|
||||||
if (symbol != null && symbol.equals(name)) {
|
if (symbol != null && symbol.equals(name)) {
|
||||||
final Matcher m = P_LINE_S_AVG_VBK.matcher(symbol);
|
final Matcher m = P_LINE_S_AVG_VBK.matcher(symbol);
|
||||||
|
|
Loading…
Add table
Add a link
Reference in a new issue