From 967f9b83209e7df98f3a94ba7c7324f3c9f5ee9b Mon Sep 17 00:00:00 2001 From: Andreas Schildbach Date: Sat, 6 Oct 2018 11:33:52 +0200 Subject: [PATCH] AbstractEfaProvider: 'BSB' lines again. --- enabler/src/de/schildbach/pte/AbstractEfaProvider.java | 4 ++-- enabler/src/de/schildbach/pte/VagfrProvider.java | 2 -- 2 files changed, 2 insertions(+), 4 deletions(-) diff --git a/enabler/src/de/schildbach/pte/AbstractEfaProvider.java b/enabler/src/de/schildbach/pte/AbstractEfaProvider.java index 2a537445..c3ef5ee9 100644 --- a/enabler/src/de/schildbach/pte/AbstractEfaProvider.java +++ b/enabler/src/de/schildbach/pte/AbstractEfaProvider.java @@ -1327,8 +1327,8 @@ public abstract class AbstractEfaProvider extends AbstractNetworkProvider { return new Line(id, network, Product.SUBURBAN_TRAIN, trainNum); if ("BSB-Zug".equals(trainName) && trainNum == null) return new Line(id, network, Product.SUBURBAN_TRAIN, "BSB"); - if ("BSB-Zug".equals(longName)) - return new Line(id, network, Product.SUBURBAN_TRAIN, "BSB"); + if (longName != null && longName.startsWith("BSB-Zug")) + return new Line(id, network, Product.SUBURBAN_TRAIN, "BSB" + Strings.nullToEmpty(trainNum)); if ("RSB".equals(trainType)) // Regionalschnellbahn, Wien return new Line(id, network, Product.SUBURBAN_TRAIN, "RSB" + trainNum); if ("RER".equals(trainName) && symbol != null && symbol.length() == 1) // Réseau Express Régional diff --git a/enabler/src/de/schildbach/pte/VagfrProvider.java b/enabler/src/de/schildbach/pte/VagfrProvider.java index 2872c20d..88473989 100644 --- a/enabler/src/de/schildbach/pte/VagfrProvider.java +++ b/enabler/src/de/schildbach/pte/VagfrProvider.java @@ -50,8 +50,6 @@ public class VagfrProvider extends AbstractEfaProvider { if ("0".equals(mot)) { if (("N".equals(trainType) || "Nahverkehrszug".equals(trainName)) && trainNum != null) return new Line(id, network, Product.REGIONAL_TRAIN, "N" + trainNum); - if (longName != null && longName.startsWith("BSB-Zug ") && trainNum != null) - return new Line(id, network, Product.SUBURBAN_TRAIN, "BSB" + trainNum); } return super.parseLine(id, network, mot, symbol, name, longName, trainType, trainNum, trainName);