implement maxDepartures argument on queryDepartures() of all efa-based providers

git-svn-id: https://public-transport-enabler.googlecode.com/svn/trunk@571 0924bc21-9374-b0fa-ee44-9ff1593b38f0

src/de/schildbach/pte/AbstractEfaProvider.java

@@ -1045,17 +1045,20 @@ public abstract class AbstractEfaProvider implements NetworkProvider
 				+ "'");
 	}
 
-	protected abstract String departuresQueryUri(String stationId, int maxDepartures);
-
 	public QueryDeparturesResult queryDepartures(final String stationId, final int maxDepartures, final boolean equivs) throws IOException
 	{
-		final String uri = wrapUri(departuresQueryUri(stationId, maxDepartures)
+		final StringBuilder uri = new StringBuilder();
-				+ "&outputFormat=XML&coordOutputFormat=WGS84&mode=direct&deleteAssignedStops_dm=" + (equivs ? "0" : "1"));
+		uri.append(apiBase).append("XSLT_DM_REQUEST");
+		uri.append("?outputFormat=XML&coordOutputFormat=WGS84&type_dm=stop&useRealtime=1&mode=direct");
+		uri.append("&name_dm=").append(ParserUtils.urlEncode(stationId));
+		uri.append("&deleteAssignedStops_dm=").append(equivs ? '0' : '1');
+		if (maxDepartures > 0)
+			uri.append("&limit=").append(maxDepartures);
 
 		InputStream is = null;
 		try
 		{
-			is = ParserUtils.scrapeInputStream(uri);
+			is = ParserUtils.scrapeInputStream(wrapUri(uri.toString()));
 
 			final XmlPullParser pp = parserFactory.newPullParser();
 			pp.setInput(is, null);

src/de/schildbach/pte/AtcProvider.java

@@ -70,17 +70,6 @@ public class AtcProvider extends AbstractEfaProvider
 		return String.format(NEARBY_STATION_URI, ParserUtils.urlEncode(stationId));
 	}
 
-	@Override
-	protected String departuresQueryUri(final String stationId, final int maxDepartures)
-	{
-		final StringBuilder uri = new StringBuilder();
-		uri.append(API_BASE).append("XSLT_DM_REQUEST");
-		uri.append("?type_dm=stop");
-		uri.append("&name_dm=").append(ParserUtils.urlEncode(stationId));
-		uri.append("&useRealtime=1");
-		return uri.toString();
-	}
-
 	@Override
 	protected String connectionsQueryUri(final Location from, final Location via, final Location to, final Date date, final boolean dep,
 			final String products, final WalkSpeed walkSpeed)

src/de/schildbach/pte/AvvProvider.java

@@ -71,17 +71,6 @@ public class AvvProvider extends AbstractEfaProvider
 		return String.format(NEARBY_STATION_URI, ParserUtils.urlEncode(stationId));
 	}
 
-	@Override
-	protected String departuresQueryUri(final String stationId, final int maxDepartures)
-	{
-		final StringBuilder uri = new StringBuilder();
-		uri.append(API_BASE).append("XSLT_DM_REQUEST");
-		uri.append("?type_dm=stop");
-		uri.append("&name_dm=").append(ParserUtils.urlEncode(stationId));
-		uri.append("&useRealtime=1");
-		return uri.toString();
-	}
-
 	@Override
 	protected String connectionsQueryUri(final Location from, final Location via, final Location to, final Date date, final boolean dep,
 			final String products, final WalkSpeed walkSpeed)

src/de/schildbach/pte/BsagProvider.java

@@ -70,17 +70,6 @@ public class BsagProvider extends AbstractEfaProvider
 		return String.format(NEARBY_STATION_URI, ParserUtils.urlEncode(stationId));
 	}
 
-	@Override
-	protected String departuresQueryUri(final String stationId, final int maxDepartures)
-	{
-		final StringBuilder uri = new StringBuilder();
-		uri.append(API_BASE).append("XSLT_DM_REQUEST");
-		uri.append("?type_dm=stop");
-		uri.append("&name_dm=").append(ParserUtils.urlEncode(stationId));
-		uri.append("&useRealtime=1");
-		return uri.toString();
-	}
-
 	@Override
 	protected String connectionsQueryUri(final Location from, final Location via, final Location to, final Date date, final boolean dep,
 			final String products, final WalkSpeed walkSpeed)

