From 6ca75b99e9a9f92663ed8d9e4912388e5a2c3f44 Mon Sep 17 00:00:00 2001 From: "andreas.schildbach" Date: Tue, 5 Oct 2010 11:23:19 +0000 Subject: [PATCH] lines for Austria git-svn-id: https://public-transport-enabler.googlecode.com/svn/trunk@239 0924bc21-9374-b0fa-ee44-9ff1593b38f0 --- src/de/schildbach/pte/AbstractHafasProvider.java | 2 ++ src/de/schildbach/pte/OebbProvider.java | 6 +++++- 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/src/de/schildbach/pte/AbstractHafasProvider.java b/src/de/schildbach/pte/AbstractHafasProvider.java index f6c63a28..7a40ed3e 100644 --- a/src/de/schildbach/pte/AbstractHafasProvider.java +++ b/src/de/schildbach/pte/AbstractHafasProvider.java @@ -202,6 +202,8 @@ public abstract class AbstractHafasProvider implements NetworkProvider return 'B'; if (ucType.equals("SEV")) // Schienen-Ersatz-Verkehr return 'B'; + if (ucType.equals("BUSSEV")) // Schienen-Ersatz-Verkehr + return 'B'; if (ucType.equals("FB")) // Luxemburg-Saarbrücken return 'B'; diff --git a/src/de/schildbach/pte/OebbProvider.java b/src/de/schildbach/pte/OebbProvider.java index 0e00c794..93b66e78 100644 --- a/src/de/schildbach/pte/OebbProvider.java +++ b/src/de/schildbach/pte/OebbProvider.java @@ -522,7 +522,7 @@ public class OebbProvider extends AbstractHafasProvider { final Date time = ParserUtils.joinDateTime(ParserUtils.parseDate(departure.getString("da")), ParserUtils.parseTime(departure .getString("ti"))); - final String line = normalizeLine(departure.getString("pr")); + final String line = normalizeLine(ParserUtils.resolveEntities(departure.getString("pr"))); final String destination = ParserUtils.resolveEntities(departure.getString("st")); String position = departure.optString("tr"); if (position != null) @@ -813,6 +813,8 @@ public class OebbProvider extends AbstractHafasProvider return 'F'; if (ucType.equals("SCHIFF")) // via JSON API return 'F'; + if (ucType.equals("F")) // Fähre + return 'F'; if (ucType.equals("SB")) // Connections only? return 'C'; @@ -820,6 +822,8 @@ public class OebbProvider extends AbstractHafasProvider return 'C'; if (ucType.equals("SEILBAHN")) // via JSON API return 'C'; + if (ucType.equals("SSB")) // Graz Schlossbergbahn + return 'C'; if (ucType.equals("FLUG")) // via JSON API return 'I';