customizable stopfinder endpoint

This commit is contained in:
Andreas Schildbach 2012-04-20 01:02:02 +02:00
parent d270ead50c
commit 750e44b1be
4 changed files with 9 additions and 7 deletions

View file

@ -77,6 +77,7 @@ public abstract class AbstractEfaProvider extends AbstractNetworkProvider
private final String apiBase;
private final String departureMonitorEndpoint;
private final String tripEndpoint;
private final String stopFinderEndpoint;
private final String additionalQueryParameter;
private final boolean canAcceptPoiID;
private final boolean needsSpEncId;
@ -115,11 +116,11 @@ public abstract class AbstractEfaProvider extends AbstractNetworkProvider
public AbstractEfaProvider(final String apiBase, final String additionalQueryParameter, final boolean canAcceptPoiID)
{
this(apiBase, null, null, additionalQueryParameter, false, false);
this(apiBase, null, null, null, additionalQueryParameter, false, false);
}
public AbstractEfaProvider(final String apiBase, final String departureMonitorEndpoint, final String tripEndpoint,
final String additionalQueryParameter, final boolean canAcceptPoiID, final boolean needsSpEncId)
final String stopFinderEndpoint, final String additionalQueryParameter, final boolean canAcceptPoiID, final boolean needsSpEncId)
{
try
{
@ -133,6 +134,7 @@ public abstract class AbstractEfaProvider extends AbstractNetworkProvider
this.apiBase = apiBase;
this.departureMonitorEndpoint = departureMonitorEndpoint != null ? departureMonitorEndpoint : "XSLT_DM_REQUEST";
this.tripEndpoint = tripEndpoint != null ? tripEndpoint : "XSLT_TRIP_REQUEST2";
this.stopFinderEndpoint = stopFinderEndpoint != null ? stopFinderEndpoint : "XML_STOPFINDER_REQUEST";
this.additionalQueryParameter = additionalQueryParameter;
this.canAcceptPoiID = canAcceptPoiID;
this.needsSpEncId = needsSpEncId;
@ -159,7 +161,7 @@ public abstract class AbstractEfaProvider extends AbstractNetworkProvider
protected List<Location> jsonStopfinderRequest(final Location constraint) throws IOException
{
final StringBuilder uri = new StringBuilder(apiBase);
uri.append("XML_STOPFINDER_REQUEST");
uri.append(stopFinderEndpoint);
appendCommonRequestParams(uri, "JSON");
uri.append("&locationServerActive=1");
uri.append("&regionID_sf=1"); // prefer own region
@ -229,7 +231,7 @@ public abstract class AbstractEfaProvider extends AbstractNetworkProvider
protected List<Location> xmlStopfinderRequest(final Location constraint) throws IOException
{
final StringBuilder uri = new StringBuilder(apiBase);
uri.append("XML_STOPFINDER_REQUEST");
uri.append(stopFinderEndpoint);
appendCommonRequestParams(uri, "XML");
uri.append("&locationServerActive=1");
appendLocation(uri, constraint, "sf");

View file

@ -32,7 +32,7 @@ public class VgnProvider extends AbstractEfaProvider
public VgnProvider(final String apiBase)
{
super(apiBase, DEPARTURE_MONITOR_ENDPOINT, TRIP_ENDPOINT, null, false, false);
super(apiBase, DEPARTURE_MONITOR_ENDPOINT, TRIP_ENDPOINT, null, null, false, false);
}
public NetworkId id()

View file

@ -36,7 +36,7 @@ public class VrrProvider extends AbstractEfaProvider
public VrrProvider()
{
super(API_BASE, null, null, null, false, true);
super(API_BASE, null, null, null, null, false, true);
}
public NetworkId id()

View file

@ -33,7 +33,7 @@ public class VvmProvider extends AbstractEfaProvider
public VvmProvider()
{
super(API_BASE, null, null, null, false, true);
super(API_BASE, null, null, null, null, false, true);
}
public NetworkId id()