capacity for connections

git-svn-id: https://public-transport-enabler.googlecode.com/svn/trunk@676 0924bc21-9374-b0fa-ee44-9ff1593b38f0
This commit is contained in:
andreas.schildbach@gmail.com 2011-06-07 07:12:50 +00:00
parent aa70c2b4fb
commit f00c4dd4f0
6 changed files with 41 additions and 8 deletions

View file

@ -623,7 +623,7 @@ public abstract class AbstractHafasProvider implements NetworkProvider
throws IOException
{
// System.out.println(request);
// ParserUtils.printXml(ParserUtils.scrape(apiUri, true, wrap(request), null, false));
// ParserUtils.printXml(ParserUtils.scrape(apiUri, true, wrap(request), null, null));
InputStream is = null;
@ -697,6 +697,35 @@ public abstract class AbstractHafasProvider implements NetworkProvider
while (pp.getName().equals("StAttrList"))
XmlPullUtil.next(pp);
final Location departure = parseLocation(pp);
XmlPullUtil.enter(pp, "Dep");
XmlPullUtil.exit(pp, "Dep");
final int[] capacity;
if (XmlPullUtil.test(pp, "StopPrognosis"))
{
XmlPullUtil.enter(pp, "StopPrognosis");
if (XmlPullUtil.test(pp, "Arr"))
XmlPullUtil.next(pp);
if (XmlPullUtil.test(pp, "Dep"))
XmlPullUtil.next(pp);
XmlPullUtil.enter(pp, "Status");
XmlPullUtil.exit(pp, "Status");
if (XmlPullUtil.test(pp, "Capacity1st"))
{
final int capacity1st = Integer.parseInt(XmlPullUtil.text(pp));
XmlPullUtil.require(pp, "Capacity2nd");
final int capacity2nd = Integer.parseInt(XmlPullUtil.text(pp));
capacity = new int[] { capacity1st, capacity2nd };
}
else
{
capacity = null;
}
XmlPullUtil.exit(pp, "StopPrognosis");
}
else
{
capacity = null;
}
XmlPullUtil.exit(pp, "BasicStop");
XmlPullUtil.exit(pp, "Departure");
@ -893,7 +922,7 @@ public abstract class AbstractHafasProvider implements NetworkProvider
XmlPullUtil.exit(pp, "Connection");
connections.add(new Connection(id, null, firstDepartureTime, lastArrivalTime, departure, arrival, parts, null));
connections.add(new Connection(id, null, firstDepartureTime, lastArrivalTime, departure, arrival, parts, null, capacity));
}
XmlPullUtil.exit(pp);