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

Rename Hafas xmlQueryDepartures to xmlStationBoard.

Browse source
This commit is contained in:
Andreas Schildbach 2014-08-10 15:06:08 +02:00
parent e897787d09
commit a22deed168
1 changed files with 6 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

12
enabler/src/de/schildbach/pte/AbstractHafasProvider.java
View file

@ -418,12 +418,12 @@ public abstract class AbstractHafasProvider extends AbstractNetworkProvider
public QueryDeparturesResult queryDepartures(final String stationId, final int maxDepartures, final boolean equivs) throws IOException
{
final StringBuilder uri = new StringBuilder(stationBoardEndpoint);
uri.append(xmlQueryDeparturesParameters(stationId, maxDepartures));
uri.append(xmlStationBoardParameters(stationId, maxDepartures));
return xmlQueryDepartures(uri.toString(), stationId);
return xmlStationBoard(uri.toString(), stationId);
}
protected StringBuilder xmlQueryDeparturesParameters(final String stationId, final int maxDepartures)
protected StringBuilder xmlStationBoardParameters(final String stationId, final int maxDepartures)
{
final StringBuilder parameters = new StringBuilder();
parameters.append("?productsFilter=").append(allProductsString());
@ -440,9 +440,9 @@ public abstract class AbstractHafasProvider extends AbstractNetworkProvider
return parameters;
}
private static final Pattern P_XML_QUERY_DEPARTURES_DELAY = Pattern.compile("(?:-|k\\.A\\.?|cancel|\\+?\\s*(\\d+))");
private static final Pattern P_XML_STATION_BOARD_DELAY = Pattern.compile("(?:-|k\\.A\\.?|cancel|\\+?\\s*(\\d+))");
protected QueryDeparturesResult xmlQueryDepartures(final String uri, final String stationId) throws IOException
protected final QueryDeparturesResult xmlStationBoard(final String uri, final String stationId) throws IOException
{
final String normalizedStationId = normalizeStationId(stationId);
@ -555,7 +555,7 @@ public abstract class AbstractHafasProvider extends AbstractNetworkProvider
}
else if (delay != null)
{
final Matcher m = P_XML_QUERY_DEPARTURES_DELAY.matcher(delay);
final Matcher m = P_XML_STATION_BOARD_DELAY.matcher(delay);
if (m.matches())
{
if (m.group(1) != null)