src/de/schildbach/pte/BsvagProvider.java

@@ -71,17 +71,6 @@ public class BsvagProvider extends AbstractEfaProvider
 		return String.format(NEARBY_STATION_URI, ParserUtils.urlEncode(stationId));
 	}
 
-	@Override
-	protected String departuresQueryUri(final String stationId, final int maxDepartures)
-	{
-		final StringBuilder uri = new StringBuilder();
-		uri.append(API_BASE).append("XSLT_DM_REQUEST");
-		uri.append("?type_dm=stop");
-		uri.append("&name_dm=").append(ParserUtils.urlEncode(stationId));
-		uri.append("&useRealtime=1");
-		return uri.toString();
-	}
-
 	@Override
 	protected String connectionsQueryUri(final Location from, final Location via, final Location to, final Date date, final boolean dep,
 			final String products, final WalkSpeed walkSpeed)

src/de/schildbach/pte/BvbProvider.java

@@ -71,17 +71,6 @@ public class BvbProvider extends AbstractEfaProvider
 		return String.format(NEARBY_STATION_URI, ParserUtils.urlEncode(stationId));
 	}
 
-	@Override
-	protected String departuresQueryUri(final String stationId, final int maxDepartures)
-	{
-		final StringBuilder uri = new StringBuilder();
-		uri.append(API_BASE).append("XSLT_DM_REQUEST");
-		uri.append("?type_dm=stop");
-		uri.append("&name_dm=").append(ParserUtils.urlEncode(stationId));
-		uri.append("&useRealtime=1");
-		return uri.toString();
-	}
-
 	@Override
 	protected String connectionsQueryUri(final Location from, final Location via, final Location to, final Date date, final boolean dep,
 			final String products, final WalkSpeed walkSpeed)

src/de/schildbach/pte/DingProvider.java

@@ -71,17 +71,6 @@ public class DingProvider extends AbstractEfaProvider
 		return String.format(NEARBY_STATION_URI, ParserUtils.urlEncode(stationId));
 	}
 
-	@Override
-	protected String departuresQueryUri(final String stationId, final int maxDepartures)
-	{
-		final StringBuilder uri = new StringBuilder();
-		uri.append(API_BASE).append("XSLT_DM_REQUEST");
-		uri.append("?type_dm=stop");
-		uri.append("&name_dm=").append(ParserUtils.urlEncode(stationId));
-		uri.append("&useRealtime=1");
-		return uri.toString();
-	}
-
 	@Override
 	protected String connectionsQueryUri(final Location from, final Location via, final Location to, final Date date, final boolean dep,
 			final String products, final WalkSpeed walkSpeed)

src/de/schildbach/pte/DubProvider.java

@@ -78,17 +78,6 @@ public class DubProvider extends AbstractEfaProvider
 		return String.format(NEARBY_STATION_URI, ParserUtils.urlEncode(stationId));
 	}
 
-	@Override
-	protected String departuresQueryUri(final String stationId, final int maxDepartures)
-	{
-		final StringBuilder uri = new StringBuilder();
-		uri.append(API_BASE).append("XSLT_DM_REQUEST");
-		uri.append("?type_dm=stop");
-		uri.append("&name_dm=").append(ParserUtils.urlEncode(stationId));
-		uri.append("&useRealtime=1");
-		return uri.toString();
-	}
-
 	@Override
 	protected String connectionsQueryUri(final Location from, final Location via, final Location to, final Date date, final boolean dep,
 			final String products, final WalkSpeed walkSpeed)

src/de/schildbach/pte/GvhProvider.java

@@ -73,17 +73,6 @@ public class GvhProvider extends AbstractEfaProvider
 		return String.format(NEARBY_STATION_URI, ParserUtils.urlEncode(stationId, "ISO-8859-1"));
 	}
 
