more lines

git-svn-id: https://public-transport-enabler.googlecode.com/svn/trunk@227 0924bc21-9374-b0fa-ee44-9ff1593b38f0
This commit is contained in:
andreas.schildbach 2010-10-02 23:24:27 +00:00
parent fa55d7274d
commit e5fefd8c8e
5 changed files with 33 additions and 16 deletions

View file

@ -126,6 +126,10 @@ public abstract class AbstractHafasProvider implements NetworkProvider
return 'I';
if (ucType.equals("DNZ")) // Berlin-Saratov, Berlin-Moskva, Connections only?
return 'I';
if (ucType.equals("AIR")) // Generic Flight
return 'I';
if (ucType.equals("ECB")) // EC, Verona-München
return 'I';
// Regional Germany
if (ucType.equals("ZUG")) // Generic Train
@ -138,6 +142,8 @@ public abstract class AbstractHafasProvider implements NetworkProvider
return 'R';
if (ucType.equals("RE")) // RegionalExpress
return 'R';
if (ucType.equals("IR")) // Interregio
return 'R';
if (ucType.equals("IRE")) // Interregio Express
return 'R';
if (ucType.equals("HEX")) // Harz-Berlin-Express, Veolia
@ -149,6 +155,12 @@ public abstract class AbstractHafasProvider implements NetworkProvider
if (ucType.equals("REX")) // RegionalExpress, Österreich
return 'R';
// Regional Poland
if (ucType.equals("OS")) // Chop-Cierna nas Tisou
return 'R';
if (ucType.equals("SP")) // Polen
return 'R';
// Suburban Trains
if (ucType.equals("S")) // Generic S-Bahn
return 'S';
@ -165,6 +177,10 @@ public abstract class AbstractHafasProvider implements NetworkProvider
if (ucType.equals("BUS")) // Generic Bus
return 'B';
// Ferry
if (ucType.equals("AS")) // SyltShuttle, eigentlich Autoreisezug
return 'F';
return 0;
}

View file

@ -217,8 +217,25 @@ public class NasaProvider extends AbstractHafasProvider
if (t != 0)
return t;
if (ucType.equals("D")) // Rußland Schlafwagenzug
return 'I';
if (ucType.equals("DPF")) // mit Dampflok bespannter Zug
return 'R';
if (ucType.equals("RR")) // Polen
return 'R';
if (ucType.equals("BSV"))
return 'B';
if (ucType.equals("RBS")) // Rufbus
return 'B';
if (ucType.equals("FB")) // Bus
return 'B';
if (ucType.equals("E")) // manchmal S4, manchmal 5stellige Zugnr.
return '?';
if (ucType.equals("EB")) // Europa-Park, vermutlich "Erlebnisbahn"
return '?';
return 0;
}

View file

@ -631,12 +631,8 @@ public class OebbProvider extends AbstractHafasProvider
return 'I';
if (ucType.equals("TGD")) // TGV, Connections only?
return 'I';
if (ucType.equals("ECB")) // EC, Connections only?
return 'I';
if (ucType.equals("IRX")) // IC, Connections only?
return 'I';
if (ucType.equals("AIR")) // Connections only?
return 'I';
if (ucType.equals("EZ")) // Erlebniszug
return 'R';
@ -664,12 +660,6 @@ public class OebbProvider extends AbstractHafasProvider
return 'R';
if (ucType.equals("WKD")) // Warszawska Kolej Dojazdowa, Polen
return 'R';
if (ucType.equals("IR")) // Polen
return 'R';
if (ucType.equals("OS")) // Chop-Cierna nas Tisou
return 'R';
if (ucType.equals("SP")) // Polen
return 'R';
if (ucType.equals("EX")) // Polen
return 'R';
if (ucType.equals("NEB")) // Kostrzyn-Berlin, via JSON API
@ -826,8 +816,6 @@ public class OebbProvider extends AbstractHafasProvider
if (ucType.equals("SCH")) // Connections only?
return 'F';
if (ucType.equals("AS")) // SyltShuttle
return 'F';
if (ucType.equals("SCHIFF")) // via JSON API
return 'F';

View file

@ -542,8 +542,6 @@ public class SbbProvider extends AbstractHafasProvider
if (ucType.equals("ARZ")) // Frankreich, Nacht
return 'I';
if (ucType.equals("IR"))
return 'R';
if (ucType.equals("D"))
return 'R';
if (ucType.equals("E"))

View file

@ -218,8 +218,6 @@ public class SncbProvider extends AbstractHafasProvider
if (ucType.equals("INT")) // Zürich-Brüssel
return 'I';
if (ucType.equals("IR"))
return 'R';
if (ucType.equals("L"))
return 'R';
if (ucType.equals("P"))