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

separate parsing of live and planned departures

Browse source 
git-svn-id: https://public-transport-enabler.googlecode.com/svn/trunk@419 0924bc21-9374-b0fa-ee44-9ff1593b38f0
This commit is contained in:
andreas.schildbach@gmail.com 2010-12-26 22:45:24 +00:00
parent 0b5a05f922
commit 221e4eabbe
1 changed files with 143 additions and 69 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -526,14 +526,21 @@ public final class BvgProvider extends AbstractHafasProvider
} }
private static final String DEPARTURE_URL_LIVE = "http://mobil.bvg.de/IstAbfahrtzeiten/index/mobil?"; private static final String DEPARTURE_URL_LIVE = "http://mobil.bvg.de/IstAbfahrtzeiten/index/mobil?";
private String departuresQueryLiveUri(final String stationId)
{
final StringBuilder uri = new StringBuilder();
uri.append(DEPARTURE_URL_LIVE);
uri.append("input=").append(stationId);
return uri.toString();
}
private static final String DEPARTURE_URL_PLAN = "http://mobil.bvg.de/Fahrinfo/bin/stboard.bin/dox/dox?boardType=dep&disableEquivs=yes&start=yes&"; private static final String DEPARTURE_URL_PLAN = "http://mobil.bvg.de/Fahrinfo/bin/stboard.bin/dox/dox?boardType=dep&disableEquivs=yes&start=yes&";
private String departuresQueryUri(final String stationId, final int maxDepartures) private String departuresQueryPlanUri(final String stationId, final int maxDepartures)
{ {
final boolean live = stationId.length() == 6;
final StringBuilder uri = new StringBuilder(); final StringBuilder uri = new StringBuilder();
uri.append(live ? DEPARTURE_URL_LIVE : DEPARTURE_URL_PLAN); uri.append(DEPARTURE_URL_PLAN);
uri.append("input=").append(stationId); uri.append("input=").append(stationId);
uri.append("&maxJourneys=").append(maxDepartures != 0 ? maxDepartures : 50); uri.append("&maxJourneys=").append(maxDepartures != 0 ? maxDepartures : 50);
return uri.toString(); return uri.toString();
@ -558,24 +565,23 @@ public final class BvgProvider extends AbstractHafasProvider
+ "<a href=\"/Fahrinfo/bin/stboard\\.bin/dox/dox.*?evaId=(\\d+)&[^>]*>" // destinationId + "<a href=\"/Fahrinfo/bin/stboard\\.bin/dox/dox.*?evaId=(\\d+)&[^>]*>" // destinationId
+ "\\s*(.*?)\\s*</a>.*?" // destination + "\\s*(.*?)\\s*</a>.*?" // destination
, Pattern.DOTALL); , Pattern.DOTALL);
private static final Pattern P_DEPARTURES_ERRORS = Pattern.compile("(derzeit leider nicht bearbeitet werden)|(Wartungsarbeiten)"); private static final Pattern P_DEPARTURES_LIVE_ERRORS = Pattern.compile("(Haltestelle:)");
private static final Pattern P_DEPARTURES_PLAN_ERRORS = Pattern.compile("(derzeit leider nicht bearbeitet werden)|(Wartungsarbeiten)");
public QueryDeparturesResult queryDepartures(final String stationId, final int maxDepartures) throws IOException public QueryDeparturesResult queryDepartures(final String stationId, final int maxDepartures) throws IOException
{ {
final String uri = departuresQueryUri(stationId, maxDepartures); if (stationId.length() == 6) // live
{
final String uri = departuresQueryLiveUri(stationId);
final CharSequence page = ParserUtils.scrape(uri); final CharSequence page = ParserUtils.scrape(uri);
final Matcher mError = P_DEPARTURES_ERRORS.matcher(page); final Matcher mError = P_DEPARTURES_LIVE_ERRORS.matcher(page);
if (mError.find()) if (mError.find())
{ {
if (mError.group(1) != null) if (mError.group(1) != null)
return new QueryDeparturesResult(Status.INVALID_STATION, Integer.parseInt(stationId)); return new QueryDeparturesResult(Status.INVALID_STATION, Integer.parseInt(stationId));
if (mError.group(2) != null)
return new QueryDeparturesResult(Status.SERVICE_DOWN, Integer.parseInt(stationId));
} }
final boolean live = stationId.length() == 6;
// parse page // parse page
final Matcher mHead = P_DEPARTURES_HEAD.matcher(page); final Matcher mHead = P_DEPARTURES_HEAD.matcher(page);
if (mHead.matches()) if (mHead.matches())
@ -588,7 +594,7 @@ public final class BvgProvider extends AbstractHafasProvider
final Matcher mDepCoarse = P_DEPARTURES_COARSE.matcher(page); final Matcher mDepCoarse = P_DEPARTURES_COARSE.matcher(page);
while (mDepCoarse.find()) while (mDepCoarse.find())
{ {
final Matcher mDepFine = (live ? P_DEPARTURES_LIVE_FINE : P_DEPARTURES_PLAN_FINE).matcher(mDepCoarse.group(1)); final Matcher mDepFine = P_DEPARTURES_LIVE_FINE.matcher(mDepCoarse.group(1));
if (mDepFine.matches()) if (mDepFine.matches())
{ {
final Calendar current = new GregorianCalendar(); final Calendar current = new GregorianCalendar();
@ -601,22 +607,22 @@ public final class BvgProvider extends AbstractHafasProvider
if (ParserUtils.timeDiff(parsed.getTime(), currentTime) < -PARSER_DAY_ROLLOVER_THRESHOLD_MS) if (ParserUtils.timeDiff(parsed.getTime(), currentTime) < -PARSER_DAY_ROLLOVER_THRESHOLD_MS)
parsed.add(Calendar.DAY_OF_MONTH, 1); parsed.add(Calendar.DAY_OF_MONTH, 1);
boolean isPlanned = live && mDepFine.group(2) != null; boolean isPlanned = mDepFine.group(2) != null;
Date plannedTime = null; Date plannedTime = null;
Date predictedTime = null; Date predictedTime = null;
if (live && !isPlanned) if (!isPlanned)
predictedTime = parsed.getTime(); predictedTime = parsed.getTime();
else else
plannedTime = parsed.getTime(); plannedTime = parsed.getTime();
final String line = normalizeLine(ParserUtils.resolveEntities(mDepFine.group(live ? 3 : 2))); final String line = normalizeLine(ParserUtils.resolveEntities(mDepFine.group(3)));
final String position = !live ? ParserUtils.resolveEntities(mDepFine.group(3)) : null; final String position = null;
final int destinationId = !live ? Integer.parseInt(mDepFine.group(4)) : 0; final int destinationId = 0;
final String destination = ParserUtils.resolveEntities(mDepFine.group(live ? 4 : 5)); final String destination = ParserUtils.resolveEntities(mDepFine.group(4));
final Departure dep = new Departure(plannedTime, predictedTime, line, line != null ? lineColors(line) : null, null, position, final Departure dep = new Departure(plannedTime, predictedTime, line, line != null ? lineColors(line) : null, null, position,
destinationId, destination, null); destinationId, destination, null);
@ -636,6 +642,74 @@ public final class BvgProvider extends AbstractHafasProvider
throw new IllegalArgumentException("cannot parse '" + page + "' on " + uri); throw new IllegalArgumentException("cannot parse '" + page + "' on " + uri);
} }
} }
else
{
final String uri = departuresQueryPlanUri(stationId, maxDepartures);
final CharSequence page = ParserUtils.scrape(uri);
final Matcher mError = P_DEPARTURES_PLAN_ERRORS.matcher(page);
if (mError.find())
{
if (mError.group(1) != null)
return new QueryDeparturesResult(Status.INVALID_STATION, Integer.parseInt(stationId));
if (mError.group(2) != null)
return new QueryDeparturesResult(Status.SERVICE_DOWN, Integer.parseInt(stationId));
}
// parse page
final Matcher mHead = P_DEPARTURES_HEAD.matcher(page);
if (mHead.matches())
{
final String location = ParserUtils.resolveEntities(mHead.group(1));
final Date currentTime = parseDate(mHead.group(2));
final List<Departure> departures = new ArrayList<Departure>(8);
// choose matcher
final Matcher mDepCoarse = P_DEPARTURES_COARSE.matcher(page);
while (mDepCoarse.find())
{
final Matcher mDepFine = P_DEPARTURES_PLAN_FINE.matcher(mDepCoarse.group(1));
if (mDepFine.matches())
{
final Calendar current = new GregorianCalendar();
current.setTime(currentTime);
final Calendar parsed = new GregorianCalendar();
parsed.setTime(ParserUtils.parseTime(mDepFine.group(1)));
parsed.set(Calendar.YEAR, current.get(Calendar.YEAR));
parsed.set(Calendar.MONTH, current.get(Calendar.MONTH));
parsed.set(Calendar.DAY_OF_MONTH, current.get(Calendar.DAY_OF_MONTH));
if (ParserUtils.timeDiff(parsed.getTime(), currentTime) < -PARSER_DAY_ROLLOVER_THRESHOLD_MS)
parsed.add(Calendar.DAY_OF_MONTH, 1);
final Date plannedTime = parsed.getTime();
final String line = normalizeLine(ParserUtils.resolveEntities(mDepFine.group(2)));
final String position = ParserUtils.resolveEntities(mDepFine.group(3));
final int destinationId = Integer.parseInt(mDepFine.group(4));
final String destination = ParserUtils.resolveEntities(mDepFine.group(5));
final Departure dep = new Departure(plannedTime, null, line, line != null ? lineColors(line) : null, null, position,
destinationId, destination, null);
if (!departures.contains(dep))
departures.add(dep);
}
else
{
throw new IllegalArgumentException("cannot parse '" + mDepCoarse.group(1) + "' on " + uri);
}
}
return new QueryDeparturesResult(new Location(LocationType.STATION, Integer.parseInt(stationId), location), departures, null);
}
else
{
throw new IllegalArgumentException("cannot parse '" + page + "' on " + uri);
}
}
}
private static final Date parseDate(String str) private static final Date parseDate(String str)
{ {