-	@Override
-	protected String departuresQueryUri(String stationId, int maxDepartures)
-	{
-		final StringBuilder uri = new StringBuilder();
-		uri.append(API_BASE).append("XSLT_DM_REQUEST");
-		uri.append("?type_dm=stop");
-		uri.append("&name_dm=").append(ParserUtils.urlEncode(stationId));
-		uri.append("&useRealtime=1");
-		return uri.toString();
-	}
-
 	@Override
 	protected String connectionsQueryUri(final Location from, final Location via, final Location to, final Date date, final boolean dep,
 			final String products, final WalkSpeed walkSpeed)

src/de/schildbach/pte/IvbProvider.java

@@ -71,17 +71,6 @@ public class IvbProvider extends AbstractEfaProvider
 		return String.format(NEARBY_STATION_URI, ParserUtils.urlEncode(stationId));
 	}
 
-	@Override
-	protected String departuresQueryUri(final String stationId, final int maxDepartures)
-	{
-		final StringBuilder uri = new StringBuilder();
-		uri.append(API_BASE).append("XSLT_DM_REQUEST");
-		uri.append("?type_dm=stop");
-		uri.append("&name_dm=").append(ParserUtils.urlEncode(stationId));
-		uri.append("&useRealtime=1");
-		return uri.toString();
-	}
-
 	@Override
 	protected String connectionsQueryUri(final Location from, final Location via, final Location to, final Date date, final boolean dep,
 			final String products, final WalkSpeed walkSpeed)

src/de/schildbach/pte/KvvProvider.java

@@ -70,17 +70,6 @@ public class KvvProvider extends AbstractEfaProvider
 		return String.format(NEARBY_STATION_URI, ParserUtils.urlEncode(stationId));
 	}
 
-	@Override
-	protected String departuresQueryUri(final String stationId, final int maxDepartures)
-	{
-		final StringBuilder uri = new StringBuilder();
-		uri.append(API_BASE).append("XSLT_DM_REQUEST");
-		uri.append("?type_dm=stop");
-		uri.append("&name_dm=").append(ParserUtils.urlEncode(stationId));
-		uri.append("&useRealtime=1");
-		return uri.toString();
-	}
-
 	@Override
 	protected String connectionsQueryUri(final Location from, final Location via, final Location to, final Date date, final boolean dep,
 			final String products, final WalkSpeed walkSpeed)

src/de/schildbach/pte/LinzProvider.java

@@ -71,17 +71,6 @@ public class LinzProvider extends AbstractEfaProvider
 		return String.format(NEARBY_STATION_URI, ParserUtils.urlEncode(stationId, "ISO-8859-1"));
 	}
 
-	@Override
-	protected String departuresQueryUri(final String stationId, final int maxDepartures)
-	{
-		final StringBuilder uri = new StringBuilder();
-		uri.append(API_BASE).append("XSLT_DM_REQUEST");
-		uri.append("?type_dm=stop");
-		uri.append("&name_dm=").append(ParserUtils.urlEncode(stationId));
-		uri.append("&useRealtime=1");
-		return uri.toString();
-	}
-
 	@Override
 	protected String connectionsQueryUri(final Location from, final Location via, final Location to, final Date date, final boolean dep,
 			final String products, final WalkSpeed walkSpeed)

src/de/schildbach/pte/MariborProvider.java

@@ -70,17 +70,6 @@ public class MariborProvider extends AbstractEfaProvider
 		return String.format(NEARBY_STATION_URI, ParserUtils.urlEncode(stationId));
 	}
 
-	@Override
-	protected String departuresQueryUri(final String stationId, final int maxDepartures)
-	{
-		final StringBuilder uri = new StringBuilder();
-		uri.append(API_BASE).append("XSLT_DM_REQUEST");
-		uri.append("?type_dm=stop");
-		uri.append("&name_dm=").append(ParserUtils.urlEncode(stationId));
-		uri.append("&useRealtime=1");
-		return uri.toString();
-	}
-
 	@Override
 	protected String connectionsQueryUri(final Location from, final Location via, final Location to, final Date date, final boolean dep,
 			final String products, final WalkSpeed walkSpeed)

src/de/schildbach/pte/MetProvider.java

@@ -77,17 +77,6 @@ public class MetProvider extends AbstractEfaProvider
 		return String.format(NEARBY_STATION_URI, ParserUtils.urlEncode(stationId));
 	}
 
