diff --git a/src/de/schildbach/pte/AbstractEfaProvider.java b/src/de/schildbach/pte/AbstractEfaProvider.java index b5d0f3a9..382ab164 100644 --- a/src/de/schildbach/pte/AbstractEfaProvider.java +++ b/src/de/schildbach/pte/AbstractEfaProvider.java @@ -1022,7 +1022,9 @@ public abstract class AbstractEfaProvider extends AbstractNetworkProvider { if (trainType == null && trainNum != null && P_LINE_IRE.matcher(trainNum).matches()) return new Line(id, network, Product.REGIONAL_TRAIN, trainNum); 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()) return new Line(id, network, Product.REGIONAL_TRAIN, trainNum); if ("RE3 / RB30".equals(trainNum) && trainType == null && trainName == null) diff --git a/src/de/schildbach/pte/VvsProvider.java b/src/de/schildbach/pte/VvsProvider.java index e2777318..7fb2240b 100644 --- a/src/de/schildbach/pte/VvsProvider.java +++ b/src/de/schildbach/pte/VvsProvider.java @@ -57,8 +57,6 @@ public class VvsProvider extends AbstractEfaProvider { if ("0".equals(mot)) { if ("IC".equals(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);