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

Add UNKNOWN_VIA error code when querying trips

Browse source
This commit is contained in:
Andreas Schildbach 2013-09-29 20:16:07 +02:00
parent f5e422d8b3
commit ed6625cbd5
3 changed files with 12 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

3
enabler/src/de/schildbach/pte/AbstractEfaProvider.java
View file

@ -2318,8 +2318,7 @@ public abstract class AbstractEfaProvider extends AbstractNetworkProvider
if ("origin".equals(usage)) if ("origin".equals(usage))
return new QueryTripsResult(header, QueryTripsResult.Status.UNKNOWN_FROM); return new QueryTripsResult(header, QueryTripsResult.Status.UNKNOWN_FROM);
else if ("via".equals(usage)) else if ("via".equals(usage))
// return new QueryTripsResult(header, QueryTripsResult.Status.UNKNOWN_VIA); return new QueryTripsResult(header, QueryTripsResult.Status.UNKNOWN_VIA);
throw new UnsupportedOperationException();
else if ("destination".equals(usage)) else if ("destination".equals(usage))
return new QueryTripsResult(header, QueryTripsResult.Status.UNKNOWN_TO); return new QueryTripsResult(header, QueryTripsResult.Status.UNKNOWN_TO);
else else

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

@ -1080,11 +1080,15 @@ public abstract class AbstractHafasProvider extends AbstractNetworkProvider
if (XmlPullUtil.test(pp, "Err")) if (XmlPullUtil.test(pp, "Err"))
{ {
final String code = XmlPullUtil.attr(pp, "code"); final String code = XmlPullUtil.attr(pp, "code");
if (code.equals("K9260")) // Departure station does not exist if (code.equals("K9260")) // Unknown departure station
return new QueryTripsResult(header, QueryTripsResult.Status.UNKNOWN_FROM); return new QueryTripsResult(header, QueryTripsResult.Status.UNKNOWN_FROM);
if (code.equals("K9300")) // Arrival station does not exist if (code.equals("K9280")) // Unknown intermediate station
return new QueryTripsResult(header, QueryTripsResult.Status.UNKNOWN_VIA);
if (code.equals("K9300")) // Unknown arrival station
return new QueryTripsResult(header, QueryTripsResult.Status.UNKNOWN_TO); return new QueryTripsResult(header, QueryTripsResult.Status.UNKNOWN_TO);
if (code.equals("K9380") || code.equals("K895")) // Departure/Arrival are too near if (code.equals("K9380")) // Dep./Arr./Intermed. or equivalent station defined more that once
return new QueryTripsResult(header, QueryTripsResult.Status.TOO_CLOSE);
if (code.equals("K895")) // Departure/Arrival are too near
return new QueryTripsResult(header, QueryTripsResult.Status.TOO_CLOSE); return new QueryTripsResult(header, QueryTripsResult.Status.TOO_CLOSE);
if (code.equals("K9220")) // Nearby to the given address stations could not be found if (code.equals("K9220")) // Nearby to the given address stations could not be found
return new QueryTripsResult(header, QueryTripsResult.Status.UNRESOLVABLE_ADDRESS); return new QueryTripsResult(header, QueryTripsResult.Status.UNRESOLVABLE_ADDRESS);
@ -2073,8 +2077,10 @@ public abstract class AbstractHafasProvider extends AbstractNetworkProvider
// H9360: Unfortunately your connection request can currently not be processed. // H9360: Unfortunately your connection request can currently not be processed.
return new QueryTripsResult(header, QueryTripsResult.Status.INVALID_DATE); return new QueryTripsResult(header, QueryTripsResult.Status.INVALID_DATE);
else if (errorCode == 9380) else if (errorCode == 9380)
return new QueryTripsResult(header, QueryTripsResult.Status.TOO_CLOSE); // H9380 // H9380: Dep./Arr./Intermed. or equivalent station defined more than once
return new QueryTripsResult(header, QueryTripsResult.Status.TOO_CLOSE);
else if (errorCode == 895) else if (errorCode == 895)
// H895: Departure/Arrival are too near
return new QueryTripsResult(header, QueryTripsResult.Status.TOO_CLOSE); return new QueryTripsResult(header, QueryTripsResult.Status.TOO_CLOSE);
else else
throw new IllegalStateException("error " + errorCode + " on " + uri); throw new IllegalStateException("error " + errorCode + " on " + uri);

2
enabler/src/de/schildbach/pte/dto/QueryTripsResult.java
View file

@ -27,7 +27,7 @@ public final class QueryTripsResult implements Serializable
{ {
public enum Status public enum Status
{ {
OK, AMBIGUOUS, TOO_CLOSE, UNKNOWN_FROM, UNKNOWN_TO, UNRESOLVABLE_ADDRESS, NO_TRIPS, INVALID_DATE, SERVICE_DOWN; OK, AMBIGUOUS, TOO_CLOSE, UNKNOWN_FROM, UNKNOWN_VIA, UNKNOWN_TO, UNRESOLVABLE_ADDRESS, NO_TRIPS, INVALID_DATE, SERVICE_DOWN;
} }
public final ResultHeader header; public final ResultHeader header;