From 86ac4cad4fc641f0f7755403f1b073f646bef285 Mon Sep 17 00:00:00 2001 From: "andreas.schildbach@gmail.com" Date: Thu, 31 Mar 2011 14:36:17 +0000 Subject: [PATCH] split place and name for departures as well git-svn-id: https://public-transport-enabler.googlecode.com/svn/trunk@544 0924bc21-9374-b0fa-ee44-9ff1593b38f0 --- src/de/schildbach/pte/BvgProvider.java | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/src/de/schildbach/pte/BvgProvider.java b/src/de/schildbach/pte/BvgProvider.java index 3c5fa38e..04934f58 100644 --- a/src/de/schildbach/pte/BvgProvider.java +++ b/src/de/schildbach/pte/BvgProvider.java @@ -672,7 +672,7 @@ public final class BvgProvider extends AbstractHafasProvider final Matcher mHead = P_DEPARTURES_LIVE_HEAD.matcher(page); 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()); currentTime.clear(); 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), - departures, null)); + result.stationDepartures.add(new StationDepartures(new Location(LocationType.STATION, Integer.parseInt(stationId), placeAndName[0], + placeAndName[1]), departures, null)); return result; } else @@ -768,7 +768,7 @@ public final class BvgProvider extends AbstractHafasProvider final Matcher mHead = P_DEPARTURES_PLAN_HEAD.matcher(page); 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()); currentTime.clear(); 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), - departures, null)); + result.stationDepartures.add(new StationDepartures(new Location(LocationType.STATION, Integer.parseInt(stationId), placeAndName[0], + placeAndName[1]), departures, null)); return result; } else