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

'unknown' line type

Browse source 
git-svn-id: https://public-transport-enabler.googlecode.com/svn/trunk@54 0924bc21-9374-b0fa-ee44-9ff1593b38f0
This commit is contained in:
andreas.schildbach 2010-08-10 08:29:53 +00:00
parent af646c7e79
commit f502ca21f3
1 changed files with 10 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -487,10 +487,10 @@ public final class BahnProvider implements NetworkProvider
return new Departure(parsed.getTime(), line, line != null ? LINES.get(line.charAt(0)) : null, destination); return new Departure(parsed.getTime(), line, line != null ? LINES.get(line.charAt(0)) : null, destination);
} }
private static final Pattern P_NORMALIZE_LINE_NUMBER = Pattern.compile("\\d{2,5}");
private static final Pattern P_NORMALIZE_LINE = Pattern.compile("([A-Za-zÄÖÜäöüß]+)[\\s-]*(.*)"); private static final Pattern P_NORMALIZE_LINE = Pattern.compile("([A-Za-zÄÖÜäöüß]+)[\\s-]*(.*)");
private static final Pattern P_NORMALIZE_LINE_RUSSIA = Pattern.compile("(?:D\\s*)?(\\d{1,3}[A-Z]{2})"); private static final Pattern P_NORMALIZE_LINE_RUSSIA = Pattern.compile("(?:D\\s*)?(\\d{1,3}[A-Z]{2})");
private static final Pattern P_NORMALIZE_LINE_SBAHN = Pattern.compile("S\\w*\\d+"); private static final Pattern P_NORMALIZE_LINE_SBAHN = Pattern.compile("S\\w*\\d+");
private static final Pattern P_NORMALIZE_LINE_NUMBER = Pattern.compile("\\d{3,5}");
private static String normalizeLine(final String line) private static String normalizeLine(final String line)
{ {
@ -501,6 +501,12 @@ public final class BahnProvider implements NetworkProvider
if (line == null || line.length() == 0) if (line == null || line.length() == 0)
return null; return null;
if (line.equals("---"))
return "?---";
if (P_NORMALIZE_LINE_NUMBER.matcher(line).matches()) // just numbers
return "?" + line;
final Matcher mRussia = P_NORMALIZE_LINE_RUSSIA.matcher(line); final Matcher mRussia = P_NORMALIZE_LINE_RUSSIA.matcher(line);
if (mRussia.matches()) if (mRussia.matches())
return "R" + mRussia.group(1); return "R" + mRussia.group(1);
@ -551,8 +557,6 @@ public final class BahnProvider implements NetworkProvider
return "R" + number; return "R" + number;
if (type.equals("IR")) // InterRegio if (type.equals("IR")) // InterRegio
return "RIR" + number; return "RIR" + number;
if (type.equals("D")) // D-Zug?
return "RD" + number;
if (type.equals("RB")) // RegionalBahn if (type.equals("RB")) // RegionalBahn
return "RRB" + number; return "RRB" + number;
if (type.equals("RE")) // RegionalExpress if (type.equals("RE")) // RegionalExpress
@ -746,13 +750,11 @@ public final class BahnProvider implements NetworkProvider
else else
return "RE" + number; return "RE" + number;
} }
if (type.equals("D"))
return "?D" + number;
throw new IllegalStateException("cannot normalize type " + type + " number " + number + " line " + line); throw new IllegalStateException("cannot normalize type " + type + " number " + number + " line " + line);
} }
else if (P_NORMALIZE_LINE_NUMBER.matcher(line).matches()) // Polen, Niederlande... leider unscharf
{
return "R" + line;
}
throw new IllegalStateException("cannot normalize line " + line); throw new IllegalStateException("cannot normalize line " + line);
} }
@ -768,6 +770,7 @@ public final class BahnProvider implements NetworkProvider
LINES.put('T', new int[] { Color.parseColor("#cc0000"), Color.WHITE }); LINES.put('T', new int[] { Color.parseColor("#cc0000"), Color.WHITE });
LINES.put('B', new int[] { Color.parseColor("#993399"), Color.WHITE }); LINES.put('B', new int[] { Color.parseColor("#993399"), Color.WHITE });
LINES.put('F', new int[] { Color.BLUE, Color.WHITE }); LINES.put('F', new int[] { Color.BLUE, Color.WHITE });
LINES.put('?', new int[] { Color.DKGRAY, Color.WHITE });
} }
public int[] lineColors(final String line) public int[] lineColors(final String line)