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

replace strange '$XINT$' tokens in location names of San Francisco

Browse source 
git-svn-id: https://public-transport-enabler.googlecode.com/svn/trunk@605 0924bc21-9374-b0fa-ee44-9ff1593b38f0
This commit is contained in:
andreas.schildbach@gmail.com 2011-05-06 16:52:20 +00:00
parent dc0f0ea8cc
commit e26eff18c2
2 changed files with 13 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -913,7 +913,7 @@ public abstract class AbstractEfaProvider implements NetworkProvider
return 'R' + name; return 'R' + name;
if ("CAPITOL".equals(name)) // San Francisco if ("CAPITOL".equals(name)) // San Francisco
return 'R' + name; return 'R' + name;
if ("Train".equals(noTrainName)) // San Francisco if ("Train".equals(noTrainName) || "Train".equals(type)) // San Francisco
return "R" + name; return "R" + name;
if ("Regional Train :".equals(longName)) if ("Regional Train :".equals(longName))
return "R"; return "R";
@ -1271,7 +1271,7 @@ public abstract class AbstractEfaProvider implements NetworkProvider
private static final Pattern P_STATION_NAME_WHITESPACE = Pattern.compile("\\s+"); private static final Pattern P_STATION_NAME_WHITESPACE = Pattern.compile("\\s+");
protected static String normalizeLocationName(final String name) protected String normalizeLocationName(final String name)
{ {
if (name == null || name.length() == 0) if (name == null || name.length() == 0)
return null; return null;

13
src/de/schildbach/pte/SfProvider.java
View file

@ -49,7 +49,7 @@ public class SfProvider extends AbstractEfaProvider
return TimeZone.getTimeZone("America/Los_Angeles"); return TimeZone.getTimeZone("America/Los_Angeles");
} }
public boolean hasCapabilities(Capability... capabilities) public boolean hasCapabilities(final Capability... capabilities)
{ {
for (final Capability capability : capabilities) for (final Capability capability : capabilities)
if (capability == Capability.AUTOCOMPLETE_ONE_LINE || capability == Capability.DEPARTURES || capability == Capability.CONNECTIONS) if (capability == Capability.AUTOCOMPLETE_ONE_LINE || capability == Capability.DEPARTURES || capability == Capability.CONNECTIONS)
@ -59,7 +59,16 @@ public class SfProvider extends AbstractEfaProvider
} }
@Override @Override
protected String parseLine(String mot, String name, String longName, String noTrainName) protected String normalizeLocationName(final String name)
{
if (name == null || name.length() == 0)
return null;
return super.normalizeLocationName(name).replace("$XINT$", "&");
}
@Override
protected String parseLine(final String mot, final String name, final String longName, final String noTrainName)
{ {
if ("NORTHBOUND".equals(name)) if ("NORTHBOUND".equals(name))
return "?" + name; return "?" + name;