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

Stricter structure check for Hafas station board.

Browse source
This commit is contained in:
Andreas Schildbach 2014-08-10 15:27:37 +02:00
parent 0b5ee4ffb7
commit b50dc033fd
15 changed files with 76 additions and 18 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -91,9 +91,11 @@ public abstract class AbstractHafasProvider extends AbstractNetworkProvider
private Charset jsonGetStopsEncoding;
private Charset jsonNearbyStationsEncoding;
private boolean dominantPlanStopTime = false;
private boolean canDoEquivs = true;
private boolean useIso8601 = false;
private String extXmlEndpoint = null;
private boolean stationBoardHasStationTable = true;
private boolean stationBoardHasLocation = false;
private boolean stationBoardCanDoEquivs = true;
private static class Context implements QueryTripsContext
{
@ -186,11 +188,6 @@ public abstract class AbstractHafasProvider extends AbstractNetworkProvider
this.jsonNearbyStationsEncoding = jsonNearbyStationsEncoding;
}
protected void setCanDoEquivs(final boolean canDoEquivs)
{
this.canDoEquivs = canDoEquivs;
}
protected void setUseIso8601(final boolean useIso8601)
{
this.useIso8601 = useIso8601;
@ -201,6 +198,21 @@ public abstract class AbstractHafasProvider extends AbstractNetworkProvider
this.extXmlEndpoint = extXmlEndpoint;
}
protected void setStationBoardHasStationTable(final boolean stationBoardHasStationTable)
{
this.stationBoardHasStationTable = stationBoardHasStationTable;
}
protected void setStationBoardHasLocation(final boolean stationBoardHasLocation)
{
this.stationBoardHasLocation = stationBoardHasLocation;
}
protected void setStationBoardCanDoEquivs(final boolean canDoEquivs)
{
this.stationBoardCanDoEquivs = canDoEquivs;
}
protected final String allProductsString()
{
final StringBuilder allProducts = new StringBuilder(numProductBits);
@ -428,7 +440,7 @@ public abstract class AbstractHafasProvider extends AbstractNetworkProvider
final StringBuilder parameters = new StringBuilder();
parameters.append("?productsFilter=").append(allProductsString());
parameters.append("&boardType=dep");
if (canDoEquivs)
if (stationBoardCanDoEquivs)
parameters.append("&disableEquivs=yes"); // don't use nearby stations
parameters.append("&maxJourneys=").append(maxDepartures > 0 ? maxDepartures : DEFAULT_MAX_DEPARTURES);
parameters.append("&start=yes");
@ -491,14 +503,15 @@ public abstract class AbstractHafasProvider extends AbstractNetworkProvider
throw new IllegalArgumentException("unknown error " + code + ", " + text);
}
if (XmlPullUtil.test(pp, "StationTable"))
{
XmlPullUtil.enter(pp, "StationTable");
}
String[] stationPlaceAndName = null;
if (XmlPullUtil.test(pp, "St"))
if (stationBoardHasStationTable)
XmlPullUtil.enter(pp, "StationTable");
if (stationBoardHasLocation)
{
XmlPullUtil.require(pp, "St");
final String evaId = XmlPullUtil.attr(pp, "evaId");
if (evaId != null)
{
@ -532,7 +545,7 @@ public abstract class AbstractHafasProvider extends AbstractNetworkProvider
// TODO is_reachable
// TODO disableTrainInfo
final boolean isEquivStation = canDoEquivs && depStation != null;
final boolean isEquivStation = stationBoardCanDoEquivs && depStation != null;
if (!isEquivStation && !"cancel".equals(eDelay))
{
@ -649,6 +662,11 @@ public abstract class AbstractHafasProvider extends AbstractNetworkProvider
XmlPullUtil.requireSkip(pp, "Journey");
}
if (stationBoardHasStationTable)
XmlPullUtil.exit(pp, "StationTable");
XmlPullUtil.requireEndDocument(pp);
result.stationDepartures.add(new StationDepartures(new Location(LocationType.STATION, normalizedStationId,
stationPlaceAndName != null ? stationPlaceAndName[0] : null, stationPlaceAndName != null ? stationPlaceAndName[1] : null),
departures, null));