From 6e2aa29eca6b50123f82a4bc5591f9f2723d7c38 Mon Sep 17 00:00:00 2001
From: Andreas Schildbach <andreas@schildbach.de>
Date: Thu, 28 Aug 2014 10:22:05 +0200
Subject: [PATCH] Allow specifying time when querying for departures.

---
 .../schildbach/pte/AbstractEfaProvider.java   | 50 ++++++++++---------
 .../schildbach/pte/AbstractHafasProvider.java | 42 ++++++++++------
 .../schildbach/pte/AbstractTsiProvider.java   |  3 +-
 .../src/de/schildbach/pte/BayernProvider.java |  5 +-
 .../src/de/schildbach/pte/BvgProvider.java    | 12 +++--
 .../src/de/schildbach/pte/InvgProvider.java   | 25 ++++------
 .../de/schildbach/pte/NetworkProvider.java    |  4 +-
 .../src/de/schildbach/pte/SeptaProvider.java  | 43 ++++++++--------
 enabler/src/de/schildbach/pte/ShProvider.java | 27 ++++------
 .../pte/live/AbstractProviderLiveTest.java    |  5 ++
 .../pte/live/AtcProviderLiveTest.java         |  2 +-
 .../pte/live/AvvProviderLiveTest.java         |  2 +-
 .../pte/live/BahnProviderLiveTest.java        |  4 +-
 .../pte/live/BayernProviderLiveTest.java      |  6 +--
 .../pte/live/BsvagProviderLiveTest.java       |  2 +-
 .../pte/live/BvbProviderLiveTest.java         |  2 +-
 .../pte/live/BvgProviderLiveTest.java         |  8 +--
 .../pte/live/DingProviderLiveTest.java        |  2 +-
 .../pte/live/DsbProviderLiveTest.java         |  4 +-
 .../pte/live/EireannProviderLiveTest.java     |  4 +-
 .../pte/live/GvhProviderLiveTest.java         |  2 +-
 .../pte/live/InvgProviderLiveTest.java        |  4 +-
 .../pte/live/IvbProviderLiveTest.java         |  2 +-
 .../pte/live/JetProviderLiveTest.java         |  8 +--
 .../pte/live/KvvProviderLiveTest.java         |  2 +-
 .../pte/live/LinzProviderLiveTest.java        |  2 +-
 .../pte/live/LuProviderLiveTest.java          |  4 +-
 .../pte/live/MetProviderLiveTest.java         |  2 +-
 .../pte/live/MvgProviderLiveTest.java         |  2 +-
 .../pte/live/MvvProviderLiveTest.java         |  4 +-
 .../pte/live/NaldoProviderLiveTest.java       |  2 +-
 .../pte/live/NasaProviderLiveTest.java        |  4 +-
 .../pte/live/NriProviderLiveTest.java         |  4 +-
 .../pte/live/NsProviderLiveTest.java          |  4 +-
 .../pte/live/NvbwProviderLiveTest.java        |  2 +-
 .../pte/live/NvvProviderLiveTest.java         | 10 ++--
 .../pte/live/OebbProviderLiveTest.java        |  4 +-
 .../pte/live/PlProviderLiveTest.java          |  4 +-
 .../pte/live/RsagProviderLiveTest.java        |  4 +-
 .../pte/live/RtProviderLiveTest.java          |  4 +-
 .../pte/live/SbbProviderLiveTest.java         |  4 +-
 .../pte/live/SeProviderLiveTest.java          |  4 +-
 .../pte/live/SeptaProviderLiveTest.java       |  4 +-
 .../pte/live/SfProviderLiveTest.java          |  2 +-
 .../pte/live/ShProviderLiveTest.java          |  4 +-
 .../pte/live/SncbProviderLiveTest.java        |  4 +-
 .../pte/live/StockholmProviderLiveTest.java   |  4 +-
 .../pte/live/StvProviderLiveTest.java         |  2 +-
 .../pte/live/SvvProviderLiveTest.java         |  2 +-
 .../pte/live/SydneyProviderLiveTest.java      |  2 +-
 .../pte/live/TfiProviderLiveTest.java         |  2 +-
 .../pte/live/TflProviderLiveTest.java         |  2 +-
 .../pte/live/TlemProviderLiveTest.java        |  2 +-
 .../pte/live/TlswProviderLiveTest.java        |  2 +-
 .../pte/live/TlwmProviderLiveTest.java        |  2 +-
 .../pte/live/VagfrProviderLiveTest.java       |  2 +-
 .../pte/live/VbbProviderLiveTest.java         |  6 +--
 .../pte/live/VblProviderLiveTest.java         |  2 +-
 .../pte/live/VbnProviderLiveTest.java         |  4 +-
 .../pte/live/VgnProviderLiveTest.java         |  2 +-
 .../pte/live/VgsProviderLiveTest.java         |  4 +-
 .../pte/live/VmobilProviderLiveTest.java      |  2 +-
 .../pte/live/VmsProviderLiveTest.java         |  2 +-
 .../pte/live/VmvProviderLiveTest.java         |  2 +-
 .../pte/live/VorProviderLiveTest.java         |  2 +-
 .../pte/live/VrnProviderLiveTest.java         |  2 +-
 .../pte/live/VrrProviderLiveTest.java         | 10 ++--
 .../pte/live/VrtProviderLiveTest.java         |  2 +-
 .../pte/live/VsnProviderLiveTest.java         |  4 +-
 .../pte/live/VvmProviderLiveTest.java         |  2 +-
 .../pte/live/VvoProviderLiveTest.java         |  2 +-
 .../pte/live/VvsProviderLiveTest.java         |  2 +-
 .../pte/live/VvtProviderLiveTest.java         |  2 +-
 .../pte/live/VvvProviderLiveTest.java         |  2 +-
 .../pte/live/WienProviderLiveTest.java        |  2 +-
 .../pte/live/ZvvProviderLiveTest.java         |  4 +-
 76 files changed, 224 insertions(+), 206 deletions(-)

diff --git a/enabler/src/de/schildbach/pte/AbstractEfaProvider.java b/enabler/src/de/schildbach/pte/AbstractEfaProvider.java
index 147ceee5..f81fdb92 100644
--- a/enabler/src/de/schildbach/pte/AbstractEfaProvider.java
+++ b/enabler/src/de/schildbach/pte/AbstractEfaProvider.java
@@ -1416,23 +1416,21 @@ public abstract class AbstractEfaProvider extends AbstractNetworkProvider
 				+ "' trainType='" + trainType + "' trainNum='" + trainNum + "' trainName='" + trainName + "'");
 	}
 
-	public QueryDeparturesResult queryDepartures(final String stationId, final int maxDepartures, final boolean equivs) throws IOException
+	public QueryDeparturesResult queryDepartures(final String stationId, final Date time, final int maxDepartures, final boolean equivs)
+			throws IOException
 	{
-		final StringBuilder parameters = xsltDepartureMonitorRequestParameters(stationId, maxDepartures, equivs);
-
-		final StringBuilder uri = new StringBuilder(departureMonitorEndpoint);
-		if (!httpPost)
-			uri.append(parameters);
-
-		return xsltDepartureMonitorRequest(stationId, maxDepartures, equivs);
+		return xsltDepartureMonitorRequest(stationId, time, maxDepartures, equivs);
 	}
 
-	protected StringBuilder xsltDepartureMonitorRequestParameters(final String stationId, final int maxDepartures, final boolean equivs)
+	protected StringBuilder xsltDepartureMonitorRequestParameters(final String stationId, final Date time, final int maxDepartures,
+			final boolean equivs)
 	{
 		final StringBuilder parameters = new StringBuilder();
 		appendCommonRequestParams(parameters, "XML");
 		parameters.append("&type_dm=stop");
 		parameters.append("&name_dm=").append(normalizeStationId(stationId));
+		if (time != null)
+			appendItdDateTimeParameters(parameters, time);
 		if (useRealtime)
 			parameters.append("&useRealtime=1");
 		parameters.append("&mode=direct");
@@ -1447,10 +1445,23 @@ public abstract class AbstractEfaProvider extends AbstractNetworkProvider
 		return parameters;
 	}
 
-	private QueryDeparturesResult xsltDepartureMonitorRequest(final String stationId, final int maxDepartures, final boolean equivs)
+	private final void appendItdDateTimeParameters(final StringBuilder uri, final Date time)
+	{
+		final Calendar c = new GregorianCalendar(timeZone);
+		c.setTime(time);
+		final int year = c.get(Calendar.YEAR);
+		final int month = c.get(Calendar.MONTH) + 1;
+		final int day = c.get(Calendar.DAY_OF_MONTH);
+		final int hour = c.get(Calendar.HOUR_OF_DAY);
+		final int minute = c.get(Calendar.MINUTE);
+		uri.append("&itdDate=").append(ParserUtils.urlEncode(String.format(Locale.ENGLISH, "%04d%02d%02d", year, month, day)));
+		uri.append("&itdTime=").append(ParserUtils.urlEncode(String.format(Locale.ENGLISH, "%02d%02d", hour, minute)));
+	}
+
+	private QueryDeparturesResult xsltDepartureMonitorRequest(final String stationId, final Date time, final int maxDepartures, final boolean equivs)
 			throws IOException
 	{
-		final StringBuilder parameters = xsltDepartureMonitorRequestParameters(stationId, maxDepartures, equivs);
+		final StringBuilder parameters = xsltDepartureMonitorRequestParameters(stationId, time, maxDepartures, equivs);
 
 		final StringBuilder uri = new StringBuilder(departureMonitorEndpoint);
 		if (!httpPost)
@@ -1662,9 +1673,10 @@ public abstract class AbstractEfaProvider extends AbstractNetworkProvider
 		}
 	}
 
-	protected QueryDeparturesResult queryDeparturesMobile(final String stationId, final int maxDepartures, final boolean equivs) throws IOException
+	protected QueryDeparturesResult queryDeparturesMobile(final String stationId, final Date time, final int maxDepartures, final boolean equivs)
+			throws IOException
 	{
-		final StringBuilder parameters = xsltDepartureMonitorRequestParameters(stationId, maxDepartures, equivs);
+		final StringBuilder parameters = xsltDepartureMonitorRequestParameters(stationId, time, maxDepartures, equivs);
 
 		final StringBuilder uri = new StringBuilder(departureMonitorEndpoint);
 		if (!httpPost)
@@ -2022,7 +2034,7 @@ public abstract class AbstractEfaProvider extends AbstractNetworkProvider
 		return (double) value / 1000000;
 	}
 
-	protected String xsltTripRequestParameters(final Location from, final Location via, final Location to, final Date date, final boolean dep,
+	protected String xsltTripRequestParameters(final Location from, final Location via, final Location to, final Date time, final boolean dep,
 			final Collection<Product> products, final WalkSpeed walkSpeed, final Accessibility accessibility, final Set<Option> options)
 	{
 		final StringBuilder uri = new StringBuilder();
@@ -2039,15 +2051,7 @@ public abstract class AbstractEfaProvider extends AbstractNetworkProvider
 		if (via != null)
 			appendLocation(uri, via, "via");
 
-		final Calendar c = new GregorianCalendar(timeZone);
-		c.setTime(date);
-		final int year = c.get(Calendar.YEAR);
-		final int month = c.get(Calendar.MONTH) + 1;
-		final int day = c.get(Calendar.DAY_OF_MONTH);
-		final int hour = c.get(Calendar.HOUR_OF_DAY);
-		final int minute = c.get(Calendar.MINUTE);
-		uri.append("&itdDate=").append(ParserUtils.urlEncode(String.format(Locale.ENGLISH, "%04d%02d%02d", year, month, day)));
-		uri.append("&itdTime=").append(ParserUtils.urlEncode(String.format(Locale.ENGLISH, "%02d%02d", hour, minute)));
+		appendItdDateTimeParameters(uri, time);
 
 		uri.append("&itdTripDateTimeDepArr=").append(dep ? "dep" : "arr");
 
diff --git a/enabler/src/de/schildbach/pte/AbstractHafasProvider.java b/enabler/src/de/schildbach/pte/AbstractHafasProvider.java
index a6303970..da841ce7 100644
--- a/enabler/src/de/schildbach/pte/AbstractHafasProvider.java
+++ b/enabler/src/de/schildbach/pte/AbstractHafasProvider.java
@@ -441,26 +441,46 @@ public abstract class AbstractHafasProvider extends AbstractNetworkProvider
 		}
 	}
 