-	@Override
-	protected String departuresQueryUri(final String stationId, final int maxDepartures)
-	{
-		final StringBuilder uri = new StringBuilder();
-		uri.append(API_BASE).append("XSLT_DM_REQUEST");
-		uri.append("?type_dm=stop");
-		uri.append("&name_dm=").append(ParserUtils.urlEncode(stationId));
-		uri.append("&useRealtime=1");
-		return uri.toString();
-	}
-
 	@Override
 	protected String connectionsQueryUri(final Location from, final Location via, final Location to, final Date date, final boolean dep,
 			final String products, final WalkSpeed walkSpeed)

src/de/schildbach/pte/MvvProvider.java

@@ -74,17 +74,6 @@ public class MvvProvider extends AbstractEfaProvider
 		return String.format(NEARBY_STATION_URI, ParserUtils.urlEncode(stationId));
 	}
 
-	@Override
-	protected String departuresQueryUri(final String stationId, final int maxDepartures)
-	{
-		final StringBuilder uri = new StringBuilder();
-		uri.append(API_BASE).append("XSLT_DM_REQUEST");
-		uri.append("?type_dm=stop");
-		uri.append("&name_dm=").append(ParserUtils.urlEncode(stationId));
-		uri.append("&useRealtime=1");
-		return uri.toString();
-	}
-
 	@Override
 	protected String connectionsQueryUri(final Location from, final Location via, final Location to, final Date date, final boolean dep,
 			final String products, final WalkSpeed walkSpeed)

src/de/schildbach/pte/NaldoProvider.java

@@ -70,17 +70,6 @@ public class NaldoProvider extends AbstractEfaProvider
 		return String.format(NEARBY_STATION_URI, ParserUtils.urlEncode(stationId));
 	}
 
-	@Override
-	protected String departuresQueryUri(final String stationId, final int maxDepartures)
-	{
-		final StringBuilder uri = new StringBuilder();
-		uri.append(API_BASE).append("XSLT_DM_REQUEST");
-		uri.append("?type_dm=stop");
-		uri.append("&name_dm=").append(ParserUtils.urlEncode(stationId));
-		uri.append("&useRealtime=1");
-		return uri.toString();
-	}
-
 	@Override
 	protected String connectionsQueryUri(final Location from, final Location via, final Location to, final Date date, final boolean dep,
 			final String products, final WalkSpeed walkSpeed)

src/de/schildbach/pte/NvbwProvider.java

@@ -70,17 +70,6 @@ public class NvbwProvider extends AbstractEfaProvider
 		return String.format(NEARBY_STATION_URI, ParserUtils.urlEncode(stationId));
 	}
 
-	@Override
-	protected String departuresQueryUri(final String stationId, final int maxDepartures)
-	{
-		final StringBuilder uri = new StringBuilder();
-		uri.append(API_BASE).append("XSLT_DM_REQUEST");
-		uri.append("?type_dm=stop");
-		uri.append("&name_dm=").append(ParserUtils.urlEncode(stationId));
-		uri.append("&useRealtime=1");
-		return uri.toString();
-	}
-
 	@Override
 	protected String connectionsQueryUri(final Location from, final Location via, final Location to, final Date date, final boolean dep,
 			final String products, final WalkSpeed walkSpeed)

src/de/schildbach/pte/SfProvider.java

@@ -92,17 +92,6 @@ public class SfProvider extends AbstractEfaProvider
 		return String.format(NEARBY_STATION_URI, ParserUtils.urlEncode(stationId));
 	}
 
-	@Override
-	protected String departuresQueryUri(final String stationId, final int maxDepartures)
-	{
-		final StringBuilder uri = new StringBuilder();
-		uri.append(API_BASE).append("XSLT_DM_REQUEST");
-		uri.append("?type_dm=stop");
-		uri.append("&name_dm=").append(ParserUtils.urlEncode(stationId));
-		uri.append("&useRealtime=1");
-		return uri.toString();
-	}
-
 	@Override
 	protected String connectionsQueryUri(final Location from, final Location via, final Location to, final Date date, final boolean dep,
 			final String products, final WalkSpeed walkSpeed)

src/de/schildbach/pte/StvProvider.java

