From 64f6b31d51991d595728810eba7fe1e427433fa0 Mon Sep 17 00:00:00 2001
From: Andreas Schildbach <andreas@schildbach.de>
Date: Tue, 28 Jan 2014 13:23:03 +0100
Subject: [PATCH] Make JSON stopfinder to use common method for constructing
 parameters.

---
 .../schildbach/pte/AbstractEfaProvider.java   | 20 ++++++-------------
 1 file changed, 6 insertions(+), 14 deletions(-)

diff --git a/enabler/src/de/schildbach/pte/AbstractEfaProvider.java b/enabler/src/de/schildbach/pte/AbstractEfaProvider.java
index 32eae7f1..59ee5254 100644
--- a/enabler/src/de/schildbach/pte/AbstractEfaProvider.java
+++ b/enabler/src/de/schildbach/pte/AbstractEfaProvider.java
@@ -249,16 +249,7 @@ public abstract class AbstractEfaProvider extends AbstractNetworkProvider
 
 	protected List<Location> jsonStopfinderRequest(final Location constraint) throws IOException
 	{
-		final StringBuilder parameters = new StringBuilder();
-		appendCommonRequestParams(parameters, "JSON");
-		parameters.append("&locationServerActive=1");
-		if (includeRegionId)
-			parameters.append("&regionID_sf=1"); // prefer own region
-		appendLocation(parameters, constraint, "sf");
-		if (constraint.type == LocationType.ANY)
-			// 1=place 2=stop 4=street 8=address 16=crossing 32=poi 64=postcode
-			parameters.append("&anyObjFilter_sf=").append(2 + 4 + 8 + 16 + 32 + 64);
-		parameters.append("&anyMaxSizeHitList=500");
+		final StringBuilder parameters = stopfinderRequestParameters(constraint, "JSON");
 
 		final StringBuilder uri = new StringBuilder(stopFinderEndpoint);
 		if (!httpPost)
@@ -348,10 +339,10 @@ public abstract class AbstractEfaProvider extends AbstractNetworkProvider
 			throw new JSONException("unknown type: " + type);
 	}
 
-	private StringBuilder stopfinderRequestParameters(final Location constraint)
+	private StringBuilder stopfinderRequestParameters(final Location constraint, final String outputFormat)
 	{
 		final StringBuilder parameters = new StringBuilder();
-		appendCommonRequestParams(parameters, "XML");
+		appendCommonRequestParams(parameters, outputFormat);
 		parameters.append("&locationServerActive=1");
 		if (includeRegionId)
 			parameters.append("&regionID_sf=1"); // prefer own region
@@ -364,6 +355,7 @@ public abstract class AbstractEfaProvider extends AbstractNetworkProvider
 			parameters.append("&anyObjFilter_sf=").append(2 + 4 + 8 + 16 + 32 + 64);
 			parameters.append("&reducedAnyPostcodeObjFilter_sf=64&reducedAnyTooManyObjFilter_sf=2");
 			parameters.append("&useHouseNumberList=true");
+			parameters.append("&anyMaxSizeHitList=500");
 		}
 
 		return parameters;
@@ -371,7 +363,7 @@ public abstract class AbstractEfaProvider extends AbstractNetworkProvider
 
 	protected List<Location> xmlStopfinderRequest(final Location constraint) throws IOException
 	{
-		final StringBuilder parameters = stopfinderRequestParameters(constraint);
+		final StringBuilder parameters = stopfinderRequestParameters(constraint, "XML");
 
 		final StringBuilder uri = new StringBuilder(stopFinderEndpoint);
 		if (!httpPost)
@@ -494,7 +486,7 @@ public abstract class AbstractEfaProvider extends AbstractNetworkProvider
 
 	protected List<Location> mobileStopfinderRequest(final Location constraint) throws IOException
 	{
-		final StringBuilder parameters = stopfinderRequestParameters(constraint);
+		final StringBuilder parameters = stopfinderRequestParameters(constraint, "XML");
 
 		final StringBuilder uri = new StringBuilder(stopFinderEndpoint);
 		if (!httpPost)