From e61480cb44f7ecbff51afa8ba26ee732760cdfd7 Mon Sep 17 00:00:00 2001 From: Andreas Schildbach Date: Wed, 6 Aug 2014 09:22:07 +0200 Subject: [PATCH] Raise default number of departures to 100 (Hafas). --- enabler/src/de/schildbach/pte/AbstractHafasProvider.java | 5 +++-- enabler/src/de/schildbach/pte/BvgProvider.java | 2 +- enabler/src/de/schildbach/pte/InvgProvider.java | 3 +-- enabler/src/de/schildbach/pte/SeptaProvider.java | 3 +-- enabler/src/de/schildbach/pte/ShProvider.java | 3 +-- 5 files changed, 7 insertions(+), 9 deletions(-) diff --git a/enabler/src/de/schildbach/pte/AbstractHafasProvider.java b/enabler/src/de/schildbach/pte/AbstractHafasProvider.java index e1089674..c5e9e12d 100644 --- a/enabler/src/de/schildbach/pte/AbstractHafasProvider.java +++ b/enabler/src/de/schildbach/pte/AbstractHafasProvider.java @@ -79,8 +79,8 @@ import de.schildbach.pte.util.XmlPullUtil; public abstract class AbstractHafasProvider extends AbstractNetworkProvider { protected final static String SERVER_PRODUCT = "hafas"; - private static final String REQC_PROD = "hafas"; + protected static final int DEFAULT_MAX_DEPARTURES = 100; protected final String stationBoardEndpoint; protected final String getStopEndpoint; @@ -430,7 +430,8 @@ public abstract class AbstractHafasProvider extends AbstractNetworkProvider parameters.append("&boardType=dep"); if (canDoEquivs) 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("&L=vs_java3"); parameters.append("&input=").append(normalizeStationId(stationId)); diff --git a/enabler/src/de/schildbach/pte/BvgProvider.java b/enabler/src/de/schildbach/pte/BvgProvider.java index fb283857..6681a0eb 100644 --- a/enabler/src/de/schildbach/pte/BvgProvider.java +++ b/enabler/src/de/schildbach/pte/BvgProvider.java @@ -271,7 +271,7 @@ public final class BvgProvider extends AbstractHafasProvider final StringBuilder uri = new StringBuilder(); uri.append(DEPARTURE_URL_PLAN); 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) uri.append('&').append(additionalQueryParameter); return uri.toString(); diff --git a/enabler/src/de/schildbach/pte/InvgProvider.java b/enabler/src/de/schildbach/pte/InvgProvider.java index 161acd64..82a9f366 100644 --- a/enabler/src/de/schildbach/pte/InvgProvider.java +++ b/enabler/src/de/schildbach/pte/InvgProvider.java @@ -125,8 +125,7 @@ public class InvgProvider extends AbstractHafasProvider uri.append("?input=").append(normalizeStationId(stationId)); uri.append("&boardType=dep"); uri.append("&productsFilter=").append(allProductsString()); - if (maxDepartures != 0) - uri.append("&maxJourneys=").append(maxDepartures); + uri.append("&maxJourneys=").append(maxDepartures != 0 ? maxDepartures : DEFAULT_MAX_DEPARTURES); uri.append("&disableEquivs=yes"); // don't use nearby stations uri.append("&start=yes"); diff --git a/enabler/src/de/schildbach/pte/SeptaProvider.java b/enabler/src/de/schildbach/pte/SeptaProvider.java index 44b218a6..96bf538e 100644 --- a/enabler/src/de/schildbach/pte/SeptaProvider.java +++ b/enabler/src/de/schildbach/pte/SeptaProvider.java @@ -150,8 +150,7 @@ public class SeptaProvider extends AbstractHafasProvider 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("&productsFilter=").append(allProductsString()); - if (maxDepartures != 0) - uri.append("&maxJourneys=").append(maxDepartures); + uri.append("&maxJourneys=").append(maxDepartures != 0 ? maxDepartures : DEFAULT_MAX_DEPARTURES); uri.append("&disableEquivs=yes"); // don't use nearby stations uri.append("&start=yes"); diff --git a/enabler/src/de/schildbach/pte/ShProvider.java b/enabler/src/de/schildbach/pte/ShProvider.java index b43f61a0..2c5d449e 100644 --- a/enabler/src/de/schildbach/pte/ShProvider.java +++ b/enabler/src/de/schildbach/pte/ShProvider.java @@ -179,8 +179,7 @@ public class ShProvider extends AbstractHafasProvider uri.append("?input=").append(normalizeStationId(stationId)); uri.append("&boardType=dep"); uri.append("&productsFilter=").append(allProductsString()); - if (maxDepartures != 0) - uri.append("&maxJourneys=").append(maxDepartures); + uri.append("&maxJourneys=").append(maxDepartures != 0 ? maxDepartures : DEFAULT_MAX_DEPARTURES); uri.append("&disableEquivs=yes"); // don't use nearby stations uri.append("&start=yes");