mirror of
https://gitlab.com/oeffi/public-transport-enabler.git
synced 2025-07-14 08:40:29 +00:00
use XML API for departures query
git-svn-id: https://public-transport-enabler.googlecode.com/svn/trunk@761 0924bc21-9374-b0fa-ee44-9ff1593b38f0
This commit is contained in:
andreas.schildbach@gmail.com
parent
8a9a97cccf
commit
dd2ea066a4
1 changed files with 10 additions and 162 deletions
|
|
@ -18,23 +18,12 @@
|
||||||
package de.schildbach.pte;
|
package de.schildbach.pte;
|
||||||
|
|
||||||
import java.io.IOException;
|
import java.io.IOException;
|
||||||
import java.util.ArrayList;
|
|
||||||
import java.util.Calendar;
|
|
||||||
import java.util.Collections;
|
|
||||||
import java.util.GregorianCalendar;
|
|
||||||
import java.util.List;
|
import java.util.List;
|
||||||
import java.util.regex.Matcher;
|
|
||||||
import java.util.regex.Pattern;
|
|
||||||
|
|
||||||
import de.schildbach.pte.dto.Departure;
|
|
||||||
import de.schildbach.pte.dto.Line;
|
|
||||||
import de.schildbach.pte.dto.Location;
|
import de.schildbach.pte.dto.Location;
|
||||||
import de.schildbach.pte.dto.LocationType;
|
import de.schildbach.pte.dto.LocationType;
|
||||||
import de.schildbach.pte.dto.NearbyStationsResult;
|
import de.schildbach.pte.dto.NearbyStationsResult;
|
||||||
import de.schildbach.pte.dto.QueryDeparturesResult;
|
import de.schildbach.pte.dto.QueryDeparturesResult;
|
||||||
import de.schildbach.pte.dto.QueryDeparturesResult.Status;
|
|
||||||
import de.schildbach.pte.dto.StationDepartures;
|
|
||||||
import de.schildbach.pte.util.ParserUtils;
|
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* @author Andreas Schildbach
|
* @author Andreas Schildbach
|
||||||
|
|
@ -45,8 +34,6 @@ public class NasaProvider extends AbstractHafasProvider
|
||||||
public static final String OLD_NETWORK_ID = "www.nasa.de";
|
public static final String OLD_NETWORK_ID = "www.nasa.de";
|
||||||
private static final String API_BASE = "http://reiseauskunft.insa.de/bin/";
|
private static final String API_BASE = "http://reiseauskunft.insa.de/bin/";
|
||||||
|
|
||||||
private static final long PARSER_DAY_ROLLOVER_THRESHOLD_MS = 12 * 60 * 60 * 1000;
|
|
||||||
|
|
||||||
public NasaProvider()
|
public NasaProvider()
|
||||||
{
|
{
|
||||||
super(API_BASE + "query.exe/dn", 8, null);
|
super(API_BASE + "query.exe/dn", 8, null);
|
||||||
|
|
@ -119,158 +106,19 @@ public class NasaProvider extends AbstractHafasProvider
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
private String departuresQueryUri(final int stationId, final int maxDepartures)
|
|
||||||
{
|
|
||||||
final StringBuilder uri = new StringBuilder();
|
|
||||||
|
|
||||||
uri.append(API_BASE).append("stboard.exe/dn");
|
|
||||||
uri.append("?input=").append(stationId);
|
|
||||||
uri.append("&boardType=dep");
|
|
||||||
uri.append("&productsFilter=").append(allProductsString());
|
|
||||||
if (maxDepartures != 0)
|
|
||||||
uri.append("&maxJourneys=").append(maxDepartures);
|
|
||||||
uri.append("&disableEquivs=yes"); // don't use nearby stations
|
|
||||||
uri.append("&start=yes");
|
|
||||||
|
|
||||||
return uri.toString();
|
|
||||||
}
|
|
||||||
|
|
||||||
private static final Pattern P_DEPARTURES_HEAD_COARSE = Pattern
|
|
||||||
.compile(
|
|
||||||
".*?" //
|
|
||||||
+ "(?:" //
|
|
||||||
+ "<table class=\"hafasResult\"[^>]*>(.+?)</table>.*?" //
|
|
||||||
+ "(?:<table cellspacing=\"0\" class=\"hafasResult\"[^>]*>(.+?)</table>|(verkehren an dieser Haltestelle keine))"//
|
|
||||||
+ "|(Eingabe kann nicht interpretiert)|(Verbindung zum Server konnte leider nicht hergestellt werden|kann vom Server derzeit leider nicht bearbeitet werden))" //
|
|
||||||
+ ".*?" //
|
|
||||||
, Pattern.DOTALL);
|
|
||||||
private static final Pattern P_DEPARTURES_HEAD_FINE = Pattern.compile(".*?" //
|
|
||||||
+ "<td class=\"querysummary screennowrap\">\\s*(.*?)\\s*<.*?" // location
|
|
||||||
+ "(\\d{2}\\.\\d{2}\\.\\d{2}).*?" // date
|
|
||||||
+ "Abfahrt (\\d{1,2}:\\d{2}).*?" // time
|
|
||||||
, Pattern.DOTALL);
|
|
||||||
private static final Pattern P_DEPARTURES_COARSE = Pattern.compile("<tr class=\"(depboard-\\w*)\">(.*?)</tr>", Pattern.DOTALL);
|
|
||||||
private static final Pattern P_DEPARTURES_FINE = Pattern.compile(".*?" //
|
|
||||||
+ "<td class=\"[\\w ]*\">(\\d{1,2}:\\d{2})</td>\n" // plannedTime
|
|
||||||
+ "(?:<td class=\"[\\w ]*prognosis[\\w ]*\">\n" //
|
|
||||||
+ "(?: |<span class=\"rtLimit\\d\">(pünktlich|\\d{1,2}:\\d{2})</span>)\n</td>\n" // predictedTime
|
|
||||||
+ ")?.*?" //
|
|
||||||
+ "<img src=\"/hafas-res/img/(\\w+)_pic\\.gif\"[^>]*>\\s*(.*?)\\s*</.*?" // type, line
|
|
||||||
+ "<span class=\"bold\">\n" //
|
|
||||||
+ "<a href=\"/bin/stboard\\.exe/dn\\?input=(\\d+)&[^>]*>" // destinationId
|
|
||||||
+ "\\s*(.*?)\\s*</a>\n" // destination
|
|
||||||
+ "</span>.*?" //
|
|
||||||
+ "(?:<td class=\"center sepline top\">\n(" + ParserUtils.P_PLATFORM + ").*?)?" // position
|
|
||||||
, Pattern.DOTALL);
|
|
||||||
|
|
||||||
public QueryDeparturesResult queryDepartures(final int stationId, final int maxDepartures, final boolean equivs) throws IOException
|
public QueryDeparturesResult queryDepartures(final int stationId, final int maxDepartures, final boolean equivs) throws IOException
|
||||||
{
|
{
|
||||||
final QueryDeparturesResult result = new QueryDeparturesResult();
|
final StringBuilder uri = new StringBuilder();
|
||||||
|
uri.append(API_BASE).append("stboard.exe/dn");
|
||||||
|
uri.append("?productsFilter=").append(allProductsString());
|
||||||
|
uri.append("&boardType=dep");
|
||||||
|
uri.append("&disableEquivs=yes"); // don't use nearby stations
|
||||||
|
uri.append("&maxJourneys=50"); // ignore maxDepartures because result contains other stations
|
||||||
|
uri.append("&start=yes");
|
||||||
|
uri.append("&L=vs_java3");
|
||||||
|
uri.append("&input=").append(stationId);
|
||||||
|
|
||||||
// scrape page
|
return xmlQueryDepartures(uri.toString(), stationId);
|
||||||
final String uri = departuresQueryUri(stationId, maxDepartures);
|
|
||||||
final CharSequence page = ParserUtils.scrape(uri);
|
|
||||||
|
|
||||||
// parse page
|
|
||||||
final Matcher mHeadCoarse = P_DEPARTURES_HEAD_COARSE.matcher(page);
|
|
||||||
if (mHeadCoarse.matches())
|
|
||||||
{
|
|
||||||
// messages
|
|
||||||
if (mHeadCoarse.group(3) != null)
|
|
||||||
{
|
|
||||||
result.stationDepartures.add(new StationDepartures(new Location(LocationType.STATION, stationId),
|
|
||||||
Collections.<Departure> emptyList(), null));
|
|
||||||
return result;
|
|
||||||
}
|
|
||||||
else if (mHeadCoarse.group(4) != null)
|
|
||||||
return new QueryDeparturesResult(Status.INVALID_STATION);
|
|
||||||
else if (mHeadCoarse.group(5) != null)
|
|
||||||
return new QueryDeparturesResult(Status.SERVICE_DOWN);
|
|
||||||
|
|
||||||
final Matcher mHeadFine = P_DEPARTURES_HEAD_FINE.matcher(mHeadCoarse.group(1));
|
|
||||||
if (mHeadFine.matches())
|
|
||||||
{
|
|
||||||
final String location = ParserUtils.resolveEntities(mHeadFine.group(1));
|
|
||||||
final Calendar currentTime = new GregorianCalendar(timeZone());
|
|
||||||
currentTime.clear();
|
|
||||||
ParserUtils.parseGermanDate(currentTime, mHeadFine.group(2));
|
|
||||||
ParserUtils.parseEuropeanTime(currentTime, mHeadFine.group(3));
|
|
||||||
final List<Departure> departures = new ArrayList<Departure>(8);
|
|
||||||
String oldZebra = null;
|
|
||||||
|
|
||||||
final Matcher mDepCoarse = P_DEPARTURES_COARSE.matcher(mHeadCoarse.group(2));
|
|
||||||
while (mDepCoarse.find())
|
|
||||||
{
|
|
||||||
final String zebra = mDepCoarse.group(1);
|
|
||||||
if (oldZebra != null && zebra.equals(oldZebra))
|
|
||||||
throw new IllegalArgumentException("missed row? last:" + zebra);
|
|
||||||
else
|
|
||||||
oldZebra = zebra;
|
|
||||||
|
|
||||||
final Matcher mDepFine = P_DEPARTURES_FINE.matcher(mDepCoarse.group(2));
|
|
||||||
if (mDepFine.matches())
|
|
||||||
{
|
|
||||||
final Calendar plannedTime = new GregorianCalendar(timeZone());
|
|
||||||
plannedTime.setTimeInMillis(currentTime.getTimeInMillis());
|
|
||||||
ParserUtils.parseEuropeanTime(plannedTime, mDepFine.group(1));
|
|
||||||
|
|
||||||
if (plannedTime.getTimeInMillis() - currentTime.getTimeInMillis() < -PARSER_DAY_ROLLOVER_THRESHOLD_MS)
|
|
||||||
plannedTime.add(Calendar.DAY_OF_MONTH, 1);
|
|
||||||
|
|
||||||
final Calendar predictedTime;
|
|
||||||
final String prognosis = ParserUtils.resolveEntities(mDepFine.group(2));
|
|
||||||
if (prognosis != null)
|
|
||||||
{
|
|
||||||
predictedTime = new GregorianCalendar(timeZone());
|
|
||||||
if (prognosis.equals("pünktlich"))
|
|
||||||
{
|
|
||||||
predictedTime.setTimeInMillis(plannedTime.getTimeInMillis());
|
|
||||||
}
|
|
||||||
else
|
|
||||||
{
|
|
||||||
predictedTime.setTimeInMillis(currentTime.getTimeInMillis());
|
|
||||||
ParserUtils.parseEuropeanTime(predictedTime, prognosis);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
else
|
|
||||||
{
|
|
||||||
predictedTime = null;
|
|
||||||
}
|
|
||||||
|
|
||||||
final String lineType = mDepFine.group(3);
|
|
||||||
|
|
||||||
final String line = normalizeLine(lineType, ParserUtils.resolveEntities(mDepFine.group(4)));
|
|
||||||
|
|
||||||
final int destinationId = mDepFine.group(5) != null ? Integer.parseInt(mDepFine.group(5)) : 0;
|
|
||||||
|
|
||||||
final String destination = ParserUtils.resolveEntities(mDepFine.group(6));
|
|
||||||
|
|
||||||
final String position = mDepFine.group(7) != null ? "Gl. " + ParserUtils.resolveEntities(mDepFine.group(7)) : null;
|
|
||||||
|
|
||||||
final Departure dep = new Departure(plannedTime.getTime(), predictedTime != null ? predictedTime.getTime() : null, new Line(
|
|
||||||
null, line, line != null ? lineColors(line) : null), position, destinationId, destination, null, null);
|
|
||||||
|
|
||||||
if (!departures.contains(dep))
|
|
||||||
departures.add(dep);
|
|
||||||
}
|
|
||||||
else
|
|
||||||
{
|
|
||||||
throw new IllegalArgumentException("cannot parse '" + mDepCoarse.group(2) + "' on " + stationId);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
result.stationDepartures.add(new StationDepartures(new Location(LocationType.STATION, stationId, null, location), departures, null));
|
|
||||||
return result;
|
|
||||||
}
|
|
||||||
else
|
|
||||||
{
|
|
||||||
throw new IllegalArgumentException("cannot parse '" + mHeadCoarse.group(1) + "' on " + stationId);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
else
|
|
||||||
{
|
|
||||||
throw new IllegalArgumentException("cannot parse '" + page + "' on " + stationId);
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
|
|
||||||
public List<Location> autocompleteStations(final CharSequence constraint) throws IOException
|
public List<Location> autocompleteStations(final CharSequence constraint) throws IOException
|
||||||
|
|
|
||||||
Loading…
Add table
Add a link
Reference in a new issue