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

streamline Bus and Tram special handling

Browse source 
git-svn-id: https://public-transport-enabler.googlecode.com/svn/trunk@921 0924bc21-9374-b0fa-ee44-9ff1593b38f0
This commit is contained in:
andreas.schildbach@gmail.com 2012-01-28 17:31:57 +00:00
parent 0a0b47413e
commit af6a358e6a
1 changed files with 46 additions and 42 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -1809,15 +1809,24 @@ public abstract class AbstractHafasProvider extends AbstractNetworkProvider
} }
protected static final Pattern P_NORMALIZE_LINE = Pattern.compile("([A-Za-zßÄÅäáàâåéèêíìîÖöóòôÜüúùûØ/]+)[\\s-]*([^#]*).*"); protected static final Pattern P_NORMALIZE_LINE = Pattern.compile("([A-Za-zßÄÅäáàâåéèêíìîÖöóòôÜüúùûØ/]+)[\\s-]*([^#]*).*");
private static final Pattern P_NORMALIZE_LINE_BUS = Pattern.compile("Bus\\s*(.*)");
private static final Pattern P_NORMALIZE_LINE_TRAM = Pattern.compile("(?:Tram|Str|STR)\\s*(.*)");
protected Line parseLine(final String type, final String line, final boolean wheelchairAccess) protected Line parseLine(final String type, final String line, final boolean wheelchairAccess)
{ {
final Matcher mBus = P_NORMALIZE_LINE_BUS.matcher(line);
if (mBus.matches())
return newLine('B' + mBus.group(1));
final Matcher mTram = P_NORMALIZE_LINE_TRAM.matcher(line);
if (mTram.matches())
return newLine('T' + mTram.group(1));
final char normalizedType = normalizeType(type); final char normalizedType = normalizeType(type);
if (normalizedType == 0)
throw new IllegalStateException("cannot normalize type '" + type + "' line '" + line + "'");
if (normalizedType != 0)
{
final String lineStr; final String lineStr;
if (line != null) if (line != null)
{ {
final Matcher m = P_NORMALIZE_LINE.matcher(line); final Matcher m = P_NORMALIZE_LINE.matcher(line);
@ -1837,22 +1846,19 @@ public abstract class AbstractHafasProvider extends AbstractNetworkProvider
else else
return newLine(lineStr); return newLine(lineStr);
} }
else
{
throw new IllegalStateException("cannot normalize type '" + type + "' line '" + line + "'");
}
}
private static final Pattern P_LINE_BUS_SPECIAL = Pattern.compile("Bus([A-Z]/[\\dA-Z]+)");
protected Line parseLineWithoutType(final String line) protected Line parseLineWithoutType(final String line)
{ {
if (line == null || line.length() == 0) if (line == null || line.length() == 0)
return null; return null;
final Matcher mBusSpecial = P_LINE_BUS_SPECIAL.matcher(line); final Matcher mBus = P_NORMALIZE_LINE_BUS.matcher(line);
if (mBusSpecial.matches()) if (mBus.matches())
return newLine('B' + mBusSpecial.group(1)); return newLine('B' + mBus.group(1));
final Matcher mTram = P_NORMALIZE_LINE_TRAM.matcher(line);
if (mTram.matches())
return newLine('T' + mTram.group(1));
final Matcher m = P_NORMALIZE_LINE.matcher(line); final Matcher m = P_NORMALIZE_LINE.matcher(line);
if (m.matches()) if (m.matches())
@ -1870,25 +1876,8 @@ public abstract class AbstractHafasProvider extends AbstractNetworkProvider
throw new IllegalStateException("cannot normalize line " + line); throw new IllegalStateException("cannot normalize line " + line);
} }
protected final Line newLine(final String lineStr, final Line.Attr... attrs)
{
if (attrs.length == 0)
{
return new Line(null, lineStr, lineStyle(lineStr));
}
else
{
final Set<Line.Attr> attrSet = new HashSet<Line.Attr>();
for (final Line.Attr attr : attrs)
attrSet.add(attr);
return new Line(null, lineStr, lineStyle(lineStr), attrSet);
}
}
protected static final Pattern P_NORMALIZE_LINE_AND_TYPE = Pattern.compile("([^#]*)#(.*)"); protected static final Pattern P_NORMALIZE_LINE_AND_TYPE = Pattern.compile("([^#]*)#(.*)");
private static final Pattern P_NORMALIZE_LINE_NUMBER = Pattern.compile("\\d{2,5}"); private static final Pattern P_NORMALIZE_LINE_NUMBER = Pattern.compile("\\d{2,5}");
private static final Pattern P_NORMALIZE_LINE_BUS = Pattern.compile("Bus\\s*(.*)");
private static final Pattern P_NORMALIZE_LINE_TRAM = Pattern.compile("(?:Tram|STR)\\s*(.*)");
protected static final Pattern P_LINE_RUSSIA = Pattern protected static final Pattern P_LINE_RUSSIA = Pattern
.compile("\\d{3}(?:AJ|BJ|DJ|FJ|GJ|IJ|KJ|LJ|NJ|MJ|OJ|RJ|SJ|TJ|UJ|VJ|ZJ|CH|KH|ZH|EI|JA|JI|MZ|SH|PC|Y)"); .compile("\\d{3}(?:AJ|BJ|DJ|FJ|GJ|IJ|KJ|LJ|NJ|MJ|OJ|RJ|SJ|TJ|UJ|VJ|ZJ|CH|KH|ZH|EI|JA|JI|MZ|SH|PC|Y)");
@ -1939,6 +1928,21 @@ public abstract class AbstractHafasProvider extends AbstractNetworkProvider
throw new IllegalStateException("cannot normalize line#type '" + lineAndType + "'"); throw new IllegalStateException("cannot normalize line#type '" + lineAndType + "'");
} }
protected final Line newLine(final String lineStr, final Line.Attr... attrs)
{
if (attrs.length == 0)
{
return new Line(null, lineStr, lineStyle(lineStr));
}
else
{
final Set<Line.Attr> attrSet = new HashSet<Line.Attr>();
for (final Line.Attr attr : attrs)
attrSet.add(attr);
return new Line(null, lineStr, lineStyle(lineStr), attrSet);
}
}
private static final Pattern P_CONNECTION_ID = Pattern.compile("co=(C\\d+-\\d+)&"); private static final Pattern P_CONNECTION_ID = Pattern.compile("co=(C\\d+-\\d+)&");
protected static String extractConnectionId(final String link) protected static String extractConnectionId(final String link)