From 8f201d4b1fa4476bff24077380359cfb505348ae Mon Sep 17 00:00:00 2001
From: Andreas Schildbach <andreas@schildbach.de>
Date: Sat, 4 Jan 2014 15:59:06 +0100
Subject: [PATCH] Raise default number of requested trips to 6

---
 .../schildbach/pte/AbstractEfaProvider.java   | 24 ++++++++---------
 .../schildbach/pte/AbstractHafasProvider.java | 27 +++++++++----------
 .../pte/AbstractNetworkProvider.java          |  7 +++++
 .../src/de/schildbach/pte/BahnProvider.java   | 10 +++----
 .../src/de/schildbach/pte/BayernProvider.java | 10 +++----
 .../src/de/schildbach/pte/BvgProvider.java    | 10 +++----
 .../src/de/schildbach/pte/JetProvider.java    | 10 +++----
 .../src/de/schildbach/pte/NasaProvider.java   | 10 +++----
 .../de/schildbach/pte/NetworkProvider.java    | 10 +++----
 enabler/src/de/schildbach/pte/NsProvider.java | 10 +++----
 .../src/de/schildbach/pte/NvvProvider.java    | 10 +++----
 .../src/de/schildbach/pte/OebbProvider.java   | 10 +++----
 .../src/de/schildbach/pte/SadProvider.java    |  6 ++---
 enabler/src/de/schildbach/pte/SeProvider.java | 10 +++----
 .../de/schildbach/pte/StockholmProvider.java  | 10 +++----
 .../src/de/schildbach/pte/VbbProvider.java    | 10 +++----
 .../src/de/schildbach/pte/VbnProvider.java    | 10 +++----
 .../src/de/schildbach/pte/VgnProvider.java    |  6 ++---
 .../src/de/schildbach/pte/VgsProvider.java    | 10 +++----
 .../pte/live/AbstractProviderLiveTest.java    |  4 +--
 .../pte/service/TripController.java           |  2 +-
 21 files changed, 107 insertions(+), 109 deletions(-)

diff --git a/enabler/src/de/schildbach/pte/AbstractEfaProvider.java b/enabler/src/de/schildbach/pte/AbstractEfaProvider.java
index 1c57b882..5a347289 100644
--- a/enabler/src/de/schildbach/pte/AbstractEfaProvider.java
+++ b/enabler/src/de/schildbach/pte/AbstractEfaProvider.java
@@ -2021,8 +2021,7 @@ public abstract class AbstractEfaProvider extends AbstractNetworkProvider
 	}
 
 	protected String xsltTripRequestParameters(final Location from, final Location via, final Location to, final Date date, final boolean dep,
-			final int numTrips, final Collection<Product> products, final WalkSpeed walkSpeed, final Accessibility accessibility,
-			final Set<Option> options)
+			final Collection<Product> products, final WalkSpeed walkSpeed, final Accessibility accessibility, final Set<Option> options)
 	{
 		final DateFormat DATE_FORMAT = new SimpleDateFormat("yyyyMMdd", Locale.US);
 		final DateFormat TIME_FORMAT = new SimpleDateFormat("HHmm", Locale.US);
@@ -2045,7 +2044,7 @@ public abstract class AbstractEfaProvider extends AbstractNetworkProvider
 		uri.append("&itdTime=").append(ParserUtils.urlEncode(TIME_FORMAT.format(date)));
 		uri.append("&itdTripDateTimeDepArr=").append(dep ? "dep" : "arr");
 
-		uri.append("&calcNumberOfTrips=").append(numTrips);
+		uri.append("&calcNumberOfTrips=").append(numTripsRequested);
 
 		uri.append("&ptOptionsActive=1"); // enable public transport options
 		uri.append("&itOptionsActive=1"); // enable individual transport options
@@ -2117,6 +2116,7 @@ public abstract class AbstractEfaProvider extends AbstractNetworkProvider
 
 		uri.append("?sessionID=").append(sessionId);
 		uri.append("&requestID=").append(requestId);
+		uri.append("&calcNumberOfTrips=").append(numTripsRequested);
 		appendCommonXsltTripRequest2Params(uri);
 
 		return uri.toString();
@@ -2126,15 +2126,14 @@ public abstract class AbstractEfaProvider extends AbstractNetworkProvider
 	{
 		if (useStringCoordListOutputFormat)
 			uri.append("&coordListOutputFormat=STRING");
-		uri.append("&calcNumberOfTrips=4");
 	}
 
 	public QueryTripsResult queryTrips(final Location from, final Location via, final Location to, final Date date, final boolean dep,
-			final int numTrips, final Collection<Product> products, final WalkSpeed walkSpeed, final Accessibility accessibility,
-			final Set<Option> options) throws IOException
+			final Collection<Product> products, final WalkSpeed walkSpeed, final Accessibility accessibility, final Set<Option> options)
+			throws IOException
 	{
 
-		final String parameters = xsltTripRequestParameters(from, via, to, date, dep, numTrips, products, walkSpeed, accessibility, options);
+		final String parameters = xsltTripRequestParameters(from, via, to, date, dep, products, walkSpeed, accessibility, options);
 
 		final StringBuilder uri = new StringBuilder(tripEndpoint);
 		if (!httpPost)
@@ -2165,11 +2164,11 @@ public abstract class AbstractEfaProvider extends AbstractNetworkProvider
 	}
 
 	protected QueryTripsResult queryTripsMobile(final Location from, final Location via, final Location to, final Date date, final boolean dep,
-			final int numTrips, final Collection<Product> products, final WalkSpeed walkSpeed, final Accessibility accessibility,
-			final Set<Option> options) throws IOException
+			final Collection<Product> products, final WalkSpeed walkSpeed, final Accessibility accessibility, final Set<Option> options)
+			throws IOException
 	{
 
-		final String parameters = xsltTripRequestParameters(from, via, to, date, dep, numTrips, products, walkSpeed, accessibility, options);
+		final String parameters = xsltTripRequestParameters(from, via, to, date, dep, products, walkSpeed, accessibility, options);
 
 		final StringBuilder uri = new StringBuilder(tripEndpoint);
 		if (!httpPost)
@@ -2201,7 +2200,7 @@ public abstract class AbstractEfaProvider extends AbstractNetworkProvider
 
 	private static final Pattern P_SESSION_EXPIRED = Pattern.compile("Your session has expired");
 
-	public QueryTripsResult queryMoreTrips(final QueryTripsContext contextObj, final boolean later, final int numTrips) throws IOException
+	public QueryTripsResult queryMoreTrips(final QueryTripsContext contextObj, final boolean later) throws IOException
 	{
 		final Context context = (Context) contextObj;
 		final String commandUri = context.context;
@@ -2247,8 +2246,7 @@ public abstract class AbstractEfaProvider extends AbstractNetworkProvider
 		}
 	}
 
