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

don't show intermediate stops with invalid date

Browse source 
git-svn-id: https://public-transport-enabler.googlecode.com/svn/trunk@576 0924bc21-9374-b0fa-ee44-9ff1593b38f0
This commit is contained in:
andreas.schildbach@gmail.com 2011-04-29 06:21:28 +00:00
parent 3dca780801
commit f06e30063c
1 changed files with 24 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -1252,22 +1252,33 @@ public abstract class AbstractEfaProvider implements NetworkProvider
return null; return null;
} }
private void processItdDateTime(final XmlPullParser pp, final Calendar calendar) throws XmlPullParserException, IOException private boolean processItdDateTime(final XmlPullParser pp, final Calendar calendar) throws XmlPullParserException, IOException
{ {
XmlPullUtil.enter(pp); XmlPullUtil.enter(pp);
calendar.clear(); calendar.clear();
processItdDate(pp, calendar); final boolean success = processItdDate(pp, calendar);
processItdTime(pp, calendar); if (success)
processItdTime(pp, calendar);
XmlPullUtil.exit(pp); XmlPullUtil.exit(pp);
return success;
} }
private void processItdDate(final XmlPullParser pp, final Calendar calendar) throws XmlPullParserException, IOException private boolean processItdDate(final XmlPullParser pp, final Calendar calendar) throws XmlPullParserException, IOException
{ {
XmlPullUtil.require(pp, "itdDate"); XmlPullUtil.require(pp, "itdDate");
calendar.set(Calendar.YEAR, Integer.parseInt(pp.getAttributeValue(null, "year"))); final int year = Integer.parseInt(pp.getAttributeValue(null, "year"));
calendar.set(Calendar.MONTH, Integer.parseInt(pp.getAttributeValue(null, "month")) - 1); final int month = Integer.parseInt(pp.getAttributeValue(null, "month")) - 1;
calendar.set(Calendar.DAY_OF_MONTH, Integer.parseInt(pp.getAttributeValue(null, "day"))); final int day = Integer.parseInt(pp.getAttributeValue(null, "day"));
XmlPullUtil.next(pp); XmlPullUtil.next(pp);
if (year == 0)
return false;
calendar.set(Calendar.YEAR, year);
calendar.set(Calendar.MONTH, month);
calendar.set(Calendar.DAY_OF_MONTH, day);
return true;
} }
private void processItdTime(final XmlPullParser pp, final Calendar calendar) throws XmlPullParserException, IOException private void processItdTime(final XmlPullParser pp, final Calendar calendar) throws XmlPullParserException, IOException
@ -1589,10 +1600,13 @@ public abstract class AbstractEfaProvider implements NetworkProvider
pp.getAttributeValue(null, "platformName")); pp.getAttributeValue(null, "platformName"));
XmlPullUtil.enter(pp, "itdPoint"); XmlPullUtil.enter(pp, "itdPoint");
XmlPullUtil.require(pp, "itdDateTime"); XmlPullUtil.require(pp, "itdDateTime");
processItdDateTime(pp, stopTime); final boolean success1 = processItdDateTime(pp, stopTime);
final boolean success2 = XmlPullUtil.test(pp, "itdDateTime") ? processItdDateTime(pp, stopTime) : false;
XmlPullUtil.exit(pp, "itdPoint"); XmlPullUtil.exit(pp, "itdPoint");
intermediateStops.add(new Stop(new Location(LocationType.STATION, stopId, null, stopName), stopPosition, stopTime
.getTime())); if (success1 || success2)
intermediateStops.add(new Stop(new Location(LocationType.STATION, stopId, null, stopName), stopPosition,
stopTime.getTime()));
} }
XmlPullUtil.exit(pp, "itdStopSeq"); XmlPullUtil.exit(pp, "itdStopSeq");