diff --git a/src/de/schildbach/pte/AbstractEfaProvider.java b/src/de/schildbach/pte/AbstractEfaProvider.java index 54cbcc4b..bdc3400a 100644 --- a/src/de/schildbach/pte/AbstractEfaProvider.java +++ b/src/de/schildbach/pte/AbstractEfaProvider.java @@ -190,6 +190,89 @@ public abstract class AbstractEfaProvider implements NetworkProvider } } + protected List xmlCoordRequest(final int lat, final int lon, final int maxDistance, final int maxStations) throws IOException + { + final StringBuilder uri = new StringBuilder(apiBase); + uri.append("XML_COORD_REQUEST?coord="); + uri.append(String.format("%2.6f:%2.6f:WGS84", latLonToDouble(lon), latLonToDouble(lat))); + uri.append("&coordOutputFormat=WGS84&coordListOutputFormat=STRING"); + uri.append("&max=").append(maxStations != 0 ? maxStations : 50); + uri.append("&inclFilter=1&radius_1=").append(maxDistance != 0 ? maxDistance : 1320); + uri.append("&type_1=STOP"); + if (additionalQueryParameter != null) + uri.append('&').append(additionalQueryParameter); + + InputStream is = null; + try + { + is = ParserUtils.scrapeInputStream(uri.toString()); + + final XmlPullParser pp = parserFactory.newPullParser(); + pp.setInput(is, null); + assertItdRequest(pp); + + XmlPullUtil.enter(pp, "itdRequest"); + + if (XmlPullUtil.test(pp, "clientHeaderLines")) + XmlPullUtil.next(pp); + + if (XmlPullUtil.test(pp, "itdVersionInfo")) + XmlPullUtil.next(pp); + + if (XmlPullUtil.test(pp, "itdInfoLinkList")) + XmlPullUtil.next(pp); + + if (XmlPullUtil.test(pp, "serverMetaInfo")) + XmlPullUtil.next(pp); + + XmlPullUtil.enter(pp, "itdCoordInfoRequest"); + + XmlPullUtil.enter(pp, "itdCoordInfo"); + + XmlPullUtil.enter(pp, "coordInfoRequest"); + XmlPullUtil.exit(pp, "coordInfoRequest"); + + final List results = new ArrayList(); + + if (XmlPullUtil.test(pp, "coordInfoItemList")) + { + XmlPullUtil.enter(pp, "coordInfoItemList"); + + while (XmlPullUtil.test(pp, "coordInfoItem")) + { + if (!"STOP".equals(pp.getAttributeValue(null, "type"))) + throw new RuntimeException("unknown type"); + + final int id = XmlPullUtil.intAttr(pp, "id"); + final String name = normalizeLocationName(XmlPullUtil.attr(pp, "name")); + final String place = normalizeLocationName(XmlPullUtil.attr(pp, "locality")); + + XmlPullUtil.enter(pp, "coordInfoItem"); + + // FIXME this is always only one coordinate + final Point coord = processItdPathCoordinates(pp).get(0); + + XmlPullUtil.exit(pp, "coordInfoItem"); + + results.add(new Location(LocationType.STATION, id, coord.lat, coord.lon, place, name)); + } + + XmlPullUtil.exit(pp, "coordInfoItemList"); + } + + return results; + } + catch (final XmlPullParserException x) + { + throw new ParserException(x); + } + finally + { + if (is != null) + is.close(); + } + } + private String autocompleteUri(final CharSequence constraint) { final String AUTOCOMPLETE_URI = apiBase + "XSLT_TRIP_REQUEST2?outputFormat=XML&coordOutputFormat=WGS84&type_origin=any&name_origin=%s"; @@ -370,18 +453,17 @@ public abstract class AbstractEfaProvider implements NetworkProvider return new Location(LocationType.STATION, id, lat, lon, place, name); } - protected abstract String nearbyLatLonUri(int lat, int lon); - protected abstract String nearbyStationUri(String stationId); public NearbyStationsResult nearbyStations(final String stationId, final int lat, final int lon, final int maxDistance, final int maxStations) throws IOException { + if (lat != 0 || lon != 0) + return new NearbyStationsResult(xmlCoordRequest(lat, lon, maxDistance, maxStations)); + String uri = null; if (uri == null && stationId != null) uri = wrapUri(nearbyStationUri(stationId)); - if (uri == null && (lat != 0 || lon != 0)) - uri = wrapUri(nearbyLatLonUri(lat, lon)); if (uri == null) throw new IllegalArgumentException("at least one of stationId or lat/lon must be given"); diff --git a/src/de/schildbach/pte/AtcProvider.java b/src/de/schildbach/pte/AtcProvider.java index 2e20b625..64b1a860 100644 --- a/src/de/schildbach/pte/AtcProvider.java +++ b/src/de/schildbach/pte/AtcProvider.java @@ -60,12 +60,6 @@ public class AtcProvider extends AbstractEfaProvider return xmlStopfinderRequest(new Location(LocationType.STATION, 0, null, constraint.toString())); } - @Override - protected String nearbyLatLonUri(final int lat, final int lon) - { - return null; - } - 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"; diff --git a/src/de/schildbach/pte/AvvProvider.java b/src/de/schildbach/pte/AvvProvider.java index 620161d4..c741d23a 100644 --- a/src/de/schildbach/pte/AvvProvider.java +++ b/src/de/schildbach/pte/AvvProvider.java @@ -61,12 +61,6 @@ public class AvvProvider extends AbstractEfaProvider return xmlStopfinderRequest(new Location(LocationType.ANY, 0, null, constraint.toString())); } - @Override - protected String nearbyLatLonUri(final int lat, final int lon) - { - return null; - } - 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"; diff --git a/src/de/schildbach/pte/BsagProvider.java b/src/de/schildbach/pte/BsagProvider.java index 42748938..da3d004e 100644 --- a/src/de/schildbach/pte/BsagProvider.java +++ b/src/de/schildbach/pte/BsagProvider.java @@ -60,12 +60,6 @@ public class BsagProvider extends AbstractEfaProvider return xmlStopfinderRequest(new Location(LocationType.STATION, 0, null, constraint.toString())); } - @Override - protected String nearbyLatLonUri(final int lat, final int lon) - { - return null; - } - 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"; diff --git a/src/de/schildbach/pte/BsvagProvider.java b/src/de/schildbach/pte/BsvagProvider.java index c8ecc5db..a6538feb 100644 --- a/src/de/schildbach/pte/BsvagProvider.java +++ b/src/de/schildbach/pte/BsvagProvider.java @@ -61,12 +61,6 @@ public class BsvagProvider extends AbstractEfaProvider return xmlStopfinderRequest(new Location(LocationType.STATION, 0, null, constraint.toString())); } - @Override - protected String nearbyLatLonUri(final int lat, final int lon) - { - return null; - } - 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"; diff --git a/src/de/schildbach/pte/BvbProvider.java b/src/de/schildbach/pte/BvbProvider.java index a47b235c..f9c247a4 100644 --- a/src/de/schildbach/pte/BvbProvider.java +++ b/src/de/schildbach/pte/BvbProvider.java @@ -61,12 +61,6 @@ public class BvbProvider extends AbstractEfaProvider return xmlStopfinderRequest(new Location(LocationType.STATION, 0, null, constraint.toString())); } - @Override - protected String nearbyLatLonUri(final int lat, final int lon) - { - return null; - } - 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"; diff --git a/src/de/schildbach/pte/DingProvider.java b/src/de/schildbach/pte/DingProvider.java index d77cd473..6f3a0b90 100644 --- a/src/de/schildbach/pte/DingProvider.java +++ b/src/de/schildbach/pte/DingProvider.java @@ -61,12 +61,6 @@ public class DingProvider extends AbstractEfaProvider return xmlStopfinderRequest(new Location(LocationType.ANY, 0, null, constraint.toString())); } - @Override - protected String nearbyLatLonUri(final int lat, final int lon) - { - return null; - } - 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"; diff --git a/src/de/schildbach/pte/DubProvider.java b/src/de/schildbach/pte/DubProvider.java index b87a66e5..f2f31199 100644 --- a/src/de/schildbach/pte/DubProvider.java +++ b/src/de/schildbach/pte/DubProvider.java @@ -68,12 +68,6 @@ public class DubProvider extends AbstractEfaProvider return xmlStopfinderRequest(new Location(LocationType.STATION, 0, null, constraint.toString())); } - @Override - protected String nearbyLatLonUri(final int lat, final int lon) - { - return null; - } - 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"; diff --git a/src/de/schildbach/pte/GvhProvider.java b/src/de/schildbach/pte/GvhProvider.java index 2e9c051a..83c6e739 100644 --- a/src/de/schildbach/pte/GvhProvider.java +++ b/src/de/schildbach/pte/GvhProvider.java @@ -73,12 +73,6 @@ public class GvhProvider extends AbstractEfaProvider return String.format(NEARBY_STATION_URI, ParserUtils.urlEncode(stationId, "ISO-8859-1")); } - @Override - protected String nearbyLatLonUri(final int lat, final int lon) - { - return null; - } - @Override protected String departuresQueryUri(String stationId, int maxDepartures) { diff --git a/src/de/schildbach/pte/IvbProvider.java b/src/de/schildbach/pte/IvbProvider.java index 004f88d8..b2351a7f 100644 --- a/src/de/schildbach/pte/IvbProvider.java +++ b/src/de/schildbach/pte/IvbProvider.java @@ -61,12 +61,6 @@ public class IvbProvider extends AbstractEfaProvider return xmlStopfinderRequest(new Location(LocationType.ANY, 0, null, constraint.toString())); } - @Override - protected String nearbyLatLonUri(final int lat, final int lon) - { - return null; - } - 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"; diff --git a/src/de/schildbach/pte/KvvProvider.java b/src/de/schildbach/pte/KvvProvider.java index b3e34547..2ea22613 100644 --- a/src/de/schildbach/pte/KvvProvider.java +++ b/src/de/schildbach/pte/KvvProvider.java @@ -60,12 +60,6 @@ public class KvvProvider extends AbstractEfaProvider return xmlStopfinderRequest(new Location(LocationType.ANY, 0, null, constraint.toString())); } - @Override - protected String nearbyLatLonUri(final int lat, final int lon) - { - return null; - } - 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"; diff --git a/src/de/schildbach/pte/LinzProvider.java b/src/de/schildbach/pte/LinzProvider.java index 9c54545c..0d8f20ec 100644 --- a/src/de/schildbach/pte/LinzProvider.java +++ b/src/de/schildbach/pte/LinzProvider.java @@ -22,7 +22,6 @@ import java.text.DateFormat; import java.text.SimpleDateFormat; import java.util.Date; import java.util.List; -import java.util.Locale; import de.schildbach.pte.dto.Location; import de.schildbach.pte.dto.LocationType; @@ -62,16 +61,6 @@ public class LinzProvider extends AbstractEfaProvider return xmlStopfinderRequest(new Location(LocationType.STATION, 0, null, constraint.toString())); } - private static final String NEARBY_LATLON_URI = API_BASE - + "XSLT_DM_REQUEST" - + "?outputFormat=XML&mode=direct&coordOutputFormat=WGS84&mergeDep=1&useAllStops=1&name_dm=%2.6f:%2.6f:WGS84&type_dm=coord&itOptionsActive=1&ptOptionsActive=1&useProxFootSearch=1&excludedMeans=checkbox"; - - @Override - protected String nearbyLatLonUri(final int lat, final int lon) - { - return String.format(Locale.ENGLISH, NEARBY_LATLON_URI, latLonToDouble(lon), latLonToDouble(lat)); - } - 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"; diff --git a/src/de/schildbach/pte/MariborProvider.java b/src/de/schildbach/pte/MariborProvider.java index 14e2833b..c20dd79c 100644 --- a/src/de/schildbach/pte/MariborProvider.java +++ b/src/de/schildbach/pte/MariborProvider.java @@ -60,12 +60,6 @@ public class MariborProvider extends AbstractEfaProvider return xmlStopfinderRequest(new Location(LocationType.STATION, 0, null, constraint.toString())); } - @Override - protected String nearbyLatLonUri(final int lat, final int lon) - { - return null; - } - 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"; diff --git a/src/de/schildbach/pte/MetProvider.java b/src/de/schildbach/pte/MetProvider.java index 26e4235e..1b44c653 100644 --- a/src/de/schildbach/pte/MetProvider.java +++ b/src/de/schildbach/pte/MetProvider.java @@ -67,12 +67,6 @@ public class MetProvider extends AbstractEfaProvider return xmlStopfinderRequest(new Location(LocationType.ANY, 0, null, constraint.toString())); } - @Override - protected String nearbyLatLonUri(final int lat, final int lon) - { - return null; - } - 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"; diff --git a/src/de/schildbach/pte/MvvProvider.java b/src/de/schildbach/pte/MvvProvider.java index 0573afbe..639dd564 100644 --- a/src/de/schildbach/pte/MvvProvider.java +++ b/src/de/schildbach/pte/MvvProvider.java @@ -64,12 +64,6 @@ public class MvvProvider extends AbstractEfaProvider return xmlStopfinderRequest(new Location(LocationType.ANY, 0, null, constraint.toString())); } - @Override - protected String nearbyLatLonUri(final int lat, final int lon) - { - return null; - } - 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"; diff --git a/src/de/schildbach/pte/NaldoProvider.java b/src/de/schildbach/pte/NaldoProvider.java index 68d69a86..8819ef4b 100644 --- a/src/de/schildbach/pte/NaldoProvider.java +++ b/src/de/schildbach/pte/NaldoProvider.java @@ -60,12 +60,6 @@ public class NaldoProvider extends AbstractEfaProvider return xmlStopfinderRequest(new Location(LocationType.STATION, 0, null, constraint.toString())); } - @Override - protected String nearbyLatLonUri(final int lat, final int lon) - { - return null; - } - 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"; diff --git a/src/de/schildbach/pte/NvbwProvider.java b/src/de/schildbach/pte/NvbwProvider.java index 55056786..2f021568 100644 --- a/src/de/schildbach/pte/NvbwProvider.java +++ b/src/de/schildbach/pte/NvbwProvider.java @@ -60,12 +60,6 @@ public class NvbwProvider extends AbstractEfaProvider return xmlStopfinderRequest(new Location(LocationType.ANY, 0, null, constraint.toString())); } - @Override - protected String nearbyLatLonUri(final int lat, final int lon) - { - return null; - } - 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"; diff --git a/src/de/schildbach/pte/SfProvider.java b/src/de/schildbach/pte/SfProvider.java index 98b4ca2e..1fbe9508 100644 --- a/src/de/schildbach/pte/SfProvider.java +++ b/src/de/schildbach/pte/SfProvider.java @@ -82,12 +82,6 @@ public class SfProvider extends AbstractEfaProvider return xmlStopfinderRequest(new Location(LocationType.ANY, 0, null, constraint.toString())); } - @Override - protected String nearbyLatLonUri(final int lat, final int lon) - { - return null; - } - 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"; diff --git a/src/de/schildbach/pte/StvProvider.java b/src/de/schildbach/pte/StvProvider.java index fef78498..36178b8c 100644 --- a/src/de/schildbach/pte/StvProvider.java +++ b/src/de/schildbach/pte/StvProvider.java @@ -61,12 +61,6 @@ public class StvProvider extends AbstractEfaProvider return xmlStopfinderRequest(new Location(LocationType.STATION, 0, null, constraint.toString())); } - @Override - protected String nearbyLatLonUri(final int lat, final int lon) - { - return null; - } - 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"; diff --git a/src/de/schildbach/pte/SvvProvider.java b/src/de/schildbach/pte/SvvProvider.java index 526397af..acac4c98 100644 --- a/src/de/schildbach/pte/SvvProvider.java +++ b/src/de/schildbach/pte/SvvProvider.java @@ -61,12 +61,6 @@ public class SvvProvider extends AbstractEfaProvider return xmlStopfinderRequest(new Location(LocationType.STATION, 0, null, constraint.toString())); } - @Override - protected String nearbyLatLonUri(final int lat, final int lon) - { - return null; - } - 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"; diff --git a/src/de/schildbach/pte/SydneyProvider.java b/src/de/schildbach/pte/SydneyProvider.java index 6a2c6af6..ae38c77e 100644 --- a/src/de/schildbach/pte/SydneyProvider.java +++ b/src/de/schildbach/pte/SydneyProvider.java @@ -67,12 +67,6 @@ public class SydneyProvider extends AbstractEfaProvider return xmlStopfinderRequest(new Location(LocationType.ANY, 0, null, constraint.toString())); } - @Override - protected String nearbyLatLonUri(final int lat, final int lon) - { - return null; - } - 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"; diff --git a/src/de/schildbach/pte/TflProvider.java b/src/de/schildbach/pte/TflProvider.java index 5230af9d..baa8800d 100644 --- a/src/de/schildbach/pte/TflProvider.java +++ b/src/de/schildbach/pte/TflProvider.java @@ -80,12 +80,6 @@ public class TflProvider extends AbstractEfaProvider return String.format(NEARBY_STATION_URI, ParserUtils.urlEncode(stationId, "ISO-8859-1")); } - @Override - protected String nearbyLatLonUri(int lat, int lon) - { - return null; - } - @Override protected String departuresQueryUri(final String stationId, final int maxDepartures) { diff --git a/src/de/schildbach/pte/TleaProvider.java b/src/de/schildbach/pte/TleaProvider.java index eff31bd6..9dc9f800 100644 --- a/src/de/schildbach/pte/TleaProvider.java +++ b/src/de/schildbach/pte/TleaProvider.java @@ -68,12 +68,6 @@ public class TleaProvider extends AbstractEfaProvider return xmlStopfinderRequest(new Location(LocationType.ANY, 0, null, constraint.toString())); } - @Override - protected String nearbyLatLonUri(final int lat, final int lon) - { - return null; - } - 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"; diff --git a/src/de/schildbach/pte/TlemProvider.java b/src/de/schildbach/pte/TlemProvider.java index 1a39201b..255b69bd 100644 --- a/src/de/schildbach/pte/TlemProvider.java +++ b/src/de/schildbach/pte/TlemProvider.java @@ -68,12 +68,6 @@ public class TlemProvider extends AbstractEfaProvider return xmlStopfinderRequest(new Location(LocationType.ANY, 0, null, constraint.toString())); } - @Override - protected String nearbyLatLonUri(final int lat, final int lon) - { - return null; - } - 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"; diff --git a/src/de/schildbach/pte/TlseProvider.java b/src/de/schildbach/pte/TlseProvider.java index 38106cf4..a8e7eb47 100644 --- a/src/de/schildbach/pte/TlseProvider.java +++ b/src/de/schildbach/pte/TlseProvider.java @@ -68,12 +68,6 @@ public class TlseProvider extends AbstractEfaProvider return xmlStopfinderRequest(new Location(LocationType.ANY, 0, null, constraint.toString())); } - @Override - protected String nearbyLatLonUri(final int lat, final int lon) - { - return null; - } - 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"; diff --git a/src/de/schildbach/pte/TlswProvider.java b/src/de/schildbach/pte/TlswProvider.java index f9402ba1..4faaef16 100644 --- a/src/de/schildbach/pte/TlswProvider.java +++ b/src/de/schildbach/pte/TlswProvider.java @@ -67,12 +67,6 @@ public class TlswProvider extends AbstractEfaProvider return xmlStopfinderRequest(new Location(LocationType.ANY, 0, null, constraint.toString())); } - @Override - protected String nearbyLatLonUri(final int lat, final int lon) - { - return null; - } - private static final String NEARBY_STATION_URI = API_BASE + "XSLT_DM_REQUEST" + "?outputFormat=XML&coordOutputFormat=WGS84&name_dm=90000591&type_dm=stop&itOptionsActive=1&ptOptionsActive=1&useProxFootSearch=1&mergeDep=1&useAllStops=1&mode=direct"; diff --git a/src/de/schildbach/pte/VagfrProvider.java b/src/de/schildbach/pte/VagfrProvider.java index 49f54e0c..ba5b7921 100644 --- a/src/de/schildbach/pte/VagfrProvider.java +++ b/src/de/schildbach/pte/VagfrProvider.java @@ -60,12 +60,6 @@ public class VagfrProvider extends AbstractEfaProvider return xmlStopfinderRequest(new Location(LocationType.STATION, 0, null, constraint.toString())); } - @Override - protected String nearbyLatLonUri(final int lat, final int lon) - { - return null; - } - 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"; diff --git a/src/de/schildbach/pte/VblProvider.java b/src/de/schildbach/pte/VblProvider.java index b5315a97..03d01a28 100644 --- a/src/de/schildbach/pte/VblProvider.java +++ b/src/de/schildbach/pte/VblProvider.java @@ -60,12 +60,6 @@ public class VblProvider extends AbstractEfaProvider return xmlStopfinderRequest(new Location(LocationType.ANY, 0, null, constraint.toString())); } - @Override - protected String nearbyLatLonUri(final int lat, final int lon) - { - return null; - } - 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"; diff --git a/src/de/schildbach/pte/VmsProvider.java b/src/de/schildbach/pte/VmsProvider.java index 3597beef..c8d462b8 100644 --- a/src/de/schildbach/pte/VmsProvider.java +++ b/src/de/schildbach/pte/VmsProvider.java @@ -61,12 +61,6 @@ public class VmsProvider extends AbstractEfaProvider return xmlStopfinderRequest(new Location(LocationType.ANY, 0, null, constraint.toString())); } - @Override - protected String nearbyLatLonUri(final int lat, final int lon) - { - return null; - } - 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"; diff --git a/src/de/schildbach/pte/VmvProvider.java b/src/de/schildbach/pte/VmvProvider.java index 0eefefea..e179efa3 100644 --- a/src/de/schildbach/pte/VmvProvider.java +++ b/src/de/schildbach/pte/VmvProvider.java @@ -61,12 +61,6 @@ public class VmvProvider extends AbstractEfaProvider return xmlStopfinderRequest(new Location(LocationType.STATION, 0, null, constraint.toString())); } - @Override - protected String nearbyLatLonUri(final int lat, final int lon) - { - return null; - } - 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"; diff --git a/src/de/schildbach/pte/VorProvider.java b/src/de/schildbach/pte/VorProvider.java index 9e14b83d..43d22761 100644 --- a/src/de/schildbach/pte/VorProvider.java +++ b/src/de/schildbach/pte/VorProvider.java @@ -61,12 +61,6 @@ public class VorProvider extends AbstractEfaProvider return xmlStopfinderRequest(new Location(LocationType.ANY, 0, null, constraint.toString())); } - @Override - protected String nearbyLatLonUri(final int lat, final int lon) - { - return null; - } - 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"; diff --git a/src/de/schildbach/pte/VrnProvider.java b/src/de/schildbach/pte/VrnProvider.java index 38c0be2e..44fa127f 100644 --- a/src/de/schildbach/pte/VrnProvider.java +++ b/src/de/schildbach/pte/VrnProvider.java @@ -61,12 +61,6 @@ public class VrnProvider extends AbstractEfaProvider return xmlStopfinderRequest(new Location(LocationType.ANY, 0, null, constraint.toString())); } - @Override - protected String nearbyLatLonUri(final int lat, final int lon) - { - return null; - } - 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"; diff --git a/src/de/schildbach/pte/VrrProvider.java b/src/de/schildbach/pte/VrrProvider.java index f373dbb1..9919cf46 100644 --- a/src/de/schildbach/pte/VrrProvider.java +++ b/src/de/schildbach/pte/VrrProvider.java @@ -23,7 +23,6 @@ import java.text.SimpleDateFormat; import java.util.Date; import java.util.HashMap; import java.util.List; -import java.util.Locale; import java.util.Map; import de.schildbach.pte.dto.Location; @@ -65,16 +64,6 @@ public class VrrProvider extends AbstractEfaProvider return xmlStopfinderRequest(new Location(LocationType.ANY, 0, null, constraint.toString())); } - private static final String NEARBY_LATLON_URI = API_BASE - + "XSLT_DM_REQUEST" - + "?outputFormat=XML&mode=direct&coordOutputFormat=WGS84&mergeDep=1&useAllStops=1&name_dm=%2.6f:%2.6f:WGS84&type_dm=coord&itOptionsActive=1&ptOptionsActive=1&useProxFootSearch=1"; - - @Override - protected String nearbyLatLonUri(final int lat, final int lon) - { - return String.format(Locale.ENGLISH, NEARBY_LATLON_URI, latLonToDouble(lon), latLonToDouble(lat)); - } - 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"; diff --git a/src/de/schildbach/pte/VrtProvider.java b/src/de/schildbach/pte/VrtProvider.java index 11a2b645..1c78c862 100644 --- a/src/de/schildbach/pte/VrtProvider.java +++ b/src/de/schildbach/pte/VrtProvider.java @@ -60,12 +60,6 @@ public class VrtProvider extends AbstractEfaProvider return xmlStopfinderRequest(new Location(LocationType.ANY, 0, null, constraint.toString())); } - @Override - protected String nearbyLatLonUri(final int lat, final int lon) - { - return null; - } - 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"; diff --git a/src/de/schildbach/pte/VvmProvider.java b/src/de/schildbach/pte/VvmProvider.java index 255778a1..56d432d6 100644 --- a/src/de/schildbach/pte/VvmProvider.java +++ b/src/de/schildbach/pte/VvmProvider.java @@ -60,12 +60,6 @@ public class VvmProvider extends AbstractEfaProvider return xmlStopfinderRequest(new Location(LocationType.ANY, 0, null, constraint.toString())); } - @Override - protected String nearbyLatLonUri(final int lat, final int lon) - { - return null; - } - 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"; diff --git a/src/de/schildbach/pte/VvoProvider.java b/src/de/schildbach/pte/VvoProvider.java index 1b745055..1589d2b8 100644 --- a/src/de/schildbach/pte/VvoProvider.java +++ b/src/de/schildbach/pte/VvoProvider.java @@ -61,12 +61,6 @@ public class VvoProvider extends AbstractEfaProvider return xmlStopfinderRequest(new Location(LocationType.STATION, 0, null, constraint.toString())); } - @Override - protected String nearbyLatLonUri(final int lat, final int lon) - { - return null; - } - 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"; diff --git a/src/de/schildbach/pte/VvsProvider.java b/src/de/schildbach/pte/VvsProvider.java index ac7d11e9..ecb68dac 100644 --- a/src/de/schildbach/pte/VvsProvider.java +++ b/src/de/schildbach/pte/VvsProvider.java @@ -61,12 +61,6 @@ public class VvsProvider extends AbstractEfaProvider return xmlStopfinderRequest(new Location(LocationType.ANY, 0, null, constraint.toString())); } - @Override - protected String nearbyLatLonUri(final int lat, final int lon) - { - return null; - } - 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"; diff --git a/test/de/schildbach/pte/live/AtcProviderLiveTest.java b/test/de/schildbach/pte/live/AtcProviderLiveTest.java index d8c72b2a..62ae7819 100644 --- a/test/de/schildbach/pte/live/AtcProviderLiveTest.java +++ b/test/de/schildbach/pte/live/AtcProviderLiveTest.java @@ -57,6 +57,14 @@ public class AtcProviderLiveTest System.out.println(result.stations.size() + " " + result.stations); } + @Test + public void nearbyStationsByCoordinate() throws Exception + { + final NearbyStationsResult result = provider.nearbyStations(null, 8168907, 10609969, 0, 0); // bad coordinate! + + System.out.println(result.stations.size() + " " + result.stations); + } + @Test public void queryDepartures() throws Exception { diff --git a/test/de/schildbach/pte/live/AvvProviderLiveTest.java b/test/de/schildbach/pte/live/AvvProviderLiveTest.java index 4225d8c5..84fef123 100644 --- a/test/de/schildbach/pte/live/AvvProviderLiveTest.java +++ b/test/de/schildbach/pte/live/AvvProviderLiveTest.java @@ -57,6 +57,14 @@ public class AvvProviderLiveTest System.out.println(result.stations.size() + " " + result.stations); } + @Test + public void nearbyStationsByCoordinate() throws Exception + { + final NearbyStationsResult result = provider.nearbyStations(null, 48367233, 10894976, 0, 0); + + System.out.println(result.stations.size() + " " + result.stations); + } + @Test public void queryDepartures() throws Exception { diff --git a/test/de/schildbach/pte/live/BsagProviderLiveTest.java b/test/de/schildbach/pte/live/BsagProviderLiveTest.java index 71ca3864..f8e6fff6 100644 --- a/test/de/schildbach/pte/live/BsagProviderLiveTest.java +++ b/test/de/schildbach/pte/live/BsagProviderLiveTest.java @@ -55,4 +55,12 @@ public class BsagProviderLiveTest System.out.println(result.stations.size() + " " + result.stations); } + + @Test + public void nearbyStationsByCoordinate() throws Exception + { + final NearbyStationsResult result = provider.nearbyStations(null, 53076146, 8806858, 0, 0); + + System.out.println(result.stations.size() + " " + result.stations); + } } diff --git a/test/de/schildbach/pte/live/BsvagProviderLiveTest.java b/test/de/schildbach/pte/live/BsvagProviderLiveTest.java index d4d777a3..748ffd25 100644 --- a/test/de/schildbach/pte/live/BsvagProviderLiveTest.java +++ b/test/de/schildbach/pte/live/BsvagProviderLiveTest.java @@ -55,4 +55,12 @@ public class BsvagProviderLiveTest System.out.println(result.stations.size() + " " + result.stations); } + + @Test + public void nearbyStationsByCoordinate() throws Exception + { + final NearbyStationsResult result = provider.nearbyStations(null, 52272065, 10524788, 0, 0); + + System.out.println(result.stations.size() + " " + result.stations); + } } diff --git a/test/de/schildbach/pte/live/BvbProviderLiveTest.java b/test/de/schildbach/pte/live/BvbProviderLiveTest.java index f2e27f09..adb4bc17 100644 --- a/test/de/schildbach/pte/live/BvbProviderLiveTest.java +++ b/test/de/schildbach/pte/live/BvbProviderLiveTest.java @@ -57,6 +57,14 @@ public class BvbProviderLiveTest System.out.println(result.stations.size() + " " + result.stations); } + @Test + public void nearbyStationsByCoordinate() throws Exception + { + final NearbyStationsResult result = provider.nearbyStations(null, 47551466, 7585187, 0, 0); + + System.out.println(result.stations.size() + " " + result.stations); + } + @Test public void queryDepartures() throws Exception { diff --git a/test/de/schildbach/pte/live/DingProviderLiveTest.java b/test/de/schildbach/pte/live/DingProviderLiveTest.java index e0d1aa5d..170d7173 100644 --- a/test/de/schildbach/pte/live/DingProviderLiveTest.java +++ b/test/de/schildbach/pte/live/DingProviderLiveTest.java @@ -57,6 +57,14 @@ public class DingProviderLiveTest System.out.println(result.stations.size() + " " + result.stations); } + @Test + public void nearbyStationsByCoordinate() throws Exception + { + final NearbyStationsResult result = provider.nearbyStations(null, 48401092, 9992037, 0, 0); + + System.out.println(result.stations.size() + " " + result.stations); + } + @Test public void queryDepartures() throws Exception { diff --git a/test/de/schildbach/pte/live/DubProviderLiveTest.java b/test/de/schildbach/pte/live/DubProviderLiveTest.java index 5d84192e..69b5bd5f 100644 --- a/test/de/schildbach/pte/live/DubProviderLiveTest.java +++ b/test/de/schildbach/pte/live/DubProviderLiveTest.java @@ -23,6 +23,7 @@ import org.junit.Test; import de.schildbach.pte.DubProvider; import de.schildbach.pte.dto.Location; +import de.schildbach.pte.dto.NearbyStationsResult; /** * @author Andreas Schildbach @@ -46,4 +47,12 @@ public class DubProviderLiveTest System.out.print(autocomplete.toDebugString() + " "); System.out.println(); } + + @Test + public void nearbyStationsByCoordinate() throws Exception + { + final NearbyStationsResult result = provider.nearbyStations(null, 25269008, 55312672, 0, 0); + + System.out.println(result.stations.size() + " " + result.stations); + } } diff --git a/test/de/schildbach/pte/live/GvhProviderLiveTest.java b/test/de/schildbach/pte/live/GvhProviderLiveTest.java index caba0aef..8d1d21c0 100644 --- a/test/de/schildbach/pte/live/GvhProviderLiveTest.java +++ b/test/de/schildbach/pte/live/GvhProviderLiveTest.java @@ -85,6 +85,14 @@ public class GvhProviderLiveTest System.out.println(result.stations.size() + " " + result.stations); } + @Test + public void nearbyStationsByCoordinate() throws Exception + { + final NearbyStationsResult result = provider.nearbyStations(null, 52379497, 9735832, 0, 0); + + System.out.println(result.stations.size() + " " + result.stations); + } + @Test public void incompleteConnection() throws Exception { diff --git a/test/de/schildbach/pte/live/IvbProviderLiveTest.java b/test/de/schildbach/pte/live/IvbProviderLiveTest.java index a378d541..bf53f0d7 100644 --- a/test/de/schildbach/pte/live/IvbProviderLiveTest.java +++ b/test/de/schildbach/pte/live/IvbProviderLiveTest.java @@ -57,6 +57,14 @@ public class IvbProviderLiveTest System.out.println(result.stations.size() + " " + result.stations); } + @Test + public void nearbyStationsByCoordinate() throws Exception + { + final NearbyStationsResult result = provider.nearbyStations(null, 47271228, 11402063, 0, 0); + + System.out.println(result.stations.size() + " " + result.stations); + } + @Test public void queryDepartures() throws Exception { diff --git a/test/de/schildbach/pte/live/KvvProviderLiveTest.java b/test/de/schildbach/pte/live/KvvProviderLiveTest.java index 15a236d3..8a7466c6 100644 --- a/test/de/schildbach/pte/live/KvvProviderLiveTest.java +++ b/test/de/schildbach/pte/live/KvvProviderLiveTest.java @@ -62,6 +62,14 @@ public class KvvProviderLiveTest System.out.println(result.stations.size() + " " + result.stations); } + @Test + public void nearbyStationsByCoordinate() throws Exception + { + final NearbyStationsResult result = provider.nearbyStations(null, 49008184, 8400736, 0, 0); + + System.out.println(result.stations.size() + " " + result.stations); + } + @Test public void queryDepartures() throws Exception { diff --git a/test/de/schildbach/pte/live/LinzProviderLiveTest.java b/test/de/schildbach/pte/live/LinzProviderLiveTest.java index 72d89bd2..041b7e1a 100644 --- a/test/de/schildbach/pte/live/LinzProviderLiveTest.java +++ b/test/de/schildbach/pte/live/LinzProviderLiveTest.java @@ -26,6 +26,7 @@ import de.schildbach.pte.LinzProvider; import de.schildbach.pte.NetworkProvider.WalkSpeed; import de.schildbach.pte.dto.Location; import de.schildbach.pte.dto.LocationType; +import de.schildbach.pte.dto.NearbyStationsResult; import de.schildbach.pte.dto.QueryConnectionsResult; import de.schildbach.pte.dto.QueryDeparturesResult; @@ -69,6 +70,14 @@ public class LinzProviderLiveTest System.out.println(); } + @Test + public void nearbyStationsByCoordinate() throws Exception + { + final NearbyStationsResult result = provider.nearbyStations(null, 48305726, 14287863, 0, 0); + + System.out.println(result.stations.size() + " " + result.stations); + } + @Test public void queryDepartures() throws Exception { diff --git a/test/de/schildbach/pte/live/MariborProviderLiveTest.java b/test/de/schildbach/pte/live/MariborProviderLiveTest.java index 82b3bd5f..4293a1da 100644 --- a/test/de/schildbach/pte/live/MariborProviderLiveTest.java +++ b/test/de/schildbach/pte/live/MariborProviderLiveTest.java @@ -57,6 +57,14 @@ public class MariborProviderLiveTest System.out.println(result.stations.size() + " " + result.stations); } + @Test + public void nearbyStationsByCoordinate() throws Exception + { + final NearbyStationsResult result = provider.nearbyStations(null, 46559958, 15646391, 0, 0); + + System.out.println(result.stations.size() + " " + result.stations); + } + @Test public void queryDepartures() throws Exception { diff --git a/test/de/schildbach/pte/live/MetProviderLiveTest.java b/test/de/schildbach/pte/live/MetProviderLiveTest.java index 9bcfde51..50688236 100644 --- a/test/de/schildbach/pte/live/MetProviderLiveTest.java +++ b/test/de/schildbach/pte/live/MetProviderLiveTest.java @@ -57,6 +57,14 @@ public class MetProviderLiveTest System.out.println(result.stations.size() + " " + result.stations); } + @Test + public void nearbyStationsByCoordinate() throws Exception + { + final NearbyStationsResult result = provider.nearbyStations(null, -37800941, 144966545, 0, 0); + + System.out.println(result.stations.size() + " " + result.stations); + } + @Test public void queryDepartures() throws Exception { diff --git a/test/de/schildbach/pte/live/MvvProviderLiveTest.java b/test/de/schildbach/pte/live/MvvProviderLiveTest.java index 878146a9..0350178a 100644 --- a/test/de/schildbach/pte/live/MvvProviderLiveTest.java +++ b/test/de/schildbach/pte/live/MvvProviderLiveTest.java @@ -62,6 +62,14 @@ public class MvvProviderLiveTest System.out.println(result.stations.size() + " " + result.stations); } + @Test + public void nearbyStationsByCoordinate() throws Exception + { + final NearbyStationsResult result = provider.nearbyStations(null, 48135232, 11560650, 0, 0); + + System.out.println(result.stations.size() + " " + result.stations); + } + @Test public void queryDepartures() throws Exception { diff --git a/test/de/schildbach/pte/live/NaldoProviderLiveTest.java b/test/de/schildbach/pte/live/NaldoProviderLiveTest.java index efb40d5e..e49609a5 100644 --- a/test/de/schildbach/pte/live/NaldoProviderLiveTest.java +++ b/test/de/schildbach/pte/live/NaldoProviderLiveTest.java @@ -57,6 +57,14 @@ public class NaldoProviderLiveTest System.out.println(result.stations.size() + " " + result.stations); } + @Test + public void nearbyStationsByCoordinate() throws Exception + { + final NearbyStationsResult result = provider.nearbyStations(null, 48493550, 9205656, 0, 0); + + System.out.println(result.stations.size() + " " + result.stations); + } + @Test public void queryDepartures() throws Exception { diff --git a/test/de/schildbach/pte/live/NvbwProviderLiveTest.java b/test/de/schildbach/pte/live/NvbwProviderLiveTest.java index eb4b4b79..d649035e 100644 --- a/test/de/schildbach/pte/live/NvbwProviderLiveTest.java +++ b/test/de/schildbach/pte/live/NvbwProviderLiveTest.java @@ -57,6 +57,14 @@ public class NvbwProviderLiveTest System.out.println(result.stations.size() + " " + result.stations); } + @Test + public void nearbyStationsByCoordinate() throws Exception + { + final NearbyStationsResult result = provider.nearbyStations(null, 48778953, 9178963, 0, 0); + + System.out.println(result.stations.size() + " " + result.stations); + } + @Test public void queryDepartures() throws Exception { diff --git a/test/de/schildbach/pte/live/SfProviderLiveTest.java b/test/de/schildbach/pte/live/SfProviderLiveTest.java index ab91630d..34f4c659 100644 --- a/test/de/schildbach/pte/live/SfProviderLiveTest.java +++ b/test/de/schildbach/pte/live/SfProviderLiveTest.java @@ -57,6 +57,14 @@ public class SfProviderLiveTest System.out.println(result.stations.size() + " " + result.stations); } + @Test + public void nearbyStationsByCoordinate() throws Exception + { + final NearbyStationsResult result = provider.nearbyStations(null, 37777811, -122419481, 0, 0); + + System.out.println(result.stations.size() + " " + result.stations); + } + @Test public void queryDepartures() throws Exception { diff --git a/test/de/schildbach/pte/live/StvProviderLiveTest.java b/test/de/schildbach/pte/live/StvProviderLiveTest.java index ee90d791..9ef73dac 100644 --- a/test/de/schildbach/pte/live/StvProviderLiveTest.java +++ b/test/de/schildbach/pte/live/StvProviderLiveTest.java @@ -57,6 +57,14 @@ public class StvProviderLiveTest System.out.println(result.stations.size() + " " + result.stations); } + @Test + public void nearbyStationsByCoordinate() throws Exception + { + final NearbyStationsResult result = provider.nearbyStations(null, 47072612, 15431814, 0, 0); + + System.out.println(result.stations.size() + " " + result.stations); + } + @Test public void queryDepartures() throws Exception { diff --git a/test/de/schildbach/pte/live/SvvProviderLiveTest.java b/test/de/schildbach/pte/live/SvvProviderLiveTest.java index 6cf20e16..c72b3eb8 100644 --- a/test/de/schildbach/pte/live/SvvProviderLiveTest.java +++ b/test/de/schildbach/pte/live/SvvProviderLiveTest.java @@ -57,6 +57,14 @@ public class SvvProviderLiveTest System.out.println(result.stations.size() + " " + result.stations); } + @Test + public void nearbyStationsByCoordinate() throws Exception + { + final NearbyStationsResult result = provider.nearbyStations(null, 47809195, 13054919, 0, 0); + + System.out.println(result.stations.size() + " " + result.stations); + } + @Test public void queryDepartures() throws Exception { diff --git a/test/de/schildbach/pte/live/SydneyProviderLiveTest.java b/test/de/schildbach/pte/live/SydneyProviderLiveTest.java index e879d176..866143fd 100644 --- a/test/de/schildbach/pte/live/SydneyProviderLiveTest.java +++ b/test/de/schildbach/pte/live/SydneyProviderLiveTest.java @@ -57,6 +57,14 @@ public class SydneyProviderLiveTest System.out.println(result.stations.size() + " " + result.stations); } + @Test + public void nearbyStationsByCoordinate() throws Exception + { + final NearbyStationsResult result = provider.nearbyStations(null, -32823911, 151462824, 0, 0); + + System.out.println(result.stations.size() + " " + result.stations); + } + @Test public void queryDepartures() throws Exception { diff --git a/test/de/schildbach/pte/live/TflProviderLiveTest.java b/test/de/schildbach/pte/live/TflProviderLiveTest.java index 59635132..2967610d 100644 --- a/test/de/schildbach/pte/live/TflProviderLiveTest.java +++ b/test/de/schildbach/pte/live/TflProviderLiveTest.java @@ -62,6 +62,14 @@ public class TflProviderLiveTest System.out.println(result.stations.size() + " " + result.stations); } + @Test + public void nearbyStationsByCoordinate() throws Exception + { + final NearbyStationsResult result = provider.nearbyStations(null, 51507161, -0127144, 0, 0); + + System.out.println(result.stations.size() + " " + result.stations); + } + @Test public void queryDepartures() throws Exception { diff --git a/test/de/schildbach/pte/live/TleaProviderLiveTest.java b/test/de/schildbach/pte/live/TleaProviderLiveTest.java index b5f7ee98..7a5b44a5 100644 --- a/test/de/schildbach/pte/live/TleaProviderLiveTest.java +++ b/test/de/schildbach/pte/live/TleaProviderLiveTest.java @@ -57,6 +57,14 @@ public class TleaProviderLiveTest System.out.println(result.stations.size() + " " + result.stations); } + @Test + public void nearbyStationsByCoordinate() throws Exception + { + final NearbyStationsResult result = provider.nearbyStations(null, 51507161, -0127144, 0, 0); + + System.out.println(result.stations.size() + " " + result.stations); + } + @Test public void queryDepartures() throws Exception { diff --git a/test/de/schildbach/pte/live/TlemProviderLiveTest.java b/test/de/schildbach/pte/live/TlemProviderLiveTest.java index ce6ffaf6..a487c101 100644 --- a/test/de/schildbach/pte/live/TlemProviderLiveTest.java +++ b/test/de/schildbach/pte/live/TlemProviderLiveTest.java @@ -57,6 +57,14 @@ public class TlemProviderLiveTest System.out.println(result.stations.size() + " " + result.stations); } + @Test + public void nearbyStationsByCoordinate() throws Exception + { + final NearbyStationsResult result = provider.nearbyStations(null, 51507161, -0127144, 0, 0); + + System.out.println(result.stations.size() + " " + result.stations); + } + @Test public void queryDepartures() throws Exception { diff --git a/test/de/schildbach/pte/live/TlseProviderLiveTest.java b/test/de/schildbach/pte/live/TlseProviderLiveTest.java index 90b2ebbe..00200348 100644 --- a/test/de/schildbach/pte/live/TlseProviderLiveTest.java +++ b/test/de/schildbach/pte/live/TlseProviderLiveTest.java @@ -57,6 +57,14 @@ public class TlseProviderLiveTest System.out.println(result.stations.size() + " " + result.stations); } + @Test + public void nearbyStationsByCoordinate() throws Exception + { + final NearbyStationsResult result = provider.nearbyStations(null, 51507161, -0127144, 0, 0); + + System.out.println(result.stations.size() + " " + result.stations); + } + @Test public void queryDepartures() throws Exception { diff --git a/test/de/schildbach/pte/live/TlswProviderLiveTest.java b/test/de/schildbach/pte/live/TlswProviderLiveTest.java index 7635edc0..f2171764 100644 --- a/test/de/schildbach/pte/live/TlswProviderLiveTest.java +++ b/test/de/schildbach/pte/live/TlswProviderLiveTest.java @@ -57,6 +57,14 @@ public class TlswProviderLiveTest System.out.println(result.stations.size() + " " + result.stations); } + @Test + public void nearbyStationsByCoordinate() throws Exception + { + final NearbyStationsResult result = provider.nearbyStations(null, 51507161, -0127144, 0, 0); + + System.out.println(result.stations.size() + " " + result.stations); + } + @Test public void queryDepartures() throws Exception { diff --git a/test/de/schildbach/pte/live/VagfrProviderLiveTest.java b/test/de/schildbach/pte/live/VagfrProviderLiveTest.java index a2171923..d426ad59 100644 --- a/test/de/schildbach/pte/live/VagfrProviderLiveTest.java +++ b/test/de/schildbach/pte/live/VagfrProviderLiveTest.java @@ -57,6 +57,14 @@ public class VagfrProviderLiveTest System.out.println(result.stations.size() + " " + result.stations); } + @Test + public void nearbyStationsByCoordinate() throws Exception + { + final NearbyStationsResult result = provider.nearbyStations(null, 48000295, 7854338, 0, 0); + + System.out.println(result.stations.size() + " " + result.stations); + } + @Test public void queryDepartures() throws Exception { diff --git a/test/de/schildbach/pte/live/VblProviderLiveTest.java b/test/de/schildbach/pte/live/VblProviderLiveTest.java index 44ef667a..29375394 100644 --- a/test/de/schildbach/pte/live/VblProviderLiveTest.java +++ b/test/de/schildbach/pte/live/VblProviderLiveTest.java @@ -57,6 +57,14 @@ public class VblProviderLiveTest System.out.println(result.stations.size() + " " + result.stations); } + @Test + public void nearbyStationsByCoordinate() throws Exception + { + final NearbyStationsResult result = provider.nearbyStations(null, 47049107, 8312502, 0, 0); + + System.out.println(result.stations.size() + " " + result.stations); + } + @Test public void queryDepartures() throws Exception { diff --git a/test/de/schildbach/pte/live/VmsProviderLiveTest.java b/test/de/schildbach/pte/live/VmsProviderLiveTest.java index 3eafeec1..481b923a 100644 --- a/test/de/schildbach/pte/live/VmsProviderLiveTest.java +++ b/test/de/schildbach/pte/live/VmsProviderLiveTest.java @@ -57,6 +57,14 @@ public class VmsProviderLiveTest System.out.println(result.stations.size() + " " + result.stations); } + @Test + public void nearbyStationsByCoordinate() throws Exception + { + final NearbyStationsResult result = provider.nearbyStations(null, 50832754, 12918348, 0, 0); + + System.out.println(result.stations.size() + " " + result.stations); + } + @Test public void queryDepartures() throws Exception { diff --git a/test/de/schildbach/pte/live/VmvProviderLiveTest.java b/test/de/schildbach/pte/live/VmvProviderLiveTest.java index a659590a..d6c984bf 100644 --- a/test/de/schildbach/pte/live/VmvProviderLiveTest.java +++ b/test/de/schildbach/pte/live/VmvProviderLiveTest.java @@ -57,6 +57,14 @@ public class VmvProviderLiveTest System.out.println(result.stations.size() + " " + result.stations); } + @Test + public void nearbyStationsByCoordinate() throws Exception + { + final NearbyStationsResult result = provider.nearbyStations(null, 53637555, 11392593, 0, 0); + + System.out.println(result.stations.size() + " " + result.stations); + } + @Test public void queryDepartures() throws Exception { diff --git a/test/de/schildbach/pte/live/VorProviderLiveTest.java b/test/de/schildbach/pte/live/VorProviderLiveTest.java index fffbb816..22da2223 100644 --- a/test/de/schildbach/pte/live/VorProviderLiveTest.java +++ b/test/de/schildbach/pte/live/VorProviderLiveTest.java @@ -57,6 +57,14 @@ public class VorProviderLiveTest System.out.println(result.stations.size() + " " + result.stations); } + @Test + public void nearbyStationsByCoordinate() throws Exception + { + final NearbyStationsResult result = provider.nearbyStations(null, 48207355, 16370602, 0, 0); + + System.out.println(result.stations.size() + " " + result.stations); + } + @Test public void queryDepartures() throws Exception { diff --git a/test/de/schildbach/pte/live/VrnProviderLiveTest.java b/test/de/schildbach/pte/live/VrnProviderLiveTest.java index 2b0620ae..8ef640b6 100644 --- a/test/de/schildbach/pte/live/VrnProviderLiveTest.java +++ b/test/de/schildbach/pte/live/VrnProviderLiveTest.java @@ -81,6 +81,14 @@ public class VrnProviderLiveTest System.out.println(result.stations.size() + " " + result.stations); } + @Test + public void nearbyStationsByCoordinate() throws Exception + { + final NearbyStationsResult result = provider.nearbyStations(null, 49486561, 8477297, 0, 0); + + System.out.println(result.stations.size() + " " + result.stations); + } + @Test public void queryDepartures() throws Exception { diff --git a/test/de/schildbach/pte/live/VrrProviderLiveTest.java b/test/de/schildbach/pte/live/VrrProviderLiveTest.java index b950e6eb..c1831ff3 100644 --- a/test/de/schildbach/pte/live/VrrProviderLiveTest.java +++ b/test/de/schildbach/pte/live/VrrProviderLiveTest.java @@ -73,6 +73,14 @@ public class VrrProviderLiveTest System.out.println(result.stations.size() + " " + result.stations); } + @Test + public void nearbyStationsByCoordinate() throws Exception + { + final NearbyStationsResult result = provider.nearbyStations(null, 51218693, 6777785, 0, 0); + + System.out.println(result.stations.size() + " " + result.stations); + } + @Test public void queryDepartures() throws Exception { diff --git a/test/de/schildbach/pte/live/VrtProviderLiveTest.java b/test/de/schildbach/pte/live/VrtProviderLiveTest.java index 1d714910..94fec214 100644 --- a/test/de/schildbach/pte/live/VrtProviderLiveTest.java +++ b/test/de/schildbach/pte/live/VrtProviderLiveTest.java @@ -57,6 +57,14 @@ public class VrtProviderLiveTest System.out.println(result.stations.size() + " " + result.stations); } + @Test + public void nearbyStationsByCoordinate() throws Exception + { + final NearbyStationsResult result = provider.nearbyStations(null, 49757571, 6639147, 0, 0); + + System.out.println(result.stations.size() + " " + result.stations); + } + @Test public void queryDepartures() throws Exception { diff --git a/test/de/schildbach/pte/live/VvmProviderLiveTest.java b/test/de/schildbach/pte/live/VvmProviderLiveTest.java index de6045c3..6449861b 100644 --- a/test/de/schildbach/pte/live/VvmProviderLiveTest.java +++ b/test/de/schildbach/pte/live/VvmProviderLiveTest.java @@ -57,6 +57,14 @@ public class VvmProviderLiveTest System.out.println(result.stations.size() + " " + result.stations); } + @Test + public void nearbyStationsByCoordinate() throws Exception + { + final NearbyStationsResult result = provider.nearbyStations(null, 49455472, 11079655, 0, 0); + + System.out.println(result.stations.size() + " " + result.stations); + } + @Test public void queryDepartures() throws Exception { diff --git a/test/de/schildbach/pte/live/VvoProviderLiveTest.java b/test/de/schildbach/pte/live/VvoProviderLiveTest.java index c21c5292..6ef63333 100644 --- a/test/de/schildbach/pte/live/VvoProviderLiveTest.java +++ b/test/de/schildbach/pte/live/VvoProviderLiveTest.java @@ -57,6 +57,14 @@ public class VvoProviderLiveTest System.out.println(result.status + " " + result.stations.size() + " " + result.stations); } + @Test + public void nearbyStationsByCoordinate() throws Exception + { + final NearbyStationsResult result = provider.nearbyStations(null, 51052467, 13733196, 0, 0); + + System.out.println(result.stations.size() + " " + result.stations); + } + @Test public void queryDepartures() throws Exception { diff --git a/test/de/schildbach/pte/live/VvsProviderLiveTest.java b/test/de/schildbach/pte/live/VvsProviderLiveTest.java index d3ba7146..44ebf693 100644 --- a/test/de/schildbach/pte/live/VvsProviderLiveTest.java +++ b/test/de/schildbach/pte/live/VvsProviderLiveTest.java @@ -57,6 +57,14 @@ public class VvsProviderLiveTest System.out.println(result.stations.size() + " " + result.stations); } + @Test + public void nearbyStationsByCoordinate() throws Exception + { + final NearbyStationsResult result = provider.nearbyStations(null, 48775005, 9166517, 0, 0); + + System.out.println(result.stations.size() + " " + result.stations); + } + @Test public void queryDepartures() throws Exception {