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

EFA: Fix parsing of unset planned/predicted times in mobile trips query.

Browse source
This commit is contained in:
Andreas Schildbach 2015-01-31 21:34:55 +01:00
parent fd3a932957
commit bb5314f7ec
1 changed files with 18 additions and 19 deletions
Download patch file Download diff file Expand all files Collapse all files

37
enabler/src/de/schildbach/pte/AbstractEfaProvider.java
View file

@ -2790,8 +2790,8 @@ public abstract class AbstractEfaProvider extends AbstractNetworkProvider
pp.setInput(is, null); pp.setInput(is, null);
final ResultHeader header = enterEfa(pp); final ResultHeader header = enterEfa(pp);
final Calendar plannedTime = new GregorianCalendar(timeZone); final Calendar plannedTimeCal = new GregorianCalendar(timeZone);
final Calendar predictedTime = new GregorianCalendar(timeZone); final Calendar predictedTimeCal = new GregorianCalendar(timeZone);
final List<Trip> trips = new ArrayList<Trip>(); final List<Trip> trips = new ArrayList<Trip>();
@ -2836,7 +2836,7 @@ public abstract class AbstractEfaProvider extends AbstractNetworkProvider
XmlPullUtil.requireSkip(pp, "dt"); XmlPullUtil.requireSkip(pp, "dt");
parseMobileSt(pp, plannedTime, predictedTime); parseMobileSt(pp, plannedTimeCal, predictedTimeCal);
XmlPullUtil.requireSkip(pp, "lis"); XmlPullUtil.requireSkip(pp, "lis");
@ -2856,19 +2856,18 @@ public abstract class AbstractEfaProvider extends AbstractNetworkProvider
XmlPullUtil.skipExit(pp, "p"); XmlPullUtil.skipExit(pp, "p");
final Date plannedTime = plannedTimeCal.isSet(Calendar.HOUR_OF_DAY) ? plannedTimeCal.getTime() : null;
final Date predictedTime = predictedTimeCal.isSet(Calendar.HOUR_OF_DAY) ? predictedTimeCal.getTime() : null;
if ("departure".equals(usage)) if ("departure".equals(usage))
{ {
departure = new Stop(location, true, plannedTime.isSet(Calendar.HOUR_OF_DAY) ? plannedTime.getTime() departure = new Stop(location, true, plannedTime, predictedTime, position, null);
: predictedTime.getTime(), predictedTime.isSet(Calendar.HOUR_OF_DAY) ? predictedTime.getTime() : null,
position, null);
if (firstDepartureLocation == null) if (firstDepartureLocation == null)
firstDepartureLocation = location; firstDepartureLocation = location;
} }
else if ("arrival".equals(usage)) else if ("arrival".equals(usage))
{ {
arrival = new Stop(location, false, plannedTime.isSet(Calendar.HOUR_OF_DAY) ? plannedTime.getTime() arrival = new Stop(location, false, plannedTime, predictedTime, position, null);
: predictedTime.getTime(), predictedTime.isSet(Calendar.HOUR_OF_DAY) ? predictedTime.getTime() : null,
position, null);
lastArrivalLocation = location; lastArrivalLocation = location;
} }
else else
@ -2904,8 +2903,8 @@ public abstract class AbstractEfaProvider extends AbstractNetworkProvider
while (XmlPullUtil.test(pp, "s")) while (XmlPullUtil.test(pp, "s"))
{ {
plannedTime.clear(); plannedTimeCal.clear();
predictedTime.clear(); predictedTimeCal.clear();
final String s = XmlPullUtil.valueTag(pp, "s"); final String s = XmlPullUtil.valueTag(pp, "s");
final String[] intermediateParts = s.split(";"); final String[] intermediateParts = s.split(";");
@ -2916,18 +2915,18 @@ public abstract class AbstractEfaProvider extends AbstractNetworkProvider
if (!("0000-1".equals(intermediateParts[2]) && "000-1".equals(intermediateParts[3]))) if (!("0000-1".equals(intermediateParts[2]) && "000-1".equals(intermediateParts[3])))
{ {
ParserUtils.parseIsoDate(plannedTime, intermediateParts[2]); ParserUtils.parseIsoDate(plannedTimeCal, intermediateParts[2]);
ParserUtils.parseIsoTime(plannedTime, intermediateParts[3]); ParserUtils.parseIsoTime(plannedTimeCal, intermediateParts[3]);
if (isRealtime) if (isRealtime)
{ {
ParserUtils.parseIsoDate(predictedTime, intermediateParts[2]); ParserUtils.parseIsoDate(predictedTimeCal, intermediateParts[2]);
ParserUtils.parseIsoTime(predictedTime, intermediateParts[3]); ParserUtils.parseIsoTime(predictedTimeCal, intermediateParts[3]);
if (intermediateParts.length > 5) if (intermediateParts.length > 5)
{ {
final int delay = Integer.parseInt(intermediateParts[5]); final int delay = Integer.parseInt(intermediateParts[5]);
predictedTime.add(Calendar.MINUTE, delay); predictedTimeCal.add(Calendar.MINUTE, delay);
} }
} }
} }
@ -2948,9 +2947,9 @@ public abstract class AbstractEfaProvider extends AbstractNetworkProvider
location = new Location(LocationType.STATION, id, null, name); location = new Location(LocationType.STATION, id, null, name);
} }
final Stop stop = new Stop(location, false, plannedTime.isSet(Calendar.HOUR_OF_DAY) ? plannedTime.getTime() final Date plannedTime = plannedTimeCal.isSet(Calendar.HOUR_OF_DAY) ? plannedTimeCal.getTime() : null;
: predictedTime.getTime(), predictedTime.isSet(Calendar.HOUR_OF_DAY) ? predictedTime.getTime() : null, final Date predictedTime = predictedTimeCal.isSet(Calendar.HOUR_OF_DAY) ? predictedTimeCal.getTime() : null;
null, null); final Stop stop = new Stop(location, false, plannedTime, predictedTime, null, null);
intermediateStops.add(stop); intermediateStops.add(stop);
} }