From 95add18fc2f930907a3e53c263a043784b080d08 Mon Sep 17 00:00:00 2001 From: "andreas.schildbach@gmail.com" Date: Sat, 28 Jan 2012 16:07:35 +0000 Subject: [PATCH] fixed parse line#type for Sweden git-svn-id: https://public-transport-enabler.googlecode.com/svn/trunk@916 0924bc21-9374-b0fa-ee44-9ff1593b38f0 --- src/de/schildbach/pte/SeProvider.java | 20 +++++++++++--------- 1 file changed, 11 insertions(+), 9 deletions(-) diff --git a/src/de/schildbach/pte/SeProvider.java b/src/de/schildbach/pte/SeProvider.java index 43268109..c1f68762 100644 --- a/src/de/schildbach/pte/SeProvider.java +++ b/src/de/schildbach/pte/SeProvider.java @@ -22,6 +22,7 @@ import java.util.List; import java.util.regex.Matcher; import java.util.regex.Pattern; +import de.schildbach.pte.dto.Line; import de.schildbach.pte.dto.Location; import de.schildbach.pte.dto.LocationType; import de.schildbach.pte.dto.NearbyStationsResult; @@ -34,8 +35,7 @@ import de.schildbach.pte.util.ParserUtils; public class SeProvider extends AbstractHafasProvider { public static final NetworkId NETWORK_ID = NetworkId.SE; - private static final String API_BASE = "http://reseplanerare.resrobot.se/bin/"; - // http://api.vasttrafik.se/bin/query.exe/sn + private static final String API_BASE = "http://reseplanerare.resrobot.se/bin/"; // http://api.vasttrafik.se/bin/query.exe/sn public SeProvider() { @@ -200,13 +200,15 @@ public class SeProvider extends AbstractHafasProvider return jsonGetStops(uri); } - @Override - protected char normalizeType(final String type) - { - final char t = super.normalizeType(type); - if (t != 0) - return t; + private static final Pattern P_NORMALIZE_LINE_BUS = Pattern.compile("Buss\\s*(.*)"); - return 0; + @Override + protected Line parseLineAndType(final String line) + { + final Matcher mBus = P_NORMALIZE_LINE_BUS.matcher(line); + if (mBus.matches()) + return newLine('B' + mBus.group(1)); + + return newLine('?' + line); } }