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

normalizeLine() to return Line rather than String

Browse source 
git-svn-id: https://public-transport-enabler.googlecode.com/svn/trunk@810 0924bc21-9374-b0fa-ee44-9ff1593b38f0
This commit is contained in:
andreas.schildbach@gmail.com 2011-10-06 12:57:02 +00:00
parent 95dd3cf7ac
commit b7ab26c57c
15 changed files with 86 additions and 127 deletions
Download patch file Download diff file Expand all files Collapse all files

19
src/de/schildbach/pte/BahnProvider.java
View file

@ -453,8 +453,7 @@ public final class BahnProvider extends AbstractHafasProvider
if (mDetFine.group(2) != null)
{
final String lineStr = normalizeLine(ParserUtils.resolveEntities(mDetFine.group(2)));
final Line line = new Line(null, lineStr, lineColors(lineStr));
final Line line = normalizeLine(ParserUtils.resolveEntities(mDetFine.group(2)));
final Calendar departureTime = new GregorianCalendar(timeZone());
departureTime.clear();
@ -555,10 +554,6 @@ public final class BahnProvider extends AbstractHafasProvider
if ("LTT".equals(ucType))
return 'B';
if (ucType.startsWith("AST")) // Anruf-Sammel-Taxi
return 'P';
if (ucType.startsWith("ALT")) // Anruf-Linien-Taxi
return 'P';
if (ucType.startsWith("RFB")) // Rufbus
return 'P';
@ -578,22 +573,22 @@ public final class BahnProvider extends AbstractHafasProvider
private static final Pattern P_LINE_NUMBER = Pattern.compile("\\d{2,5}");
@Override
protected final String normalizeLine(final String line)
protected final Line normalizeLine(final String line)
{
if ("Schw-B".equals(line)) // Schwebebahn, gilt als "Straßenbahn besonderer Bauart"
return 'T' + line;
return newLine('T' + line);
if (P_LINE_BUS_SPECIAL.matcher(line).matches())
return "B" + line;
return newLine('B' + line);
if (P_LINE_RUSSIA.matcher(line).matches())
return 'R' + line;
return newLine('R' + line);
if (P_LINE_NUMBER.matcher(line).matches())
return "?" + line;
return newLine('?' + line);
if ("---".equals(line))
return "?" + line;
return newLine('?' + line);
return super.normalizeLine(line);
}