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

AbstractEfaProvider: 'BSB' lines again.

Browse source
This commit is contained in:
Andreas Schildbach 2018-10-06 11:33:52 +02:00
parent 509fa449cc
commit 967f9b8320
2 changed files with 2 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -1327,8 +1327,8 @@ public abstract class AbstractEfaProvider extends AbstractNetworkProvider {
return new Line(id, network, Product.SUBURBAN_TRAIN, trainNum); return new Line(id, network, Product.SUBURBAN_TRAIN, trainNum);
if ("BSB-Zug".equals(trainName) && trainNum == null) if ("BSB-Zug".equals(trainName) && trainNum == null)
return new Line(id, network, Product.SUBURBAN_TRAIN, "BSB"); return new Line(id, network, Product.SUBURBAN_TRAIN, "BSB");
if ("BSB-Zug".equals(longName)) if (longName != null && longName.startsWith("BSB-Zug"))
return new Line(id, network, Product.SUBURBAN_TRAIN, "BSB"); return new Line(id, network, Product.SUBURBAN_TRAIN, "BSB" + Strings.nullToEmpty(trainNum));
if ("RSB".equals(trainType)) // Regionalschnellbahn, Wien if ("RSB".equals(trainType)) // Regionalschnellbahn, Wien
return new Line(id, network, Product.SUBURBAN_TRAIN, "RSB" + trainNum); return new Line(id, network, Product.SUBURBAN_TRAIN, "RSB" + trainNum);
if ("RER".equals(trainName) && symbol != null && symbol.length() == 1) // Réseau Express Régional if ("RER".equals(trainName) && symbol != null && symbol.length() == 1) // Réseau Express Régional

2
enabler/src/de/schildbach/pte/VagfrProvider.java
View file

@ -50,8 +50,6 @@ public class VagfrProvider extends AbstractEfaProvider {
if ("0".equals(mot)) { if ("0".equals(mot)) {
if (("N".equals(trainType) || "Nahverkehrszug".equals(trainName)) && trainNum != null) if (("N".equals(trainType) || "Nahverkehrszug".equals(trainName)) && trainNum != null)
return new Line(id, network, Product.REGIONAL_TRAIN, "N" + trainNum); 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); return super.parseLine(id, network, mot, symbol, name, longName, trainType, trainNum, trainName);