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

AbstractEfaProvider: 'RE' line

Browse source
This commit is contained in:
Andreas Schildbach 2023-09-04 11:28:48 +02:00
parent dad6f92556
commit 3185dcbf21
2 changed files with 3 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -1022,7 +1022,9 @@ public abstract class AbstractEfaProvider extends AbstractNetworkProvider {
if (trainType == null && trainNum != null && P_LINE_IRE.matcher(trainNum).matches()) if (trainType == null && trainNum != null && P_LINE_IRE.matcher(trainNum).matches())
return new Line(id, network, Product.REGIONAL_TRAIN, trainNum); return new Line(id, network, Product.REGIONAL_TRAIN, trainNum);
if ("RE".equals(trainType) || "Regional-Express".equals(trainName)) if ("RE".equals(trainType) || "Regional-Express".equals(trainName))
return new Line(id, network, Product.REGIONAL_TRAIN, "RE" + trainNum); return new Line(id, network, Product.REGIONAL_TRAIN, "RE" + Strings.nullToEmpty(trainNum));
if ("RE".equals(trainNum) && trainName == null)
return new Line(id, network, Product.REGIONAL_TRAIN, "RE");
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 ("RE3 / RB30".equals(trainNum) && trainType == null && trainName == null) if ("RE3 / RB30".equals(trainNum) && trainType == null && trainName == null)

2
src/de/schildbach/pte/VvsProvider.java
View file

@ -57,8 +57,6 @@ public class VvsProvider extends AbstractEfaProvider {
if ("0".equals(mot)) { if ("0".equals(mot)) {
if ("IC".equals(trainNum)) if ("IC".equals(trainNum))
return new Line(id, network, Product.HIGH_SPEED_TRAIN, trainNum); return new Line(id, network, Product.HIGH_SPEED_TRAIN, trainNum);
if ("RE".equals(trainNum))
return new Line(id, network, Product.REGIONAL_TRAIN, trainNum);
} }
return super.parseLine(id, network, mot, symbol, name, longName, trainType, trainNum, trainName); return super.parseLine(id, network, mot, symbol, name, longName, trainType, trainNum, trainName);