@@ -71,17 +71,6 @@ public class StvProvider extends AbstractEfaProvider
 		return String.format(NEARBY_STATION_URI, ParserUtils.urlEncode(stationId));
 	}
 
-	@Override
-	protected String departuresQueryUri(final String stationId, final int maxDepartures)
-	{
-		final StringBuilder uri = new StringBuilder();
-		uri.append(API_BASE).append("XSLT_DM_REQUEST");
-		uri.append("?type_dm=stop");
-		uri.append("&name_dm=").append(ParserUtils.urlEncode(stationId));
-		uri.append("&useRealtime=1");
-		return uri.toString();
-	}
-
 	@Override
 	protected String connectionsQueryUri(final Location from, final Location via, final Location to, final Date date, final boolean dep,
 			final String products, final WalkSpeed walkSpeed)

src/de/schildbach/pte/SvvProvider.java

@@ -71,17 +71,6 @@ public class SvvProvider extends AbstractEfaProvider
 		return String.format(NEARBY_STATION_URI, ParserUtils.urlEncode(stationId));
 	}
 
-	@Override
-	protected String departuresQueryUri(final String stationId, final int maxDepartures)
-	{
-		final StringBuilder uri = new StringBuilder();
-		uri.append(API_BASE).append("XSLT_DM_REQUEST");
-		uri.append("?type_dm=stop");
-		uri.append("&name_dm=").append(ParserUtils.urlEncode(stationId));
-		uri.append("&useRealtime=1");
-		return uri.toString();
-	}
-
 	@Override
 	protected String connectionsQueryUri(final Location from, final Location via, final Location to, final Date date, final boolean dep,
 			final String products, final WalkSpeed walkSpeed)

src/de/schildbach/pte/SydneyProvider.java

@@ -77,17 +77,6 @@ public class SydneyProvider extends AbstractEfaProvider
 		return String.format(NEARBY_STATION_URI, ParserUtils.urlEncode(stationId));
 	}
 
-	@Override
-	protected String departuresQueryUri(final String stationId, final int maxDepartures)
-	{
-		final StringBuilder uri = new StringBuilder();
-		uri.append(API_BASE).append("XSLT_DM_REQUEST");
-		uri.append("?type_dm=stop");
-		uri.append("&name_dm=").append(ParserUtils.urlEncode(stationId));
-		uri.append("&useRealtime=1");
-		return uri.toString();
-	}
-
 	@Override
 	protected String connectionsQueryUri(final Location from, final Location via, final Location to, final Date date, final boolean dep,
 			final String products, final WalkSpeed walkSpeed)

src/de/schildbach/pte/TflProvider.java

@@ -80,17 +80,6 @@ public class TflProvider extends AbstractEfaProvider
 		return String.format(NEARBY_STATION_URI, ParserUtils.urlEncode(stationId, "ISO-8859-1"));
 	}
 
-	@Override
-	protected String departuresQueryUri(final String stationId, final int maxDepartures)
-	{
-		final StringBuilder uri = new StringBuilder();
-		uri.append(API_BASE).append("XSLT_DM_REQUEST");
-		uri.append("?type_dm=stop");
-		uri.append("&name_dm=").append(ParserUtils.urlEncode(stationId));
-		uri.append("&useRealtime=1");
-		return uri.toString();
-	}
-
 	@Override
 	protected String connectionsQueryUri(final Location from, final Location via, final Location to, final Date date, final boolean dep,
 			final String products, final WalkSpeed walkSpeed)

src/de/schildbach/pte/TleaProvider.java

@@ -78,17 +78,6 @@ public class TleaProvider extends AbstractEfaProvider
 		return String.format(NEARBY_STATION_URI, ParserUtils.urlEncode(stationId));
 	}
 
-	@Override
-	protected String departuresQueryUri(final String stationId, final int maxDepartures)
-	{
-		final StringBuilder uri = new StringBuilder();
-		uri.append(API_BASE).append("XSLT_DM_REQUEST");
-		uri.append("?type_dm=stop");
-		uri.append("&name_dm=").append(ParserUtils.urlEncode(stationId));
-		uri.append("&useRealtime=1");
-		return uri.toString();
-	}
-
 	@Override
 	protected String connectionsQueryUri(final Location from, final Location via, final Location to, final Date date, final boolean dep,
 			final String products, final WalkSpeed walkSpeed)