-	protected QueryTripsResult queryMoreTripsMobile(final QueryTripsContext contextObj, final boolean later, final int numConnections)
-			throws IOException
+	protected QueryTripsResult queryMoreTripsMobile(final QueryTripsContext contextObj, final boolean later) throws IOException
 	{
 		final Context context = (Context) contextObj;
 		final String commandUri = context.context;
diff --git a/enabler/src/de/schildbach/pte/AbstractHafasProvider.java b/enabler/src/de/schildbach/pte/AbstractHafasProvider.java
index 221b60a6..6ebaa876 100644
--- a/enabler/src/de/schildbach/pte/AbstractHafasProvider.java
+++ b/enabler/src/de/schildbach/pte/AbstractHafasProvider.java
@@ -807,15 +807,15 @@ public abstract class AbstractHafasProvider extends AbstractNetworkProvider
 	}
 
 	public QueryTripsResult queryTrips(final Location from, final Location via, final Location to, final Date date, final boolean dep,
-			final int numTrips, final Collection<Product> products, final WalkSpeed walkSpeed, final Accessibility accessibility,
-			final Set<Option> options) throws IOException
+			final Collection<Product> products, final WalkSpeed walkSpeed, final Accessibility accessibility, final Set<Option> options)
+			throws IOException
 	{
-		return queryTripsXml(from, via, to, date, dep, numTrips, products, walkSpeed, accessibility, options);
+		return queryTripsXml(from, via, to, date, dep, products, walkSpeed, accessibility, options);
 	}
 
-	public QueryTripsResult queryMoreTrips(final QueryTripsContext context, final boolean later, final int numTrips) throws IOException
+	public QueryTripsResult queryMoreTrips(final QueryTripsContext context, final boolean later) throws IOException
 	{
-		return queryMoreTripsXml(context, later, numTrips);
+		return queryMoreTripsXml(context, later);
 	}
 
 	protected final void appendTripsQueryUri(final StringBuilder uri, final Location from, final Location via, final Location to, final Date date,
@@ -889,7 +889,7 @@ public abstract class AbstractHafasProvider extends AbstractNetworkProvider
 			uri.append("&REQ0JourneyProduct_opt3=1");
 	}
 
