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

Lines.

Browse source
This commit is contained in:
Andreas Schildbach 2014-07-17 01:03:21 +02:00
parent d9098fc927
commit 9b1ece6cdf
12 changed files with 40 additions and 22 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -1315,9 +1315,15 @@ public abstract class AbstractEfaProvider extends AbstractNetworkProvider
return "RDPF" + trainNum;
if ("WBA".equals(trainType) || "Waldbahn".equals(trainName))
return "RWBA" + trainNum;
if ("ÖBA".equals(trainType) && trainNum != null) // Eisenbahn-Betriebsgesellschaft Ochsenhausen
return "RÖBA" + trainNum;
if (("UEF".equals(trainType) || "Ulmer Eisenbahnfreunde".equals(trainName)) && trainNum != null)
return "RUEF" + trainNum;
if ("BSB-Zug".equals(trainName)) // Breisgau-S-Bahn
if ("BSB-Zug".equals(trainName) && trainNum != null) // Breisgau-S-Bahn
return 'S' + trainNum;
if ("BSB-Zug".equals(longName))
return "SBSB";
if ("RSB".equals(trainType)) // Regionalschnellbahn, Wien
return "SRSB" + trainNum;
if ("RER".equals(trainName) && symbol.length() == 1) // Réseau Express Régional, Frankreich

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

@ -2804,6 +2804,8 @@ public abstract class AbstractHafasProvider extends AbstractNetworkProvider
return 'P';
if (ucType.startsWith("BUXI")) // Bus-Taxi (Schweiz)
return 'P';
if ("TB".equals(ucType)) // Taxi-Bus?
return 'P';
// Ferry
if ("SCHIFF".equals(ucType))

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

@ -144,6 +144,8 @@ public class DsbProvider extends AbstractHafasProvider
return 'I';
if ("IB".equals(ucType))
return 'I';
if ("SJ".equals(ucType))
return 'I';
if ("ØR".equals(ucType))
return 'R';

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

@ -138,7 +138,7 @@ public class JetProvider extends AbstractHafasProvider
if ("רק1#".equals(lineAndType))
return newLine('T', "רק1", null);
if ("א 11#".equals(lineAndType))
if ("א 11#".equals(lineAndType) || "11א#".equals(lineAndType))
return newLine('B', "א11", null);
final Matcher mBus = P_NORMALIZE_BUS.matcher(lineAndType);

14
enabler/src/de/schildbach/pte/NvbwProvider.java
View file

@ -53,12 +53,22 @@ public class NvbwProvider extends AbstractEfaProvider
{
if ("0".equals(mot))
{
if ("ICE".equals(trainName) && trainNum == null)
return "IICE";
if ("Fernreisezug externer EU".equals(trainName))
return "I";
if ("Nahverkehrszug von Dritten".equals(trainName) || "DB-Zug".equals(trainName) || "REGIOBAHN".equals(trainName))
return "R";
if ("RR".equals(trainType))
return "RRR" + trainNum;
if ("Meridian".equals(trainName) && symbol != null)
return "R" + symbol;
if ("BSB-Zug".equals(longName))
return "SBSB";
if ("CityBahn".equals(trainName) && trainNum == null)
return "RCB";
if ("Trilex".equals(trainName) && trainNum == null)
return "RTLX";
if ("Koleje Dolnoslaskie".equals(trainName))
return "RKD";
if ("Bay. Seenschifffahrt".equals(trainName) && symbol != null)
return "F" + symbol;
}

9
enabler/src/de/schildbach/pte/ShProvider.java
View file

@ -298,8 +298,17 @@ public class ShProvider extends AbstractHafasProvider
{
final String ucType = type.toUpperCase();
if ("IXB".equals(ucType)) // ICE
return 'I';
if ("ECW".equals(ucType)) // EC
return 'I';
if ("DPF".equals(ucType)) // Hamburg-Koeln-Express
return 'I';
if ("RRT".equals(ucType)) // TGV
return 'I';
if ("ZRB".equals(ucType)) // Zahnradbahn
return 'R';
if ("KBS".equals(ucType))
return 'B';

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

@ -170,6 +170,8 @@ public class SncbProvider extends AbstractHafasProvider
return 'R';
if ("CR".equals(ucType))
return 'R';
if ("TRN".equals(ucType))
return 'R';
if ("MÉTRO".equals(ucType))
return 'U';

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

@ -53,19 +53,6 @@ public class VagfrProvider extends AbstractEfaProvider
return false;
}
@Override
protected String parseLine(final String mot, final String symbol, final String name, final String longName, final String trainType,
final String trainNum, final String trainName)
{
if ("0".equals(mot))
{
if ("BSB-Zug".equals(longName))
return "SBSB";
}
return super.parseLine(mot, symbol, name, longName, trainType, trainNum, trainName);
}
private static final Map<String, Style> STYLES = new HashMap<String, Style>();
static

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

@ -117,8 +117,6 @@ public class VbnProvider extends AbstractHafasProvider
if ("P".equals(ucType)) // Brohltalbahn
return 'R';
if ("TB".equals(ucType))
return 'B';
if ("RFTAST".equals(ucType))
return 'B';

3
enabler/src/de/schildbach/pte/VsnProvider.java
View file

@ -164,9 +164,6 @@ public class VsnProvider extends AbstractHafasProvider
if ("E".equals(ucType))
return 'R';
if ("TB".equals(ucType)) // Hamburg-Koeln-Express
return 'P';
if ("T84".equals(ucType))
return '?';

3
enabler/src/de/schildbach/pte/VvoProvider.java
View file

@ -63,6 +63,9 @@ public class VvoProvider extends AbstractEfaProvider
return "ROE";
if ("Meridian".equals(longName))
return "RM";
if ("Fernbus".equals(trainName) && trainNum == null)
return "B" + trainName;
}
return super.parseLine(mot, symbol, name, longName, trainType, trainNum, trainName);

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

@ -242,6 +242,8 @@ public class ZvvProvider extends AbstractHafasProvider
if ("D-SCHIFF".equals(ucType))
return 'F';
if ("DAMPFSCH".equals(ucType))
return 'F';
if ("BERGBAHN".equals(ucType))
return 'C';