-	public QueryDeparturesResult queryDepartures(final String stationId, final int maxDepartures, final boolean equivs) throws IOException
+	public QueryDeparturesResult queryDepartures(final String stationId, final Date time, final int maxDepartures, final boolean equivs)
+			throws IOException
 	{
 		final StringBuilder uri = new StringBuilder(stationBoardEndpoint);
-		appendXmlStationBoardParameters(uri, stationId, maxDepartures);
+		appendXmlStationBoardParameters(uri, time, stationId, maxDepartures, "vs_java3");
 
 		return xmlStationBoard(uri.toString(), stationId);
 	}
 
-	protected void appendXmlStationBoardParameters(final StringBuilder uri, final String stationId, final int maxDepartures)
+	protected void appendXmlStationBoardParameters(final StringBuilder uri, final Date time, final String stationId, final int maxDepartures,
+			final String styleSheet)
 	{
 		uri.append("?productsFilter=").append(allProductsString());
 		uri.append("&boardType=dep");
 		if (stationBoardCanDoEquivs)
 			uri.append("&disableEquivs=yes"); // don't use nearby stations
 		uri.append("&maxJourneys=").append(maxDepartures > 0 ? maxDepartures : DEFAULT_MAX_DEPARTURES);
-		uri.append("&start=yes");
-		uri.append("&L=vs_java3");
 		uri.append("&input=").append(normalizeStationId(stationId));
+		appendDateTimeParameters(uri, time, "date", "time");
 		if (clientType != null)
 			uri.append("&clientType=").append(ParserUtils.urlEncode(clientType));
+		if (styleSheet != null)
+			uri.append("&L=").append(styleSheet);
+		uri.append("&start=yes");
+	}
+
+	protected void appendDateTimeParameters(final StringBuilder uri, final Date time, final String dateParamName, final String timeParamName)
+	{
+		final Calendar c = new GregorianCalendar(timeZone);
+		c.setTime(time);
+		final int year = c.get(Calendar.YEAR);
+		final int month = c.get(Calendar.MONTH) + 1;
+		final int day = c.get(Calendar.DAY_OF_MONTH);
+		final int hour = c.get(Calendar.HOUR_OF_DAY);
+		final int minute = c.get(Calendar.MINUTE);
+		uri.append('&').append(dateParamName).append('=');
+		uri.append(ParserUtils.urlEncode(useIso8601 ? String.format(Locale.ENGLISH, "%04d-%02d-%02d", year, month, day) : String.format(
+				Locale.ENGLISH, "%02d.%02d.%02d", day, month, year - 2000)));
+		uri.append('&').append(timeParamName).append('=');
+		uri.append(ParserUtils.urlEncode(String.format(Locale.ENGLISH, "%02d:%02d", hour, minute)));
 	}
 
 	private static final Pattern P_XML_STATION_BOARD_DELAY = Pattern.compile("(?:-|k\\.A\\.?|cancel|\\+?\\s*(\\d+))");
@@ -1358,17 +1378,7 @@ public abstract class AbstractHafasProvider extends AbstractNetworkProvider
 
 		uri.append("&REQ0HafasSearchForw=").append(dep ? "1" : "0");
 
-		final Calendar c = new GregorianCalendar(timeZone);
-		c.setTime(date);
-		final int year = c.get(Calendar.YEAR);
-		final int month = c.get(Calendar.MONTH) + 1;
-		final int day = c.get(Calendar.DAY_OF_MONTH);
-		final int hour = c.get(Calendar.HOUR_OF_DAY);
-		final int minute = c.get(Calendar.MINUTE);
-		uri.append("&REQ0JourneyDate=").append(
-				ParserUtils.urlEncode(useIso8601 ? String.format(Locale.ENGLISH, "%04d-%02d-%02d", year, month, day) : String.format(Locale.ENGLISH,
-						"%02d.%02d.%02d", day, month, year - 2000)));
-		uri.append("&REQ0JourneyTime=").append(ParserUtils.urlEncode(String.format(Locale.ENGLISH, "%02d:%02d", hour, minute)));
+		appendDateTimeParameters(uri, date, "REQ0JourneyDate", "REQ0JourneyTime");
 
 		final StringBuilder productsStr = new StringBuilder(numProductBits);
 		if (products != null)
diff --git a/enabler/src/de/schildbach/pte/AbstractTsiProvider.java b/enabler/src/de/schildbach/pte/AbstractTsiProvider.java
index 7734998b..1a65b4f5 100644
--- a/enabler/src/de/schildbach/pte/AbstractTsiProvider.java
+++ b/enabler/src/de/schildbach/pte/AbstractTsiProvider.java
@@ -605,7 +605,8 @@ public abstract class AbstractTsiProvider extends AbstractNetworkProvider
 		return new Location(locType, id, latInt, lonInt, place, name);
 	}
 
-	public QueryDeparturesResult queryDepartures(final String stationId, final int maxDepartures, final boolean equivs) throws IOException
+	public QueryDeparturesResult queryDepartures(final String stationId, final Date time, final int maxDepartures, final boolean equivs)
+			throws IOException
 	{
 		throw new UnsupportedOperationException();
 	}
diff --git a/enabler/src/de/schildbach/pte/BayernProvider.java b/enabler/src/de/schildbach/pte/BayernProvider.java
index f4e893ef..d795278c 100644
--- a/enabler/src/de/schildbach/pte/BayernProvider.java
+++ b/enabler/src/de/schildbach/pte/BayernProvider.java
@@ -110,9 +110,10 @@ public class BayernProvider extends AbstractEfaProvider
 	}
 
 	@Override
-	public QueryDeparturesResult queryDepartures(final String stationId, final int maxDepartures, final boolean equivs) throws IOException
+	public QueryDeparturesResult queryDepartures(final String stationId, final Date time, final int maxDepartures, final boolean equivs)
+			throws IOException
 	{
-		return queryDeparturesMobile(stationId, maxDepartures, equivs);
+		return queryDeparturesMobile(stationId, time, maxDepartures, equivs);
 	}
 
 	@Override
diff --git a/enabler/src/de/schildbach/pte/BvgProvider.java b/enabler/src/de/schildbach/pte/BvgProvider.java
index 2808eec8..717fd7c4 100644
--- a/enabler/src/de/schildbach/pte/BvgProvider.java
+++ b/enabler/src/de/schildbach/pte/BvgProvider.java
@@ -62,8 +62,9 @@ public final class BvgProvider extends AbstractHafasProvider
 	{
 		super(API_BASE + "stboard.bin/dn", API_BASE + "ajax-getstop.bin/dny", API_BASE + "query.bin/dn", 8, UTF_8);
 
-		setStyles(STYLES);
 		setJsonGetStopsUseWeight(false);
+		setStationBoardCanDoEquivs(false);
+		setStyles(STYLES);
 
 		this.additionalQueryParameter = additionalQueryParameter;
 	}
@@ -258,11 +259,13 @@ public final class BvgProvider extends AbstractHafasProvider
 
 	private static final String DEPARTURE_URL_PLAN = DEPARTURE_URL + "/Fahrinfo/bin/stboard.bin/dox?boardType=dep&disableEquivs=yes&start=yes";
 
-	private String departuresQueryPlanUri(final String stationId, final int maxDepartures)
+	private String departuresQueryPlanUri(final String stationId, final Date time, final int maxDepartures)
 	{
 		final StringBuilder uri = new StringBuilder();
 		uri.append(DEPARTURE_URL_PLAN);
 		uri.append("&input=").append(normalizeStationId(stationId));
+		if (time != null)
+			appendDateTimeParameters(uri, time, "date", "time");
 		uri.append("&maxJourneys=").append(maxDepartures != 0 ? maxDepartures : DEFAULT_MAX_DEPARTURES);
 		if (additionalQueryParameter != null)
 			uri.append('&').append(additionalQueryParameter);
@@ -308,7 +311,8 @@ public final class BvgProvider extends AbstractHafasProvider
 			Pattern.CASE_INSENSITIVE);
 
 	@Override
-	public QueryDeparturesResult queryDepartures(final String stationId, final int maxDepartures, final boolean equivs) throws IOException
+	public QueryDeparturesResult queryDepartures(final String stationId, final Date time, final int maxDepartures, final boolean equivs)
+			throws IOException
 	{
 		final ResultHeader header = new ResultHeader(SERVER_PRODUCT);
 		final QueryDeparturesResult result = new QueryDeparturesResult(header);
@@ -415,7 +419,7 @@ public final class BvgProvider extends AbstractHafasProvider
 		else
 		{
 			// scrape page
-			final String uri = departuresQueryPlanUri(stationId, maxDepartures);
+			final String uri = departuresQueryPlanUri(stationId, time, maxDepartures);
 			final CharSequence page = ParserUtils.scrape(uri);
 
 			final Matcher mError = P_DEPARTURES_PLAN_ERRORS.matcher(page);
diff --git a/enabler/src/de/schildbach/pte/InvgProvider.java b/enabler/src/de/schildbach/pte/InvgProvider.java
index e0301712..740a6dc0 100644
--- a/enabler/src/de/schildbach/pte/InvgProvider.java
+++ b/enabler/src/de/schildbach/pte/InvgProvider.java
@@ -61,6 +61,7 @@ public class InvgProvider extends AbstractHafasProvider
 	{
 		super(API_BASE + "stboard.exe/dn", API_BASE + "ajax-getstop.exe/dn", API_BASE + "query.exe/dn", 10, UTF_8);
 
+		setStationBoardCanDoEquivs(false);
 		setStyles(STYLES);
 		setExtXmlEndpoint(API_BASE + "extxml.exe");
 	}
@@ -119,19 +120,6 @@ public class InvgProvider extends AbstractHafasProvider
 		}
 	}
 
-	private String departuresQueryUri(final String stationId, final int maxDepartures)
-	{
-		final StringBuilder uri = new StringBuilder(stationBoardEndpoint);
-		uri.append("?input=").append(normalizeStationId(stationId));
-		uri.append("&boardType=dep");
-		uri.append("&productsFilter=").append(allProductsString());
-		uri.append("&maxJourneys=").append(maxDepartures != 0 ? maxDepartures : DEFAULT_MAX_DEPARTURES);
-		uri.append("&disableEquivs=yes"); // don't use nearby stations
-		uri.append("&start=yes");
-
-		return uri.toString();
-	}
-
 	private static final Pattern P_DEPARTURES_HEAD_COARSE = Pattern
 			.compile(
 					".*?" //
@@ -163,14 +151,19 @@ public class InvgProvider extends AbstractHafasProvider
 	, Pattern.DOTALL);
 
 	@Override
