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

filter unassociated serving lines

Browse source 
git-svn-id: https://public-transport-enabler.googlecode.com/svn/trunk@472 0924bc21-9374-b0fa-ee44-9ff1593b38f0
This commit is contained in:
andreas.schildbach@gmail.com 2011-01-30 12:15:43 +00:00
parent ba7bf25f83
commit 2a1df9b041
1 changed files with 17 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -868,14 +868,23 @@ public abstract class AbstractEfaProvider implements NetworkProvider
XmlPullUtil.enter(pp, "itdServingLines"); XmlPullUtil.enter(pp, "itdServingLines");
while (XmlPullUtil.test(pp, "itdServingLine")) while (XmlPullUtil.test(pp, "itdServingLine"))
{ {
final String destination = normalizeLocationName(pp.getAttributeValue(null, "direction")); final String assignedStopId = pp.getAttributeValue(null, "assignedStopID");
final String destinationIdStr = pp.getAttributeValue(null, "destID"); if (assignedStopId == null || Integer.parseInt(assignedStopId) == location.id)
final int destinationId = destinationIdStr.length() > 0 ? Integer.parseInt(destinationIdStr) : 0; {
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 String lineStr = processItdServingLine(pp); final String lineStr = processItdServingLine(pp);
final Line line = new Line(lineStr, lineColors(lineStr), destinationId, destination); final Line line = new Line(lineStr, lineColors(lineStr), destinationId, destination);
if (!lines.contains(line)) if (!lines.contains(line))
lines.add(line); lines.add(line);
}
else
{
XmlPullUtil.enter(pp, "itdServingLine");
XmlPullUtil.exit(pp, "itdServingLine");
}
} }
XmlPullUtil.exit(pp, "itdServingLines"); XmlPullUtil.exit(pp, "itdServingLines");
} }
@ -892,7 +901,7 @@ public abstract class AbstractEfaProvider implements NetworkProvider
XmlPullUtil.enter(pp, "itdDepartureList"); XmlPullUtil.enter(pp, "itdDepartureList");
while (XmlPullUtil.test(pp, "itdDeparture")) while (XmlPullUtil.test(pp, "itdDeparture"))
{ {
if (Integer.parseInt(pp.getAttributeValue(null, "stopID")) == location.id) if (XmlPullUtil.intAttr(pp, "stopID") == location.id)
{ {
final String position = normalizePlatform(pp.getAttributeValue(null, "platform"), final String position = normalizePlatform(pp.getAttributeValue(null, "platform"),
pp.getAttributeValue(null, "platformName")); pp.getAttributeValue(null, "platformName"));