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

VRS: Quickly handle API error 'Keine Abfahrten gefunden.'. The full solution would be to restructure the code in a way that allows to return at least the List<LineDestination> part.

Browse source
This commit is contained in:
Michael Dyrna 2015-04-09 16:31:20 +02:00 • committed by Andreas Schildbach
parent 7545abea7a
commit 8a5341438f
2 changed files with 16 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

11
enabler/src/de/schildbach/pte/VrsProvider.java
View file

@ -439,7 +439,7 @@ public class VrsProvider extends AbstractNetworkProvider
// VRS does not show LongDistanceTrains departures. Parameter p for product
// filter is supported, but LongDistanceTrains filter seems to be ignored.
// equivs not supported.
// TODO equivs not supported; JSON result would support multiple timetables
public QueryDeparturesResult queryDepartures(final String stationId, @Nullable Date time, int maxDepartures, boolean equivs) throws IOException
{
checkNotNull(Strings.emptyToNull(stationId));
@ -466,6 +466,8 @@ public class VrsProvider extends AbstractNetworkProvider
return new QueryDeparturesResult(new ResultHeader(NetworkId.VRS, SERVER_PRODUCT), QueryDeparturesResult.Status.SERVICE_DOWN);
else if (error.equals("Leere ASS-ID und leere Koordinate"))
return new QueryDeparturesResult(new ResultHeader(NetworkId.VRS, SERVER_PRODUCT), QueryDeparturesResult.Status.INVALID_STATION);
else if (error.equals("Keine Abfahrten gefunden."))
return new QueryDeparturesResult(new ResultHeader(NetworkId.VRS, SERVER_PRODUCT), QueryDeparturesResult.Status.INVALID_STATION);
else
throw new IllegalStateException("unknown error: " + error);
}
@ -821,9 +823,9 @@ public class VrsProvider extends AbstractNetworkProvider
for (int k = 0; k < vias.length(); k++)
{
final JSONObject viaJsonObject = vias.getJSONObject(k);
LocationWithPosition viaLocationWithPosition = parseLocationAndPosition(viaJsonObject);
Location viaLocation = viaLocationWithPosition.location;
Position viaPosition = viaLocationWithPosition.position;
final LocationWithPosition viaLocationWithPosition = parseLocationAndPosition(viaJsonObject);
final Location viaLocation = viaLocationWithPosition.location;
final Position viaPosition = viaLocationWithPosition.position;
Date arrivalPlanned = null;
Date arrivalPredicted = null;
if (viaJsonObject.has("arrivalScheduled"))
@ -894,6 +896,7 @@ public class VrsProvider extends AbstractNetworkProvider
{
for (int k = 0; k < infos.length(); k++)
{
// TODO there can also be a "header" string
if (k > 0)
{
message.append(", ");

9
enabler/test/de/schildbach/pte/live/VrsProviderLiveTest.java
View file

@ -168,6 +168,15 @@ public class VrsProviderLiveTest extends AbstractProviderLiveTest
printLineDestinations(result);
}
@Test
public void queryDeparturesGaussstr() throws Exception
{
final QueryDeparturesResult result = queryDepartures("8984", false);
// will return {"error": "Keine Abfahrten gefunden."}
print(result);
printLineDestinations(result);
}
@Test
public void queryManyDepartures() throws Exception
{