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

more lines

Browse source 
git-svn-id: https://public-transport-enabler.googlecode.com/svn/trunk@658 0924bc21-9374-b0fa-ee44-9ff1593b38f0
This commit is contained in:
andreas.schildbach@gmail.com 2011-05-25 11:21:23 +00:00
parent 7b5f1afd03
commit 5d6d496a35
6 changed files with 26 additions and 26 deletions
Download patch file Download diff file Expand all files Collapse all files

8
src/de/schildbach/pte/AbstractHafasProvider.java
View file

@ -1406,8 +1406,6 @@ public abstract class AbstractHafasProvider implements NetworkProvider
return 'U'; return 'U';
if ("MET".equals(ucType)) if ("MET".equals(ucType))
return 'U'; return 'U';
// if ("M".equals(normalizedType)) // Metro
// return "U" + normalizedName;
// Tram // Tram
if (P_LINE_TRAM.matcher(ucType).matches()) // Generic Tram if (P_LINE_TRAM.matcher(ucType).matches()) // Generic Tram
@ -1416,8 +1414,6 @@ public abstract class AbstractHafasProvider implements NetworkProvider
return 'T'; return 'T';
if ("TRA".equals(ucType)) if ("TRA".equals(ucType))
return 'T'; return 'T';
// if ("T".equals(normalizedType)) // Tram
// return "T" + normalizedName;
// Bus // Bus
if (P_LINE_BUS.matcher(ucType).matches()) // Generic Bus if (P_LINE_BUS.matcher(ucType).matches()) // Generic Bus
@ -1450,14 +1446,14 @@ public abstract class AbstractHafasProvider implements NetworkProvider
return 'B'; return 'B';
// if ("N".equals(normalizedType)) // Nachtbus // if ("N".equals(normalizedType)) // Nachtbus
// return "B" + normalizedName; // return "B" + normalizedName;
// if ("TX".equals(normalizedType)) // Taxi
// return "B" + normalizedName;
// Ferry // Ferry
if ("SCHIFF".equals(ucType)) if ("SCHIFF".equals(ucType))
return 'F'; return 'F';
if ("FÄHRE".equals(ucType)) if ("FÄHRE".equals(ucType))
return 'F'; return 'F';
if ("FAE".equals(ucType))
return 'F';
if ("SCH".equals(ucType)) // Schiff if ("SCH".equals(ucType)) // Schiff
return 'F'; return 'F';
if ("AS".equals(ucType)) // SyltShuttle, eigentlich Autoreisezug if ("AS".equals(ucType)) // SyltShuttle, eigentlich Autoreisezug

4
src/de/schildbach/pte/BahnProvider.java
View file

@ -797,6 +797,8 @@ public final class BahnProvider extends AbstractHafasProvider
return "SDPN" + number; return "SDPN" + number;
if (type.equals("WKD")) // Warszawska Kolej Dojazdowa (Warsaw Suburban Railway) if (type.equals("WKD")) // Warszawska Kolej Dojazdowa (Warsaw Suburban Railway)
return "SWKD" + number; return "SWKD" + number;
if (type.equals("SE")) // S-Bahn Kopenhagen
return "SE" + number;
if (type.equals("U")) if (type.equals("U"))
return "UU" + number; return "UU" + number;
@ -836,6 +838,8 @@ public final class BahnProvider extends AbstractHafasProvider
return "BRFB" + type.substring(3) + number; return "BRFB" + type.substring(3) + number;
if (type.equals("RNV")) // Rhein-Neckar-Verkehr GmbH - TODO aufteilen in Tram/Bus/Fähre if (type.equals("RNV")) // Rhein-Neckar-Verkehr GmbH - TODO aufteilen in Tram/Bus/Fähre
return "BRNV" + number; return "BRNV" + number;
if (type.equals("LTT"))
return "BLTT" + number;
if (type.equals("Fähre")) if (type.equals("Fähre"))
return "F" + number; return "F" + number;