-	protected final QueryTripsResult queryTripsXml(Location from, Location via, Location to, final Date date, final boolean dep, final int numTrips,
+	protected final QueryTripsResult queryTripsXml(Location from, Location via, Location to, final Date date, final boolean dep,
 			final Collection<Product> products, final WalkSpeed walkSpeed, final Accessibility accessibility, final Set<Option> options)
 			throws IOException
 	{
@@ -967,7 +967,7 @@ public abstract class AbstractHafasProvider extends AbstractNetworkProvider
 		// number of trips backwards
 		conReq.append(" b=\"").append(0).append("\"");
 		// number of trips forwards
-		conReq.append(" f=\"").append(numTrips).append("\"");
+		conReq.append(" f=\"").append(numTripsRequested).append("\"");
 		// percentual extension of change time
 		conReq.append(" chExtension=\"").append(walkSpeed == WalkSpeed.SLOW ? 50 : 0).append("\"");
 		// TODO nrChanges: max number of changes
@@ -977,13 +977,12 @@ public abstract class AbstractHafasProvider extends AbstractNetworkProvider
 		return queryTripsXml(null, true, conReq, from, via, to);
 	}
 
-	protected final QueryTripsResult queryMoreTripsXml(final QueryTripsContext contextObj, final boolean later, final int numTrips)
-			throws IOException
+	protected final QueryTripsResult queryMoreTripsXml(final QueryTripsContext contextObj, final boolean later) throws IOException
 	{
 		final Context context = (Context) contextObj;
 
-		final StringBuilder conScrReq = new StringBuilder("<ConScrReq scrDir=\"").append(later ? 'F' : 'B').append("\" nrCons=\"").append(numTrips)
-				.append("\">");
+		final StringBuilder conScrReq = new StringBuilder("<ConScrReq scrDir=\"").append(later ? 'F' : 'B').append("\" nrCons=\"")
+				.append(numTripsRequested).append("\">");
 		conScrReq.append("<ConResCtxt>").append(later ? context.laterContext : context.earlierContext).append("</ConResCtxt>");
 		conScrReq.append("</ConScrReq>");
 
@@ -1516,8 +1515,8 @@ public abstract class AbstractHafasProvider extends AbstractNetworkProvider
 	private final static int QUERY_TRIPS_BINARY_BUFFER_SIZE = 384 * 1024;
 
 	protected final QueryTripsResult queryTripsBinary(Location from, Location via, Location to, final Date date, final boolean dep,
-			final int numTrips, final Collection<Product> products, final WalkSpeed walkSpeed, final Accessibility accessibility,
-			final Set<Option> options) throws IOException
+			final Collection<Product> products, final WalkSpeed walkSpeed, final Accessibility accessibility, final Set<Option> options)
+			throws IOException
 	{
 		final ResultHeader header = new ResultHeader(SERVER_PRODUCT);
 
@@ -1558,7 +1557,7 @@ public abstract class AbstractHafasProvider extends AbstractNetworkProvider
 		return queryTripsBinary(uri.toString(), from, via, to, QUERY_TRIPS_BINARY_BUFFER_SIZE);
 	}
 
-	protected QueryTripsResult queryMoreTripsBinary(final QueryTripsContext contextObj, final boolean later, final int numTrips) throws IOException
+	protected QueryTripsResult queryMoreTripsBinary(final QueryTripsContext contextObj, final boolean later) throws IOException
 	{
 		final QueryTripsBinaryContext context = (QueryTripsBinaryContext) contextObj;
 
diff --git a/enabler/src/de/schildbach/pte/AbstractNetworkProvider.java b/enabler/src/de/schildbach/pte/AbstractNetworkProvider.java
index 7725a288..f1f9eece 100644
--- a/enabler/src/de/schildbach/pte/AbstractNetworkProvider.java
+++ b/enabler/src/de/schildbach/pte/AbstractNetworkProvider.java
@@ -36,6 +36,8 @@ public abstract class AbstractNetworkProvider implements NetworkProvider
 	protected static final Charset ISO_8859_1 = Charset.forName("ISO-8859-1");
 	protected static final Set<Product> ALL_EXCEPT_HIGHSPEED;
 
+	protected int numTripsRequested = 6;
+
 	private Map<String, Style> styles = null;
 
 	static
@@ -49,6 +51,11 @@ public abstract class AbstractNetworkProvider implements NetworkProvider
 		return ALL_EXCEPT_HIGHSPEED;
 	}
 
+	protected void setNumTripsRequested(final int numTripsRequested)
+	{
+		this.numTripsRequested = numTripsRequested;
+	}
+
 	protected void setStyles(final Map<String, Style> styles)
 	{
 		this.styles = styles;
diff --git a/enabler/src/de/schildbach/pte/BahnProvider.java b/enabler/src/de/schildbach/pte/BahnProvider.java
index fa0c7fcf..2b4fd42e 100644
--- a/enabler/src/de/schildbach/pte/BahnProvider.java
+++ b/enabler/src/de/schildbach/pte/BahnProvider.java
@@ -186,16 +186,16 @@ public final class BahnProvider extends AbstractHafasProvider
 
 	@Override
 	public QueryTripsResult queryTrips(final Location from, final Location via, final Location to, final Date date, final boolean dep,
-			final int numTrips, final Collection<Product> products, final WalkSpeed walkSpeed, final Accessibility accessibility,
-			final Set<Option> options) throws IOException
+			final Collection<Product> products, final WalkSpeed walkSpeed, final Accessibility accessibility, final Set<Option> options)
+			throws IOException
 	{
-		return queryTripsBinary(from, via, to, date, dep, numTrips, products, walkSpeed, accessibility, options);
+		return queryTripsBinary(from, via, to, date, dep, products, walkSpeed, accessibility, options);
 	}
 
 	@Override
-	public QueryTripsResult queryMoreTrips(final QueryTripsContext contextObj, final boolean later, final int numTrips) throws IOException
+	public QueryTripsResult queryMoreTrips(final QueryTripsContext contextObj, final boolean later) throws IOException
 	{
-		return queryMoreTripsBinary(contextObj, later, numTrips);
+		return queryMoreTripsBinary(contextObj, later);
 	}
 
 	private static final Pattern P_NORMALIZE_LINE_NAME_TRAM = Pattern.compile("str\\s+(.*)", Pattern.CASE_INSENSITIVE);
diff --git a/enabler/src/de/schildbach/pte/BayernProvider.java b/enabler/src/de/schildbach/pte/BayernProvider.java
index ad3ebb90..a5a79ef7 100644
--- a/enabler/src/de/schildbach/pte/BayernProvider.java
+++ b/enabler/src/de/schildbach/pte/BayernProvider.java
@@ -124,15 +124,15 @@ public class BayernProvider extends AbstractEfaProvider
 
 	@Override
 	public QueryTripsResult queryTrips(final Location from, final Location via, final Location to, final Date date, final boolean dep,
-			final int numTrips, final Collection<Product> products, final WalkSpeed walkSpeed, final Accessibility accessibility,
-			final Set<Option> options) throws IOException
+			final Collection<Product> products, final WalkSpeed walkSpeed, final Accessibility accessibility, final Set<Option> options)
+			throws IOException
 	{
-		return queryTripsMobile(from, via, to, date, dep, numTrips, products, walkSpeed, accessibility, options);
+		return queryTripsMobile(from, via, to, date, dep, products, walkSpeed, accessibility, options);
 	}
 
 	@Override
