Raise default number of departures to 100 (Hafas).

This commit is contained in:
Andreas Schildbach 2014-08-06 09:22:07 +02:00
parent 31b89f7ef8
commit e61480cb44
5 changed files with 7 additions and 9 deletions

View file

@ -79,8 +79,8 @@ import de.schildbach.pte.util.XmlPullUtil;
public abstract class AbstractHafasProvider extends AbstractNetworkProvider public abstract class AbstractHafasProvider extends AbstractNetworkProvider
{ {
protected final static String SERVER_PRODUCT = "hafas"; protected final static String SERVER_PRODUCT = "hafas";
private static final String REQC_PROD = "hafas"; private static final String REQC_PROD = "hafas";
protected static final int DEFAULT_MAX_DEPARTURES = 100;
protected final String stationBoardEndpoint; protected final String stationBoardEndpoint;
protected final String getStopEndpoint; protected final String getStopEndpoint;
@ -430,7 +430,8 @@ public abstract class AbstractHafasProvider extends AbstractNetworkProvider
parameters.append("&boardType=dep"); parameters.append("&boardType=dep");
if (canDoEquivs) if (canDoEquivs)
parameters.append("&disableEquivs=yes"); // don't use nearby stations parameters.append("&disableEquivs=yes"); // don't use nearby stations
parameters.append("&maxJourneys=50"); // ignore maxDepartures because result contains other stations // ignore maxDepartures because result contains other stations
parameters.append("&maxJourneys=").append(DEFAULT_MAX_DEPARTURES);
parameters.append("&start=yes"); parameters.append("&start=yes");
parameters.append("&L=vs_java3"); parameters.append("&L=vs_java3");
parameters.append("&input=").append(normalizeStationId(stationId)); parameters.append("&input=").append(normalizeStationId(stationId));

View file

@ -271,7 +271,7 @@ public final class BvgProvider extends AbstractHafasProvider
final StringBuilder uri = new StringBuilder(); final StringBuilder uri = new StringBuilder();
uri.append(DEPARTURE_URL_PLAN); uri.append(DEPARTURE_URL_PLAN);
uri.append("&input=").append(normalizeStationId(stationId)); uri.append("&input=").append(normalizeStationId(stationId));
uri.append("&maxJourneys=").append(maxDepartures != 0 ? maxDepartures : 50); uri.append("&maxJourneys=").append(maxDepartures != 0 ? maxDepartures : DEFAULT_MAX_DEPARTURES);
if (additionalQueryParameter != null) if (additionalQueryParameter != null)
uri.append('&').append(additionalQueryParameter); uri.append('&').append(additionalQueryParameter);
return uri.toString(); return uri.toString();

View file

@ -125,8 +125,7 @@ public class InvgProvider extends AbstractHafasProvider
uri.append("?input=").append(normalizeStationId(stationId)); uri.append("?input=").append(normalizeStationId(stationId));
uri.append("&boardType=dep"); uri.append("&boardType=dep");
uri.append("&productsFilter=").append(allProductsString()); uri.append("&productsFilter=").append(allProductsString());
if (maxDepartures != 0) uri.append("&maxJourneys=").append(maxDepartures != 0 ? maxDepartures : DEFAULT_MAX_DEPARTURES);
uri.append("&maxJourneys=").append(maxDepartures);
uri.append("&disableEquivs=yes"); // don't use nearby stations uri.append("&disableEquivs=yes"); // don't use nearby stations
uri.append("&start=yes"); uri.append("&start=yes");

View file

@ -150,8 +150,7 @@ public class SeptaProvider extends AbstractHafasProvider
uri.append("&date="); uri.append("&date=");
uri.append(String.format(Locale.ENGLISH, "%02d%02d%04d", now.get(Calendar.MONTH) + 1, now.get(Calendar.DAY_OF_MONTH), now.get(Calendar.YEAR))); uri.append(String.format(Locale.ENGLISH, "%02d%02d%04d", now.get(Calendar.MONTH) + 1, now.get(Calendar.DAY_OF_MONTH), now.get(Calendar.YEAR)));
uri.append("&productsFilter=").append(allProductsString()); uri.append("&productsFilter=").append(allProductsString());
if (maxDepartures != 0) uri.append("&maxJourneys=").append(maxDepartures != 0 ? maxDepartures : DEFAULT_MAX_DEPARTURES);
uri.append("&maxJourneys=").append(maxDepartures);
uri.append("&disableEquivs=yes"); // don't use nearby stations uri.append("&disableEquivs=yes"); // don't use nearby stations
uri.append("&start=yes"); uri.append("&start=yes");

View file

@ -179,8 +179,7 @@ public class ShProvider extends AbstractHafasProvider
uri.append("?input=").append(normalizeStationId(stationId)); uri.append("?input=").append(normalizeStationId(stationId));
uri.append("&boardType=dep"); uri.append("&boardType=dep");
uri.append("&productsFilter=").append(allProductsString()); uri.append("&productsFilter=").append(allProductsString());
if (maxDepartures != 0) uri.append("&maxJourneys=").append(maxDepartures != 0 ? maxDepartures : DEFAULT_MAX_DEPARTURES);
uri.append("&maxJourneys=").append(maxDepartures);
uri.append("&disableEquivs=yes"); // don't use nearby stations uri.append("&disableEquivs=yes"); // don't use nearby stations
uri.append("&start=yes"); uri.append("&start=yes");