2
src/de/schildbach/pte/RmvProvider.java
View file

@ -287,6 +287,8 @@ public class RmvProvider extends AbstractHafasProvider
return "RRB" + number; return "RRB" + number;
if (type.equals("RE")) // RegionalExpress if (type.equals("RE")) // RegionalExpress
return "RRE" + number; return "RRE" + number;
if (type.equals("IRE")) // Interregio Express
return "RIRE" + number;
if (type.equals("SE")) // StadtExpress if (type.equals("SE")) // StadtExpress
return "RSE" + number; return "RSE" + number;
if (type.equals("R")) if (type.equals("R"))

10
src/de/schildbach/pte/SbbProvider.java
View file

@ -141,18 +141,18 @@ public class SbbProvider extends AbstractHafasProvider
{ {
final String ucType = type.toUpperCase(); final String ucType = type.toUpperCase();
if (ucType.equals("IN")) // Italien Roma-Lecce if ("IN".equals(ucType)) // Italien Roma-Lecce
return 'I'; return 'I';
if (ucType.equals("E")) if ("E".equals(ucType))
return 'R'; return 'R';
if (ucType.equals("T")) if ("T".equals(ucType))
return 'R'; return 'R';
if (ucType.equals("M")) // Metro Wien if ("M".equals(ucType)) // Metro Wien
return 'U'; return 'U';
if (ucType.equals("TX")) if ("TX".equals(ucType))
return 'B'; return 'B';
final char t = super.normalizeType(type); final char t = super.normalizeType(type);

24
src/de/schildbach/pte/SncbProvider.java
View file

@ -206,31 +206,33 @@ public class SncbProvider extends AbstractHafasProvider
{ {
final String ucType = type.toUpperCase(); final String ucType = type.toUpperCase();
if (ucType.equals("INT")) // Zürich-Brüssel if ("INT".equals(ucType)) // Zürich-Brüssel
return 'I'; return 'I';
if (ucType.startsWith("IC ")) if ("IC ".startsWith(ucType))
return 'I';
if ("THA".equals(ucType)) // Thalys
return 'I'; return 'I';
if (ucType.startsWith("IR ")) if ("IR ".startsWith(ucType))
return 'R'; return 'R';
if (ucType.equals("L")) if ("L".equals(ucType))
return 'R'; return 'R';
if (ucType.equals("P")) if ("P".equals(ucType))
return 'R'; return 'R';
if (ucType.equals("CR")) if ("CR".equals(ucType))
return 'R'; return 'R';
if (ucType.equals("ICT")) // Brügge if ("ICT".equals(ucType)) // Brügge
return 'R'; return 'R';
if (ucType.equals("TRN")) // Mons if ("TRN".equals(ucType)) // Mons
return 'R'; return 'R';
if (ucType.equals("MÉT")) if ("MÉT".equals(ucType))
return 'U'; return 'U';
if (ucType.equals("MÉTRO")) if ("MÉTRO".equals(ucType))
return 'U'; return 'U';
if (ucType.equals("TRAMWAY")) if ("TRAMWAY".equals(ucType))
return 'T'; return 'T';
final char t = super.normalizeType(type); final char t = super.normalizeType(type);

4
src/de/schildbach/pte/ZvvProvider.java
View file

@ -150,15 +150,11 @@ public class ZvvProvider extends AbstractHafasProvider
if ("D-SCHIFF".equals(ucType)) if ("D-SCHIFF".equals(ucType))
return 'F'; return 'F';
if ("FAE".equals(ucType))
return 'F';
if ("BERGBAHN".equals(ucType)) if ("BERGBAHN".equals(ucType))
return 'C'; return 'C';
if ("SEILBAHN".equals(ucType)) if ("SEILBAHN".equals(ucType))
return 'C'; return 'C';
if ("SL".equals(ucType)) // Sessel-Lift
return 'C';
if ("UNB".equals(ucType)) if ("UNB".equals(ucType))
return '?'; return '?';