-	public QueryDeparturesResult queryDepartures(final String stationId, final int maxDepartures, final boolean equivs) throws IOException
+	public QueryDeparturesResult queryDepartures(final String stationId, final Date time, final int maxDepartures, final boolean equivs)
+			throws IOException
 	{
 		final ResultHeader header = new ResultHeader(SERVER_PRODUCT);
 		final QueryDeparturesResult result = new QueryDeparturesResult(header);
 
 		// scrape page
-		final String uri = departuresQueryUri(stationId, maxDepartures);
-		final CharSequence page = ParserUtils.scrape(uri);
+		final StringBuilder uri = new StringBuilder(stationBoardEndpoint);
+		appendXmlStationBoardParameters(uri, time, stationId, maxDepartures, null);
+		final CharSequence page = ParserUtils.scrape(uri.toString());
+
+		// System.out.println(uri);
+		// System.out.println(page);
 
 		// parse page
 		final Matcher mHeadCoarse = P_DEPARTURES_HEAD_COARSE.matcher(page);
diff --git a/enabler/src/de/schildbach/pte/NetworkProvider.java b/enabler/src/de/schildbach/pte/NetworkProvider.java
index efa93e58..d06fd071 100644
--- a/enabler/src/de/schildbach/pte/NetworkProvider.java
+++ b/enabler/src/de/schildbach/pte/NetworkProvider.java
@@ -89,6 +89,8 @@ public interface NetworkProvider
 	 * 
 	 * @param stationId
 	 *            id of the station
+	 * @param time
+	 *            desired time for departing, optional
 	 * @param maxDepartures
 	 *            maximum number of departures to get or {@code 0}
 	 * @param equivs
@@ -96,7 +98,7 @@ public interface NetworkProvider
 	 * @return result object containing the departures
 	 * @throws IOException
 	 */
-	QueryDeparturesResult queryDepartures(String stationId, int maxDepartures, boolean equivs) throws IOException;
+	QueryDeparturesResult queryDepartures(String stationId, Date time, int maxDepartures, boolean equivs) throws IOException;
 
 	/**
 	 * Meant for auto-completion of location names, like in an {@link android.widget.AutoCompleteTextView}
diff --git a/enabler/src/de/schildbach/pte/SeptaProvider.java b/enabler/src/de/schildbach/pte/SeptaProvider.java
index c6f28412..a1fe85a5 100644
--- a/enabler/src/de/schildbach/pte/SeptaProvider.java
+++ b/enabler/src/de/schildbach/pte/SeptaProvider.java
@@ -59,6 +59,7 @@ public class SeptaProvider extends AbstractHafasProvider
 	{
 		super(API_BASE + "stboard.exe/en", API_BASE + "ajax-getstop.exe/dny", API_BASE + "query.exe/en", 4);
 
+		setStationBoardCanDoEquivs(false);
 		setTimeZone("EST");
 	}
 
@@ -128,24 +129,21 @@ public class SeptaProvider extends AbstractHafasProvider
 		}
 	}
 
-	private String departuresQueryUri(final String stationId, final int maxDepartures)
+	@Override
+	protected void appendDateTimeParameters(final StringBuilder uri, final Date time, final String dateParamName, final String timeParamName)
 	{
-		final Calendar now = new GregorianCalendar(timeZone);
-
-		final StringBuilder uri = new StringBuilder(stationBoardEndpoint);
-		uri.append("?input=").append(normalizeStationId(stationId));
-		uri.append("&boardType=dep");
-		uri.append("&time=");
-		uri.append(ParserUtils.urlEncode(String.format(Locale.ENGLISH, "%02d:%02d %s", now.get(Calendar.HOUR), now.get(Calendar.MINUTE),
-				now.get(Calendar.AM_PM) == Calendar.AM ? "am" : "pm")));
-		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());
-		uri.append("&maxJourneys=").append(maxDepartures != 0 ? maxDepartures : DEFAULT_MAX_DEPARTURES);
-		uri.append("&disableEquivs=yes"); // don't use nearby stations
-		uri.append("&start=yes");
-
-		return uri.toString();
+		final Calendar c = new GregorianCalendar(timeZone);
+		c.setTime(time);
+		final int year = c.get(Calendar.YEAR);
+		final int month = c.get(Calendar.MONTH) + 1;
+		final int day = c.get(Calendar.DAY_OF_MONTH);
+		final int hour = c.get(Calendar.HOUR);
+		final int minute = c.get(Calendar.MINUTE);
+		final String amPm = c.get(Calendar.AM_PM) == Calendar.AM ? "am" : "pm";
+		uri.append('&').append(dateParamName).append('=');
+		uri.append(ParserUtils.urlEncode(String.format(Locale.ENGLISH, "%02d%02d%04d", month, day, year)));
+		uri.append('&').append(timeParamName).append('=');
+		uri.append(ParserUtils.urlEncode(String.format(Locale.ENGLISH, "%02d:%02d %s", hour, minute, amPm)));
 	}
 
 	private static final Pattern P_DEPARTURES_PAGE_COARSE = Pattern
@@ -175,14 +173,19 @@ public class SeptaProvider extends AbstractHafasProvider
 	, Pattern.DOTALL);
 
 	@Override
-	public QueryDeparturesResult queryDepartures(final String stationId, final int maxDepartures, final boolean equivs) throws IOException
+	public QueryDeparturesResult queryDepartures(final String stationId, final Date time, final int maxDepartures, final boolean equivs)
+			throws IOException
 	{
 		final ResultHeader header = new ResultHeader(SERVER_PRODUCT);
 		final QueryDeparturesResult result = new QueryDeparturesResult(header);
 
 		// scrape page
-		final String uri = departuresQueryUri(stationId, maxDepartures);
-		final CharSequence page = ParserUtils.scrape(uri);
+		final StringBuilder uri = new StringBuilder(stationBoardEndpoint);
+		appendXmlStationBoardParameters(uri, time, stationId, maxDepartures, null);
+		final CharSequence page = ParserUtils.scrape(uri.toString());
+
+		// System.out.println(uri);
+		// System.out.println(page);
 
 		// parse page
 		final Matcher mPageCoarse = P_DEPARTURES_PAGE_COARSE.matcher(page);
diff --git a/enabler/src/de/schildbach/pte/ShProvider.java b/enabler/src/de/schildbach/pte/ShProvider.java
index df560562..7c67c952 100644
--- a/enabler/src/de/schildbach/pte/ShProvider.java
+++ b/enabler/src/de/schildbach/pte/ShProvider.java
@@ -21,6 +21,7 @@ import java.io.IOException;
 import java.util.ArrayList;
 import java.util.Calendar;
 import java.util.Collections;
+import java.util.Date;
 import java.util.GregorianCalendar;
 import java.util.List;
 import java.util.regex.Matcher;
@@ -52,6 +53,8 @@ public class ShProvider extends AbstractHafasProvider
 	public ShProvider()
 	{
 		super(API_BASE + "stboard.exe/dn", API_BASE + "ajax-getstop.exe/dn", API_BASE + "query.exe/dn", 10, UTF_8);
+
+		setStationBoardCanDoEquivs(false);
 	}
 
 	public NetworkId id()
@@ -164,19 +167,6 @@ public class ShProvider extends AbstractHafasProvider
 		}
 	}
 
-	private String departuresQueryUri(final String stationId, final int maxDepartures)
-	{
-		final StringBuilder uri = new StringBuilder(stationBoardEndpoint);
-		uri.append("?input=").append(normalizeStationId(stationId));
-		uri.append("&boardType=dep");
-		uri.append("&productsFilter=").append(allProductsString());
-		uri.append("&maxJourneys=").append(maxDepartures != 0 ? maxDepartures : DEFAULT_MAX_DEPARTURES);
-		uri.append("&disableEquivs=yes"); // don't use nearby stations
-		uri.append("&start=yes");
-
-		return uri.toString();
-	}
-
 	private static final Pattern P_DEPARTURES_HEAD_COARSE = Pattern.compile(".*?" //
 			+ "(?:" //
 			+ "Bhf\\./Haltest\\.:</span>\\n<span class=\"output\">([^<]*)<.*?" // location
@@ -199,14 +189,19 @@ public class ShProvider extends AbstractHafasProvider
 	, Pattern.DOTALL);
 
 	@Override
-	public QueryDeparturesResult queryDepartures(final String stationId, final int maxDepartures, final boolean equivs) throws IOException
+	public QueryDeparturesResult queryDepartures(final String stationId, final Date time, final int maxDepartures, final boolean equivs)
+			throws IOException
 	{
 		final ResultHeader header = new ResultHeader(SERVER_PRODUCT);
 		final QueryDeparturesResult result = new QueryDeparturesResult(header);
 
 		// scrape page
-		final String uri = departuresQueryUri(stationId, maxDepartures);
-		final CharSequence page = ParserUtils.scrape(uri);
+		final StringBuilder uri = new StringBuilder(stationBoardEndpoint);
+		appendXmlStationBoardParameters(uri, time, stationId, maxDepartures, null);
+		final CharSequence page = ParserUtils.scrape(uri.toString());
+
+		// System.out.println(uri);
+		// System.out.println(page);
 
 		// parse page
 		final Matcher mHeadCoarse = P_DEPARTURES_HEAD_COARSE.matcher(page);
diff --git a/enabler/test/de/schildbach/pte/live/AbstractProviderLiveTest.java b/enabler/test/de/schildbach/pte/live/AbstractProviderLiveTest.java
index 21426e8b..23149bdb 100644
--- a/enabler/test/de/schildbach/pte/live/AbstractProviderLiveTest.java
+++ b/enabler/test/de/schildbach/pte/live/AbstractProviderLiveTest.java
@@ -68,6 +68,11 @@ public abstract class AbstractProviderLiveTest
 		System.out.println(result);
 	}
 
+	protected final QueryDeparturesResult queryDepartures(final String stationId, boolean equivs) throws IOException
+	{
+		return provider.queryDepartures(stationId, new Date(), 0, equivs);
+	}
+
 	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
 	{
diff --git a/enabler/test/de/schildbach/pte/live/AtcProviderLiveTest.java b/enabler/test/de/schildbach/pte/live/AtcProviderLiveTest.java
index 288653f1..190c8e08 100644
--- a/enabler/test/de/schildbach/pte/live/AtcProviderLiveTest.java
+++ b/enabler/test/de/schildbach/pte/live/AtcProviderLiveTest.java
@@ -62,7 +62,7 @@ public class AtcProviderLiveTest extends AbstractProviderLiveTest
 	@Test
 	public void queryDepartures() throws Exception
 	{
-		final QueryDeparturesResult result = provider.queryDepartures("740", 0, false);
+		final QueryDeparturesResult result = queryDepartures("740", false);
 
 		print(result);
 	}
diff --git a/enabler/test/de/schildbach/pte/live/AvvProviderLiveTest.java b/enabler/test/de/schildbach/pte/live/AvvProviderLiveTest.java
index ca33e9d0..34f289f2 100644
--- a/enabler/test/de/schildbach/pte/live/AvvProviderLiveTest.java
+++ b/enabler/test/de/schildbach/pte/live/AvvProviderLiveTest.java
@@ -64,7 +64,7 @@ public class AvvProviderLiveTest extends AbstractProviderLiveTest
 	@Test
 	public void queryDepartures() throws Exception
 	{
-		final QueryDeparturesResult result = provider.queryDepartures("100", 0, false);
+		final QueryDeparturesResult result = queryDepartures("100", false);
 
 		print(result);
 	}
diff --git a/enabler/test/de/schildbach/pte/live/BahnProviderLiveTest.java b/enabler/test/de/schildbach/pte/live/BahnProviderLiveTest.java
index ad9d1ba1..d4fa7c2b 100644
--- a/enabler/test/de/schildbach/pte/live/BahnProviderLiveTest.java
+++ b/enabler/test/de/schildbach/pte/live/BahnProviderLiveTest.java
@@ -63,7 +63,7 @@ public class BahnProviderLiveTest extends AbstractProviderLiveTest
 	@Test
 	public void queryDepartures() throws Exception
 	{
-		final QueryDeparturesResult result = provider.queryDepartures("692991", 0, false);
+		final QueryDeparturesResult result = queryDepartures("692991", false);
 
 		print(result);
 	}
@@ -71,7 +71,7 @@ public class BahnProviderLiveTest extends AbstractProviderLiveTest
 	@Test
 	public void queryDeparturesInvalidStation() throws Exception
 	{
-		final QueryDeparturesResult resultLive = provider.queryDepartures("999999", 0, false);
+		final QueryDeparturesResult resultLive = queryDepartures("999999", false);
 		assertEquals(QueryDeparturesResult.Status.INVALID_STATION, resultLive.status);
 	}
 
diff --git a/enabler/test/de/schildbach/pte/live/BayernProviderLiveTest.java b/enabler/test/de/schildbach/pte/live/BayernProviderLiveTest.java
index c81575a4..8a1314f2 100644
--- a/enabler/test/de/schildbach/pte/live/BayernProviderLiveTest.java
+++ b/enabler/test/de/schildbach/pte/live/BayernProviderLiveTest.java
@@ -63,13 +63,13 @@ public class BayernProviderLiveTest extends AbstractProviderLiveTest
 	@Test
 	public void queryDepartures() throws Exception
 	{
-		final QueryDeparturesResult munichOstbahnhof = provider.queryDepartures("80000793", 0, false);
+		final QueryDeparturesResult munichOstbahnhof = queryDepartures("80000793", false);
 		print(munichOstbahnhof);
 
-		final QueryDeparturesResult munichHauptbahnhof = provider.queryDepartures("80000689", 0, false);
+		final QueryDeparturesResult munichHauptbahnhof = queryDepartures("80000689", false);
 		print(munichHauptbahnhof);
 
-		final QueryDeparturesResult nurembergHauptbahnhof = provider.queryDepartures("80001020", 0, false);
+		final QueryDeparturesResult nurembergHauptbahnhof = queryDepartures("80001020", false);
 		print(nurembergHauptbahnhof);
 	}
 
diff --git a/enabler/test/de/schildbach/pte/live/BsvagProviderLiveTest.java b/enabler/test/de/schildbach/pte/live/BsvagProviderLiveTest.java
index f49ecff2..231ed1a5 100644
--- a/enabler/test/de/schildbach/pte/live/BsvagProviderLiveTest.java
+++ b/enabler/test/de/schildbach/pte/live/BsvagProviderLiveTest.java
@@ -66,7 +66,7 @@ public class BsvagProviderLiveTest extends AbstractProviderLiveTest
 	@Test
 	public void queryDepartures() throws Exception
 	{
-		final QueryDeparturesResult result = provider.queryDepartures("26000256", 0, false);
+		final QueryDeparturesResult result = queryDepartures("26000256", false);
 
 		print(result);
 	}
diff --git a/enabler/test/de/schildbach/pte/live/BvbProviderLiveTest.java b/enabler/test/de/schildbach/pte/live/BvbProviderLiveTest.java
index 15066b77..be8e1bfa 100644
--- a/enabler/test/de/schildbach/pte/live/BvbProviderLiveTest.java
+++ b/enabler/test/de/schildbach/pte/live/BvbProviderLiveTest.java
@@ -64,7 +64,7 @@ public class BvbProviderLiveTest extends AbstractProviderLiveTest
 	@Test
 	public void queryDepartures() throws Exception
 	{
-		final QueryDeparturesResult result = provider.queryDepartures("10000", 0, false);
+		final QueryDeparturesResult result = queryDepartures("10000", false);
 
 		print(result);
 	}
diff --git a/enabler/test/de/schildbach/pte/live/BvgProviderLiveTest.java b/enabler/test/de/schildbach/pte/live/BvgProviderLiveTest.java
index dbf70f14..c3188066 100644
--- a/enabler/test/de/schildbach/pte/live/BvgProviderLiveTest.java
+++ b/enabler/test/de/schildbach/pte/live/BvgProviderLiveTest.java
@@ -71,11 +71,11 @@ public class BvgProviderLiveTest extends AbstractProviderLiveTest
 	@Test
 	public void queryDepartures() throws Exception
 	{
-		final QueryDeparturesResult resultLive = provider.queryDepartures("309557", 0, false);
+		final QueryDeparturesResult resultLive = queryDepartures("309557", false);
 		assertEquals(QueryDeparturesResult.Status.OK, resultLive.status);
 		print(resultLive);
 
-		final QueryDeparturesResult resultPlan = provider.queryDepartures("9100003", 0, false);
+		final QueryDeparturesResult resultPlan = queryDepartures("9100003", false);
 		assertEquals(QueryDeparturesResult.Status.OK, resultPlan.status);
 		print(resultPlan);
 	}
@@ -83,10 +83,10 @@ public class BvgProviderLiveTest extends AbstractProviderLiveTest
 	@Test
 	public void queryDeparturesInvalidStation() throws Exception
 	{
-		final QueryDeparturesResult resultLive = provider.queryDepartures("111111", 0, false);
+		final QueryDeparturesResult resultLive = queryDepartures("111111", false);
 		assertEquals(QueryDeparturesResult.Status.INVALID_STATION, resultLive.status);
 
-		final QueryDeparturesResult resultPlan = provider.queryDepartures("2449475", 0, false);
+		final QueryDeparturesResult resultPlan = queryDepartures("2449475", false);
 		assertEquals(QueryDeparturesResult.Status.INVALID_STATION, resultPlan.status);
 	}
 
diff --git a/enabler/test/de/schildbach/pte/live/DingProviderLiveTest.java b/enabler/test/de/schildbach/pte/live/DingProviderLiveTest.java
index c7902934..3294040e 100644
--- a/enabler/test/de/schildbach/pte/live/DingProviderLiveTest.java
+++ b/enabler/test/de/schildbach/pte/live/DingProviderLiveTest.java
@@ -64,7 +64,7 @@ public class DingProviderLiveTest extends AbstractProviderLiveTest
 	@Test
 	public void queryDepartures() throws Exception
 	{
-		final QueryDeparturesResult result = provider.queryDepartures("90001611", 0, false);
+		final QueryDeparturesResult result = queryDepartures("90001611", false);
 
 		print(result);
 	}
diff --git a/enabler/test/de/schildbach/pte/live/DsbProviderLiveTest.java b/enabler/test/de/schildbach/pte/live/DsbProviderLiveTest.java
index e5adae10..bba4570a 100644
--- a/enabler/test/de/schildbach/pte/live/DsbProviderLiveTest.java
+++ b/enabler/test/de/schildbach/pte/live/DsbProviderLiveTest.java
@@ -63,7 +63,7 @@ public class DsbProviderLiveTest extends AbstractProviderLiveTest
 	@Test
 	public void queryDepartures() throws Exception
 	{
-		final QueryDeparturesResult result = provider.queryDepartures("8600858", 0, false);
+		final QueryDeparturesResult result = queryDepartures("8600858", false);
 
 		print(result);
 	}
@@ -71,7 +71,7 @@ public class DsbProviderLiveTest extends AbstractProviderLiveTest
 	@Test
 	public void queryDeparturesInvalidStation() throws Exception
 	{
-		final QueryDeparturesResult result = provider.queryDepartures("999999", 0, false);
+		final QueryDeparturesResult result = queryDepartures("999999", false);
 
 		assertEquals(QueryDeparturesResult.Status.INVALID_STATION, result.status);
 	}
diff --git a/enabler/test/de/schildbach/pte/live/EireannProviderLiveTest.java b/enabler/test/de/schildbach/pte/live/EireannProviderLiveTest.java
index 648c5e17..8f918d94 100644
--- a/enabler/test/de/schildbach/pte/live/EireannProviderLiveTest.java
+++ b/enabler/test/de/schildbach/pte/live/EireannProviderLiveTest.java
@@ -63,7 +63,7 @@ public class EireannProviderLiveTest extends AbstractProviderLiveTest
 	@Test
 	public void queryDepartures() throws Exception
 	{
-		final QueryDeparturesResult result = provider.queryDepartures("8013500", 0, false);
+		final QueryDeparturesResult result = queryDepartures("8013500", false);
 
 		print(result);
 	}
@@ -71,7 +71,7 @@ public class EireannProviderLiveTest extends AbstractProviderLiveTest
 	@Test
 	public void queryDeparturesInvalidStation() throws Exception
 	{
-		final QueryDeparturesResult result = provider.queryDepartures("999999", 0, false);
+		final QueryDeparturesResult result = queryDepartures("999999", false);
 
 		assertEquals(QueryDeparturesResult.Status.INVALID_STATION, result.status);
 	}
diff --git a/enabler/test/de/schildbach/pte/live/GvhProviderLiveTest.java b/enabler/test/de/schildbach/pte/live/GvhProviderLiveTest.java
index f9e51aab..b5d67fd2 100644
--- a/enabler/test/de/schildbach/pte/live/GvhProviderLiveTest.java
+++ b/enabler/test/de/schildbach/pte/live/GvhProviderLiveTest.java
@@ -74,7 +74,7 @@ public class GvhProviderLiveTest extends AbstractProviderLiveTest
 	@Test
 	public void queryDepartures() throws Exception
 	{
-		final QueryDeparturesResult result = provider.queryDepartures("25000031", 0, false);
+		final QueryDeparturesResult result = queryDepartures("25000031", false);
 
 		print(result);
 	}
diff --git a/enabler/test/de/schildbach/pte/live/InvgProviderLiveTest.java b/enabler/test/de/schildbach/pte/live/InvgProviderLiveTest.java
index f9f7d133..24c327d8 100644
--- a/enabler/test/de/schildbach/pte/live/InvgProviderLiveTest.java
+++ b/enabler/test/de/schildbach/pte/live/InvgProviderLiveTest.java
@@ -63,7 +63,7 @@ public class InvgProviderLiveTest extends AbstractProviderLiveTest
 	@Test
 	public void queryDepartures() throws Exception
 	{
-		final QueryDeparturesResult result = provider.queryDepartures("80301", 0, false);
+		final QueryDeparturesResult result = queryDepartures("80301", false);
 
 		print(result);
 	}
@@ -71,7 +71,7 @@ public class InvgProviderLiveTest extends AbstractProviderLiveTest
 	@Test
 	public void queryDeparturesInvalidStation() throws Exception
 	{
-		final QueryDeparturesResult result = provider.queryDepartures("999999", 0, false);
+		final QueryDeparturesResult result = queryDepartures("999999", false);
 
 		assertEquals(QueryDeparturesResult.Status.INVALID_STATION, result.status);
 	}
diff --git a/enabler/test/de/schildbach/pte/live/IvbProviderLiveTest.java b/enabler/test/de/schildbach/pte/live/IvbProviderLiveTest.java
index 0d8fb1ba..7a7c1e55 100644
--- a/enabler/test/de/schildbach/pte/live/IvbProviderLiveTest.java
+++ b/enabler/test/de/schildbach/pte/live/IvbProviderLiveTest.java
@@ -64,7 +64,7 @@ public class IvbProviderLiveTest extends AbstractProviderLiveTest
 	@Test
 	public void queryDepartures() throws Exception
 	{
-		final QueryDeparturesResult result = provider.queryDepartures("60401187", 0, false);
+		final QueryDeparturesResult result = queryDepartures("60401187", false);
 
 		print(result);
 	}
diff --git a/enabler/test/de/schildbach/pte/live/JetProviderLiveTest.java b/enabler/test/de/schildbach/pte/live/JetProviderLiveTest.java
index e0655650..31121ae2 100644
--- a/enabler/test/de/schildbach/pte/live/JetProviderLiveTest.java
+++ b/enabler/test/de/schildbach/pte/live/JetProviderLiveTest.java
@@ -63,20 +63,20 @@ public class JetProviderLiveTest extends AbstractProviderLiveTest
 	@Test
 	public void queryDepartures() throws Exception
 	{
-		final QueryDeparturesResult result1 = provider.queryDepartures("568", 0, false);
+		final QueryDeparturesResult result1 = queryDepartures("568", false);
 		print(result1);
 
-		final QueryDeparturesResult result2 = provider.queryDepartures("1055", 0, false);
+		final QueryDeparturesResult result2 = queryDepartures("1055", false);
 		print(result2);
 
-		final QueryDeparturesResult result3 = provider.queryDepartures("90010", 0, false);
+		final QueryDeparturesResult result3 = queryDepartures("90010", false);
 		print(result3);
 	}
 
 	@Test
 	public void queryDeparturesInvalidStation() throws Exception
 	{
-		final QueryDeparturesResult result = provider.queryDepartures("999999", 0, false);
+		final QueryDeparturesResult result = queryDepartures("999999", false);
 
 		assertEquals(QueryDeparturesResult.Status.INVALID_STATION, result.status);
 	}
diff --git a/enabler/test/de/schildbach/pte/live/KvvProviderLiveTest.java b/enabler/test/de/schildbach/pte/live/KvvProviderLiveTest.java
index 475cfece..1a85c679 100644
--- a/enabler/test/de/schildbach/pte/live/KvvProviderLiveTest.java
+++ b/enabler/test/de/schildbach/pte/live/KvvProviderLiveTest.java
@@ -64,7 +64,7 @@ public class KvvProviderLiveTest extends AbstractProviderLiveTest
 	@Test
 	public void queryDepartures() throws Exception
 	{
-		final QueryDeparturesResult result = provider.queryDepartures("7000090", 0, false);
+		final QueryDeparturesResult result = queryDepartures("7000090", false);
 
 		print(result);
 	}
diff --git a/enabler/test/de/schildbach/pte/live/LinzProviderLiveTest.java b/enabler/test/de/schildbach/pte/live/LinzProviderLiveTest.java
index 0e0552ca..a97dca2f 100644
--- a/enabler/test/de/schildbach/pte/live/LinzProviderLiveTest.java
+++ b/enabler/test/de/schildbach/pte/live/LinzProviderLiveTest.java
@@ -64,7 +64,7 @@ public class LinzProviderLiveTest extends AbstractProviderLiveTest
 	@Test
 	public void queryDepartures() throws Exception
 	{
-		final QueryDeparturesResult result = provider.queryDepartures("60501720", 0, false);
+		final QueryDeparturesResult result = queryDepartures("60501720", false);
 		print(result);
 	}
 
diff --git a/enabler/test/de/schildbach/pte/live/LuProviderLiveTest.java b/enabler/test/de/schildbach/pte/live/LuProviderLiveTest.java
index 91859076..bbbba67a 100644
--- a/enabler/test/de/schildbach/pte/live/LuProviderLiveTest.java
+++ b/enabler/test/de/schildbach/pte/live/LuProviderLiveTest.java
@@ -63,7 +63,7 @@ public class LuProviderLiveTest extends AbstractProviderLiveTest
 	@Test
 	public void queryDepartures() throws Exception
 	{
-		final QueryDeparturesResult result = provider.queryDepartures("200501001", 0, false);
+		final QueryDeparturesResult result = queryDepartures("200501001", false);
 
 		print(result);
 	}
@@ -71,7 +71,7 @@ public class LuProviderLiveTest extends AbstractProviderLiveTest
 	@Test
 	public void queryDeparturesInvalidStation() throws Exception
 	{
-		final QueryDeparturesResult result = provider.queryDepartures("999999", 0, false);
+		final QueryDeparturesResult result = queryDepartures("999999", false);
 
 		assertEquals(QueryDeparturesResult.Status.INVALID_STATION, result.status);
 	}
diff --git a/enabler/test/de/schildbach/pte/live/MetProviderLiveTest.java b/enabler/test/de/schildbach/pte/live/MetProviderLiveTest.java
index 43f83b22..6c643fde 100644
--- a/enabler/test/de/schildbach/pte/live/MetProviderLiveTest.java
+++ b/enabler/test/de/schildbach/pte/live/MetProviderLiveTest.java
@@ -64,7 +64,7 @@ public class MetProviderLiveTest extends AbstractProviderLiveTest
 	@Test
 	public void queryDepartures() throws Exception
 	{
-		final QueryDeparturesResult result = provider.queryDepartures("10001167", 0, false);
+		final QueryDeparturesResult result = queryDepartures("10001167", false);
 
 		print(result);
 	}
diff --git a/enabler/test/de/schildbach/pte/live/MvgProviderLiveTest.java b/enabler/test/de/schildbach/pte/live/MvgProviderLiveTest.java
index 9107489a..36211c86 100644
--- a/enabler/test/de/schildbach/pte/live/MvgProviderLiveTest.java
+++ b/enabler/test/de/schildbach/pte/live/MvgProviderLiveTest.java
@@ -66,7 +66,7 @@ public class MvgProviderLiveTest extends AbstractProviderLiveTest
 	@Test
 	public void queryDepartures() throws Exception
 	{
-		final QueryDeparturesResult result = provider.queryDepartures("3", 0, false);
+		final QueryDeparturesResult result = queryDepartures("3", false);
 
 		print(result);
 	}
diff --git a/enabler/test/de/schildbach/pte/live/MvvProviderLiveTest.java b/enabler/test/de/schildbach/pte/live/MvvProviderLiveTest.java
index 25bc1fc7..8b4b6450 100644
--- a/enabler/test/de/schildbach/pte/live/MvvProviderLiveTest.java
+++ b/enabler/test/de/schildbach/pte/live/MvvProviderLiveTest.java
@@ -65,7 +65,7 @@ public class MvvProviderLiveTest extends AbstractProviderLiveTest
 	@Test
 	public void queryDepartures() throws Exception
 	{
-		final QueryDeparturesResult result = provider.queryDepartures("2", 0, false);
+		final QueryDeparturesResult result = queryDepartures("2", false);
 
 		assertEquals(QueryDeparturesResult.Status.OK, result.status);
 		print(result);
@@ -74,7 +74,7 @@ public class MvvProviderLiveTest extends AbstractProviderLiveTest
 	@Test
 	public void queryDeparturesInvalidStation() throws Exception
 	{
-		final QueryDeparturesResult result = provider.queryDepartures("999999", 0, false);
+		final QueryDeparturesResult result = queryDepartures("999999", false);
 
 		assertEquals(QueryDeparturesResult.Status.INVALID_STATION, result.status);
 	}
diff --git a/enabler/test/de/schildbach/pte/live/NaldoProviderLiveTest.java b/enabler/test/de/schildbach/pte/live/NaldoProviderLiveTest.java
index 297171d9..e054ddb0 100644
--- a/enabler/test/de/schildbach/pte/live/NaldoProviderLiveTest.java
+++ b/enabler/test/de/schildbach/pte/live/NaldoProviderLiveTest.java
@@ -64,7 +64,7 @@ public class NaldoProviderLiveTest extends AbstractProviderLiveTest
 	@Test
 	public void queryDepartures() throws Exception
 	{
-		final QueryDeparturesResult result = provider.queryDepartures("53019174", 0, false);
+		final QueryDeparturesResult result = queryDepartures("53019174", false);
 
 		print(result);
 	}
diff --git a/enabler/test/de/schildbach/pte/live/NasaProviderLiveTest.java b/enabler/test/de/schildbach/pte/live/NasaProviderLiveTest.java
index ec9bb05f..c77f35c7 100644
--- a/enabler/test/de/schildbach/pte/live/NasaProviderLiveTest.java
+++ b/enabler/test/de/schildbach/pte/live/NasaProviderLiveTest.java
@@ -66,7 +66,7 @@ public class NasaProviderLiveTest extends AbstractProviderLiveTest
 	@Test
 	public void queryDepartures() throws Exception
 	{
-		final QueryDeparturesResult result = provider.queryDepartures("13000", 0, false);
+		final QueryDeparturesResult result = queryDepartures("13000", false);
 
 		print(result);
 	}
@@ -74,7 +74,7 @@ public class NasaProviderLiveTest extends AbstractProviderLiveTest
 	@Test
 	public void queryDeparturesInvalidStation() throws Exception
 	{
-		final QueryDeparturesResult result = provider.queryDepartures("999999", 0, false);
+		final QueryDeparturesResult result = queryDepartures("999999", false);
 
 		assertEquals(QueryDeparturesResult.Status.INVALID_STATION, result.status);
 	}
diff --git a/enabler/test/de/schildbach/pte/live/NriProviderLiveTest.java b/enabler/test/de/schildbach/pte/live/NriProviderLiveTest.java
index 9fab8ad7..fccc910e 100644
--- a/enabler/test/de/schildbach/pte/live/NriProviderLiveTest.java
+++ b/enabler/test/de/schildbach/pte/live/NriProviderLiveTest.java
@@ -63,7 +63,7 @@ public class NriProviderLiveTest extends AbstractProviderLiveTest
 	@Test
 	public void queryDepartures() throws Exception
 	{
-		final QueryDeparturesResult result = provider.queryDepartures("6735", 0, false);
+		final QueryDeparturesResult result = queryDepartures("6735", false);
 
 		print(result);
 	}
@@ -71,7 +71,7 @@ public class NriProviderLiveTest extends AbstractProviderLiveTest
 	@Test
 	public void queryDeparturesInvalidStation() throws Exception
 	{
-		final QueryDeparturesResult result = provider.queryDepartures("999999", 0, false);
+		final QueryDeparturesResult result = queryDepartures("999999", false);
 
 		assertEquals(QueryDeparturesResult.Status.INVALID_STATION, result.status);
 	}
diff --git a/enabler/test/de/schildbach/pte/live/NsProviderLiveTest.java b/enabler/test/de/schildbach/pte/live/NsProviderLiveTest.java
index ac471bea..e41e8321 100644
--- a/enabler/test/de/schildbach/pte/live/NsProviderLiveTest.java
+++ b/enabler/test/de/schildbach/pte/live/NsProviderLiveTest.java
@@ -62,7 +62,7 @@ public class NsProviderLiveTest extends AbstractProviderLiveTest
 	@Test
 	public void queryDepartures() throws Exception
 	{
-		final QueryDeparturesResult result = provider.queryDepartures("8800004", 0, false);
+		final QueryDeparturesResult result = queryDepartures("8800004", false);
 
 		print(result);
 	}
@@ -70,7 +70,7 @@ public class NsProviderLiveTest extends AbstractProviderLiveTest
 	@Test
 	public void queryDeparturesInvalidStation() throws Exception
 	{
-		final QueryDeparturesResult result = provider.queryDepartures("999999", 0, false);
+		final QueryDeparturesResult result = queryDepartures("999999", false);
 
 		assertEquals(QueryDeparturesResult.Status.INVALID_STATION, result.status);
 	}
diff --git a/enabler/test/de/schildbach/pte/live/NvbwProviderLiveTest.java b/enabler/test/de/schildbach/pte/live/NvbwProviderLiveTest.java
index d1d0b0aa..9aac5386 100644
--- a/enabler/test/de/schildbach/pte/live/NvbwProviderLiveTest.java
+++ b/enabler/test/de/schildbach/pte/live/NvbwProviderLiveTest.java
@@ -66,7 +66,7 @@ public class NvbwProviderLiveTest extends AbstractProviderLiveTest
 	@Test
 	public void queryDepartures() throws Exception
 	{
-		final QueryDeparturesResult result = provider.queryDepartures("6900001", 0, false);
+		final QueryDeparturesResult result = queryDepartures("6900001", false);
 
 		print(result);
 	}
diff --git a/enabler/test/de/schildbach/pte/live/NvvProviderLiveTest.java b/enabler/test/de/schildbach/pte/live/NvvProviderLiveTest.java
index 81a3339a..40567d62 100644
--- a/enabler/test/de/schildbach/pte/live/NvvProviderLiveTest.java
+++ b/enabler/test/de/schildbach/pte/live/NvvProviderLiveTest.java
@@ -73,23 +73,23 @@ public class NvvProviderLiveTest extends AbstractProviderLiveTest
 	@Test
 	public void queryDepartures() throws Exception
 	{
-		final QueryDeparturesResult result = provider.queryDepartures("3000408", 0, false);
+		final QueryDeparturesResult result = queryDepartures("3000408", false);
 		print(result);
 
-		final QueryDeparturesResult result2 = provider.queryDepartures("3000010", 0, false);
+		final QueryDeparturesResult result2 = queryDepartures("3000010", false);
 		print(result2);
 
-		final QueryDeparturesResult result3 = provider.queryDepartures("3015989", 0, false);
+		final QueryDeparturesResult result3 = queryDepartures("3015989", false);
 		print(result3);
 
-		final QueryDeparturesResult result4 = provider.queryDepartures("3000139", 0, false);
+		final QueryDeparturesResult result4 = queryDepartures("3000139", false);
 		print(result4);
 	}
 
 	@Test
 	public void queryDeparturesInvalidStation() throws Exception
 	{
-		final QueryDeparturesResult result = provider.queryDepartures("999999", 0, false);
+		final QueryDeparturesResult result = queryDepartures("999999", false);
 
 		assertEquals(QueryDeparturesResult.Status.INVALID_STATION, result.status);
 	}
diff --git a/enabler/test/de/schildbach/pte/live/OebbProviderLiveTest.java b/enabler/test/de/schildbach/pte/live/OebbProviderLiveTest.java
index fd5c11e4..f172ac13 100644
--- a/enabler/test/de/schildbach/pte/live/OebbProviderLiveTest.java
+++ b/enabler/test/de/schildbach/pte/live/OebbProviderLiveTest.java
@@ -66,7 +66,7 @@ public class OebbProviderLiveTest extends AbstractProviderLiveTest
 	@Test
 	public void queryDepartures() throws Exception
 	{
-		final QueryDeparturesResult result = provider.queryDepartures("902006", 0, false);
+		final QueryDeparturesResult result = queryDepartures("902006", false);
 
 		print(result);
 		assertEquals(QueryDeparturesResult.Status.OK, result.status);
@@ -76,7 +76,7 @@ public class OebbProviderLiveTest extends AbstractProviderLiveTest
 	@Test
 	public void queryDeparturesInvalidStation() throws Exception
 	{
-		final QueryDeparturesResult result = provider.queryDepartures("999999", 0, false);
+		final QueryDeparturesResult result = queryDepartures("999999", false);
 
 		assertEquals(QueryDeparturesResult.Status.INVALID_STATION, result.status);
 	}
diff --git a/enabler/test/de/schildbach/pte/live/PlProviderLiveTest.java b/enabler/test/de/schildbach/pte/live/PlProviderLiveTest.java
index 05e9cbe2..5b80fdbe 100644
--- a/enabler/test/de/schildbach/pte/live/PlProviderLiveTest.java
+++ b/enabler/test/de/schildbach/pte/live/PlProviderLiveTest.java
@@ -63,7 +63,7 @@ public class PlProviderLiveTest extends AbstractProviderLiveTest
 	@Test
 	public void queryDepartures() throws Exception
 	{
-		final QueryDeparturesResult result = provider.queryDepartures("5100065", 0, false);
+		final QueryDeparturesResult result = queryDepartures("5100065", false);
 
 		print(result);
 	}
@@ -71,7 +71,7 @@ public class PlProviderLiveTest extends AbstractProviderLiveTest
 	@Test
 	public void queryDeparturesInvalidStation() throws Exception
 	{
-		final QueryDeparturesResult result = provider.queryDepartures("999999", 0, false);
+		final QueryDeparturesResult result = queryDepartures("999999", false);
 
 		assertEquals(QueryDeparturesResult.Status.INVALID_STATION, result.status);
 	}
diff --git a/enabler/test/de/schildbach/pte/live/RsagProviderLiveTest.java b/enabler/test/de/schildbach/pte/live/RsagProviderLiveTest.java
index 4cfc233d..1f25d663 100644
--- a/enabler/test/de/schildbach/pte/live/RsagProviderLiveTest.java
+++ b/enabler/test/de/schildbach/pte/live/RsagProviderLiveTest.java
@@ -65,7 +65,7 @@ public class RsagProviderLiveTest extends AbstractProviderLiveTest
 	@Test
 	public void queryDepartures() throws Exception
 	{
-		final QueryDeparturesResult result = provider.queryDepartures("8010304", 0, false);
+		final QueryDeparturesResult result = queryDepartures("8010304", false);
 
 		print(result);
 	}
@@ -73,7 +73,7 @@ public class RsagProviderLiveTest extends AbstractProviderLiveTest
 	@Test
 	public void queryDeparturesInvalidStation() throws Exception
 	{
-		final QueryDeparturesResult result = provider.queryDepartures("999999", 0, false);
+		final QueryDeparturesResult result = queryDepartures("999999", false);
 
 		assertEquals(QueryDeparturesResult.Status.INVALID_STATION, result.status);
 	}
diff --git a/enabler/test/de/schildbach/pte/live/RtProviderLiveTest.java b/enabler/test/de/schildbach/pte/live/RtProviderLiveTest.java
index 4c723d42..76977449 100644
--- a/enabler/test/de/schildbach/pte/live/RtProviderLiveTest.java
+++ b/enabler/test/de/schildbach/pte/live/RtProviderLiveTest.java
@@ -63,7 +63,7 @@ public class RtProviderLiveTest extends AbstractProviderLiveTest
 	@Test
 	public void queryDepartures() throws Exception
 	{
-		final QueryDeparturesResult result = provider.queryDepartures("8588344", 0, false);
+		final QueryDeparturesResult result = queryDepartures("8588344", false);
 
 		print(result);
 	}
@@ -71,7 +71,7 @@ public class RtProviderLiveTest extends AbstractProviderLiveTest
 	@Test
 	public void queryDeparturesInvalidStation() throws Exception
 	{
-		final QueryDeparturesResult result = provider.queryDepartures("999999", 0, false);
+		final QueryDeparturesResult result = queryDepartures("999999", false);
 
 		assertEquals(QueryDeparturesResult.Status.INVALID_STATION, result.status);
 	}
diff --git a/enabler/test/de/schildbach/pte/live/SbbProviderLiveTest.java b/enabler/test/de/schildbach/pte/live/SbbProviderLiveTest.java
index 25fe4ca3..eee0a22b 100644
--- a/enabler/test/de/schildbach/pte/live/SbbProviderLiveTest.java
+++ b/enabler/test/de/schildbach/pte/live/SbbProviderLiveTest.java
@@ -63,7 +63,7 @@ public class SbbProviderLiveTest extends AbstractProviderLiveTest
 	@Test
 	public void queryDepartures() throws Exception
 	{
-		final QueryDeparturesResult result = provider.queryDepartures("8500010", 0, false);
+		final QueryDeparturesResult result = queryDepartures("8500010", false);
 
 		print(result);
 	}
@@ -71,7 +71,7 @@ public class SbbProviderLiveTest extends AbstractProviderLiveTest
 	@Test
 	public void queryDeparturesInvalidStation() throws Exception
 	{
-		final QueryDeparturesResult result = provider.queryDepartures("999999", 0, false);
+		final QueryDeparturesResult result = queryDepartures("999999", false);
 
 		assertEquals(QueryDeparturesResult.Status.INVALID_STATION, result.status);
 	}
diff --git a/enabler/test/de/schildbach/pte/live/SeProviderLiveTest.java b/enabler/test/de/schildbach/pte/live/SeProviderLiveTest.java
index 7121a7c0..c1b3b965 100644
--- a/enabler/test/de/schildbach/pte/live/SeProviderLiveTest.java
+++ b/enabler/test/de/schildbach/pte/live/SeProviderLiveTest.java
@@ -63,7 +63,7 @@ public class SeProviderLiveTest extends AbstractProviderLiveTest
 	@Test
 	public void queryDepartures() throws Exception
 	{
-		final QueryDeparturesResult result = provider.queryDepartures("7414867", 0, false);
+		final QueryDeparturesResult result = queryDepartures("7414867", false);
 
 		print(result);
 	}
@@ -71,7 +71,7 @@ public class SeProviderLiveTest extends AbstractProviderLiveTest
 	@Test
 	public void queryDeparturesInvalidStation() throws Exception
 	{
-		final QueryDeparturesResult result = provider.queryDepartures("999999", 0, false);
+		final QueryDeparturesResult result = queryDepartures("999999", false);
 
 		assertEquals(QueryDeparturesResult.Status.INVALID_STATION, result.status);
 	}
diff --git a/enabler/test/de/schildbach/pte/live/SeptaProviderLiveTest.java b/enabler/test/de/schildbach/pte/live/SeptaProviderLiveTest.java
index 6f5cd08b..f7215bf3 100644
--- a/enabler/test/de/schildbach/pte/live/SeptaProviderLiveTest.java
+++ b/enabler/test/de/schildbach/pte/live/SeptaProviderLiveTest.java
@@ -63,7 +63,7 @@ public class SeptaProviderLiveTest extends AbstractProviderLiveTest
 	@Test
 	public void queryDepartures() throws Exception
 	{
-		final QueryDeparturesResult result = provider.queryDepartures("2090227", 0, false);
+		final QueryDeparturesResult result = queryDepartures("2090227", false);
 
 		print(result);
 	}
@@ -71,7 +71,7 @@ public class SeptaProviderLiveTest extends AbstractProviderLiveTest
 	@Test
 	public void queryDeparturesInvalidStation() throws Exception
 	{
-		final QueryDeparturesResult result = provider.queryDepartures("999999", 0, false);
+		final QueryDeparturesResult result = queryDepartures("999999", false);
 
 		assertEquals(QueryDeparturesResult.Status.INVALID_STATION, result.status);
 	}
diff --git a/enabler/test/de/schildbach/pte/live/SfProviderLiveTest.java b/enabler/test/de/schildbach/pte/live/SfProviderLiveTest.java
index 8536fbb7..7128c7f5 100644
--- a/enabler/test/de/schildbach/pte/live/SfProviderLiveTest.java
+++ b/enabler/test/de/schildbach/pte/live/SfProviderLiveTest.java
@@ -64,7 +64,7 @@ public class SfProviderLiveTest extends AbstractProviderLiveTest
 	@Test
 	public void queryDepartures() throws Exception
 	{
-		final QueryDeparturesResult result = provider.queryDepartures("10001017", 0, false);
+		final QueryDeparturesResult result = queryDepartures("10001017", false);
 
 		print(result);
 	}
diff --git a/enabler/test/de/schildbach/pte/live/ShProviderLiveTest.java b/enabler/test/de/schildbach/pte/live/ShProviderLiveTest.java
index ce4ea244..ec672736 100644
--- a/enabler/test/de/schildbach/pte/live/ShProviderLiveTest.java
+++ b/enabler/test/de/schildbach/pte/live/ShProviderLiveTest.java
@@ -55,7 +55,7 @@ public class ShProviderLiveTest extends AbstractProviderLiveTest
 	@Test
 	public void queryDepartures() throws Exception
 	{
-		final QueryDeparturesResult result = provider.queryDepartures("8002547", 0, false);
+		final QueryDeparturesResult result = queryDepartures("8002547", false);
 
 		print(result);
 	}
@@ -63,7 +63,7 @@ public class ShProviderLiveTest extends AbstractProviderLiveTest
 	@Test
 	public void queryDeparturesInvalidStation() throws Exception
 	{
-		final QueryDeparturesResult result = provider.queryDepartures("999999", 0, false);
+		final QueryDeparturesResult result = queryDepartures("999999", false);
 
 		assertEquals(QueryDeparturesResult.Status.INVALID_STATION, result.status);
 	}
diff --git a/enabler/test/de/schildbach/pte/live/SncbProviderLiveTest.java b/enabler/test/de/schildbach/pte/live/SncbProviderLiveTest.java
index ba322485..1776436a 100644
--- a/enabler/test/de/schildbach/pte/live/SncbProviderLiveTest.java
+++ b/enabler/test/de/schildbach/pte/live/SncbProviderLiveTest.java
@@ -63,7 +63,7 @@ public class SncbProviderLiveTest extends AbstractProviderLiveTest
 	@Test
 	public void queryDepartures() throws Exception
 	{
-		final QueryDeparturesResult result = provider.queryDepartures("8813003", 0, false);
+		final QueryDeparturesResult result = queryDepartures("8813003", false);
 
 		print(result);
 	}
@@ -71,7 +71,7 @@ public class SncbProviderLiveTest extends AbstractProviderLiveTest
 	@Test
 	public void queryDeparturesInvalidStation() throws Exception
 	{
-		final QueryDeparturesResult result = provider.queryDepartures("999999", 0, false);
+		final QueryDeparturesResult result = queryDepartures("999999", false);
 
 		assertEquals(QueryDeparturesResult.Status.INVALID_STATION, result.status);
 	}
diff --git a/enabler/test/de/schildbach/pte/live/StockholmProviderLiveTest.java b/enabler/test/de/schildbach/pte/live/StockholmProviderLiveTest.java
index c2287c6e..8b389791 100644
--- a/enabler/test/de/schildbach/pte/live/StockholmProviderLiveTest.java
+++ b/enabler/test/de/schildbach/pte/live/StockholmProviderLiveTest.java
@@ -63,7 +63,7 @@ public class StockholmProviderLiveTest extends AbstractProviderLiveTest
 	@Test
 	public void queryDepartures() throws Exception
 	{
-		final QueryDeparturesResult result = provider.queryDepartures("301109600", 0, false);
+		final QueryDeparturesResult result = queryDepartures("301109600", false);
 
 		print(result);
 	}
@@ -71,7 +71,7 @@ public class StockholmProviderLiveTest extends AbstractProviderLiveTest
 	@Test
 	public void queryDeparturesInvalidStation() throws Exception
 	{
-		final QueryDeparturesResult result = provider.queryDepartures("999999", 0, false);
+		final QueryDeparturesResult result = queryDepartures("999999", false);
 
 		assertEquals(QueryDeparturesResult.Status.INVALID_STATION, result.status);
 	}
diff --git a/enabler/test/de/schildbach/pte/live/StvProviderLiveTest.java b/enabler/test/de/schildbach/pte/live/StvProviderLiveTest.java
index 55c9d267..4377c1d1 100644
--- a/enabler/test/de/schildbach/pte/live/StvProviderLiveTest.java
+++ b/enabler/test/de/schildbach/pte/live/StvProviderLiveTest.java
@@ -66,7 +66,7 @@ public class StvProviderLiveTest extends AbstractProviderLiveTest
 	@Test
 	public void queryDepartures() throws Exception
 	{
-		final QueryDeparturesResult result = provider.queryDepartures("63203040", 0, false);
+		final QueryDeparturesResult result = queryDepartures("63203040", false);
 
 		print(result);
 	}
diff --git a/enabler/test/de/schildbach/pte/live/SvvProviderLiveTest.java b/enabler/test/de/schildbach/pte/live/SvvProviderLiveTest.java
index 2ef6294f..d3b88fcb 100644
--- a/enabler/test/de/schildbach/pte/live/SvvProviderLiveTest.java
+++ b/enabler/test/de/schildbach/pte/live/SvvProviderLiveTest.java
@@ -66,7 +66,7 @@ public class SvvProviderLiveTest extends AbstractProviderLiveTest
 	@Test
 	public void queryDepartures() throws Exception
 	{
-		final QueryDeparturesResult result = provider.queryDepartures("60650002", 0, false);
+		final QueryDeparturesResult result = queryDepartures("60650002", false);
 
 		print(result);
 	}
diff --git a/enabler/test/de/schildbach/pte/live/SydneyProviderLiveTest.java b/enabler/test/de/schildbach/pte/live/SydneyProviderLiveTest.java
index 5bd5b676..ae09b12c 100644
--- a/enabler/test/de/schildbach/pte/live/SydneyProviderLiveTest.java
+++ b/enabler/test/de/schildbach/pte/live/SydneyProviderLiveTest.java
@@ -64,7 +64,7 @@ public class SydneyProviderLiveTest extends AbstractProviderLiveTest
 	@Test
 	public void queryDepartures() throws Exception
 	{
-		final QueryDeparturesResult result = provider.queryDepartures("10101101", 0, false);
+		final QueryDeparturesResult result = queryDepartures("10101101", false);
 
 		print(result);
 	}
diff --git a/enabler/test/de/schildbach/pte/live/TfiProviderLiveTest.java b/enabler/test/de/schildbach/pte/live/TfiProviderLiveTest.java
index 3e1bb24a..2d9f04a4 100644
--- a/enabler/test/de/schildbach/pte/live/TfiProviderLiveTest.java
+++ b/enabler/test/de/schildbach/pte/live/TfiProviderLiveTest.java
@@ -64,7 +64,7 @@ public class TfiProviderLiveTest extends AbstractProviderLiveTest
 	@Test
 	public void queryDepartures() throws Exception
 	{
-		final QueryDeparturesResult result = provider.queryDepartures("51013670", 0, false);
+		final QueryDeparturesResult result = queryDepartures("51013670", false);
 
 		print(result);
 	}
diff --git a/enabler/test/de/schildbach/pte/live/TflProviderLiveTest.java b/enabler/test/de/schildbach/pte/live/TflProviderLiveTest.java
index b7df3ae9..2549d0f8 100644
--- a/enabler/test/de/schildbach/pte/live/TflProviderLiveTest.java
+++ b/enabler/test/de/schildbach/pte/live/TflProviderLiveTest.java
@@ -64,7 +64,7 @@ public class TflProviderLiveTest extends AbstractProviderLiveTest
 	@Test
 	public void queryDepartures() throws Exception
 	{
-		final QueryDeparturesResult result = provider.queryDepartures("1000086", 0, false);
+		final QueryDeparturesResult result = queryDepartures("1000086", false);
 
 		print(result);
 	}
diff --git a/enabler/test/de/schildbach/pte/live/TlemProviderLiveTest.java b/enabler/test/de/schildbach/pte/live/TlemProviderLiveTest.java
index 7e41a4d3..a1e45dde 100644
--- a/enabler/test/de/schildbach/pte/live/TlemProviderLiveTest.java
+++ b/enabler/test/de/schildbach/pte/live/TlemProviderLiveTest.java
@@ -64,7 +64,7 @@ public class TlemProviderLiveTest extends AbstractProviderLiveTest
 	@Test
 	public void queryDepartures() throws Exception
 	{
-		final QueryDeparturesResult result = provider.queryDepartures("1001003", 0, false);
+		final QueryDeparturesResult result = queryDepartures("1001003", false);
 
 		print(result);
 	}
diff --git a/enabler/test/de/schildbach/pte/live/TlswProviderLiveTest.java b/enabler/test/de/schildbach/pte/live/TlswProviderLiveTest.java
index 712bd37f..e47876ad 100644
--- a/enabler/test/de/schildbach/pte/live/TlswProviderLiveTest.java
+++ b/enabler/test/de/schildbach/pte/live/TlswProviderLiveTest.java
@@ -64,7 +64,7 @@ public class TlswProviderLiveTest extends AbstractProviderLiveTest
 	@Test
 	public void queryDepartures() throws Exception
 	{
-		final QueryDeparturesResult result = provider.queryDepartures("247616", 0, false);
+		final QueryDeparturesResult result = queryDepartures("247616", false);
 
 		print(result);
 	}
diff --git a/enabler/test/de/schildbach/pte/live/TlwmProviderLiveTest.java b/enabler/test/de/schildbach/pte/live/TlwmProviderLiveTest.java
index f98ba729..9753be69 100644
--- a/enabler/test/de/schildbach/pte/live/TlwmProviderLiveTest.java
+++ b/enabler/test/de/schildbach/pte/live/TlwmProviderLiveTest.java
@@ -64,7 +64,7 @@ public class TlwmProviderLiveTest extends AbstractProviderLiveTest
 	@Test
 	public void queryDepartures() throws Exception
 	{
-		final QueryDeparturesResult result = provider.queryDepartures("1001003", 0, false);
+		final QueryDeparturesResult result = queryDepartures("1001003", false);
 
 		print(result);
 	}
diff --git a/enabler/test/de/schildbach/pte/live/VagfrProviderLiveTest.java b/enabler/test/de/schildbach/pte/live/VagfrProviderLiveTest.java
index 2c0f95c0..413e7b92 100644
--- a/enabler/test/de/schildbach/pte/live/VagfrProviderLiveTest.java
+++ b/enabler/test/de/schildbach/pte/live/VagfrProviderLiveTest.java
@@ -66,7 +66,7 @@ public class VagfrProviderLiveTest extends AbstractProviderLiveTest
 	@Test
 	public void queryDepartures() throws Exception
 	{
-		final QueryDeparturesResult result = provider.queryDepartures("6930112", 0, false);
+		final QueryDeparturesResult result = queryDepartures("6930112", false);
 
 		print(result);
 	}
diff --git a/enabler/test/de/schildbach/pte/live/VbbProviderLiveTest.java b/enabler/test/de/schildbach/pte/live/VbbProviderLiveTest.java
index 24956488..50a50eba 100644
--- a/enabler/test/de/schildbach/pte/live/VbbProviderLiveTest.java
+++ b/enabler/test/de/schildbach/pte/live/VbbProviderLiveTest.java
@@ -71,7 +71,7 @@ public class VbbProviderLiveTest extends AbstractProviderLiveTest
 	@Test
 	public void queryDepartures() throws Exception
 	{
-		final QueryDeparturesResult result = provider.queryDepartures("9007102", 0, false);
+		final QueryDeparturesResult result = queryDepartures("9007102", false);
 
 		print(result);
 	}
@@ -79,10 +79,10 @@ public class VbbProviderLiveTest extends AbstractProviderLiveTest
 	@Test
 	public void queryDeparturesInvalidStation() throws Exception
 	{
-		final QueryDeparturesResult resultLive = provider.queryDepartures("111111", 0, false);
+		final QueryDeparturesResult resultLive = queryDepartures("111111", false);
 		assertEquals(QueryDeparturesResult.Status.INVALID_STATION, resultLive.status);
 
-		final QueryDeparturesResult resultPlan = provider.queryDepartures("2449475", 0, false);
+		final QueryDeparturesResult resultPlan = queryDepartures("2449475", false);
 		assertEquals(QueryDeparturesResult.Status.INVALID_STATION, resultPlan.status);
 	}
 
diff --git a/enabler/test/de/schildbach/pte/live/VblProviderLiveTest.java b/enabler/test/de/schildbach/pte/live/VblProviderLiveTest.java
index 65aa2262..5c98d27b 100644
--- a/enabler/test/de/schildbach/pte/live/VblProviderLiveTest.java
+++ b/enabler/test/de/schildbach/pte/live/VblProviderLiveTest.java
@@ -64,7 +64,7 @@ public class VblProviderLiveTest extends AbstractProviderLiveTest
 	@Test
 	public void queryDepartures() throws Exception
 	{
-		final QueryDeparturesResult result = provider.queryDepartures("717", 0, false);
+		final QueryDeparturesResult result = queryDepartures("717", false);
 
 		print(result);
 	}
diff --git a/enabler/test/de/schildbach/pte/live/VbnProviderLiveTest.java b/enabler/test/de/schildbach/pte/live/VbnProviderLiveTest.java
index 18d6eb63..ecf4d2b0 100644
--- a/enabler/test/de/schildbach/pte/live/VbnProviderLiveTest.java
+++ b/enabler/test/de/schildbach/pte/live/VbnProviderLiveTest.java
@@ -63,7 +63,7 @@ public class VbnProviderLiveTest extends AbstractProviderLiveTest
 	@Test
 	public void queryDepartures() throws Exception
 	{
-		final QueryDeparturesResult result = provider.queryDepartures("8000110", 0, false);
+		final QueryDeparturesResult result = queryDepartures("8000110", false);
 
 		print(result);
 	}
@@ -71,7 +71,7 @@ public class VbnProviderLiveTest extends AbstractProviderLiveTest
 	@Test
 	public void queryDeparturesInvalidStation() throws Exception
 	{
-		final QueryDeparturesResult result = provider.queryDepartures("999999", 0, false);
+		final QueryDeparturesResult result = queryDepartures("999999", false);
 
 		assertEquals(QueryDeparturesResult.Status.INVALID_STATION, result.status);
 	}
diff --git a/enabler/test/de/schildbach/pte/live/VgnProviderLiveTest.java b/enabler/test/de/schildbach/pte/live/VgnProviderLiveTest.java
index 6455edf8..ed934b0b 100644
--- a/enabler/test/de/schildbach/pte/live/VgnProviderLiveTest.java
+++ b/enabler/test/de/schildbach/pte/live/VgnProviderLiveTest.java
@@ -61,7 +61,7 @@ public class VgnProviderLiveTest extends AbstractProviderLiveTest
 	@Test
 	public void queryDepartures() throws Exception
 	{
-		final QueryDeparturesResult result = provider.queryDepartures("3000510", 0, false);
+		final QueryDeparturesResult result = queryDepartures("3000510", false);
 
 		print(result);
 	}
diff --git a/enabler/test/de/schildbach/pte/live/VgsProviderLiveTest.java b/enabler/test/de/schildbach/pte/live/VgsProviderLiveTest.java
index 88000a76..c33aaa99 100644
--- a/enabler/test/de/schildbach/pte/live/VgsProviderLiveTest.java
+++ b/enabler/test/de/schildbach/pte/live/VgsProviderLiveTest.java
@@ -71,7 +71,7 @@ public class VgsProviderLiveTest extends AbstractProviderLiveTest
 	@Test
 	public void queryDepartures() throws Exception
 	{
-		final QueryDeparturesResult result = provider.queryDepartures("8000244", 0, false);
+		final QueryDeparturesResult result = queryDepartures("8000244", false);
 
 		print(result);
 	}
@@ -79,7 +79,7 @@ public class VgsProviderLiveTest extends AbstractProviderLiveTest
 	@Test
 	public void queryDeparturesInvalidStation() throws Exception
 	{
-		final QueryDeparturesResult result = provider.queryDepartures("999999", 0, false);
+		final QueryDeparturesResult result = queryDepartures("999999", false);
 
 		assertEquals(QueryDeparturesResult.Status.INVALID_STATION, result.status);
 	}
diff --git a/enabler/test/de/schildbach/pte/live/VmobilProviderLiveTest.java b/enabler/test/de/schildbach/pte/live/VmobilProviderLiveTest.java
index e4e1e9cd..5346e4d2 100644
--- a/enabler/test/de/schildbach/pte/live/VmobilProviderLiveTest.java
+++ b/enabler/test/de/schildbach/pte/live/VmobilProviderLiveTest.java
@@ -64,7 +64,7 @@ public class VmobilProviderLiveTest extends AbstractProviderLiveTest
 	@Test
 	public void queryDepartures() throws Exception
 	{
-		final QueryDeparturesResult result = provider.queryDepartures("60001296", 0, false);
+		final QueryDeparturesResult result = queryDepartures("60001296", false);
 
 		print(result);
 	}
diff --git a/enabler/test/de/schildbach/pte/live/VmsProviderLiveTest.java b/enabler/test/de/schildbach/pte/live/VmsProviderLiveTest.java
index 5809de1d..b541956a 100644
--- a/enabler/test/de/schildbach/pte/live/VmsProviderLiveTest.java
+++ b/enabler/test/de/schildbach/pte/live/VmsProviderLiveTest.java
@@ -64,7 +64,7 @@ public class VmsProviderLiveTest extends AbstractProviderLiveTest
 	@Test
 	public void queryDepartures() throws Exception
 	{
-		final QueryDeparturesResult result = provider.queryDepartures("36030062", 0, false);
+		final QueryDeparturesResult result = queryDepartures("36030062", false);
 
 		print(result);
 	}
diff --git a/enabler/test/de/schildbach/pte/live/VmvProviderLiveTest.java b/enabler/test/de/schildbach/pte/live/VmvProviderLiveTest.java
index d138fa2e..7616a729 100644
--- a/enabler/test/de/schildbach/pte/live/VmvProviderLiveTest.java
+++ b/enabler/test/de/schildbach/pte/live/VmvProviderLiveTest.java
@@ -64,7 +64,7 @@ public class VmvProviderLiveTest extends AbstractProviderLiveTest
 	@Test
 	public void queryDepartures() throws Exception
 	{
-		final QueryDeparturesResult result = provider.queryDepartures("80001834", 0, false);
+		final QueryDeparturesResult result = queryDepartures("80001834", false);
 
 		print(result);
 	}
diff --git a/enabler/test/de/schildbach/pte/live/VorProviderLiveTest.java b/enabler/test/de/schildbach/pte/live/VorProviderLiveTest.java
index 1fd62727..2530ce70 100644
--- a/enabler/test/de/schildbach/pte/live/VorProviderLiveTest.java
+++ b/enabler/test/de/schildbach/pte/live/VorProviderLiveTest.java
@@ -66,7 +66,7 @@ public class VorProviderLiveTest extends AbstractProviderLiveTest
 	@Test
 	public void queryDepartures() throws Exception
 	{
-		final QueryDeparturesResult result = provider.queryDepartures("60203090", 0, false);
+		final QueryDeparturesResult result = queryDepartures("60203090", false);
 
 		print(result);
 	}
diff --git a/enabler/test/de/schildbach/pte/live/VrnProviderLiveTest.java b/enabler/test/de/schildbach/pte/live/VrnProviderLiveTest.java
index bbf6e536..8d37c3bf 100644
--- a/enabler/test/de/schildbach/pte/live/VrnProviderLiveTest.java
+++ b/enabler/test/de/schildbach/pte/live/VrnProviderLiveTest.java
@@ -64,7 +64,7 @@ public class VrnProviderLiveTest extends AbstractProviderLiveTest
 	@Test
 	public void queryDepartures() throws Exception
 	{
-		final QueryDeparturesResult result = provider.queryDepartures("6032236", 0, false);
+		final QueryDeparturesResult result = queryDepartures("6032236", false);
 
 		print(result);
 	}
diff --git a/enabler/test/de/schildbach/pte/live/VrrProviderLiveTest.java b/enabler/test/de/schildbach/pte/live/VrrProviderLiveTest.java
index 2154498c..9b363ffd 100644
--- a/enabler/test/de/schildbach/pte/live/VrrProviderLiveTest.java
+++ b/enabler/test/de/schildbach/pte/live/VrrProviderLiveTest.java
@@ -70,23 +70,23 @@ public class VrrProviderLiveTest extends AbstractProviderLiveTest
 	@Test
 	public void queryDepartures() throws Exception
 	{
-		final QueryDeparturesResult result = provider.queryDepartures("1007258", 0, false);
+		final QueryDeparturesResult result = queryDepartures("1007258", false);
 
 		print(result);
 
-		final QueryDeparturesResult result2 = provider.queryDepartures("20019904", 0, false);
+		final QueryDeparturesResult result2 = queryDepartures("20019904", false);
 
 		print(result2);
 
 		// Bonn
-		provider.queryDepartures("22000687", 0, false); // Hauptbahnhof
-		provider.queryDepartures("22001374", 0, false); // Suedwache
+		queryDepartures("22000687", false); // Hauptbahnhof
+		queryDepartures("22001374", false); // Suedwache
 	}
 
 	@Test
 	public void queryManyDeparturesWithEquivs() throws Exception
 	{
-		final QueryDeparturesResult result = provider.queryDepartures("20018235", 200, true);
+		final QueryDeparturesResult result = queryDepartures("20018235", true);
 
 		print(result);
 	}
diff --git a/enabler/test/de/schildbach/pte/live/VrtProviderLiveTest.java b/enabler/test/de/schildbach/pte/live/VrtProviderLiveTest.java
index 811cffc1..f4562af6 100644
--- a/enabler/test/de/schildbach/pte/live/VrtProviderLiveTest.java
+++ b/enabler/test/de/schildbach/pte/live/VrtProviderLiveTest.java
@@ -64,7 +64,7 @@ public class VrtProviderLiveTest extends AbstractProviderLiveTest
 	@Test
 	public void queryDepartures() throws Exception
 	{
-		final QueryDeparturesResult result = provider.queryDepartures("17001301", 0, false);
+		final QueryDeparturesResult result = queryDepartures("17001301", false);
 
 		print(result);
 	}
diff --git a/enabler/test/de/schildbach/pte/live/VsnProviderLiveTest.java b/enabler/test/de/schildbach/pte/live/VsnProviderLiveTest.java
index 42ab0665..93589404 100644
--- a/enabler/test/de/schildbach/pte/live/VsnProviderLiveTest.java
+++ b/enabler/test/de/schildbach/pte/live/VsnProviderLiveTest.java
@@ -63,7 +63,7 @@ public class VsnProviderLiveTest extends AbstractProviderLiveTest
 	@Test
 	public void queryDepartures() throws Exception
 	{
-		final QueryDeparturesResult result = provider.queryDepartures("8000128", 0, false);
+		final QueryDeparturesResult result = queryDepartures("8000128", false);
 
 		print(result);
 	}
@@ -71,7 +71,7 @@ public class VsnProviderLiveTest extends AbstractProviderLiveTest
 	@Test
 	public void queryDeparturesInvalidStation() throws Exception
 	{
-		final QueryDeparturesResult result = provider.queryDepartures("999999", 0, false);
+		final QueryDeparturesResult result = queryDepartures("999999", false);
 
 		assertEquals(QueryDeparturesResult.Status.INVALID_STATION, result.status);
 	}
diff --git a/enabler/test/de/schildbach/pte/live/VvmProviderLiveTest.java b/enabler/test/de/schildbach/pte/live/VvmProviderLiveTest.java
index 0f3ff1fb..f41660d7 100644
--- a/enabler/test/de/schildbach/pte/live/VvmProviderLiveTest.java
+++ b/enabler/test/de/schildbach/pte/live/VvmProviderLiveTest.java
@@ -64,7 +64,7 @@ public class VvmProviderLiveTest extends AbstractProviderLiveTest
 	@Test
 	public void queryDepartures() throws Exception
 	{
-		final QueryDeparturesResult result = provider.queryDepartures("3000510", 0, false);
+		final QueryDeparturesResult result = queryDepartures("3000510", false);
 
 		print(result);
 	}
diff --git a/enabler/test/de/schildbach/pte/live/VvoProviderLiveTest.java b/enabler/test/de/schildbach/pte/live/VvoProviderLiveTest.java
index d2448711..fa0c4aea 100644
--- a/enabler/test/de/schildbach/pte/live/VvoProviderLiveTest.java
+++ b/enabler/test/de/schildbach/pte/live/VvoProviderLiveTest.java
@@ -66,7 +66,7 @@ public class VvoProviderLiveTest extends AbstractProviderLiveTest
 	@Test
 	public void queryDepartures() throws Exception
 	{
-		final QueryDeparturesResult result = provider.queryDepartures("100", 0, false);
+		final QueryDeparturesResult result = queryDepartures("100", false);
 
 		print(result);
 	}
diff --git a/enabler/test/de/schildbach/pte/live/VvsProviderLiveTest.java b/enabler/test/de/schildbach/pte/live/VvsProviderLiveTest.java
index 2c85ba45..c380386e 100644
--- a/enabler/test/de/schildbach/pte/live/VvsProviderLiveTest.java
+++ b/enabler/test/de/schildbach/pte/live/VvsProviderLiveTest.java
@@ -64,7 +64,7 @@ public class VvsProviderLiveTest extends AbstractProviderLiveTest
 	@Test
 	public void queryDepartures() throws Exception
 	{
-		final QueryDeparturesResult result = provider.queryDepartures("6118", 0, false);
+		final QueryDeparturesResult result = queryDepartures("6118", false);
 
 		print(result);
 	}
diff --git a/enabler/test/de/schildbach/pte/live/VvtProviderLiveTest.java b/enabler/test/de/schildbach/pte/live/VvtProviderLiveTest.java
index ea50e1a3..67924c3b 100644
--- a/enabler/test/de/schildbach/pte/live/VvtProviderLiveTest.java
+++ b/enabler/test/de/schildbach/pte/live/VvtProviderLiveTest.java
@@ -64,7 +64,7 @@ public class VvtProviderLiveTest extends AbstractProviderLiveTest
 	@Test
 	public void queryDepartures() throws Exception
 	{
-		final QueryDeparturesResult result = provider.queryDepartures("60101187", 0, false);
+		final QueryDeparturesResult result = queryDepartures("60101187", false);
 
 		print(result);
 	}
diff --git a/enabler/test/de/schildbach/pte/live/VvvProviderLiveTest.java b/enabler/test/de/schildbach/pte/live/VvvProviderLiveTest.java
index 077eddfd..2fb64003 100644
--- a/enabler/test/de/schildbach/pte/live/VvvProviderLiveTest.java
+++ b/enabler/test/de/schildbach/pte/live/VvvProviderLiveTest.java
@@ -64,7 +64,7 @@ public class VvvProviderLiveTest extends AbstractProviderLiveTest
 	@Test
 	public void queryDepartures() throws Exception
 	{
-		final QueryDeparturesResult result = provider.queryDepartures("80007271", 0, false);
+		final QueryDeparturesResult result = queryDepartures("80007271", false);
 
 		print(result);
 	}
diff --git a/enabler/test/de/schildbach/pte/live/WienProviderLiveTest.java b/enabler/test/de/schildbach/pte/live/WienProviderLiveTest.java
index dc346772..4e80d393 100644
--- a/enabler/test/de/schildbach/pte/live/WienProviderLiveTest.java
+++ b/enabler/test/de/schildbach/pte/live/WienProviderLiveTest.java
@@ -66,7 +66,7 @@ public class WienProviderLiveTest extends AbstractProviderLiveTest
 	@Test
 	public void queryDepartures() throws Exception
 	{
-		final QueryDeparturesResult result = provider.queryDepartures("60203090", 0, false);
+		final QueryDeparturesResult result = queryDepartures("60203090", false);
 
 		print(result);
 	}
diff --git a/enabler/test/de/schildbach/pte/live/ZvvProviderLiveTest.java b/enabler/test/de/schildbach/pte/live/ZvvProviderLiveTest.java
index 42952ed4..849de4f8 100644
--- a/enabler/test/de/schildbach/pte/live/ZvvProviderLiveTest.java
+++ b/enabler/test/de/schildbach/pte/live/ZvvProviderLiveTest.java
@@ -63,7 +63,7 @@ public class ZvvProviderLiveTest extends AbstractProviderLiveTest
 	@Test
 	public void queryDepartures() throws Exception
 	{
-		final QueryDeparturesResult result = provider.queryDepartures("8503000", 0, false);
+		final QueryDeparturesResult result = queryDepartures("8503000", false);
 
 		print(result);
 	}
@@ -71,7 +71,7 @@ public class ZvvProviderLiveTest extends AbstractProviderLiveTest
 	@Test
 	public void queryDeparturesInvalidStation() throws Exception
 	{
-		final QueryDeparturesResult result = provider.queryDepartures("999999", 0, false);
+		final QueryDeparturesResult result = queryDepartures("999999", false);
 
 		assertEquals(QueryDeparturesResult.Status.INVALID_STATION, result.status);
 	}