-	public QueryTripsResult queryMoreTrips(final QueryTripsContext contextObj, final boolean later, final int numTrips) throws IOException
+	public QueryTripsResult queryMoreTrips(final QueryTripsContext contextObj, final boolean later) throws IOException
 	{
-		return queryMoreTripsMobile(contextObj, later, numTrips);
+		return queryMoreTripsMobile(contextObj, later);
 	}
 }
diff --git a/enabler/src/de/schildbach/pte/BvgProvider.java b/enabler/src/de/schildbach/pte/BvgProvider.java
index 83d655a6..23e02ba8 100644
--- a/enabler/src/de/schildbach/pte/BvgProvider.java
+++ b/enabler/src/de/schildbach/pte/BvgProvider.java
@@ -536,16 +536,16 @@ public final class BvgProvider extends AbstractHafasProvider
 
 	@Override
 	public QueryTripsResult queryTrips(final Location from, final Location via, final Location to, final Date date, final boolean dep,
-			final int numTrips, final Collection<Product> products, final WalkSpeed walkSpeed, final Accessibility accessibility,
-			final Set<Option> options) throws IOException
+			final Collection<Product> products, final WalkSpeed walkSpeed, final Accessibility accessibility, final Set<Option> options)
+			throws IOException
 	{
-		return queryTripsBinary(from, via, to, date, dep, numTrips, products, walkSpeed, accessibility, options);
+		return queryTripsBinary(from, via, to, date, dep, products, walkSpeed, accessibility, options);
 	}
 
 	@Override
-	public QueryTripsResult queryMoreTrips(final QueryTripsContext contextObj, final boolean later, final int numTrips) throws IOException
+	public QueryTripsResult queryMoreTrips(final QueryTripsContext contextObj, final boolean later) throws IOException
 	{
-		return queryMoreTripsBinary(contextObj, later, numTrips);
+		return queryMoreTripsBinary(contextObj, later);
 	}
 
 	private static final Pattern P_NORMALIZE_LINE_NAME_TRAM = Pattern.compile("(?:tra|tram)\\s+(.*)", Pattern.CASE_INSENSITIVE);
diff --git a/enabler/src/de/schildbach/pte/JetProvider.java b/enabler/src/de/schildbach/pte/JetProvider.java
index ce1d0373..c3315d7b 100644
--- a/enabler/src/de/schildbach/pte/JetProvider.java
+++ b/enabler/src/de/schildbach/pte/JetProvider.java
@@ -160,16 +160,16 @@ public class JetProvider extends AbstractHafasProvider
 
 	@Override
 	public QueryTripsResult queryTrips(final Location from, final Location via, final Location to, final Date date, final boolean dep,
-			final int numTrips, final Collection<Product> products, final WalkSpeed walkSpeed, final Accessibility accessibility,
-			final Set<Option> options) throws IOException
+			final Collection<Product> products, final WalkSpeed walkSpeed, final Accessibility accessibility, final Set<Option> options)
+			throws IOException
 	{
-		return queryTripsBinary(from, via, to, date, dep, numTrips, products, walkSpeed, accessibility, options);
+		return queryTripsBinary(from, via, to, date, dep, products, walkSpeed, accessibility, options);
 	}
 
 	@Override
-	public QueryTripsResult queryMoreTrips(final QueryTripsContext contextObj, final boolean later, final int numTrips) throws IOException
+	public QueryTripsResult queryMoreTrips(final QueryTripsContext contextObj, final boolean later) throws IOException
 	{
-		return queryMoreTripsBinary(contextObj, later, numTrips);
+		return queryMoreTripsBinary(contextObj, later);
 	}
 
 	private static final Pattern P_NORMALIZE_BUS = Pattern.compile("([א]?\\d{1,3})#");
