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

fixed type and visibility of westbahn

Browse source
This commit is contained in:
Andreas Schildbach 2012-08-10 14:35:36 +02:00
parent 67a33dc391
commit eb2741b03a
3 changed files with 8 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -733,6 +733,8 @@ public abstract class AbstractEfaProvider extends AbstractNetworkProvider
return 'I' + str; return 'I' + str;
if (type.equals("RJ")) // railjet if (type.equals("RJ")) // railjet
return 'I' + str; return 'I' + str;
if ("WB".equals(type)) // westbahn
return 'R' + str;
if (type.equals("OEC")) // ÖBB-EuroCity if (type.equals("OEC")) // ÖBB-EuroCity
return 'I' + str; return 'I' + str;
if (type.equals("OIC")) // ÖBB-InterCity if (type.equals("OIC")) // ÖBB-InterCity
@ -980,8 +982,6 @@ public abstract class AbstractEfaProvider extends AbstractNetworkProvider
return 'R' + str; return 'R' + str;
if (type.equals("VIAMO")) if (type.equals("VIAMO"))
return 'R' + str; return 'R' + str;
if ("WB".equals(type)) // WESTbahn
return 'R' + str;
if (type.equals("SE")) // Southeastern, GB if (type.equals("SE")) // Southeastern, GB
return 'R' + str; return 'R' + str;
if (type.equals("SW")) // South West Trains, GB if (type.equals("SW")) // South West Trains, GB

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

@ -2251,6 +2251,8 @@ public abstract class AbstractHafasProvider extends AbstractNetworkProvider
return 'I'; return 'I';
if ("RJ".equals(ucType)) // RailJet, Österreichische Bundesbahnen if ("RJ".equals(ucType)) // RailJet, Österreichische Bundesbahnen
return 'I'; return 'I';
if ("WB".equals(ucType)) // westbahn
return 'I';
if ("THA".equals(ucType)) // Thalys if ("THA".equals(ucType)) // Thalys
return 'I'; return 'I';
if ("TGV".equals(ucType)) // Train à Grande Vitesse if ("TGV".equals(ucType)) // Train à Grande Vitesse
@ -2493,8 +2495,6 @@ public abstract class AbstractHafasProvider extends AbstractNetworkProvider
return 'R'; return 'R';
if ("ZR".equals(ucType)) // ZSR (Slovakian Republic Railways) if ("ZR".equals(ucType)) // ZSR (Slovakian Republic Railways)
return 'R'; return 'R';
if ("WB".equals(ucType)) // WESTbahn
return 'R';
if ("RNV".equals(ucType)) // Rhein-Neckar-Verkehr GmbH if ("RNV".equals(ucType)) // Rhein-Neckar-Verkehr GmbH
return 'R'; return 'R';
if ("DWE".equals(ucType)) // Dessau-Wörlitzer Eisenbahn if ("DWE".equals(ucType)) // Dessau-Wörlitzer Eisenbahn

5
enabler/src/de/schildbach/pte/OebbProvider.java
View file

@ -40,7 +40,7 @@ public class OebbProvider extends AbstractHafasProvider
public OebbProvider() public OebbProvider()
{ {
super(API_BASE + "query.exe/dn", 12, null); super(API_BASE + "query.exe/dn", 13, null);
} }
public NetworkId id() public NetworkId id()
@ -85,6 +85,8 @@ public class OebbProvider extends AbstractHafasProvider
return 'I'; return 'I';
if (value == 2048) if (value == 2048)
return 'P'; return 'P';
if (value == 4096)
return 'I';
throw new IllegalArgumentException("cannot handle: " + value); throw new IllegalArgumentException("cannot handle: " + value);
} }
@ -98,6 +100,7 @@ public class OebbProvider extends AbstractHafasProvider
productBits.setCharAt(1, '1'); // ÖBB EC/ÖBB IC productBits.setCharAt(1, '1'); // ÖBB EC/ÖBB IC
productBits.setCharAt(2, '1'); // EC/IC productBits.setCharAt(2, '1'); // EC/IC
productBits.setCharAt(10, '1'); // Autoreisezug productBits.setCharAt(10, '1'); // Autoreisezug
productBits.setCharAt(12, '1'); // westbahn
} }
else if (product == 'R') else if (product == 'R')
{ {