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

fixed parsing of time in some 'walk' cases

Browse source 
git-svn-id: https://public-transport-enabler.googlecode.com/svn/trunk@561 0924bc21-9374-b0fa-ee44-9ff1593b38f0
This commit is contained in:
andreas.schildbach@gmail.com 2011-04-14 17:51:36 +00:00
parent 4a4cbad21c
commit dfe99ab68d
1 changed files with 18 additions and 11 deletions
Download patch file Download diff file Expand all files Collapse all files

29
src/de/schildbach/pte/BvgProvider.java
View file

@ -516,24 +516,23 @@ public final class BvgProvider extends AbstractHafasProvider
final Location departure = location(tDep); final Location departure = location(tDep);
ParserUtils.parseEuropeanTime(time, tDep[8]);
if (lastTime != null && time.getTime().before(lastTime))
time.add(Calendar.DAY_OF_YEAR, 1);
lastTime = time.getTime();
final Date departureTime = time.getTime();
if (firstDepartureTime == null)
firstDepartureTime = departureTime;
final String departurePosition = !mDetails.group(1).equals(" ") ? ParserUtils.resolveEntities(mDetails.group(1)) : null; final String departurePosition = !mDetails.group(1).equals(" ") ? ParserUtils.resolveEntities(mDetails.group(1)) : null;
if (tArr[2].equals("walk")) if (tArr[2].equals("walk"))
{ {
final boolean grabFromNext = track.size() == 1; ParserUtils.parseEuropeanTime(time, tDep[tDep[8].length() > 0 ? 8 : 7]);
final String[] tArr2 = grabFromNext ? tracks.get(iTrack + 1).get(0) : tArr; if (lastTime != null && time.getTime().before(lastTime))
time.add(Calendar.DAY_OF_YEAR, 1);
lastTime = time.getTime();
final Date departureTime = time.getTime();
if (firstDepartureTime == null)
firstDepartureTime = departureTime;
final String[] tArr2 = track.size() == 1 ? tracks.get(iTrack + 1).get(0) : tArr;
final Location arrival = location(tArr2); final Location arrival = location(tArr2);
ParserUtils.parseEuropeanTime(time, tArr2[grabFromNext ? 8 : 7]); ParserUtils.parseEuropeanTime(time, tArr2[tArr2[7].length() > 0 ? 7 : 8]);
if (lastTime != null && time.getTime().before(lastTime)) if (lastTime != null && time.getTime().before(lastTime))
time.add(Calendar.DAY_OF_YEAR, 1); time.add(Calendar.DAY_OF_YEAR, 1);
lastTime = time.getTime(); lastTime = time.getTime();
@ -546,6 +545,14 @@ public final class BvgProvider extends AbstractHafasProvider
} }
else else
{ {
ParserUtils.parseEuropeanTime(time, tDep[8]);
if (lastTime != null && time.getTime().before(lastTime))
time.add(Calendar.DAY_OF_YEAR, 1);
lastTime = time.getTime();
final Date departureTime = time.getTime();
if (firstDepartureTime == null)
firstDepartureTime = departureTime;
final List<Stop> intermediateStops = new LinkedList<Stop>(); final List<Stop> intermediateStops = new LinkedList<Stop>();
for (final String[] tStop : track.subList(1, track.size() - 1)) for (final String[] tStop : track.subList(1, track.size() - 1))
{ {