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

handle stations by id if possible

Browse source 
git-svn-id: https://public-transport-enabler.googlecode.com/svn/trunk@124 0924bc21-9374-b0fa-ee44-9ff1593b38f0
This commit is contained in:
andreas.schildbach 2010-09-02 14:46:51 +00:00
parent 197202e275
commit e3b8e3e02e
7 changed files with 63 additions and 34 deletions
Download patch file Download diff file Expand all files Collapse all files

22
src/de/schildbach/pte/RmvProvider.java
View file

@ -134,7 +134,7 @@ public class RmvProvider implements NetworkProvider
return (double) value / 1000000;
}
private String connectionsQueryUri(final LocationType fromType, final String from, final String via, final LocationType toType, final String to,
private String connectionsQueryUri(final LocationType fromType, final String from, final LocationType viaType, final String via, final LocationType toType, final String to,
final Date date, final boolean dep)
{
final DateFormat DATE_FORMAT = new SimpleDateFormat("dd.MM.yy");
@ -153,7 +153,7 @@ public class RmvProvider implements NetworkProvider
if (via != null)
{
uri.append("&REQ0JourneyStops1.0G=").append(ParserUtils.urlEncode(via));
uri.append("&REQ0JourneyStops1.0A=255");
uri.append("&REQ0JourneyStops1.0A=").append(locationType(viaType));
}
uri.append("&start=Suchen");
@ -162,6 +162,8 @@ public class RmvProvider implements NetworkProvider
private static int locationType(final LocationType locationType)
{
if (locationType == LocationType.STATION)
return 1;
if (locationType == LocationType.ADDRESS)
return 2;
if (locationType == LocationType.ANY)
@ -169,13 +171,6 @@ public class RmvProvider implements NetworkProvider
throw new IllegalArgumentException(locationType.toString());
}
public QueryConnectionsResult queryMoreConnections(final String uri) throws IOException
{
final CharSequence page = ParserUtils.scrape(uri);
return queryConnections(uri, page);
}
private static final Pattern P_PRE_ADDRESS = Pattern.compile("(?:Geben Sie einen (Startort|Zielort) an.*?)?Bitte wählen Sie aus der Liste",
Pattern.DOTALL);
private static final Pattern P_ADDRESSES = Pattern.compile(
@ -186,7 +181,7 @@ public class RmvProvider implements NetworkProvider
public QueryConnectionsResult queryConnections(final LocationType fromType, final String from, final LocationType viaType, final String via,
final LocationType toType, final String to, final Date date, final boolean dep) throws IOException
{
final String uri = connectionsQueryUri(fromType, from, via, toType, to, date, dep);
final String uri = connectionsQueryUri(fromType, from, viaType, via, toType, to, date, dep);
final CharSequence page = ParserUtils.scrape(uri);
final Matcher mError = P_CHECK_CONNECTIONS_ERROR.matcher(page);
@ -246,6 +241,13 @@ public class RmvProvider implements NetworkProvider
+ "(?: (.+?))?" //
, Pattern.DOTALL);
public QueryConnectionsResult queryMoreConnections(final String uri) throws IOException
{
final CharSequence page = ParserUtils.scrape(uri);
return queryConnections(uri, page);
}
private QueryConnectionsResult queryConnections(final String uri, final CharSequence page) throws IOException
{
final Matcher mHead = P_CONNECTIONS_HEAD.matcher(page);