EFA: Set language in all requests.

This commit is contained in:
Andreas Schildbach 2015-01-13 14:33:42 +01:00
parent 864783fed0
commit 70c1037bc4
6 changed files with 12 additions and 1 deletions

View file

@ -86,6 +86,7 @@ public abstract class AbstractEfaProvider extends AbstractNetworkProvider
private final String stopFinderEndpoint; private final String stopFinderEndpoint;
private final String coordEndpoint; private final String coordEndpoint;
private String language = "de";
private String additionalQueryParameter = null; private String additionalQueryParameter = null;
private boolean useRealtime = true; private boolean useRealtime = true;
private boolean needsSpEncId = false; private boolean needsSpEncId = false;
@ -160,6 +161,11 @@ public abstract class AbstractEfaProvider extends AbstractNetworkProvider
this.coordEndpoint = coordEndpoint; this.coordEndpoint = coordEndpoint;
} }
protected void setLanguage(final String language)
{
this.language = language;
}
protected void setAdditionalQueryParameter(final String additionalQueryParameter) protected void setAdditionalQueryParameter(final String additionalQueryParameter)
{ {
this.additionalQueryParameter = additionalQueryParameter; this.additionalQueryParameter = additionalQueryParameter;
@ -235,6 +241,7 @@ public abstract class AbstractEfaProvider extends AbstractNetworkProvider
private final void appendCommonRequestParams(final StringBuilder uri, final String outputFormat) private final void appendCommonRequestParams(final StringBuilder uri, final String outputFormat)
{ {
uri.append("?outputFormat=").append(outputFormat); uri.append("?outputFormat=").append(outputFormat);
uri.append("&language=").append(language);
uri.append("&stateless=1"); uri.append("&stateless=1");
uri.append("&coordOutputFormat=WGS84"); uri.append("&coordOutputFormat=WGS84");
if (additionalQueryParameter != null) if (additionalQueryParameter != null)
@ -2037,7 +2044,6 @@ public abstract class AbstractEfaProvider extends AbstractNetworkProvider
uri.append("&sessionID=0"); uri.append("&sessionID=0");
uri.append("&requestID=0"); uri.append("&requestID=0");
uri.append("&language=de");
appendCommonXsltTripRequest2Params(uri); appendCommonXsltTripRequest2Params(uri);

View file

@ -36,6 +36,7 @@ public class MetProvider extends AbstractEfaProvider
{ {
super(API_BASE); super(API_BASE);
setLanguage("en");
setTimeZone("Australia/Melbourne"); setTimeZone("Australia/Melbourne");
setUseRouteIndexAsTripId(false); setUseRouteIndexAsTripId(false);
setStyles(STYLES); setStyles(STYLES);

View file

@ -34,6 +34,7 @@ public class SfProvider extends AbstractEfaProvider
{ {
super(API_BASE); super(API_BASE);
setLanguage("en");
setTimeZone("America/Los_Angeles"); setTimeZone("America/Los_Angeles");
setUseRouteIndexAsTripId(false); setUseRouteIndexAsTripId(false);
setFareCorrectionFactor(0.01f); setFareCorrectionFactor(0.01f);

View file

@ -29,6 +29,7 @@ public class SydneyProvider extends AbstractEfaProvider
{ {
super(API_BASE); super(API_BASE);
setLanguage("en");
setTimeZone("Australia/Sydney"); setTimeZone("Australia/Sydney");
setUseRouteIndexAsTripId(false); setUseRouteIndexAsTripId(false);
} }

View file

@ -33,6 +33,7 @@ public class TfiProvider extends AbstractEfaProvider
{ {
super(API_BASE); super(API_BASE);
setLanguage("en");
setTimeZone("Europe/London"); setTimeZone("Europe/London");
} }

View file

@ -43,6 +43,7 @@ public class TlemProvider extends AbstractEfaProvider
{ {
super(API_BASE); super(API_BASE);
setLanguage("en");
setTimeZone("Europe/London"); setTimeZone("Europe/London");
setUseProxFootSearch(false); setUseProxFootSearch(false);
setStyles(STYLES); setStyles(STYLES);