src/de/schildbach/pte/TlemProvider.java

@@ -78,17 +78,6 @@ public class TlemProvider extends AbstractEfaProvider
 		return String.format(NEARBY_STATION_URI, ParserUtils.urlEncode(stationId));
 	}
 
-	@Override
-	protected String departuresQueryUri(final String stationId, final int maxDepartures)
-	{
-		final StringBuilder uri = new StringBuilder();
-		uri.append(API_BASE).append("XSLT_DM_REQUEST");
-		uri.append("?type_dm=stop");
-		uri.append("&name_dm=").append(ParserUtils.urlEncode(stationId));
-		uri.append("&useRealtime=1");
-		return uri.toString();
-	}
-
 	@Override
 	protected String connectionsQueryUri(final Location from, final Location via, final Location to, final Date date, final boolean dep,
 			final String products, final WalkSpeed walkSpeed)

src/de/schildbach/pte/TlseProvider.java

@@ -78,17 +78,6 @@ public class TlseProvider extends AbstractEfaProvider
 		return String.format(NEARBY_STATION_URI, ParserUtils.urlEncode(stationId));
 	}
 
-	@Override
-	protected String departuresQueryUri(final String stationId, final int maxDepartures)
-	{
-		final StringBuilder uri = new StringBuilder();
-		uri.append(API_BASE).append("XSLT_DM_REQUEST");
-		uri.append("?type_dm=stop");
-		uri.append("&name_dm=").append(ParserUtils.urlEncode(stationId));
-		uri.append("&useRealtime=1");
-		return uri.toString();
-	}
-
 	@Override
 	protected String connectionsQueryUri(final Location from, final Location via, final Location to, final Date date, final boolean dep,
 			final String products, final WalkSpeed walkSpeed)

src/de/schildbach/pte/TlswProvider.java

@@ -77,17 +77,6 @@ public class TlswProvider extends AbstractEfaProvider
 		return String.format(NEARBY_STATION_URI, ParserUtils.urlEncode(stationId, "ISO-8859-1"));
 	}
 
-	@Override
-	protected String departuresQueryUri(final String stationId, final int maxDepartures)
-	{
-		final StringBuilder uri = new StringBuilder();
-		uri.append(API_BASE).append("XSLT_DM_REQUEST");
-		uri.append("?type_dm=stop");
-		uri.append("&name_dm=").append(ParserUtils.urlEncode(stationId));
-		uri.append("&useRealtime=1");
-		return uri.toString();
-	}
-
 	@Override
 	protected String connectionsQueryUri(final Location from, final Location via, final Location to, final Date date, final boolean dep,
 			final String products, final WalkSpeed walkSpeed)

src/de/schildbach/pte/VagfrProvider.java

@@ -70,17 +70,6 @@ public class VagfrProvider extends AbstractEfaProvider
 		return String.format(NEARBY_STATION_URI, ParserUtils.urlEncode(stationId, "UTF-8"));
 	}
 
-	@Override
-	protected String departuresQueryUri(final String stationId, final int maxDepartures)
-	{
-		final StringBuilder uri = new StringBuilder();
-		uri.append(API_BASE).append("XSLT_DM_REQUEST");
-		uri.append("?type_dm=stop");
-		uri.append("&name_dm=").append(ParserUtils.urlEncode(stationId));
-		uri.append("&useRealtime=1");
-		return uri.toString();
-	}
-
 	@Override
 	protected String connectionsQueryUri(final Location from, final Location via, final Location to, final Date date, final boolean dep,
 			final String products, final WalkSpeed walkSpeed)

src/de/schildbach/pte/VblProvider.java

@@ -70,17 +70,6 @@ public class VblProvider extends AbstractEfaProvider
 		return String.format(NEARBY_STATION_URI, ParserUtils.urlEncode(stationId));
 	}
 
