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

split place and name for departures as well

Browse source 
git-svn-id: https://public-transport-enabler.googlecode.com/svn/trunk@544 0924bc21-9374-b0fa-ee44-9ff1593b38f0
This commit is contained in:
andreas.schildbach@gmail.com 2011-03-31 14:36:17 +00:00
parent b105904d09
commit 86ac4cad4f
1 changed files with 6 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -672,7 +672,7 @@ public final class BvgProvider extends AbstractHafasProvider
final Matcher mHead = P_DEPARTURES_LIVE_HEAD.matcher(page); final Matcher mHead = P_DEPARTURES_LIVE_HEAD.matcher(page);
if (mHead.matches()) if (mHead.matches())
{ {
final String location = ParserUtils.resolveEntities(mHead.group(1)); final String[] placeAndName = splitNameAndPlace(ParserUtils.resolveEntities(mHead.group(1)));
final Calendar currentTime = new GregorianCalendar(timeZone()); final Calendar currentTime = new GregorianCalendar(timeZone());
currentTime.clear(); currentTime.clear();
parseDateTime(currentTime, mHead.group(2)); parseDateTime(currentTime, mHead.group(2));
@ -738,8 +738,8 @@ public final class BvgProvider extends AbstractHafasProvider
} }
} }
result.stationDepartures.add(new StationDepartures(new Location(LocationType.STATION, Integer.parseInt(stationId), null, location), result.stationDepartures.add(new StationDepartures(new Location(LocationType.STATION, Integer.parseInt(stationId), placeAndName[0],
departures, null)); placeAndName[1]), departures, null));
return result; return result;
} }
else else
@ -768,7 +768,7 @@ public final class BvgProvider extends AbstractHafasProvider
final Matcher mHead = P_DEPARTURES_PLAN_HEAD.matcher(page); final Matcher mHead = P_DEPARTURES_PLAN_HEAD.matcher(page);
if (mHead.matches()) if (mHead.matches())
{ {
final String location = ParserUtils.resolveEntities(mHead.group(1)); final String[] placeAndName = splitNameAndPlace(ParserUtils.resolveEntities(mHead.group(1)));
final Calendar currentTime = new GregorianCalendar(timeZone()); final Calendar currentTime = new GregorianCalendar(timeZone());
currentTime.clear(); currentTime.clear();
ParserUtils.parseGermanDate(currentTime, mHead.group(2)); ParserUtils.parseGermanDate(currentTime, mHead.group(2));
@ -808,8 +808,8 @@ public final class BvgProvider extends AbstractHafasProvider
} }
} }
result.stationDepartures.add(new StationDepartures(new Location(LocationType.STATION, Integer.parseInt(stationId), null, location), result.stationDepartures.add(new StationDepartures(new Location(LocationType.STATION, Integer.parseInt(stationId), placeAndName[0],
departures, null)); placeAndName[1]), departures, null));
return result; return result;
} }
else else