From 51db8036e5f6628d5490c529ef3d30641555a36e Mon Sep 17 00:00:00 2001 From: "andreas.schildbach@gmail.com" Date: Thu, 16 Dec 2010 13:11:36 +0000 Subject: [PATCH] more lines git-svn-id: https://public-transport-enabler.googlecode.com/svn/trunk@397 0924bc21-9374-b0fa-ee44-9ff1593b38f0 --- src/de/schildbach/pte/AbstractHafasProvider.java | 2 ++ src/de/schildbach/pte/BahnProvider.java | 2 ++ src/de/schildbach/pte/BvgProvider.java | 6 ++++-- 3 files changed, 8 insertions(+), 2 deletions(-) diff --git a/src/de/schildbach/pte/AbstractHafasProvider.java b/src/de/schildbach/pte/AbstractHafasProvider.java index cfc97e21..8213b4b5 100644 --- a/src/de/schildbach/pte/AbstractHafasProvider.java +++ b/src/de/schildbach/pte/AbstractHafasProvider.java @@ -627,6 +627,8 @@ public abstract class AbstractHafasProvider implements NetworkProvider return "I" + normalizedName; if ("NZ".equals(normalizedType)) // Nacht-Zug return "I" + normalizedName; + if ("FYR".equals(normalizedType)) // Fyra, Amsterdam-Schiphol-Rotterdam + return "I" + normalizedName; if ("R".equals(normalizedType)) // Regio return "R" + normalizedName; diff --git a/src/de/schildbach/pte/BahnProvider.java b/src/de/schildbach/pte/BahnProvider.java index ffdde523..41ad657b 100644 --- a/src/de/schildbach/pte/BahnProvider.java +++ b/src/de/schildbach/pte/BahnProvider.java @@ -782,6 +782,8 @@ public final class BahnProvider extends AbstractHafasProvider return "RVE" + number; if (type.equals("DZ")) // Dampfzug Freiburg-Innsbruck return "RDZ " + number; + if (type.equals("ag")) // Regensburg-Landshut + return "Rag " + number; if (type.equals("S")) return "SS" + number; diff --git a/src/de/schildbach/pte/BvgProvider.java b/src/de/schildbach/pte/BvgProvider.java index 74c09ab1..cf18d582 100644 --- a/src/de/schildbach/pte/BvgProvider.java +++ b/src/de/schildbach/pte/BvgProvider.java @@ -684,6 +684,8 @@ public final class BvgProvider extends AbstractHafasProvider return "IEN" + number; if (type.equals("CNL")) // CityNightLine return "ICNL" + number; + if (type.equals("IR")) + return "R" + number; if (type.equals("Zug")) return "R" + number; if (type.equals("ZUG")) @@ -715,10 +717,10 @@ public final class BvgProvider extends AbstractHafasProvider if (type.equals("F")) return "FF" + number; - throw new IllegalStateException("cannot normalize type " + type + " line " + line); + throw new IllegalStateException("cannot normalize type '" + type + "' number '" + number + "' line '" + line + "'"); } - throw new IllegalStateException("cannot normalize line " + line); + throw new IllegalStateException("cannot normalize line '" + line + "'"); } @Override