diff --git a/src/de/schildbach/pte/AbstractEfaProvider.java b/src/de/schildbach/pte/AbstractEfaProvider.java index 1cfbde1d..07438e7a 100644 --- a/src/de/schildbach/pte/AbstractEfaProvider.java +++ b/src/de/schildbach/pte/AbstractEfaProvider.java @@ -290,6 +290,8 @@ public abstract class AbstractEfaProvider extends AbstractNetworkProvider uri.append("&inclFilter=1&radius_1=").append(maxDistance != 0 ? maxDistance : 1320); uri.append("&type_1=STOP"); // ENTRANCE, BUS_POINT, POI_POINT + // System.out.println(uri); + InputStream is = null; try { @@ -464,8 +466,6 @@ public abstract class AbstractEfaProvider extends AbstractNetworkProvider return new Location(LocationType.STATION, id, lat, lon, place, name); } - protected abstract String nearbyStationUri(int stationId); - public NearbyStationsResult queryNearbyStations(final Location location, final int maxDistance, final int maxStations) throws IOException { if (location.hasLocation()) @@ -477,12 +477,28 @@ public abstract class AbstractEfaProvider extends AbstractNetworkProvider if (!location.hasId()) throw new IllegalArgumentException("at least one of stationId or lat/lon must be given"); - final String uri = nearbyStationUri(location.id); + return nearbyStationsRequest(location.id, maxStations); + } + + private NearbyStationsResult nearbyStationsRequest(final int stationId, final int maxStations) throws IOException + { + final StringBuilder uri = new StringBuilder(apiBase); + uri.append(departureMonitorEndpoint); + appendCommonRequestParams(uri, "XML"); + uri.append("&type_dm=stop&name_dm=").append(stationId); + uri.append("&itOptionsActive=1"); + uri.append("&ptOptionsActive=1"); + uri.append("&useProxFootSearch=1"); + uri.append("&mergeDep=1"); + uri.append("&useAllStops=1"); + uri.append("&mode=direct"); + + // System.out.println(uri); InputStream is = null; try { - is = ParserUtils.scrapeInputStream(uri); + is = ParserUtils.scrapeInputStream(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 dbc22eb7..82cedf31 100644 --- a/src/de/schildbach/pte/AtcProvider.java +++ b/src/de/schildbach/pte/AtcProvider.java @@ -50,16 +50,6 @@ public class AtcProvider extends AbstractEfaProvider return false; } - private static final String NEARBY_STATION_URI = API_BASE - + "XSLT_DM_REQUEST" - + "?outputFormat=XML&coordOutputFormat=WGS84&type_dm=stop&name_dm=%s&itOptionsActive=1&ptOptionsActive=1&useProxFootSearch=1&mergeDep=1&useAllStops=1&mode=direct"; - - @Override - protected String nearbyStationUri(final int stationId) - { - return String.format(NEARBY_STATION_URI, stationId); - } - @Override public List autocompleteStations(final CharSequence constraint) throws IOException { diff --git a/src/de/schildbach/pte/AvvProvider.java b/src/de/schildbach/pte/AvvProvider.java index 96dd0868..25e7d2c2 100644 --- a/src/de/schildbach/pte/AvvProvider.java +++ b/src/de/schildbach/pte/AvvProvider.java @@ -51,16 +51,6 @@ public class AvvProvider extends AbstractEfaProvider return false; } - private static final String NEARBY_STATION_URI = API_BASE - + "XSLT_DM_REQUEST" - + "?outputFormat=XML&coordOutputFormat=WGS84&type_dm=stop&name_dm=%s&itOptionsActive=1&ptOptionsActive=1&useProxFootSearch=1&mergeDep=1&useAllStops=1&mode=direct"; - - @Override - protected String nearbyStationUri(final int stationId) - { - return String.format(NEARBY_STATION_URI, stationId); - } - @Override public List autocompleteStations(final CharSequence constraint) throws IOException { diff --git a/src/de/schildbach/pte/BayernProvider.java b/src/de/schildbach/pte/BayernProvider.java index 70188486..7afabf6a 100644 --- a/src/de/schildbach/pte/BayernProvider.java +++ b/src/de/schildbach/pte/BayernProvider.java @@ -50,16 +50,6 @@ public class BayernProvider extends AbstractEfaProvider return false; } - private static final String NEARBY_STATION_URI = API_BASE - + "XSLT_DM_REQUEST" - + "?outputFormat=XML&coordOutputFormat=WGS84&type_dm=stop&name_dm=%s&itOptionsActive=1&ptOptionsActive=1&useProxFootSearch=1&mergeDep=1&useAllStops=1&mode=direct"; - - @Override - protected String nearbyStationUri(final int stationId) - { - return String.format(NEARBY_STATION_URI, stationId); - } - @Override public List autocompleteStations(final CharSequence constraint) throws IOException { diff --git a/src/de/schildbach/pte/BsagProvider.java b/src/de/schildbach/pte/BsagProvider.java index c564a378..d1c5ec29 100644 --- a/src/de/schildbach/pte/BsagProvider.java +++ b/src/de/schildbach/pte/BsagProvider.java @@ -50,16 +50,6 @@ public class BsagProvider extends AbstractEfaProvider return false; } - private static final String NEARBY_STATION_URI = API_BASE - + "XSLT_DM_REQUEST" - + "?outputFormat=XML&coordOutputFormat=WGS84&type_dm=stop&name_dm=%s&itOptionsActive=1&ptOptionsActive=1&useProxFootSearch=1&mergeDep=1&useAllStops=1&mode=direct"; - - @Override - protected String nearbyStationUri(final int stationId) - { - return String.format(NEARBY_STATION_URI, stationId); - } - @Override public List autocompleteStations(final CharSequence constraint) throws IOException { diff --git a/src/de/schildbach/pte/BsvagProvider.java b/src/de/schildbach/pte/BsvagProvider.java index 890070a5..2f8323ac 100644 --- a/src/de/schildbach/pte/BsvagProvider.java +++ b/src/de/schildbach/pte/BsvagProvider.java @@ -51,16 +51,6 @@ public class BsvagProvider extends AbstractEfaProvider return false; } - private static final String NEARBY_STATION_URI = API_BASE - + "XSLT_DM_REQUEST" - + "?outputFormat=XML&coordOutputFormat=WGS84&type_dm=stop&name_dm=%s&itOptionsActive=1&ptOptionsActive=1&useProxFootSearch=1&mergeDep=1&useAllStops=1&mode=direct"; - - @Override - protected String nearbyStationUri(final int stationId) - { - return String.format(NEARBY_STATION_URI, stationId); - } - @Override public List autocompleteStations(final CharSequence constraint) throws IOException { diff --git a/src/de/schildbach/pte/BvbProvider.java b/src/de/schildbach/pte/BvbProvider.java index 435543c0..7f2b9cac 100644 --- a/src/de/schildbach/pte/BvbProvider.java +++ b/src/de/schildbach/pte/BvbProvider.java @@ -51,16 +51,6 @@ public class BvbProvider extends AbstractEfaProvider return false; } - private static final String NEARBY_STATION_URI = API_BASE - + "XSLT_DM_REQUEST" - + "?outputFormat=XML&coordOutputFormat=WGS84&type_dm=stop&name_dm=%s&itOptionsActive=1&ptOptionsActive=1&useProxFootSearch=1&mergeDep=1&useAllStops=1&mode=direct"; - - @Override - protected String nearbyStationUri(final int stationId) - { - return String.format(NEARBY_STATION_URI, stationId); - } - @Override public List autocompleteStations(final CharSequence constraint) throws IOException { diff --git a/src/de/schildbach/pte/DingProvider.java b/src/de/schildbach/pte/DingProvider.java index bc20bab7..cd8c87d3 100644 --- a/src/de/schildbach/pte/DingProvider.java +++ b/src/de/schildbach/pte/DingProvider.java @@ -51,16 +51,6 @@ public class DingProvider extends AbstractEfaProvider return false; } - private static final String NEARBY_STATION_URI = API_BASE - + "XSLT_DM_REQUEST" - + "?outputFormat=XML&coordOutputFormat=WGS84&type_dm=stop&name_dm=%s&itOptionsActive=1&ptOptionsActive=1&useProxFootSearch=1&mergeDep=1&useAllStops=1&mode=direct"; - - @Override - protected String nearbyStationUri(final int stationId) - { - return String.format(NEARBY_STATION_URI, stationId); - } - @Override public List autocompleteStations(final CharSequence constraint) throws IOException { diff --git a/src/de/schildbach/pte/DubProvider.java b/src/de/schildbach/pte/DubProvider.java index d9cbebe4..fced9501 100644 --- a/src/de/schildbach/pte/DubProvider.java +++ b/src/de/schildbach/pte/DubProvider.java @@ -58,16 +58,6 @@ public class DubProvider extends AbstractEfaProvider return false; } - private static final String NEARBY_STATION_URI = API_BASE - + "XSLT_DM_REQUEST" - + "?outputFormat=XML&coordOutputFormat=WGS84&type_dm=stop&name_dm=%s&itOptionsActive=1&ptOptionsActive=1&useProxFootSearch=1&mergeDep=1&useAllStops=1&mode=direct"; - - @Override - protected String nearbyStationUri(final int stationId) - { - return String.format(NEARBY_STATION_URI, stationId); - } - @Override public List autocompleteStations(final CharSequence constraint) throws IOException { diff --git a/src/de/schildbach/pte/GvhProvider.java b/src/de/schildbach/pte/GvhProvider.java index af634aba..47c243b4 100644 --- a/src/de/schildbach/pte/GvhProvider.java +++ b/src/de/schildbach/pte/GvhProvider.java @@ -54,15 +54,6 @@ public class GvhProvider extends AbstractEfaProvider return false; } - private static final String NEARBY_STATION_URI = API_BASE - + "XSLT_DM_REQUEST?outputFormat=XML&coordOutputFormat=WGS84&type_dm=stop&name_dm=%s&itOptionsActive=1&ptOptionsActive=1&useProxFootSearch=1&mergeDep=1&useAllStops=1&mode=direct"; - - @Override - protected String nearbyStationUri(final int stationId) - { - return String.format(NEARBY_STATION_URI, stationId); - } - @Override public List autocompleteStations(final CharSequence constraint) throws IOException { diff --git a/src/de/schildbach/pte/IvbProvider.java b/src/de/schildbach/pte/IvbProvider.java index c2de4045..94abc837 100644 --- a/src/de/schildbach/pte/IvbProvider.java +++ b/src/de/schildbach/pte/IvbProvider.java @@ -51,16 +51,6 @@ public class IvbProvider extends AbstractEfaProvider return false; } - private static final String NEARBY_STATION_URI = API_BASE - + "XSLT_DM_REQUEST" - + "?outputFormat=XML&coordOutputFormat=WGS84&type_dm=stop&name_dm=%s&itOptionsActive=1&ptOptionsActive=1&useProxFootSearch=1&mergeDep=1&useAllStops=1&mode=direct"; - - @Override - protected String nearbyStationUri(final int stationId) - { - return String.format(NEARBY_STATION_URI, stationId); - } - @Override public List autocompleteStations(final CharSequence constraint) throws IOException { diff --git a/src/de/schildbach/pte/KvvProvider.java b/src/de/schildbach/pte/KvvProvider.java index ada45a72..9e64c2f9 100644 --- a/src/de/schildbach/pte/KvvProvider.java +++ b/src/de/schildbach/pte/KvvProvider.java @@ -59,16 +59,6 @@ public class KvvProvider extends AbstractEfaProvider return false; } - private static final String NEARBY_STATION_URI = API_BASE - + "XSLT_DM_REQUEST" - + "?outputFormat=XML&coordOutputFormat=WGS84&type_dm=stop&name_dm=%s&itOptionsActive=1&ptOptionsActive=1&useProxFootSearch=1&mergeDep=1&useAllStops=1&mode=direct"; - - @Override - protected String nearbyStationUri(final int stationId) - { - return String.format(NEARBY_STATION_URI, stationId); - } - @Override public List autocompleteStations(final CharSequence constraint) throws IOException { diff --git a/src/de/schildbach/pte/LinzProvider.java b/src/de/schildbach/pte/LinzProvider.java index f171a242..ade1448f 100644 --- a/src/de/schildbach/pte/LinzProvider.java +++ b/src/de/schildbach/pte/LinzProvider.java @@ -51,16 +51,6 @@ public class LinzProvider extends AbstractEfaProvider return false; } - private static final String NEARBY_STATION_URI = API_BASE - + "XSLT_DM_REQUEST" - + "?outputFormat=XML&mode=direct&coordOutputFormat=WGS84&mergeDep=1&useAllStops=1&type_dm=stop&name_dm=%s&itOptionsActive=1&ptOptionsActive=1&useProxFootSearch=1&excludedMeans=checkbox"; - - @Override - protected String nearbyStationUri(final int stationId) - { - return String.format(NEARBY_STATION_URI, stationId); - } - @Override public List autocompleteStations(final CharSequence constraint) throws IOException { diff --git a/src/de/schildbach/pte/MariborProvider.java b/src/de/schildbach/pte/MariborProvider.java index 320e8c08..93436f05 100644 --- a/src/de/schildbach/pte/MariborProvider.java +++ b/src/de/schildbach/pte/MariborProvider.java @@ -51,16 +51,6 @@ public class MariborProvider extends AbstractEfaProvider return false; } - private static final String NEARBY_STATION_URI = API_BASE - + "XSLT_DM_REQUEST" - + "?outputFormat=XML&coordOutputFormat=WGS84&type_dm=stop&name_dm=%s&itOptionsActive=1&ptOptionsActive=1&useProxFootSearch=1&mergeDep=1&useAllStops=1&mode=direct"; - - @Override - protected String nearbyStationUri(final int stationId) - { - return String.format(NEARBY_STATION_URI, stationId); - } - @Override public List autocompleteStations(final CharSequence constraint) throws IOException { diff --git a/src/de/schildbach/pte/MetProvider.java b/src/de/schildbach/pte/MetProvider.java index 2efc4f3d..1ee30c27 100644 --- a/src/de/schildbach/pte/MetProvider.java +++ b/src/de/schildbach/pte/MetProvider.java @@ -60,16 +60,6 @@ public class MetProvider extends AbstractEfaProvider return false; } - private static final String NEARBY_STATION_URI = API_BASE - + "XSLT_DM_REQUEST" - + "?outputFormat=XML&coordOutputFormat=WGS84&type_dm=stop&name_dm=%s&itOptionsActive=1&ptOptionsActive=1&useProxFootSearch=1&mergeDep=1&useAllStops=1&mode=direct"; - - @Override - protected String nearbyStationUri(final int stationId) - { - return String.format(NEARBY_STATION_URI, stationId); - } - @Override public List autocompleteStations(final CharSequence constraint) throws IOException { diff --git a/src/de/schildbach/pte/MvgProvider.java b/src/de/schildbach/pte/MvgProvider.java index 69dc039c..75807b0e 100644 --- a/src/de/schildbach/pte/MvgProvider.java +++ b/src/de/schildbach/pte/MvgProvider.java @@ -50,16 +50,6 @@ public class MvgProvider extends AbstractEfaProvider return false; } - private static final String NEARBY_STATION_URI = API_BASE - + "XSLT_DM_REQUEST" - + "?outputFormat=XML&coordOutputFormat=WGS84&type_dm=stop&name_dm=%s&itOptionsActive=1&ptOptionsActive=1&useProxFootSearch=1&mergeDep=1&useAllStops=1&mode=direct&deleteAssignedStop=0"; - - @Override - protected String nearbyStationUri(final int stationId) - { - return String.format(NEARBY_STATION_URI, stationId); - } - @Override public List autocompleteStations(final CharSequence constraint) throws IOException { diff --git a/src/de/schildbach/pte/MvvProvider.java b/src/de/schildbach/pte/MvvProvider.java index 495f3f8b..1ee7191c 100644 --- a/src/de/schildbach/pte/MvvProvider.java +++ b/src/de/schildbach/pte/MvvProvider.java @@ -55,16 +55,6 @@ public class MvvProvider extends AbstractEfaProvider return false; } - private static final String NEARBY_STATION_URI = API_BASE - + "XSLT_DM_REQUEST" - + "?outputFormat=XML&coordOutputFormat=WGS84&type_dm=stop&name_dm=%s&itOptionsActive=1&ptOptionsActive=1&useProxFootSearch=1&mergeDep=1&useAllStops=1&mode=direct"; - - @Override - protected String nearbyStationUri(final int stationId) - { - return String.format(NEARBY_STATION_URI, stationId); - } - @Override public List autocompleteStations(final CharSequence constraint) throws IOException { diff --git a/src/de/schildbach/pte/NaldoProvider.java b/src/de/schildbach/pte/NaldoProvider.java index 8bfcf1cd..4a5f03c2 100644 --- a/src/de/schildbach/pte/NaldoProvider.java +++ b/src/de/schildbach/pte/NaldoProvider.java @@ -51,16 +51,6 @@ public class NaldoProvider extends AbstractEfaProvider return false; } - private static final String NEARBY_STATION_URI = API_BASE - + "XSLT_DM_REQUEST" - + "?outputFormat=XML&coordOutputFormat=WGS84&type_dm=stop&name_dm=%s&itOptionsActive=1&ptOptionsActive=1&useProxFootSearch=1&mergeDep=1&useAllStops=1&mode=direct"; - - @Override - protected String nearbyStationUri(final int stationId) - { - return String.format(NEARBY_STATION_URI, stationId); - } - @Override public List autocompleteStations(final CharSequence constraint) throws IOException { diff --git a/src/de/schildbach/pte/NphProvider.java b/src/de/schildbach/pte/NphProvider.java index 6de8d641..7fec5d14 100644 --- a/src/de/schildbach/pte/NphProvider.java +++ b/src/de/schildbach/pte/NphProvider.java @@ -50,16 +50,6 @@ public class NphProvider extends AbstractEfaProvider return false; } - private static final String NEARBY_STATION_URI = API_BASE - + "XSLT_DM_REQUEST" - + "?outputFormat=XML&coordOutputFormat=WGS84&type_dm=stop&name_dm=%s&itOptionsActive=1&ptOptionsActive=1&useProxFootSearch=1&mergeDep=1&useAllStops=1&mode=direct&deleteAssignedStop=0"; - - @Override - protected String nearbyStationUri(final int stationId) - { - return String.format(NEARBY_STATION_URI, stationId); - } - @Override public List autocompleteStations(final CharSequence constraint) throws IOException { diff --git a/src/de/schildbach/pte/NvbwProvider.java b/src/de/schildbach/pte/NvbwProvider.java index f0d4b980..8659f0af 100644 --- a/src/de/schildbach/pte/NvbwProvider.java +++ b/src/de/schildbach/pte/NvbwProvider.java @@ -50,16 +50,6 @@ public class NvbwProvider extends AbstractEfaProvider return false; } - private static final String NEARBY_STATION_URI = API_BASE - + "XSLT_DM_REQUEST" - + "?outputFormat=XML&coordOutputFormat=WGS84&type_dm=stop&name_dm=%s&itOptionsActive=1&ptOptionsActive=1&useProxFootSearch=1&mergeDep=1&useAllStops=1&mode=direct"; - - @Override - protected String nearbyStationUri(final int stationId) - { - return String.format(NEARBY_STATION_URI, stationId); - } - @Override public List autocompleteStations(final CharSequence constraint) throws IOException { diff --git a/src/de/schildbach/pte/SfProvider.java b/src/de/schildbach/pte/SfProvider.java index 20830ece..c77e8030 100644 --- a/src/de/schildbach/pte/SfProvider.java +++ b/src/de/schildbach/pte/SfProvider.java @@ -60,16 +60,6 @@ public class SfProvider extends AbstractEfaProvider return false; } - private static final String NEARBY_STATION_URI = API_BASE - + "XSLT_DM_REQUEST" - + "?outputFormat=XML&coordOutputFormat=WGS84&type_dm=stop&name_dm=%s&itOptionsActive=1&ptOptionsActive=1&useProxFootSearch=1&mergeDep=1&useAllStops=1&mode=direct"; - - @Override - protected String nearbyStationUri(final int stationId) - { - return String.format(NEARBY_STATION_URI, stationId); - } - @Override public List autocompleteStations(final CharSequence constraint) throws IOException { diff --git a/src/de/schildbach/pte/StvProvider.java b/src/de/schildbach/pte/StvProvider.java index 773991f0..c9652b1e 100644 --- a/src/de/schildbach/pte/StvProvider.java +++ b/src/de/schildbach/pte/StvProvider.java @@ -51,16 +51,6 @@ public class StvProvider extends AbstractEfaProvider return false; } - private static final String NEARBY_STATION_URI = API_BASE - + "XSLT_DM_REQUEST" - + "?outputFormat=XML&coordOutputFormat=WGS84&type_dm=stop&name_dm=%s&itOptionsActive=1&ptOptionsActive=1&useProxFootSearch=1&mergeDep=1&useAllStops=1&mode=direct"; - - @Override - protected String nearbyStationUri(final int stationId) - { - return String.format(NEARBY_STATION_URI, stationId); - } - @Override public List autocompleteStations(final CharSequence constraint) throws IOException { diff --git a/src/de/schildbach/pte/SvvProvider.java b/src/de/schildbach/pte/SvvProvider.java index ea0166c5..7c82b2cb 100644 --- a/src/de/schildbach/pte/SvvProvider.java +++ b/src/de/schildbach/pte/SvvProvider.java @@ -51,16 +51,6 @@ public class SvvProvider extends AbstractEfaProvider return false; } - private static final String NEARBY_STATION_URI = API_BASE - + "XSLT_DM_REQUEST" - + "?outputFormat=XML&coordOutputFormat=WGS84&type_dm=stop&name_dm=%s&itOptionsActive=1&ptOptionsActive=1&useProxFootSearch=1&mergeDep=1&useAllStops=1&mode=direct"; - - @Override - protected String nearbyStationUri(final int stationId) - { - return String.format(NEARBY_STATION_URI, stationId); - } - @Override public List autocompleteStations(final CharSequence constraint) throws IOException { diff --git a/src/de/schildbach/pte/SydneyProvider.java b/src/de/schildbach/pte/SydneyProvider.java index 5a7b2e4b..e0003cdc 100644 --- a/src/de/schildbach/pte/SydneyProvider.java +++ b/src/de/schildbach/pte/SydneyProvider.java @@ -62,14 +62,4 @@ public class SydneyProvider extends AbstractEfaProvider { return jsonStopfinderRequest(new Location(LocationType.ANY, 0, null, constraint.toString())); } - - private static final String NEARBY_STATION_URI = API_BASE - + "XSLT_DM_REQUEST" - + "?outputFormat=XML&coordOutputFormat=WGS84&type_dm=stop&name_dm=%s&itOptionsActive=1&ptOptionsActive=1&useProxFootSearch=1&mergeDep=1&useAllStops=1&mode=direct"; - - @Override - protected String nearbyStationUri(final int stationId) - { - return String.format(NEARBY_STATION_URI, stationId); - } } diff --git a/src/de/schildbach/pte/TflProvider.java b/src/de/schildbach/pte/TflProvider.java index b022f4f6..6dac1223 100644 --- a/src/de/schildbach/pte/TflProvider.java +++ b/src/de/schildbach/pte/TflProvider.java @@ -61,15 +61,6 @@ public class TflProvider extends AbstractEfaProvider return false; } - private static final String NEARBY_STATION_URI = API_BASE - + "XSLT_DM_REQUEST?outputFormat=XML&coordOutputFormat=WGS84&type_dm=stop&name_dm=%s&itOptionsActive=1&ptOptionsActive=1&useProxFootSearch=1&mergeDep=1&useAllStops=1&mode=direct"; - - @Override - protected String nearbyStationUri(final int stationId) - { - return String.format(NEARBY_STATION_URI, stationId); - } - @Override public List autocompleteStations(final CharSequence constraint) throws IOException { diff --git a/src/de/schildbach/pte/TleaProvider.java b/src/de/schildbach/pte/TleaProvider.java index 880b395d..5ee8df7b 100644 --- a/src/de/schildbach/pte/TleaProvider.java +++ b/src/de/schildbach/pte/TleaProvider.java @@ -58,16 +58,6 @@ public class TleaProvider extends AbstractEfaProvider return false; } - private static final String NEARBY_STATION_URI = API_BASE - + "XSLT_DM_REQUEST" - + "?outputFormat=XML&coordOutputFormat=WGS84&type_dm=stop&name_dm=%s&itOptionsActive=1&ptOptionsActive=1&useProxFootSearch=1&mergeDep=1&useAllStops=1&mode=direct"; - - @Override - protected String nearbyStationUri(final int stationId) - { - return String.format(NEARBY_STATION_URI, stationId); - } - @Override public List autocompleteStations(final CharSequence constraint) throws IOException { diff --git a/src/de/schildbach/pte/TlemProvider.java b/src/de/schildbach/pte/TlemProvider.java index f8a8e575..b61c0427 100644 --- a/src/de/schildbach/pte/TlemProvider.java +++ b/src/de/schildbach/pte/TlemProvider.java @@ -58,16 +58,6 @@ public class TlemProvider extends AbstractEfaProvider return false; } - private static final String NEARBY_STATION_URI = API_BASE - + "XSLT_DM_REQUEST" - + "?outputFormat=XML&coordOutputFormat=WGS84&type_dm=stop&name_dm=%s&itOptionsActive=1&ptOptionsActive=1&useProxFootSearch=1&mergeDep=1&useAllStops=1&mode=direct"; - - @Override - protected String nearbyStationUri(final int stationId) - { - return String.format(NEARBY_STATION_URI, stationId); - } - @Override public List autocompleteStations(final CharSequence constraint) throws IOException { diff --git a/src/de/schildbach/pte/TlseProvider.java b/src/de/schildbach/pte/TlseProvider.java index 6f7ae31d..d4a80aac 100644 --- a/src/de/schildbach/pte/TlseProvider.java +++ b/src/de/schildbach/pte/TlseProvider.java @@ -58,16 +58,6 @@ public class TlseProvider extends AbstractEfaProvider return false; } - private static final String NEARBY_STATION_URI = API_BASE - + "XSLT_DM_REQUEST" - + "?outputFormat=XML&coordOutputFormat=WGS84&type_dm=stop&name_dm=%s&itOptionsActive=1&ptOptionsActive=1&useProxFootSearch=1&mergeDep=1&useAllStops=1&mode=direct"; - - @Override - protected String nearbyStationUri(final int stationId) - { - return String.format(NEARBY_STATION_URI, stationId); - } - @Override public List autocompleteStations(final CharSequence constraint) throws IOException { diff --git a/src/de/schildbach/pte/TlswProvider.java b/src/de/schildbach/pte/TlswProvider.java index adff1f5a..45fc3757 100644 --- a/src/de/schildbach/pte/TlswProvider.java +++ b/src/de/schildbach/pte/TlswProvider.java @@ -57,16 +57,6 @@ public class TlswProvider extends AbstractEfaProvider return false; } - private static final String NEARBY_STATION_URI = API_BASE - + "XSLT_DM_REQUEST" - + "?outputFormat=XML&coordOutputFormat=WGS84&name_dm=%s&type_dm=stop&itOptionsActive=1&ptOptionsActive=1&useProxFootSearch=1&mergeDep=1&useAllStops=1&mode=direct"; - - @Override - protected String nearbyStationUri(final int stationId) - { - return String.format(NEARBY_STATION_URI, stationId); - } - @Override public List autocompleteStations(final CharSequence constraint) throws IOException { diff --git a/src/de/schildbach/pte/VagfrProvider.java b/src/de/schildbach/pte/VagfrProvider.java index d41c2e31..6d112dd7 100644 --- a/src/de/schildbach/pte/VagfrProvider.java +++ b/src/de/schildbach/pte/VagfrProvider.java @@ -50,16 +50,6 @@ public class VagfrProvider extends AbstractEfaProvider return false; } - private static final String NEARBY_STATION_URI = API_BASE - + "XSLT_DM_REQUEST" - + "?outputFormat=XML&coordOutputFormat=WGS84&type_dm=stop&name_dm=%s&itOptionsActive=1&ptOptionsActive=1&useProxFootSearch=1&mergeDep=1&useAllStops=1&mode=direct"; - - @Override - protected String nearbyStationUri(final int stationId) - { - return String.format(NEARBY_STATION_URI, stationId); - } - @Override public List autocompleteStations(final CharSequence constraint) throws IOException { diff --git a/src/de/schildbach/pte/VblProvider.java b/src/de/schildbach/pte/VblProvider.java index 2cff964b..5b273bc9 100644 --- a/src/de/schildbach/pte/VblProvider.java +++ b/src/de/schildbach/pte/VblProvider.java @@ -50,16 +50,6 @@ public class VblProvider extends AbstractEfaProvider return false; } - private static final String NEARBY_STATION_URI = API_BASE - + "XSLT_DM_REQUEST" - + "?outputFormat=XML&coordOutputFormat=WGS84&type_dm=stop&name_dm=%s&itOptionsActive=1&ptOptionsActive=1&useProxFootSearch=1&mergeDep=1&useAllStops=1&mode=direct"; - - @Override - protected String nearbyStationUri(final int stationId) - { - return String.format(NEARBY_STATION_URI, stationId); - } - @Override public List autocompleteStations(final CharSequence constraint) throws IOException { diff --git a/src/de/schildbach/pte/VgnProvider.java b/src/de/schildbach/pte/VgnProvider.java index 991c63e7..d958b87d 100644 --- a/src/de/schildbach/pte/VgnProvider.java +++ b/src/de/schildbach/pte/VgnProvider.java @@ -54,15 +54,6 @@ public class VgnProvider extends AbstractEfaProvider return false; } - private static final String NEARBY_STATION_URI = DEPARTURE_MONITOR_ENDPOINT - + "?outputFormat=XML&coordOutputFormat=WGS84&type_dm=stop&name_dm=%s&itOptionsActive=1&ptOptionsActive=1&useProxFootSearch=1&mergeDep=1&useAllStops=1&mode=direct"; - - @Override - protected String nearbyStationUri(final int stationId) - { - return String.format(apiBase + NEARBY_STATION_URI, stationId); - } - @Override public List autocompleteStations(final CharSequence constraint) throws IOException { diff --git a/src/de/schildbach/pte/VmobilProvider.java b/src/de/schildbach/pte/VmobilProvider.java index 4f13c94a..dd0d8e77 100644 --- a/src/de/schildbach/pte/VmobilProvider.java +++ b/src/de/schildbach/pte/VmobilProvider.java @@ -52,16 +52,6 @@ public class VmobilProvider extends AbstractEfaProvider return false; } - private static final String NEARBY_STATION_URI = API_BASE - + "XSLT_DM_REQUEST" - + "?outputFormat=XML&coordOutputFormat=WGS84&type_dm=stop&name_dm=%s&itOptionsActive=1&ptOptionsActive=1&useProxFootSearch=1&mergeDep=1&useAllStops=1&mode=direct"; - - @Override - protected String nearbyStationUri(final int stationId) - { - return String.format(NEARBY_STATION_URI, stationId); - } - @Override public List autocompleteStations(final CharSequence constraint) throws IOException { diff --git a/src/de/schildbach/pte/VmsProvider.java b/src/de/schildbach/pte/VmsProvider.java index 8df2d844..891e9b4a 100644 --- a/src/de/schildbach/pte/VmsProvider.java +++ b/src/de/schildbach/pte/VmsProvider.java @@ -51,16 +51,6 @@ public class VmsProvider extends AbstractEfaProvider return false; } - private static final String NEARBY_STATION_URI = API_BASE - + "XSLT_DM_REQUEST" - + "?outputFormat=XML&coordOutputFormat=WGS84&type_dm=stop&name_dm=%s&itOptionsActive=1&ptOptionsActive=1&useProxFootSearch=1&mergeDep=1&useAllStops=1&mode=direct&deleteAssignedStop=0"; - - @Override - protected String nearbyStationUri(final int stationId) - { - return String.format(NEARBY_STATION_URI, stationId); - } - @Override public List autocompleteStations(final CharSequence constraint) throws IOException { diff --git a/src/de/schildbach/pte/VmvProvider.java b/src/de/schildbach/pte/VmvProvider.java index 8c093cda..888d5580 100644 --- a/src/de/schildbach/pte/VmvProvider.java +++ b/src/de/schildbach/pte/VmvProvider.java @@ -51,16 +51,6 @@ public class VmvProvider extends AbstractEfaProvider return false; } - private static final String NEARBY_STATION_URI = API_BASE - + "XSLT_DM_REQUEST" - + "?outputFormat=XML&coordOutputFormat=WGS84&type_dm=stop&name_dm=%s&itOptionsActive=1&ptOptionsActive=1&useProxFootSearch=1&mergeDep=1&useAllStops=1&mode=direct&deleteAssignedStop=0"; - - @Override - protected String nearbyStationUri(final int stationId) - { - return String.format(NEARBY_STATION_URI, stationId); - } - @Override public List autocompleteStations(final CharSequence constraint) throws IOException { diff --git a/src/de/schildbach/pte/VorProvider.java b/src/de/schildbach/pte/VorProvider.java index 1ca97b51..590e1afd 100644 --- a/src/de/schildbach/pte/VorProvider.java +++ b/src/de/schildbach/pte/VorProvider.java @@ -51,16 +51,6 @@ public class VorProvider extends AbstractEfaProvider return false; } - private static final String NEARBY_STATION_URI = API_BASE - + "XSLT_DM_REQUEST" - + "?outputFormat=XML&coordOutputFormat=WGS84&type_dm=stop&name_dm=%s&itOptionsActive=1&ptOptionsActive=1&useProxFootSearch=1&mergeDep=1&useAllStops=1&mode=direct"; - - @Override - protected String nearbyStationUri(final int stationId) - { - return String.format(NEARBY_STATION_URI, stationId); - } - @Override public List autocompleteStations(final CharSequence constraint) throws IOException { diff --git a/src/de/schildbach/pte/VrnProvider.java b/src/de/schildbach/pte/VrnProvider.java index 2b9db656..67e5c746 100644 --- a/src/de/schildbach/pte/VrnProvider.java +++ b/src/de/schildbach/pte/VrnProvider.java @@ -51,16 +51,6 @@ public class VrnProvider extends AbstractEfaProvider return false; } - private static final String NEARBY_STATION_URI = API_BASE - + "XSLT_DM_REQUEST" - + "?outputFormat=XML&coordOutputFormat=WGS84&type_dm=stop&name_dm=%s&itOptionsActive=1&ptOptionsActive=1&useProxFootSearch=1&mergeDep=1&useAllStops=1&mode=direct&deleteAssignedStop=0"; - - @Override - protected String nearbyStationUri(final int stationId) - { - return String.format(NEARBY_STATION_URI, stationId); - } - @Override public List autocompleteStations(final CharSequence constraint) throws IOException { diff --git a/src/de/schildbach/pte/VrrProvider.java b/src/de/schildbach/pte/VrrProvider.java index f7561251..86f0b5e9 100644 --- a/src/de/schildbach/pte/VrrProvider.java +++ b/src/de/schildbach/pte/VrrProvider.java @@ -54,16 +54,6 @@ public class VrrProvider extends AbstractEfaProvider return false; } - private static final String NEARBY_STATION_URI = API_BASE - + "XSLT_DM_REQUEST" - + "?outputFormat=XML&coordOutputFormat=WGS84&type_dm=stop&name_dm=%s&itOptionsActive=1&ptOptionsActive=1&useProxFootSearch=1&mergeDep=1&useAllStops=1&mode=direct&deleteAssignedStop=0"; - - @Override - protected String nearbyStationUri(final int stationId) - { - return String.format(NEARBY_STATION_URI, stationId); - } - @Override public List autocompleteStations(final CharSequence constraint) throws IOException { diff --git a/src/de/schildbach/pte/VrtProvider.java b/src/de/schildbach/pte/VrtProvider.java index b3bb45a1..cdba5187 100644 --- a/src/de/schildbach/pte/VrtProvider.java +++ b/src/de/schildbach/pte/VrtProvider.java @@ -50,16 +50,6 @@ public class VrtProvider extends AbstractEfaProvider return false; } - private static final String NEARBY_STATION_URI = API_BASE - + "XSLT_DM_REQUEST" - + "?outputFormat=XML&coordOutputFormat=WGS84&type_dm=stop&name_dm=%s&itOptionsActive=1&ptOptionsActive=1&useProxFootSearch=1&mergeDep=1&useAllStops=1&mode=direct"; - - @Override - protected String nearbyStationUri(final int stationId) - { - return String.format(NEARBY_STATION_URI, stationId); - } - @Override public List autocompleteStations(final CharSequence constraint) throws IOException { diff --git a/src/de/schildbach/pte/VvmProvider.java b/src/de/schildbach/pte/VvmProvider.java index dc74923c..d2ee85c9 100644 --- a/src/de/schildbach/pte/VvmProvider.java +++ b/src/de/schildbach/pte/VvmProvider.java @@ -50,16 +50,6 @@ public class VvmProvider extends AbstractEfaProvider return false; } - private static final String NEARBY_STATION_URI = API_BASE - + "XSLT_DM_REQUEST" - + "?outputFormat=XML&coordOutputFormat=WGS84&type_dm=stop&name_dm=%s&itOptionsActive=1&ptOptionsActive=1&useProxFootSearch=1&mergeDep=1&useAllStops=1&mode=direct"; - - @Override - protected String nearbyStationUri(final int stationId) - { - return String.format(NEARBY_STATION_URI, stationId); - } - @Override public List autocompleteStations(final CharSequence constraint) throws IOException { diff --git a/src/de/schildbach/pte/VvoProvider.java b/src/de/schildbach/pte/VvoProvider.java index 8b138302..a90ba34e 100644 --- a/src/de/schildbach/pte/VvoProvider.java +++ b/src/de/schildbach/pte/VvoProvider.java @@ -56,16 +56,6 @@ public class VvoProvider extends AbstractEfaProvider return false; } - private static final String NEARBY_STATION_URI = API_BASE - + "XSLT_DM_REQUEST" - + "?outputFormat=XML&coordOutputFormat=WGS84&type_dm=stop&name_dm=%s&itOptionsActive=1&ptOptionsActive=1&useProxFootSearch=1&mergeDep=1&useAllStops=1&mode=direct"; - - @Override - protected String nearbyStationUri(final int stationId) - { - return String.format(NEARBY_STATION_URI, stationId); - } - @Override public List autocompleteStations(final CharSequence constraint) throws IOException { diff --git a/src/de/schildbach/pte/VvsProvider.java b/src/de/schildbach/pte/VvsProvider.java index 16b633c1..5493b267 100644 --- a/src/de/schildbach/pte/VvsProvider.java +++ b/src/de/schildbach/pte/VvsProvider.java @@ -57,16 +57,6 @@ public class VvsProvider extends AbstractEfaProvider return false; } - private static final String NEARBY_STATION_URI = API_BASE - + "XSLT_DM_REQUEST" - + "?outputFormat=XML&coordOutputFormat=WGS84&type_dm=stop&name_dm=%s&itOptionsActive=1&ptOptionsActive=1&useProxFootSearch=1&mergeDep=1&useAllStops=1&mode=direct&deleteAssignedStop=0"; - - @Override - protected String nearbyStationUri(final int stationId) - { - return String.format(NEARBY_STATION_URI, stationId); - } - @Override public List autocompleteStations(final CharSequence constraint) throws IOException { diff --git a/src/de/schildbach/pte/VvtProvider.java b/src/de/schildbach/pte/VvtProvider.java index 01bb6448..f7d39eb7 100644 --- a/src/de/schildbach/pte/VvtProvider.java +++ b/src/de/schildbach/pte/VvtProvider.java @@ -50,16 +50,6 @@ public class VvtProvider extends AbstractEfaProvider return false; } - private static final String NEARBY_STATION_URI = API_BASE - + "XSLT_DM_REQUEST" - + "?outputFormat=XML&coordOutputFormat=WGS84&type_dm=stop&name_dm=%s&itOptionsActive=1&ptOptionsActive=1&useProxFootSearch=1&mergeDep=1&useAllStops=1&mode=direct"; - - @Override - protected String nearbyStationUri(final int stationId) - { - return String.format(NEARBY_STATION_URI, stationId); - } - @Override public List autocompleteStations(final CharSequence constraint) throws IOException { diff --git a/test/de/schildbach/pte/live/MvgProviderLiveTest.java b/test/de/schildbach/pte/live/MvgProviderLiveTest.java index 5c665605..f76c63f9 100644 --- a/test/de/schildbach/pte/live/MvgProviderLiveTest.java +++ b/test/de/schildbach/pte/live/MvgProviderLiveTest.java @@ -42,7 +42,7 @@ public class MvgProviderLiveTest @Test public void nearbyStations() throws Exception { - final NearbyStationsResult result = provider.queryNearbyStations(new Location(LocationType.STATION, 3), 0, 0); + final NearbyStationsResult result = provider.queryNearbyStations(new Location(LocationType.STATION, 24200006), 0, 0); System.out.println(result.stations.size() + " " + result.stations); } diff --git a/test/de/schildbach/pte/live/VmvProviderLiveTest.java b/test/de/schildbach/pte/live/VmvProviderLiveTest.java index a4bc5589..b8ec6f0c 100644 --- a/test/de/schildbach/pte/live/VmvProviderLiveTest.java +++ b/test/de/schildbach/pte/live/VmvProviderLiveTest.java @@ -42,7 +42,7 @@ public class VmvProviderLiveTest @Test public void nearbyStations() throws Exception { - final NearbyStationsResult result = provider.queryNearbyStations(new Location(LocationType.STATION, 80001834), 0, 0); + final NearbyStationsResult result = provider.queryNearbyStations(new Location(LocationType.STATION, 44402031), 0, 0); System.out.println(result.stations.size() + " " + result.stations); }