From d24b1fc567fb59b2207d195e81d31cacc5768cdd Mon Sep 17 00:00:00 2001 From: Andreas Schildbach Date: Fri, 19 Oct 2012 22:21:45 +0200 Subject: [PATCH] don't include regionID for Vienna --- .../src/de/schildbach/pte/AbstractEfaProvider.java | 13 +++++++++++-- enabler/src/de/schildbach/pte/VorProvider.java | 1 + 2 files changed, 12 insertions(+), 2 deletions(-) diff --git a/enabler/src/de/schildbach/pte/AbstractEfaProvider.java b/enabler/src/de/schildbach/pte/AbstractEfaProvider.java index 4c64e234..e52b36f9 100644 --- a/enabler/src/de/schildbach/pte/AbstractEfaProvider.java +++ b/enabler/src/de/schildbach/pte/AbstractEfaProvider.java @@ -85,6 +85,7 @@ public abstract class AbstractEfaProvider extends AbstractNetworkProvider private final String additionalQueryParameter; private final boolean canAcceptPoiID; private final boolean needsSpEncId; + private boolean includeRegionId = true; private Charset requestUrlEncoding = ISO_8859_1; private String referer; private boolean suppressPositions = false; @@ -163,6 +164,11 @@ public abstract class AbstractEfaProvider extends AbstractNetworkProvider this.referer = referer; } + protected void setIncludeRegionId(final boolean includeRegionId) + { + this.includeRegionId = includeRegionId; + } + protected void setSuppressPositions(final boolean suppressPositions) { this.suppressPositions = suppressPositions; @@ -192,7 +198,8 @@ public abstract class AbstractEfaProvider extends AbstractNetworkProvider uri.append(stopFinderEndpoint); appendCommonRequestParams(uri, "JSON"); uri.append("&locationServerActive=1"); - uri.append("®ionID_sf=1"); // prefer own region + if (includeRegionId) + uri.append("®ionID_sf=1"); // prefer own region appendLocation(uri, constraint, "sf"); if (constraint.type == LocationType.ANY) // 1=place 2=stop 4=street 8=address 16=crossing 32=poi 64=postcode @@ -263,6 +270,8 @@ public abstract class AbstractEfaProvider extends AbstractNetworkProvider uri.append(stopFinderEndpoint); appendCommonRequestParams(uri, "XML"); uri.append("&locationServerActive=1"); + if (includeRegionId) + uri.append("®ionID_sf=1"); // prefer own region appendLocation(uri, constraint, "sf"); if (constraint.type == LocationType.ANY) { @@ -271,7 +280,7 @@ public abstract class AbstractEfaProvider extends AbstractNetworkProvider // 1=place 2=stop 4=street 8=address 16=crossing 32=poi 64=postcode uri.append("&anyObjFilter_sf=").append(2 + 4 + 8 + 16 + 32 + 64); uri.append("&reducedAnyPostcodeObjFilter_sf=64&reducedAnyTooManyObjFilter_sf=2"); - uri.append("&useHouseNumberList=true®ionID_sf=1"); + uri.append("&useHouseNumberList=true"); } // System.out.println(uri.toString()); diff --git a/enabler/src/de/schildbach/pte/VorProvider.java b/enabler/src/de/schildbach/pte/VorProvider.java index 2409f8eb..352d9137 100644 --- a/enabler/src/de/schildbach/pte/VorProvider.java +++ b/enabler/src/de/schildbach/pte/VorProvider.java @@ -35,6 +35,7 @@ public class VorProvider extends AbstractEfaProvider super(API_BASE, null); setReferer("http://www.wienerlinien.at/eportal/"); + setIncludeRegionId(false); } public NetworkId id()