From 9ad3bc6e02ef85fb19d20c0a5eddf8c4a3685e9d Mon Sep 17 00:00:00 2001 From: "andreas.schildbach@gmail.com" Date: Fri, 7 Jan 2011 22:41:26 +0000 Subject: [PATCH] parsing of 'Y' lines for all efa based providers git-svn-id: https://public-transport-enabler.googlecode.com/svn/trunk@436 0924bc21-9374-b0fa-ee44-9ff1593b38f0 --- src/de/schildbach/pte/AbstractEfaProvider.java | 3 +++ src/de/schildbach/pte/TflProvider.java | 12 ------------ 2 files changed, 3 insertions(+), 12 deletions(-) diff --git a/src/de/schildbach/pte/AbstractEfaProvider.java b/src/de/schildbach/pte/AbstractEfaProvider.java index 1b035da0..d6c56795 100644 --- a/src/de/schildbach/pte/AbstractEfaProvider.java +++ b/src/de/schildbach/pte/AbstractEfaProvider.java @@ -351,6 +351,7 @@ public abstract class AbstractEfaProvider implements NetworkProvider private static final Pattern P_LINE_U = Pattern.compile("U\\d+"); private static final Pattern P_LINE_S = Pattern.compile("^(?:%)?(S\\d+)"); private static final Pattern P_LINE_NUMBER = Pattern.compile("\\d+"); + private static final Pattern P_LINE_Y = Pattern.compile("\\d+Y"); protected String parseLine(final String mot, final String name, final String longName, final String noTrainName) { @@ -720,6 +721,8 @@ public abstract class AbstractEfaProvider implements NetworkProvider return "?"; if (P_LINE_NUMBER.matcher(type).matches()) return "?"; + if (P_LINE_Y.matcher(name).matches()) + return "?" + name; throw new IllegalStateException("cannot normalize mot '" + mot + "' name '" + name + "' long '" + longName + "' noTrainName '" + noTrainName + "' type '" + type + "' str '" + str + "'"); diff --git a/src/de/schildbach/pte/TflProvider.java b/src/de/schildbach/pte/TflProvider.java index 66fe6827..0af95e28 100644 --- a/src/de/schildbach/pte/TflProvider.java +++ b/src/de/schildbach/pte/TflProvider.java @@ -23,7 +23,6 @@ import java.util.Date; import java.util.HashMap; import java.util.Map; import java.util.TimeZone; -import java.util.regex.Pattern; import de.schildbach.pte.dto.Location; import de.schildbach.pte.util.Color; @@ -96,17 +95,6 @@ public class TflProvider extends AbstractEfaProvider return uri.toString(); } - private static final Pattern P_LINE_Y = Pattern.compile("\\d+Y"); - - @Override - protected String parseLine(final String mot, final String name, final String longName, final String noTrainName) - { - if (P_LINE_Y.matcher(name).matches()) - return "?" + name; - else - return super.parseLine(mot, name, longName, noTrainName); - } - @Override protected String connectionsQueryUri(final Location from, final Location via, final Location to, final Date date, final boolean dep, final String products, final WalkSpeed walkSpeed)