diff --git a/enabler/src/de/schildbach/pte/NasaProvider.java b/enabler/src/de/schildbach/pte/NasaProvider.java
index 0c765901..5ceed6b7 100644
--- a/enabler/src/de/schildbach/pte/NasaProvider.java
+++ b/enabler/src/de/schildbach/pte/NasaProvider.java
@@ -179,16 +179,16 @@ public class NasaProvider extends AbstractHafasProvider
 
 	@Override
 	public QueryTripsResult queryTrips(final Location from, final Location via, final Location to, final Date date, final boolean dep,
-			final int numTrips, final Collection<Product> products, final WalkSpeed walkSpeed, final Accessibility accessibility,
-			final Set<Option> options) throws IOException
+			final Collection<Product> products, final WalkSpeed walkSpeed, final Accessibility accessibility, final Set<Option> options)
+			throws IOException
 	{
-		return queryTripsBinary(from, via, to, date, dep, numTrips, products, walkSpeed, accessibility, options);
+		return queryTripsBinary(from, via, to, date, dep, products, walkSpeed, accessibility, options);
 	}
 
 	@Override
-	public QueryTripsResult queryMoreTrips(final QueryTripsContext contextObj, final boolean later, final int numTrips) throws IOException
+	public QueryTripsResult queryMoreTrips(final QueryTripsContext contextObj, final boolean later) throws IOException
 	{
-		return queryMoreTripsBinary(contextObj, later, numTrips);
+		return queryMoreTripsBinary(contextObj, later);
 	}
 
 	@Override
diff --git a/enabler/src/de/schildbach/pte/NetworkProvider.java b/enabler/src/de/schildbach/pte/NetworkProvider.java
index dddda1e3..7a8a4f1e 100644
--- a/enabler/src/de/schildbach/pte/NetworkProvider.java
+++ b/enabler/src/de/schildbach/pte/NetworkProvider.java
@@ -128,8 +128,6 @@ public interface NetworkProvider
 	 *            desired date for departing, mandatory
 	 * @param dep
 	 *            date is departure date? {@code true} for departure, {@code false} for arrival
-	 * @param numTrips
-	 *            number of trips to query
 	 * @param products
 	 *            products to take into account
 	 * @param walkSpeed
@@ -141,8 +139,8 @@ public interface NetworkProvider
 	 * @return result object that can contain alternatives to clear up ambiguousnesses, or contains possible trips
 	 * @throws IOException
 	 */
-	QueryTripsResult queryTrips(Location from, Location via, Location to, Date date, boolean dep, int numTrips, Collection<Product> products,
-			WalkSpeed walkSpeed, Accessibility accessibility, Set<Option> options) throws IOException;
+	QueryTripsResult queryTrips(Location from, Location via, Location to, Date date, boolean dep, Collection<Product> products, WalkSpeed walkSpeed,
+			Accessibility accessibility, Set<Option> options) throws IOException;
 
 	/**
 	 * Query more trips (e.g. earlier or later)
@@ -151,12 +149,10 @@ public interface NetworkProvider
 	 *            context to query more trips from
 	 * @param next
 	 *            {@code true} for get next trips, {@code false} for get previous trips
-	 * @param numTrips
-	 *            number of trips to query
 	 * @return result object that contains possible trips
 	 * @throws IOException
 	 */
