From 8978db8cb7307e863476b1dd09b6450d9df1c5c2 Mon Sep 17 00:00:00 2001 From: "andreas.schildbach@gmail.com" Date: Sun, 17 Apr 2011 21:51:40 +0000 Subject: [PATCH] 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 | 13 ++++++++----- src/de/schildbach/pte/AtcProvider.java | 11 ----------- src/de/schildbach/pte/AvvProvider.java | 11 ----------- src/de/schildbach/pte/BsagProvider.java | 11 ----------- src/de/schildbach/pte/BsvagProvider.java | 11 ----------- src/de/schildbach/pte/BvbProvider.java | 11 ----------- src/de/schildbach/pte/DingProvider.java | 11 ----------- src/de/schildbach/pte/DubProvider.java | 11 ----------- src/de/schildbach/pte/GvhProvider.java | 11 ----------- src/de/schildbach/pte/IvbProvider.java | 11 ----------- src/de/schildbach/pte/KvvProvider.java | 11 ----------- src/de/schildbach/pte/LinzProvider.java | 11 ----------- src/de/schildbach/pte/MariborProvider.java | 11 ----------- src/de/schildbach/pte/MetProvider.java | 11 ----------- src/de/schildbach/pte/MvvProvider.java | 11 ----------- src/de/schildbach/pte/NaldoProvider.java | 11 ----------- src/de/schildbach/pte/NvbwProvider.java | 11 ----------- src/de/schildbach/pte/SfProvider.java | 11 ----------- src/de/schildbach/pte/StvProvider.java | 11 ----------- src/de/schildbach/pte/SvvProvider.java | 11 ----------- src/de/schildbach/pte/SydneyProvider.java | 11 ----------- src/de/schildbach/pte/TflProvider.java | 11 ----------- src/de/schildbach/pte/TleaProvider.java | 11 ----------- src/de/schildbach/pte/TlemProvider.java | 11 ----------- src/de/schildbach/pte/TlseProvider.java | 11 ----------- src/de/schildbach/pte/TlswProvider.java | 11 ----------- src/de/schildbach/pte/VagfrProvider.java | 11 ----------- src/de/schildbach/pte/VblProvider.java | 11 ----------- src/de/schildbach/pte/VmsProvider.java | 11 ----------- src/de/schildbach/pte/VmvProvider.java | 11 ----------- src/de/schildbach/pte/VorProvider.java | 11 ----------- src/de/schildbach/pte/VrnProvider.java | 11 ----------- src/de/schildbach/pte/VrrProvider.java | 11 ----------- src/de/schildbach/pte/VrtProvider.java | 11 ----------- src/de/schildbach/pte/VvmProvider.java | 11 ----------- src/de/schildbach/pte/VvoProvider.java | 11 ----------- src/de/schildbach/pte/VvsProvider.java | 11 ----------- 37 files changed, 8 insertions(+), 401 deletions(-) diff --git a/src/de/schildbach/pte/AbstractEfaProvider.java b/src/de/schildbach/pte/AbstractEfaProvider.java index bdc3400a..259c13b0 100644 --- a/src/de/schildbach/pte/AbstractEfaProvider.java +++ b/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) - + "&outputFormat=XML&coordOutputFormat=WGS84&mode=direct&deleteAssignedStops_dm=" + (equivs ? "0" : "1")); + final StringBuilder uri = new StringBuilder(); + 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); diff --git a/src/de/schildbach/pte/AtcProvider.java b/src/de/schildbach/pte/AtcProvider.java index 64b1a860..0f90008d 100644 --- a/src/de/schildbach/pte/AtcProvider.java +++ b/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) diff --git a/src/de/schildbach/pte/AvvProvider.java b/src/de/schildbach/pte/AvvProvider.java index c741d23a..033566bb 100644 --- a/src/de/schildbach/pte/AvvProvider.java +++ b/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) diff --git a/src/de/schildbach/pte/BsagProvider.java b/src/de/schildbach/pte/BsagProvider.java index da3d004e..f19b5a8c 100644 --- a/src/de/schildbach/pte/BsagProvider.java +++ b/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) diff --git a/src/de/schildbach/pte/BsvagProvider.java b/src/de/schildbach/pte/BsvagProvider.java index a6538feb..8aa6a36b 100644 --- a/src/de/schildbach/pte/BsvagProvider.java +++ b/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) diff --git a/src/de/schildbach/pte/BvbProvider.java b/src/de/schildbach/pte/BvbProvider.java index f9c247a4..df4094a4 100644 --- a/src/de/schildbach/pte/BvbProvider.java +++ b/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) diff --git a/src/de/schildbach/pte/DingProvider.java b/src/de/schildbach/pte/DingProvider.java index 6f3a0b90..dc627297 100644 --- a/src/de/schildbach/pte/DingProvider.java +++ b/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) diff --git a/src/de/schildbach/pte/DubProvider.java b/src/de/schildbach/pte/DubProvider.java index f2f31199..8e179c9a 100644 --- a/src/de/schildbach/pte/DubProvider.java +++ b/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) diff --git a/src/de/schildbach/pte/GvhProvider.java b/src/de/schildbach/pte/GvhProvider.java index 83c6e739..319479d8 100644 --- a/src/de/schildbach/pte/GvhProvider.java +++ b/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) diff --git a/src/de/schildbach/pte/IvbProvider.java b/src/de/schildbach/pte/IvbProvider.java index b2351a7f..0b029d5d 100644 --- a/src/de/schildbach/pte/IvbProvider.java +++ b/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) diff --git a/src/de/schildbach/pte/KvvProvider.java b/src/de/schildbach/pte/KvvProvider.java index 2ea22613..d4b76324 100644 --- a/src/de/schildbach/pte/KvvProvider.java +++ b/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) diff --git a/src/de/schildbach/pte/LinzProvider.java b/src/de/schildbach/pte/LinzProvider.java index 0d8f20ec..2ed6e773 100644 --- a/src/de/schildbach/pte/LinzProvider.java +++ b/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) diff --git a/src/de/schildbach/pte/MariborProvider.java b/src/de/schildbach/pte/MariborProvider.java index c20dd79c..72d17818 100644 --- a/src/de/schildbach/pte/MariborProvider.java +++ b/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) diff --git a/src/de/schildbach/pte/MetProvider.java b/src/de/schildbach/pte/MetProvider.java index 1b44c653..f8552d27 100644 --- a/src/de/schildbach/pte/MetProvider.java +++ b/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) diff --git a/src/de/schildbach/pte/MvvProvider.java b/src/de/schildbach/pte/MvvProvider.java index 639dd564..5900b1b5 100644 --- a/src/de/schildbach/pte/MvvProvider.java +++ b/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) diff --git a/src/de/schildbach/pte/NaldoProvider.java b/src/de/schildbach/pte/NaldoProvider.java index 8819ef4b..43b7632c 100644 --- a/src/de/schildbach/pte/NaldoProvider.java +++ b/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) diff --git a/src/de/schildbach/pte/NvbwProvider.java b/src/de/schildbach/pte/NvbwProvider.java index 2f021568..86dea1a5 100644 --- a/src/de/schildbach/pte/NvbwProvider.java +++ b/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) diff --git a/src/de/schildbach/pte/SfProvider.java b/src/de/schildbach/pte/SfProvider.java index 1fbe9508..85241965 100644 --- a/src/de/schildbach/pte/SfProvider.java +++ b/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) diff --git a/src/de/schildbach/pte/StvProvider.java b/src/de/schildbach/pte/StvProvider.java index 36178b8c..6b297612 100644 --- a/src/de/schildbach/pte/StvProvider.java +++ b/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) diff --git a/src/de/schildbach/pte/SvvProvider.java b/src/de/schildbach/pte/SvvProvider.java index acac4c98..18f12bf3 100644 --- a/src/de/schildbach/pte/SvvProvider.java +++ b/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) diff --git a/src/de/schildbach/pte/SydneyProvider.java b/src/de/schildbach/pte/SydneyProvider.java index ae38c77e..25744fe2 100644 --- a/src/de/schildbach/pte/SydneyProvider.java +++ b/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) diff --git a/src/de/schildbach/pte/TflProvider.java b/src/de/schildbach/pte/TflProvider.java index 0e5c964f..d9be8e7b 100644 --- a/src/de/schildbach/pte/TflProvider.java +++ b/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) diff --git a/src/de/schildbach/pte/TleaProvider.java b/src/de/schildbach/pte/TleaProvider.java index 9dc9f800..b67d7cee 100644 --- a/src/de/schildbach/pte/TleaProvider.java +++ b/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) diff --git a/src/de/schildbach/pte/TlemProvider.java b/src/de/schildbach/pte/TlemProvider.java index 255b69bd..196a737a 100644 --- a/src/de/schildbach/pte/TlemProvider.java +++ b/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) diff --git a/src/de/schildbach/pte/TlseProvider.java b/src/de/schildbach/pte/TlseProvider.java index a8e7eb47..d8636f37 100644 --- a/src/de/schildbach/pte/TlseProvider.java +++ b/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) diff --git a/src/de/schildbach/pte/TlswProvider.java b/src/de/schildbach/pte/TlswProvider.java index 4faaef16..cad5b003 100644 --- a/src/de/schildbach/pte/TlswProvider.java +++ b/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) diff --git a/src/de/schildbach/pte/VagfrProvider.java b/src/de/schildbach/pte/VagfrProvider.java index ba5b7921..f8fcb261 100644 --- a/src/de/schildbach/pte/VagfrProvider.java +++ b/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) diff --git a/src/de/schildbach/pte/VblProvider.java b/src/de/schildbach/pte/VblProvider.java index 03d01a28..b049f9da 100644 --- a/src/de/schildbach/pte/VblProvider.java +++ b/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) diff --git a/src/de/schildbach/pte/VmsProvider.java b/src/de/schildbach/pte/VmsProvider.java index c8d462b8..f7553c8e 100644 --- a/src/de/schildbach/pte/VmsProvider.java +++ b/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) diff --git a/src/de/schildbach/pte/VmvProvider.java b/src/de/schildbach/pte/VmvProvider.java index e179efa3..295b0d01 100644 --- a/src/de/schildbach/pte/VmvProvider.java +++ b/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) diff --git a/src/de/schildbach/pte/VorProvider.java b/src/de/schildbach/pte/VorProvider.java index 43d22761..f4685213 100644 --- a/src/de/schildbach/pte/VorProvider.java +++ b/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) diff --git a/src/de/schildbach/pte/VrnProvider.java b/src/de/schildbach/pte/VrnProvider.java index 44fa127f..87b69e64 100644 --- a/src/de/schildbach/pte/VrnProvider.java +++ b/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) diff --git a/src/de/schildbach/pte/VrrProvider.java b/src/de/schildbach/pte/VrrProvider.java index 9919cf46..61fb4c9d 100644 --- a/src/de/schildbach/pte/VrrProvider.java +++ b/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) diff --git a/src/de/schildbach/pte/VrtProvider.java b/src/de/schildbach/pte/VrtProvider.java index 1c78c862..9a5b0136 100644 --- a/src/de/schildbach/pte/VrtProvider.java +++ b/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) diff --git a/src/de/schildbach/pte/VvmProvider.java b/src/de/schildbach/pte/VvmProvider.java index 56d432d6..802512af 100644 --- a/src/de/schildbach/pte/VvmProvider.java +++ b/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) diff --git a/src/de/schildbach/pte/VvoProvider.java b/src/de/schildbach/pte/VvoProvider.java index 1589d2b8..68e76897 100644 --- a/src/de/schildbach/pte/VvoProvider.java +++ b/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) diff --git a/src/de/schildbach/pte/VvsProvider.java b/src/de/schildbach/pte/VvsProvider.java index ecb68dac..2d7fc435 100644 --- a/src/de/schildbach/pte/VvsProvider.java +++ b/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)