-	@Override
-	protected String departuresQueryUri(final String stationId, final int maxDepartures)
-	{
-		final StringBuilder uri = new StringBuilder();
-		uri.append(API_BASE).append("XSLT_DM_REQUEST");
-		uri.append("?type_dm=stop");
-		uri.append("&name_dm=").append(ParserUtils.urlEncode(stationId));
-		uri.append("&useRealtime=1");
-		return uri.toString();
-	}
-
 	@Override
 	protected String connectionsQueryUri(final Location from, final Location via, final Location to, final Date date, final boolean dep,
 			final String products, final WalkSpeed walkSpeed)

src/de/schildbach/pte/VmsProvider.java

@@ -71,17 +71,6 @@ public class VmsProvider extends AbstractEfaProvider
 		return String.format(NEARBY_STATION_URI, ParserUtils.urlEncode(stationId, "ISO-8859-1"));
 	}
 
-	@Override
-	protected String departuresQueryUri(final String stationId, final int maxDepartures)
-	{
-		final StringBuilder uri = new StringBuilder();
-		uri.append(API_BASE).append("XSLT_DM_REQUEST");
-		uri.append("?type_dm=stop");
-		uri.append("&name_dm=").append(ParserUtils.urlEncode(stationId));
-		uri.append("&useRealtime=1");
-		return uri.toString();
-	}
-
 	@Override
 	protected String connectionsQueryUri(final Location from, final Location via, final Location to, final Date date, final boolean dep,
 			final String products, final WalkSpeed walkSpeed)

src/de/schildbach/pte/VmvProvider.java

@@ -71,17 +71,6 @@ public class VmvProvider extends AbstractEfaProvider
 		return String.format(NEARBY_STATION_URI, ParserUtils.urlEncode(stationId, "ISO-8859-1"));
 	}
 
-	@Override
-	protected String departuresQueryUri(final String stationId, final int maxDepartures)
-	{
-		final StringBuilder uri = new StringBuilder();
-		uri.append(API_BASE).append("XSLT_DM_REQUEST");
-		uri.append("?type_dm=stop");
-		uri.append("&name_dm=").append(ParserUtils.urlEncode(stationId));
-		uri.append("&useRealtime=1");
-		return uri.toString();
-	}
-
 	@Override
 	protected String connectionsQueryUri(final Location from, final Location via, final Location to, final Date date, final boolean dep,
 			final String products, final WalkSpeed walkSpeed)

src/de/schildbach/pte/VorProvider.java

@@ -71,17 +71,6 @@ public class VorProvider extends AbstractEfaProvider
 		return String.format(NEARBY_STATION_URI, ParserUtils.urlEncode(stationId));
 	}
 
-	@Override
-	protected String departuresQueryUri(final String stationId, final int maxDepartures)
-	{
-		final StringBuilder uri = new StringBuilder();
-		uri.append(API_BASE).append("XSLT_DM_REQUEST");
-		uri.append("?type_dm=stop");
-		uri.append("&name_dm=").append(ParserUtils.urlEncode(stationId));
-		uri.append("&useRealtime=1");
-		return uri.toString();
-	}
-
 	@Override
 	protected String connectionsQueryUri(final Location from, final Location via, final Location to, final Date date, final boolean dep,
 			final String products, final WalkSpeed walkSpeed)

src/de/schildbach/pte/VrnProvider.java

@@ -71,17 +71,6 @@ public class VrnProvider extends AbstractEfaProvider
 		return String.format(NEARBY_STATION_URI, ParserUtils.urlEncode(stationId, "ISO-8859-1"));
 	}
 
-	@Override
-	protected String departuresQueryUri(final String stationId, final int maxDepartures)
-	{
-		final StringBuilder uri = new StringBuilder();
-		uri.append(API_BASE).append("XSLT_DM_REQUEST");
-		uri.append("?type_dm=stop");
-		uri.append("&name_dm=").append(ParserUtils.urlEncode(stationId));
-		uri.append("&useRealtime=1");
-		return uri.toString();
-	}
-
 	@Override
 	protected String connectionsQueryUri(final Location from, final Location via, final Location to, final Date date, final boolean dep,
 			final String products, final WalkSpeed walkSpeed)

src/de/schildbach/pte/VrrProvider.java

@@ -74,17 +74,6 @@ public class VrrProvider extends AbstractEfaProvider
 		return String.format(NEARBY_STATION_URI, ParserUtils.urlEncode(stationId, "ISO-8859-1"));
 	}
 
