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

remove superfluous departureQueryUri() method from interface

Browse source 
git-svn-id: https://public-transport-enabler.googlecode.com/svn/trunk@304 0924bc21-9374-b0fa-ee44-9ff1593b38f0
This commit is contained in:
andreas.schildbach 2010-10-17 15:50:02 +00:00
parent 1e49dd0e46
commit 4d4355ac4f
36 changed files with 126 additions and 128 deletions
Download patch file Download diff file Expand all files Collapse all files

14
src/de/schildbach/pte/OebbProvider.java
View file

@ -491,7 +491,7 @@ public class OebbProvider extends AbstractHafasProvider
throw new UnsupportedOperationException();
}
public String departuresQueryUri(final String stationId, final int maxDepartures)
private String departuresQueryUri(final String stationId, final int maxDepartures)
{
final DateFormat TIME_FORMAT = new SimpleDateFormat("HH:mm");
final Date now = new Date();
@ -518,16 +518,16 @@ public class OebbProvider extends AbstractHafasProvider
private static final Pattern P_DEPARTURES_ERROR = Pattern.compile("(Verbindung zum Server konnte leider nicht hergestellt werden)");
public QueryDeparturesResult queryDepartures(final String uri) throws IOException
public QueryDeparturesResult queryDepartures(final String stationId, final int maxDepartures) throws IOException
{
// scrape page
final String page = ParserUtils.scrape(uri).toString().substring(14);
final String page = ParserUtils.scrape(departuresQueryUri(stationId, maxDepartures)).toString().substring(14);
final Matcher mError = P_DEPARTURES_ERROR.matcher(page);
if (mError.find())
{
if (mError.group(1) != null)
return new QueryDeparturesResult(uri, Status.SERVICE_DOWN);
return new QueryDeparturesResult(Status.SERVICE_DOWN, Integer.parseInt(stationId));
}
try
@ -537,7 +537,7 @@ public class OebbProvider extends AbstractHafasProvider
final int locationId = head.optInt("stationEvaId", -1);
// final boolean rt = head.optBoolean("rtInfo");
if (locationId == -1)
return new QueryDeparturesResult(uri, Status.INVALID_STATION);
return new QueryDeparturesResult(Status.INVALID_STATION, Integer.parseInt(stationId));
final List<Departure> departures = new ArrayList<Departure>(8);
@ -565,11 +565,11 @@ public class OebbProvider extends AbstractHafasProvider
}
}
return new QueryDeparturesResult(uri, locationId, location, departures);
return new QueryDeparturesResult(locationId, location, departures);
}
catch (final JSONException x)
{
throw new RuntimeException("cannot parse: '" + page + "' on " + uri, x);
throw new RuntimeException("cannot parse: '" + page + "' on " + stationId, x);
}
}