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

parse <noTrain />

Browse source 
git-svn-id: https://public-transport-enabler.googlecode.com/svn/trunk@380 0924bc21-9374-b0fa-ee44-9ff1593b38f0
This commit is contained in:
andreas.schildbach 2010-12-04 01:15:37 +00:00
parent 87a1fd2781
commit cc81262592
1 changed files with 52 additions and 25 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -352,10 +352,30 @@ public abstract class AbstractEfaProvider implements NetworkProvider
private static final Pattern P_LINE_S = Pattern.compile("^(?:%)?(S\\d+)"); private static final Pattern P_LINE_S = Pattern.compile("^(?:%)?(S\\d+)");
private static final Pattern P_LINE_NUMBER = Pattern.compile("\\d+"); private static final Pattern P_LINE_NUMBER = Pattern.compile("\\d+");
protected String parseLine(final String mot, final String name, final String longName) protected String parseLine(final String mot, final String name, final String longName, final String noTrainName)
{ {
if (mot == null || name == null || longName == null) if (mot == null)
throw new IllegalStateException("cannot normalize mot '" + mot + "' name '" + name + "' long '" + longName + "'"); {
if (noTrainName != null)
{
final String str = name != null ? name : "";
if (noTrainName.equals("S-Bahn"))
return 'S' + str;
if (noTrainName.equals("Citybus"))
return 'B' + str;
if (noTrainName.equals("Regionalbus"))
return 'B' + str;
if (noTrainName.equals("ÖBB-Postbus"))
return 'B' + str;
if (noTrainName.equals("Autobus"))
return 'B' + str;
if (noTrainName.equals("Anrufsammeltaxi"))
return 'B' + str;
}
throw new IllegalStateException("cannot normalize mot '" + mot + "' name '" + name + "' long '" + longName + "' noTrainName '"
+ noTrainName + "'");
}
final int t = Integer.parseInt(mot); final int t = Integer.parseInt(mot);
@ -647,7 +667,8 @@ public abstract class AbstractEfaProvider implements NetworkProvider
if (P_LINE_NUMBER.matcher(type).matches()) if (P_LINE_NUMBER.matcher(type).matches())
return "?"; return "?";
throw new IllegalArgumentException("cannot normalize: long '" + longName + "' type '" + type + "' str '" + str + "'"); throw new IllegalStateException("cannot normalize mot '" + mot + "' name '" + name + "' long '" + longName + "' noTrainName '"
+ noTrainName + "' type '" + type + "' str '" + str + "'");
} }
if (t == 1) if (t == 1)
@ -682,7 +703,8 @@ public abstract class AbstractEfaProvider implements NetworkProvider
if (t == 11 || t == -1) if (t == 11 || t == -1)
return '?' + name; return '?' + name;
throw new IllegalStateException("cannot normalize mot '" + mot + "' name '" + name + "' long '" + longName + "'"); throw new IllegalStateException("cannot normalize mot '" + mot + "' name '" + name + "' long '" + longName + "' noTrainName '" + noTrainName
+ "'");
} }
protected abstract String departuresQueryUri(String stationId, int maxDepartures); protected abstract String departuresQueryUri(String stationId, int maxDepartures);
@ -730,24 +752,14 @@ public abstract class AbstractEfaProvider implements NetworkProvider
XmlPullUtil.enter(pp, "itdServingLines"); XmlPullUtil.enter(pp, "itdServingLines");
while (XmlPullUtil.test(pp, "itdServingLine")) while (XmlPullUtil.test(pp, "itdServingLine"))
{ {
try final String destination = normalizeLocationName(pp.getAttributeValue(null, "direction"));
{ final String destinationIdStr = pp.getAttributeValue(null, "destID");
final String lineStr = parseLine(pp.getAttributeValue(null, "motType"), pp.getAttributeValue(null, "number"), pp final int destinationId = destinationIdStr.length() > 0 ? Integer.parseInt(destinationIdStr) : 0;
.getAttributeValue(null, "number"));
final String destination = normalizeLocationName(pp.getAttributeValue(null, "direction"));
final String destinationIdStr = pp.getAttributeValue(null, "destID");
final int destinationId = destinationIdStr.length() > 0 ? Integer.parseInt(destinationIdStr) : 0;
final Line line = new Line(lineStr, lineColors(lineStr), destinationId, destination);
if (!lines.contains(line))
lines.add(line);
}
catch (final IllegalArgumentException x)
{
// swallow for now
}
XmlPullUtil.enter(pp); final String lineStr = processItdServingLine(pp);
XmlPullUtil.exit(pp); final Line line = new Line(lineStr, lineColors(lineStr), destinationId, destination);
if (!lines.contains(line))
lines.add(line);
} }
XmlPullUtil.exit(pp, "itdServingLines"); XmlPullUtil.exit(pp, "itdServingLines");
} }
@ -783,12 +795,12 @@ public abstract class AbstractEfaProvider implements NetworkProvider
XmlPullUtil.next(pp); XmlPullUtil.next(pp);
XmlPullUtil.require(pp, "itdServingLine"); XmlPullUtil.require(pp, "itdServingLine");
final String line = parseLine(pp.getAttributeValue(null, "motType"), pp.getAttributeValue(null, "number"), pp
.getAttributeValue(null, "number"));
final boolean isRealtime = pp.getAttributeValue(null, "realtime").equals("1"); final boolean isRealtime = pp.getAttributeValue(null, "realtime").equals("1");
final String destination = normalizeLocationName(pp.getAttributeValue(null, "direction")); final String destination = normalizeLocationName(pp.getAttributeValue(null, "direction"));
final int destinationId = Integer.parseInt(pp.getAttributeValue(null, "destID")); final int destinationId = Integer.parseInt(pp.getAttributeValue(null, "destID"));
final String line = processItdServingLine(pp);
if (isRealtime && !predictedDepartureTime.isSet(Calendar.HOUR_OF_DAY)) if (isRealtime && !predictedDepartureTime.isSet(Calendar.HOUR_OF_DAY))
predictedDepartureTime.setTimeInMillis(plannedDepartureTime.getTimeInMillis()); predictedDepartureTime.setTimeInMillis(plannedDepartureTime.getTimeInMillis());
@ -854,6 +866,21 @@ public abstract class AbstractEfaProvider implements NetworkProvider
XmlPullUtil.next(pp); XmlPullUtil.next(pp);
} }
private String processItdServingLine(final XmlPullParser pp) throws XmlPullParserException, IOException
{
XmlPullUtil.require(pp, "itdServingLine");
final String motType = pp.getAttributeValue(null, "motType");
final String number = pp.getAttributeValue(null, "number");
XmlPullUtil.enter(pp, "itdServingLine");
String noTrainName = null;
if (XmlPullUtil.test(pp, "itdNoTrain"))
noTrainName = pp.getAttributeValue(null, "name");
XmlPullUtil.exit(pp, "itdServingLine");
return parseLine(motType, number, number, noTrainName);
}
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 static String normalizeLocationName(final String name)
@ -1106,7 +1133,7 @@ public abstract class AbstractEfaProvider implements NetworkProvider
line = "BAST"; line = "BAST";
else else
line = parseLine(pp.getAttributeValue(null, "motType"), pp.getAttributeValue(null, "shortname"), pp line = parseLine(pp.getAttributeValue(null, "motType"), pp.getAttributeValue(null, "shortname"), pp
.getAttributeValue(null, "name")); .getAttributeValue(null, "name"), null);
XmlPullUtil.enter(pp, "itdMeansOfTransport"); XmlPullUtil.enter(pp, "itdMeansOfTransport");
XmlPullUtil.exit(pp, "itdMeansOfTransport"); XmlPullUtil.exit(pp, "itdMeansOfTransport");