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

parsing of 'Y' lines for all efa based providers

Browse source 
git-svn-id: https://public-transport-enabler.googlecode.com/svn/trunk@436 0924bc21-9374-b0fa-ee44-9ff1593b38f0
This commit is contained in:
andreas.schildbach@gmail.com 2011-01-07 22:41:26 +00:00
parent 2dabe921d4
commit 9ad3bc6e02
2 changed files with 3 additions and 12 deletions
Download patch file Download diff file Expand all files Collapse all files

3
src/de/schildbach/pte/AbstractEfaProvider.java
View file

@ -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 + "'");

12
src/de/schildbach/pte/TflProvider.java
View file

@ -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)