-	QueryTripsResult queryMoreTrips(QueryTripsContext context, boolean later, int numTrips) throws IOException;
+	QueryTripsResult queryMoreTrips(QueryTripsContext context, boolean later) throws IOException;
 
 	/**
 	 * Get style of line
diff --git a/enabler/src/de/schildbach/pte/NsProvider.java b/enabler/src/de/schildbach/pte/NsProvider.java
index 12d32a39..677b72df 100644
--- a/enabler/src/de/schildbach/pte/NsProvider.java
+++ b/enabler/src/de/schildbach/pte/NsProvider.java
@@ -155,16 +155,16 @@ public class NsProvider extends AbstractHafasProvider
 
 	@Override
 	public QueryTripsResult queryTrips(final Location from, final Location via, final Location to, final Date date, final boolean dep,
-			final int numTrips, final Collection<Product> products, final WalkSpeed walkSpeed, final Accessibility accessibility,
-			final Set<Option> options) throws IOException
+			final Collection<Product> products, final WalkSpeed walkSpeed, final Accessibility accessibility, final Set<Option> options)
+			throws IOException
 	{
-		return queryTripsBinary(from, via, to, date, dep, numTrips, products, walkSpeed, accessibility, options);
+		return queryTripsBinary(from, via, to, date, dep, products, walkSpeed, accessibility, options);
 	}
 
 	@Override
-	public QueryTripsResult queryMoreTrips(final QueryTripsContext contextObj, final boolean later, final int numTrips) throws IOException
+	public QueryTripsResult queryMoreTrips(final QueryTripsContext contextObj, final boolean later) throws IOException
 	{
-		return queryMoreTripsBinary(contextObj, later, numTrips);
+		return queryMoreTripsBinary(contextObj, later);
 	}
 
 	@Override
diff --git a/enabler/src/de/schildbach/pte/NvvProvider.java b/enabler/src/de/schildbach/pte/NvvProvider.java
index fca7b6a2..7357fdf3 100644
--- a/enabler/src/de/schildbach/pte/NvvProvider.java
+++ b/enabler/src/de/schildbach/pte/NvvProvider.java
@@ -213,16 +213,16 @@ public class NvvProvider extends AbstractHafasProvider
 
 	@Override
 	public QueryTripsResult queryTrips(final Location from, final Location via, final Location to, final Date date, final boolean dep,
-			final int numTrips, final Collection<Product> products, final WalkSpeed walkSpeed, final Accessibility accessibility,
-			final Set<Option> options) throws IOException
+			final Collection<Product> products, final WalkSpeed walkSpeed, final Accessibility accessibility, final Set<Option> options)
+			throws IOException
 	{
-		return queryTripsBinary(from, via, to, date, dep, numTrips, products, walkSpeed, accessibility, options);
+		return queryTripsBinary(from, via, to, date, dep, products, walkSpeed, accessibility, options);
 	}
 
 	@Override
-	public QueryTripsResult queryMoreTrips(final QueryTripsContext contextObj, final boolean later, final int numTrips) throws IOException
+	public QueryTripsResult queryMoreTrips(final QueryTripsContext contextObj, final boolean later) throws IOException
 	{
-		return queryMoreTripsBinary(contextObj, later, numTrips);
+		return queryMoreTripsBinary(contextObj, later);
 	}
 
 	@Override
diff --git a/enabler/src/de/schildbach/pte/OebbProvider.java b/enabler/src/de/schildbach/pte/OebbProvider.java
index 31c2ef48..960743d9 100644
--- a/enabler/src/de/schildbach/pte/OebbProvider.java
+++ b/enabler/src/de/schildbach/pte/OebbProvider.java
@@ -198,16 +198,16 @@ public class OebbProvider extends AbstractHafasProvider
 
 	@Override
 	public QueryTripsResult queryTrips(final Location from, final Location via, final Location to, final Date date, final boolean dep,
-			final int numTrips, final Collection<Product> products, final WalkSpeed walkSpeed, final Accessibility accessibility,
-			final Set<Option> options) throws IOException
+			final Collection<Product> products, final WalkSpeed walkSpeed, final Accessibility accessibility, final Set<Option> options)
+			throws IOException
 	{
-		return queryTripsBinary(from, via, to, date, dep, numTrips, products, walkSpeed, accessibility, options);
+		return queryTripsBinary(from, via, to, date, dep, products, walkSpeed, accessibility, options);
 	}
 
 	@Override
-	public QueryTripsResult queryMoreTrips(final QueryTripsContext contextObj, final boolean later, final int numTrips) throws IOException
+	public QueryTripsResult queryMoreTrips(final QueryTripsContext contextObj, final boolean later) throws IOException
 	{
-		return queryMoreTripsBinary(contextObj, later, numTrips);
+		return queryMoreTripsBinary(contextObj, later);
 	}
 
 	@Override
diff --git a/enabler/src/de/schildbach/pte/SadProvider.java b/enabler/src/de/schildbach/pte/SadProvider.java
index c0e02b13..4159a20a 100644
--- a/enabler/src/de/schildbach/pte/SadProvider.java
+++ b/enabler/src/de/schildbach/pte/SadProvider.java
@@ -121,7 +121,7 @@ public class SadProvider extends AbstractNetworkProvider {
 		return list;
 	}
 	
-	public QueryTripsResult queryTrips(Location from, Location via, Location to, Date date, boolean dep, final int numTrips,
+	public QueryTripsResult queryTrips(Location from, Location via, Location to, Date date, boolean dep,
 			Collection<Product> products, WalkSpeed walkSpeed, Accessibility accessibility, Set<Option> options) throws IOException {
 
 		// Select correct SOAP method depending on the dep flag
@@ -193,7 +193,7 @@ public class SadProvider extends AbstractNetworkProvider {
 		return calculateResponse(from, to, response, dep, date);
 	}
 
-	public QueryTripsResult queryMoreTrips(final QueryTripsContext contextObj, final boolean later, final int numTrips) throws IOException
+	public QueryTripsResult queryMoreTrips(final QueryTripsContext contextObj, final boolean later) throws IOException
 	{
 		// Split and parse context
 		final Context context = (Context) contextObj;
@@ -221,7 +221,7 @@ public class SadProvider extends AbstractNetworkProvider {
 		// Query for trips with new date/time value
 		// NOTE: via, products, walkSpeed, accessibility are set to null
 		return queryTrips(new Location(LocationType.STATION, fromId), null, new Location(LocationType.STATION, toId), date, dep,
-				0, null, null, null, null);
+				null, null, null, null);
 	}
 
 	protected TimeZone timeZone() {
diff --git a/enabler/src/de/schildbach/pte/SeProvider.java b/enabler/src/de/schildbach/pte/SeProvider.java
index da6a9060..9cb4a63b 100644
--- a/enabler/src/de/schildbach/pte/SeProvider.java
+++ b/enabler/src/de/schildbach/pte/SeProvider.java
@@ -200,16 +200,16 @@ public class SeProvider extends AbstractHafasProvider
 
 	@Override
 	public QueryTripsResult queryTrips(final Location from, final Location via, final Location to, final Date date, final boolean dep,
-			final int numTrips, final Collection<Product> products, final WalkSpeed walkSpeed, final Accessibility accessibility,
-			final Set<Option> options) throws IOException
+			final Collection<Product> products, final WalkSpeed walkSpeed, final Accessibility accessibility, final Set<Option> options)
+			throws IOException
 	{
-		return queryTripsBinary(from, via, to, date, dep, numTrips, products, walkSpeed, accessibility, options);
+		return queryTripsBinary(from, via, to, date, dep, products, walkSpeed, accessibility, options);
 	}
 
 	@Override
-	public QueryTripsResult queryMoreTrips(final QueryTripsContext contextObj, final boolean later, final int numTrips) throws IOException
+	public QueryTripsResult queryMoreTrips(final QueryTripsContext contextObj, final boolean later) throws IOException
 	{
-		return queryMoreTripsBinary(contextObj, later, numTrips);
+		return queryMoreTripsBinary(contextObj, later);
 	}
 
 	@Override
diff --git a/enabler/src/de/schildbach/pte/StockholmProvider.java b/enabler/src/de/schildbach/pte/StockholmProvider.java
index d0f6012d..f865eaa4 100644
--- a/enabler/src/de/schildbach/pte/StockholmProvider.java
+++ b/enabler/src/de/schildbach/pte/StockholmProvider.java
@@ -190,16 +190,16 @@ public class StockholmProvider extends AbstractHafasProvider
 
 	@Override
 	public QueryTripsResult queryTrips(final Location from, final Location via, final Location to, final Date date, final boolean dep,
-			final int numTrips, final Collection<Product> products, final WalkSpeed walkSpeed, final Accessibility accessibility,
-			final Set<Option> options) throws IOException
+			final Collection<Product> products, final WalkSpeed walkSpeed, final Accessibility accessibility, final Set<Option> options)
+			throws IOException
 	{
-		return queryTripsBinary(from, via, to, date, dep, numTrips, products, walkSpeed, accessibility, options);
+		return queryTripsBinary(from, via, to, date, dep, products, walkSpeed, accessibility, options);
 	}
 
 	@Override
-	public QueryTripsResult queryMoreTrips(final QueryTripsContext contextObj, final boolean later, final int numTrips) throws IOException
+	public QueryTripsResult queryMoreTrips(final QueryTripsContext contextObj, final boolean later) throws IOException
 	{
-		return queryMoreTripsBinary(contextObj, later, numTrips);
+		return queryMoreTripsBinary(contextObj, later);
 	}
 
 	@Override
diff --git a/enabler/src/de/schildbach/pte/VbbProvider.java b/enabler/src/de/schildbach/pte/VbbProvider.java
index 91d9af08..4a86c083 100644
--- a/enabler/src/de/schildbach/pte/VbbProvider.java
+++ b/enabler/src/de/schildbach/pte/VbbProvider.java
@@ -188,16 +188,16 @@ public class VbbProvider extends AbstractHafasProvider
 
 	@Override
 	public QueryTripsResult queryTrips(final Location from, final Location via, final Location to, final Date date, final boolean dep,
-			final int numTrips, final Collection<Product> products, final WalkSpeed walkSpeed, final Accessibility accessibility,
-			final Set<Option> options) throws IOException
+			final Collection<Product> products, final WalkSpeed walkSpeed, final Accessibility accessibility, final Set<Option> options)
+			throws IOException
 	{
-		return queryTripsBinary(from, via, to, date, dep, numTrips, products, walkSpeed, accessibility, options);
+		return queryTripsBinary(from, via, to, date, dep, products, walkSpeed, accessibility, options);
 	}
 
 	@Override
-	public QueryTripsResult queryMoreTrips(final QueryTripsContext contextObj, final boolean later, final int numTrips) throws IOException
+	public QueryTripsResult queryMoreTrips(final QueryTripsContext contextObj, final boolean later) throws IOException
 	{
-		return queryMoreTripsBinary(contextObj, later, numTrips);
+		return queryMoreTripsBinary(contextObj, later);
 	}
 
 	@Override
diff --git a/enabler/src/de/schildbach/pte/VbnProvider.java b/enabler/src/de/schildbach/pte/VbnProvider.java
index 9bd77e8e..bf946926 100644
--- a/enabler/src/de/schildbach/pte/VbnProvider.java
+++ b/enabler/src/de/schildbach/pte/VbnProvider.java
@@ -165,16 +165,16 @@ public class VbnProvider extends AbstractHafasProvider
 
 	@Override
 	public QueryTripsResult queryTrips(final Location from, final Location via, final Location to, final Date date, final boolean dep,
-			final int numTrips, final Collection<Product> products, final WalkSpeed walkSpeed, final Accessibility accessibility,
-			final Set<Option> options) throws IOException
+			final Collection<Product> products, final WalkSpeed walkSpeed, final Accessibility accessibility, final Set<Option> options)
+			throws IOException
 	{
-		return queryTripsBinary(from, via, to, date, dep, numTrips, products, walkSpeed, accessibility, options);
+		return queryTripsBinary(from, via, to, date, dep, products, walkSpeed, accessibility, options);
 	}
 
 	@Override
-	public QueryTripsResult queryMoreTrips(final QueryTripsContext contextObj, final boolean later, final int numTrips) throws IOException
+	public QueryTripsResult queryMoreTrips(final QueryTripsContext contextObj, final boolean later) throws IOException
 	{
-		return queryMoreTripsBinary(contextObj, later, numTrips);
+		return queryMoreTripsBinary(contextObj, later);
 	}
 
 	@Override
diff --git a/enabler/src/de/schildbach/pte/VgnProvider.java b/enabler/src/de/schildbach/pte/VgnProvider.java
index 470bfb21..c3fe9157 100644
--- a/enabler/src/de/schildbach/pte/VgnProvider.java
+++ b/enabler/src/de/schildbach/pte/VgnProvider.java
@@ -71,10 +71,8 @@ public class VgnProvider extends AbstractEfaProvider
 
 	@Override
 	protected String xsltTripRequestParameters(final Location from, final Location via, final Location to, final Date date, final boolean dep,
-			final int numTrips, final Collection<Product> products, final WalkSpeed walkSpeed, final Accessibility accessibility,
-			final Set<Option> options)
+			final Collection<Product> products, final WalkSpeed walkSpeed, final Accessibility accessibility, final Set<Option> options)
 	{
-		return super.xsltTripRequestParameters(from, via, to, date, dep, numTrips, products, walkSpeed, accessibility, options)
-				+ "&itdLPxx_showTariffLevel=1";
+		return super.xsltTripRequestParameters(from, via, to, date, dep, products, walkSpeed, accessibility, options) + "&itdLPxx_showTariffLevel=1";
 	}
 }
diff --git a/enabler/src/de/schildbach/pte/VgsProvider.java b/enabler/src/de/schildbach/pte/VgsProvider.java
index 52c0d6aa..2679a742 100644
--- a/enabler/src/de/schildbach/pte/VgsProvider.java
+++ b/enabler/src/de/schildbach/pte/VgsProvider.java
@@ -168,15 +168,15 @@ public class VgsProvider extends AbstractHafasProvider
 
 	@Override
 	public QueryTripsResult queryTrips(final Location from, final Location via, final Location to, final Date date, final boolean dep,
-			final int numTrips, final Collection<Product> products, final WalkSpeed walkSpeed, final Accessibility accessibility,
-			final Set<Option> options) throws IOException
+			final Collection<Product> products, final WalkSpeed walkSpeed, final Accessibility accessibility, final Set<Option> options)
+			throws IOException
 	{
-		return queryTripsBinary(from, via, to, date, dep, numTrips, products, walkSpeed, accessibility, options);
+		return queryTripsBinary(from, via, to, date, dep, products, walkSpeed, accessibility, options);
 	}
 
 	@Override
-	public QueryTripsResult queryMoreTrips(final QueryTripsContext contextObj, final boolean later, final int numTrips) throws IOException
+	public QueryTripsResult queryMoreTrips(final QueryTripsContext contextObj, final boolean later) throws IOException
 	{
-		return queryMoreTripsBinary(contextObj, later, numTrips);
+		return queryMoreTripsBinary(contextObj, later);
 	}
 }
diff --git a/enabler/test/de/schildbach/pte/live/AbstractProviderLiveTest.java b/enabler/test/de/schildbach/pte/live/AbstractProviderLiveTest.java
index ad55d106..43c4c828 100644
--- a/enabler/test/de/schildbach/pte/live/AbstractProviderLiveTest.java
+++ b/enabler/test/de/schildbach/pte/live/AbstractProviderLiveTest.java
@@ -70,11 +70,11 @@ public abstract class AbstractProviderLiveTest
 	protected final QueryTripsResult queryTrips(final Location from, final Location via, final Location to, final Date date, final boolean dep,
 			final Collection<Product> products, final WalkSpeed walkSpeed, final Accessibility accessibility) throws IOException
 	{
-		return provider.queryTrips(from, via, to, date, dep, 4, products, walkSpeed, accessibility, null);
+		return provider.queryTrips(from, via, to, date, dep, products, walkSpeed, accessibility, null);
 	}
 
 	protected final QueryTripsResult queryMoreTrips(final QueryTripsContext context, final boolean later) throws IOException
 	{
-		return provider.queryMoreTrips(context, later, 4);
+		return provider.queryMoreTrips(context, later);
 	}
 }
diff --git a/service/src/main/java/de/schildbach/pte/service/TripController.java b/service/src/main/java/de/schildbach/pte/service/TripController.java
index 436c97c5..74d948e7 100644
--- a/service/src/main/java/de/schildbach/pte/service/TripController.java
+++ b/service/src/main/java/de/schildbach/pte/service/TripController.java
@@ -53,6 +53,6 @@ public class TripController
 	{
 		final Location fromLocation = new Location(fromType, fromId, null, from);
 		final Location toLocation = new Location(toType, toId, null, to);
-		return provider.queryTrips(fromLocation, null, toLocation, new Date(), true, 4, Product.ALL, WalkSpeed.NORMAL, Accessibility.NEUTRAL, null);
+		return provider.queryTrips(fromLocation, null, toLocation, new Date(), true, Product.ALL, WalkSpeed.NORMAL, Accessibility.NEUTRAL, null);
 	}
 }