diff --git a/enabler/src/de/schildbach/pte/AbstractHafasClientInterfaceProvider.java b/enabler/src/de/schildbach/pte/AbstractHafasClientInterfaceProvider.java index 8b9d4e92..7781629d 100644 --- a/enabler/src/de/schildbach/pte/AbstractHafasClientInterfaceProvider.java +++ b/enabler/src/de/schildbach/pte/AbstractHafasClientInterfaceProvider.java @@ -129,7 +129,7 @@ public abstract class AbstractHafasClientInterfaceProvider extends AbstractHafas public NearbyLocationsResult queryNearbyLocations(final EnumSet types, final Location location, final int maxDistance, final int maxLocations) throws IOException { if (location.hasLocation()) - return jsonLocGeoPos(types, location.lat, location.lon, maxDistance); + return jsonLocGeoPos(types, location.lat, location.lon, maxDistance, maxLocations); else throw new IllegalArgumentException("cannot handle: " + location); } @@ -161,15 +161,18 @@ public abstract class AbstractHafasClientInterfaceProvider extends AbstractHafas } protected final NearbyLocationsResult jsonLocGeoPos(final EnumSet types, final int lat, final int lon, - int maxDistance) throws IOException { + int maxDistance, int maxLocations) throws IOException { if (maxDistance == 0) maxDistance = DEFAULT_MAX_DISTANCE; + if (maxLocations == 0) + maxLocations = DEFAULT_MAX_LOCATIONS; final boolean getStations = types.contains(LocationType.STATION); final boolean getPOIs = types.contains(LocationType.POI); final String request = wrapJsonApiRequest("LocGeoPos", "{\"ring\":" // + "{\"cCrd\":{\"x\":" + lon + ",\"y\":" + lat + "},\"maxDist\":" + maxDistance + "}," // + "\"getStops\":" + getStations + "," // - + "\"getPOIs\":" + getPOIs + "}", // + + "\"getPOIs\":" + getPOIs + "," // + + "\"maxLoc\":" + maxLocations + "}", // false); final HttpUrl url = requestUrl(request); @@ -400,7 +403,7 @@ public abstract class AbstractHafasClientInterfaceProvider extends AbstractHafas } if (location.hasLocation()) { final List locations = jsonLocGeoPos(EnumSet.allOf(LocationType.class), location.lat, - location.lon, 0).locations; + location.lon, 0, 0).locations; if (!locations.isEmpty()) return locations.get(0); } diff --git a/enabler/src/de/schildbach/pte/BvgProvider.java b/enabler/src/de/schildbach/pte/BvgProvider.java index b3aa28eb..b2fbc41c 100644 --- a/enabler/src/de/schildbach/pte/BvgProvider.java +++ b/enabler/src/de/schildbach/pte/BvgProvider.java @@ -45,7 +45,7 @@ public final class BvgProvider extends AbstractHafasClientInterfaceProvider { public BvgProvider(final String jsonApiAuthorization) { super(NetworkId.BVG, API_BASE, PRODUCTS_MAP); - setApiVersion("1.13"); + setApiVersion("1.14"); setApiClient("{\"id\":\"BVG\",\"type\":\"AND\"}"); setApiAuthorization(jsonApiAuthorization); setStyles(STYLES); diff --git a/enabler/src/de/schildbach/pte/CmtaProvider.java b/enabler/src/de/schildbach/pte/CmtaProvider.java index 85eb6c60..53a931c7 100644 --- a/enabler/src/de/schildbach/pte/CmtaProvider.java +++ b/enabler/src/de/schildbach/pte/CmtaProvider.java @@ -33,7 +33,7 @@ public class CmtaProvider extends AbstractHafasClientInterfaceProvider { public CmtaProvider() { super(NetworkId.CMTA, API_BASE, PRODUCTS_MAP); setTimeZone("America/Chicago"); - setApiVersion("1.13"); + setApiVersion("1.14"); setApiClient("{\"id\":\"CMTA\",\"type\":\"AND\"}"); } } diff --git a/enabler/src/de/schildbach/pte/NasaProvider.java b/enabler/src/de/schildbach/pte/NasaProvider.java index 8f03114a..671d7c0c 100644 --- a/enabler/src/de/schildbach/pte/NasaProvider.java +++ b/enabler/src/de/schildbach/pte/NasaProvider.java @@ -38,7 +38,7 @@ public class NasaProvider extends AbstractHafasClientInterfaceProvider { public NasaProvider(final String apiAuthorization) { super(NetworkId.NASA, API_BASE, PRODUCTS_MAP); - setApiVersion("1.13"); + setApiVersion("1.14"); setApiClient("{\"id\":\"NASA\",\"type\":\"AND\"}"); setApiAuthorization(apiAuthorization); } diff --git a/enabler/src/de/schildbach/pte/OoevvProvider.java b/enabler/src/de/schildbach/pte/OoevvProvider.java index 8013bea2..f553eb44 100644 --- a/enabler/src/de/schildbach/pte/OoevvProvider.java +++ b/enabler/src/de/schildbach/pte/OoevvProvider.java @@ -36,7 +36,7 @@ public class OoevvProvider extends AbstractHafasClientInterfaceProvider { public OoevvProvider(final String apiAuthorization) { super(NetworkId.OOEVV, API_BASE, PRODUCTS_MAP); - setApiVersion("1.13"); + setApiVersion("1.14"); setApiClient("{\"id\":\"VAO\",\"l\":\"vs_ooevv\",\"type\":\"AND\"}"); setApiAuthorization(apiAuthorization); httpClient.setSslAcceptAllHostnames(true); diff --git a/enabler/src/de/schildbach/pte/ShProvider.java b/enabler/src/de/schildbach/pte/ShProvider.java index b5989865..f5811d08 100644 --- a/enabler/src/de/schildbach/pte/ShProvider.java +++ b/enabler/src/de/schildbach/pte/ShProvider.java @@ -42,7 +42,7 @@ public class ShProvider extends AbstractHafasClientInterfaceProvider { public ShProvider(final String apiAuthorization) { super(NetworkId.SH, API_BASE, PRODUCTS_MAP); - setApiVersion("1.13"); + setApiVersion("1.14"); setApiClient("{\"id\":\"NAHSH\",\"type\":\"AND\"}"); setApiAuthorization(apiAuthorization); setStyles(STYLES); diff --git a/enabler/src/de/schildbach/pte/SvvProvider.java b/enabler/src/de/schildbach/pte/SvvProvider.java index 849da43e..9fdacab6 100644 --- a/enabler/src/de/schildbach/pte/SvvProvider.java +++ b/enabler/src/de/schildbach/pte/SvvProvider.java @@ -39,7 +39,7 @@ public class SvvProvider extends AbstractHafasClientInterfaceProvider { public SvvProvider(final String apiAuthorization) { super(NetworkId.SVV, API_BASE, PRODUCTS_MAP); - setApiVersion("1.13"); + setApiVersion("1.14"); setApiClient("{\"id\":\"VAO\",\"l\":\"vs_svv\",\"type\":\"AND\"}"); setApiAuthorization(apiAuthorization); setStyles(STYLES); diff --git a/enabler/src/de/schildbach/pte/VaoProvider.java b/enabler/src/de/schildbach/pte/VaoProvider.java index f1361bb7..75cbf602 100644 --- a/enabler/src/de/schildbach/pte/VaoProvider.java +++ b/enabler/src/de/schildbach/pte/VaoProvider.java @@ -39,7 +39,7 @@ public class VaoProvider extends AbstractHafasClientInterfaceProvider { public VaoProvider(final String apiAuthorization) { super(NetworkId.VAO, API_BASE, PRODUCTS_MAP); - setApiVersion("1.13"); + setApiVersion("1.14"); setApiClient("{\"id\":\"VAO\",\"l\":\"vs_vvv\",\"type\":\"AND\"}"); setApiAuthorization(apiAuthorization); setStyles(STYLES); diff --git a/enabler/src/de/schildbach/pte/VbnProvider.java b/enabler/src/de/schildbach/pte/VbnProvider.java index c7ba8174..420b4bac 100644 --- a/enabler/src/de/schildbach/pte/VbnProvider.java +++ b/enabler/src/de/schildbach/pte/VbnProvider.java @@ -47,7 +47,7 @@ public class VbnProvider extends AbstractHafasClientInterfaceProvider { public VbnProvider(final String apiAuthorization) { super(NetworkId.VBN, API_BASE, PRODUCTS_MAP); - setApiVersion("1.13"); + setApiVersion("1.14"); setApiClient("{\"id\":\"VBN\",\"type\":\"AND\"}"); setApiAuthorization(apiAuthorization); setStyles(STYLES); diff --git a/enabler/src/de/schildbach/pte/VmobilProvider.java b/enabler/src/de/schildbach/pte/VmobilProvider.java index 5d05220e..40b2ea96 100644 --- a/enabler/src/de/schildbach/pte/VmobilProvider.java +++ b/enabler/src/de/schildbach/pte/VmobilProvider.java @@ -36,7 +36,7 @@ public class VmobilProvider extends AbstractHafasClientInterfaceProvider { public VmobilProvider(final String apiAuthorization) { super(NetworkId.VMOBIL, API_BASE, PRODUCTS_MAP); - setApiVersion("1.13"); + setApiVersion("1.14"); setApiClient("{\"id\":\"VAO\",\"l\":\"vs_vvv\",\"type\":\"AND\"}"); setApiAuthorization(apiAuthorization); } diff --git a/enabler/src/de/schildbach/pte/VmtProvider.java b/enabler/src/de/schildbach/pte/VmtProvider.java index 568bd056..301cfd52 100644 --- a/enabler/src/de/schildbach/pte/VmtProvider.java +++ b/enabler/src/de/schildbach/pte/VmtProvider.java @@ -35,7 +35,7 @@ public class VmtProvider extends AbstractHafasClientInterfaceProvider { public VmtProvider(final String jsonApiAuthorization) { super(NetworkId.VMT, API_BASE, PRODUCTS_MAP); - setApiVersion("1.13"); + setApiVersion("1.14"); setApiClient("{\"name\":\"VMT\",\"type\":\"AND\"}"); setApiAuthorization(jsonApiAuthorization); } diff --git a/enabler/src/de/schildbach/pte/VorProvider.java b/enabler/src/de/schildbach/pte/VorProvider.java index 70b49780..806560a2 100644 --- a/enabler/src/de/schildbach/pte/VorProvider.java +++ b/enabler/src/de/schildbach/pte/VorProvider.java @@ -39,7 +39,7 @@ public class VorProvider extends AbstractHafasClientInterfaceProvider { public VorProvider(final String apiAuthorization) { super(NetworkId.VOR, API_BASE, PRODUCTS_MAP); - setApiVersion("1.13"); + setApiVersion("1.14"); setApiClient("{\"id\":\"VAO\",\"l\":\"vs_anachb\",\"type\":\"AND\"}"); setApiAuthorization(apiAuthorization); setStyles(STYLES); diff --git a/enabler/src/de/schildbach/pte/VvtProvider.java b/enabler/src/de/schildbach/pte/VvtProvider.java index 8ecde46f..5a133650 100644 --- a/enabler/src/de/schildbach/pte/VvtProvider.java +++ b/enabler/src/de/schildbach/pte/VvtProvider.java @@ -36,7 +36,7 @@ public class VvtProvider extends AbstractHafasClientInterfaceProvider { public VvtProvider(final String apiAuthorization) { super(NetworkId.VVT, API_BASE, PRODUCTS_MAP); - setApiVersion("1.13"); + setApiVersion("1.14"); setApiClient("{\"id\":\"VAO\",\"l\":\"vs_vvt\",\"type\":\"AND\"}"); setApiAuthorization(apiAuthorization); }