AbstractHafasClientInterfaceProvider: Support maxLocations when querying for nearby locations.

Also advance all API versions to 1.14, as required by the maxLoc option to LocGeoPos.

enabler/src/de/schildbach/pte/AbstractHafasClientInterfaceProvider.java

@@ -129,7 +129,7 @@ public abstract class AbstractHafasClientInterfaceProvider extends AbstractHafas
     public NearbyLocationsResult queryNearbyLocations(final EnumSet<LocationType> 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<LocationType> 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<Location> locations = jsonLocGeoPos(EnumSet.allOf(LocationType.class), location.lat,
-                    location.lon, 0).locations;
+                    location.lon, 0, 0).locations;
             if (!locations.isEmpty())
                 return locations.get(0);
         }

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);

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\"}");
     }
 }

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);
     }

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);

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);

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);

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);

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);

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);
     }

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);
     }

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);

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);
     }