mirrors/public-transport-enabler
1
0
Fork 0
mirror of https://gitlab.com/oeffi/public-transport-enabler.git synced 2025-07-14 00:30:31 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

don't include regionID for Vienna

Browse source
This commit is contained in:
Andreas Schildbach 2012-10-19 22:21:45 +02:00
parent a988add80f
commit d24b1fc567
2 changed files with 12 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

13
enabler/src/de/schildbach/pte/AbstractEfaProvider.java
View file

@ -85,6 +85,7 @@ public abstract class AbstractEfaProvider extends AbstractNetworkProvider
private final String additionalQueryParameter; private final String additionalQueryParameter;
private final boolean canAcceptPoiID; private final boolean canAcceptPoiID;
private final boolean needsSpEncId; private final boolean needsSpEncId;
private boolean includeRegionId = true;
private Charset requestUrlEncoding = ISO_8859_1; private Charset requestUrlEncoding = ISO_8859_1;
private String referer; private String referer;
private boolean suppressPositions = false; private boolean suppressPositions = false;
@ -163,6 +164,11 @@ public abstract class AbstractEfaProvider extends AbstractNetworkProvider
this.referer = referer; this.referer = referer;
} }
protected void setIncludeRegionId(final boolean includeRegionId)
{
this.includeRegionId = includeRegionId;
}
protected void setSuppressPositions(final boolean suppressPositions) protected void setSuppressPositions(final boolean suppressPositions)
{ {
this.suppressPositions = suppressPositions; this.suppressPositions = suppressPositions;
@ -192,7 +198,8 @@ public abstract class AbstractEfaProvider extends AbstractNetworkProvider
uri.append(stopFinderEndpoint); uri.append(stopFinderEndpoint);
appendCommonRequestParams(uri, "JSON"); appendCommonRequestParams(uri, "JSON");
uri.append("&locationServerActive=1"); uri.append("&locationServerActive=1");
uri.append("&regionID_sf=1"); // prefer own region if (includeRegionId)
uri.append("&regionID_sf=1"); // prefer own region
appendLocation(uri, constraint, "sf"); appendLocation(uri, constraint, "sf");
if (constraint.type == LocationType.ANY) if (constraint.type == LocationType.ANY)
// 1=place 2=stop 4=street 8=address 16=crossing 32=poi 64=postcode // 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); uri.append(stopFinderEndpoint);
appendCommonRequestParams(uri, "XML"); appendCommonRequestParams(uri, "XML");
uri.append("&locationServerActive=1"); uri.append("&locationServerActive=1");
if (includeRegionId)
uri.append("&regionID_sf=1"); // prefer own region
appendLocation(uri, constraint, "sf"); appendLocation(uri, constraint, "sf");
if (constraint.type == LocationType.ANY) 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 // 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("&anyObjFilter_sf=").append(2 + 4 + 8 + 16 + 32 + 64);
uri.append("&reducedAnyPostcodeObjFilter_sf=64&reducedAnyTooManyObjFilter_sf=2"); uri.append("&reducedAnyPostcodeObjFilter_sf=64&reducedAnyTooManyObjFilter_sf=2");
uri.append("&useHouseNumberList=true&regionID_sf=1"); uri.append("&useHouseNumberList=true");
} }
// System.out.println(uri.toString()); // System.out.println(uri.toString());

1
enabler/src/de/schildbach/pte/VorProvider.java
View file

@ -35,6 +35,7 @@ public class VorProvider extends AbstractEfaProvider
super(API_BASE, null); super(API_BASE, null);
setReferer("http://www.wienerlinien.at/eportal/"); setReferer("http://www.wienerlinien.at/eportal/");
setIncludeRegionId(false);
} }
public NetworkId id() public NetworkId id()