-	@Override
-	protected String departuresQueryUri(final String stationId, final int maxDepartures)
-	{
-		final StringBuilder uri = new StringBuilder();
-		uri.append(API_BASE).append("XSLT_DM_REQUEST");
-		uri.append("?type_dm=stop");
-		uri.append("&name_dm=").append(ParserUtils.urlEncode(stationId));
-		uri.append("&useRealtime=1");
-		return uri.toString();
-	}
-
 	@Override
 	protected String connectionsQueryUri(final Location from, final Location via, final Location to, final Date date, final boolean dep,
 			final String products, final WalkSpeed walkSpeed)

src/de/schildbach/pte/VrtProvider.java

@@ -70,17 +70,6 @@ public class VrtProvider extends AbstractEfaProvider
 		return String.format(NEARBY_STATION_URI, ParserUtils.urlEncode(stationId, "UTF-8"));
 	}
 
-	@Override
-	protected String departuresQueryUri(final String stationId, final int maxDepartures)
-	{
-		final StringBuilder uri = new StringBuilder();
-		uri.append(API_BASE).append("XSLT_DM_REQUEST");
-		uri.append("?type_dm=stop");
-		uri.append("&name_dm=").append(ParserUtils.urlEncode(stationId));
-		uri.append("&useRealtime=1");
-		return uri.toString();
-	}
-
 	@Override
 	protected String connectionsQueryUri(final Location from, final Location via, final Location to, final Date date, final boolean dep,
 			final String products, final WalkSpeed walkSpeed)

src/de/schildbach/pte/VvmProvider.java

@@ -70,17 +70,6 @@ public class VvmProvider extends AbstractEfaProvider
 		return String.format(NEARBY_STATION_URI, ParserUtils.urlEncode(stationId, "UTF-8"));
 	}
 
-	@Override
-	protected String departuresQueryUri(final String stationId, final int maxDepartures)
-	{
-		final StringBuilder uri = new StringBuilder();
-		uri.append(API_BASE).append("XSLT_DM_REQUEST");
-		uri.append("?type_dm=stop");
-		uri.append("&name_dm=").append(ParserUtils.urlEncode(stationId));
-		uri.append("&useRealtime=1");
-		return uri.toString();
-	}
-
 	@Override
 	protected String connectionsQueryUri(final Location from, final Location via, final Location to, final Date date, final boolean dep,
 			final String products, final WalkSpeed walkSpeed)

src/de/schildbach/pte/VvoProvider.java

@@ -71,17 +71,6 @@ public class VvoProvider extends AbstractEfaProvider
 		return String.format(NEARBY_STATION_URI, ParserUtils.urlEncode(stationId));
 	}
 
-	@Override
-	protected String departuresQueryUri(final String stationId, final int maxDepartures)
-	{
-		final StringBuilder uri = new StringBuilder();
-		uri.append(API_BASE).append("XSLT_DM_REQUEST");
-		uri.append("?type_dm=stop");
-		uri.append("&name_dm=").append(ParserUtils.urlEncode(stationId));
-		uri.append("&useRealtime=1");
-		return uri.toString();
-	}
-
 	@Override
 	protected String connectionsQueryUri(final Location from, final Location via, final Location to, final Date date, final boolean dep,
 			final String products, final WalkSpeed walkSpeed)

src/de/schildbach/pte/VvsProvider.java

@@ -71,17 +71,6 @@ public class VvsProvider extends AbstractEfaProvider
 		return String.format(NEARBY_STATION_URI, ParserUtils.urlEncode(stationId, "ISO-8859-1"));
 	}
 
-	@Override
-	protected String departuresQueryUri(final String stationId, final int maxDepartures)
-	{
-		final StringBuilder uri = new StringBuilder();
-		uri.append(API_BASE).append("XSLT_DM_REQUEST");
-		uri.append("?type_dm=stop");
-		uri.append("&name_dm=").append(ParserUtils.urlEncode(stationId));
-		uri.append("&useRealtime=1");
-		return uri.toString();
-	}
-
 	@Override
 	protected String connectionsQueryUri(final Location from, final Location via, final Location to, final Date date, final boolean dep,
 			final String products, final WalkSpeed walkSpeed)