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

refactored normalizeLine to parseLine

Browse source 
git-svn-id: https://public-transport-enabler.googlecode.com/svn/trunk@788 0924bc21-9374-b0fa-ee44-9ff1593b38f0
This commit is contained in:
andreas.schildbach@gmail.com 2011-09-25 11:01:04 +00:00
parent 5cbbd7f175
commit ed80d13ff9
5 changed files with 41 additions and 25 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -923,8 +923,7 @@ public abstract class AbstractHafasProvider implements NetworkProvider
if (category == null)
category = shortCategory;
final String lineStr = normalizeLine(category, name);
line = new Line(null, lineStr, lineColors(lineStr));
line = parseLine(category, name);
}
else if (tag.equals("Walk") || tag.equals("Transfer") || tag.equals("GisRoute"))
{
@ -1687,26 +1686,32 @@ public abstract class AbstractHafasProvider implements NetworkProvider
protected static final Pattern P_NORMALIZE_LINE = Pattern.compile("([A-Za-zßÄÅäáàâåéèêíìîÖöóòôÜüúùûØ/]+)[\\s-]*(.*)");
protected String normalizeLine(final String type, final String line)
protected Line parseLine(final String type, final String line)
{
final char normalizedType = normalizeType(type);
if (normalizedType != 0)
{
final String lineStr;
if (line != null)
{
final Matcher m = P_NORMALIZE_LINE.matcher(line);
final String strippedLine = m.matches() ? m.group(1) + m.group(2) : line;
return normalizedType + strippedLine;
lineStr = normalizedType + strippedLine;
}
else
{
return Character.toString(normalizedType);
lineStr = Character.toString(normalizedType);
}
}
throw new IllegalStateException("cannot normalize type '" + type + "' line '" + line + "'");
return new Line(null, lineStr, lineColors(lineStr));
}
else
{
throw new IllegalStateException("cannot normalize type '" + type + "' line '" + line + "'");
}
}
protected String normalizeLine(final String line)