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

remove needsSpEncId from constructor of AbstractEfaProvider

Browse source
This commit is contained in:
Andreas Schildbach 2013-03-10 23:02:48 +01:00
parent 118a62b98f
commit 40d3d67da5
4 changed files with 19 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -90,13 +90,14 @@ public abstract class AbstractEfaProvider extends AbstractNetworkProvider
private final String additionalQueryParameter; private final String additionalQueryParameter;
private boolean canAcceptPoiId = false; private boolean canAcceptPoiId = false;
private final boolean needsSpEncId; private boolean needsSpEncId = false;
private boolean includeRegionId = true; private boolean includeRegionId = true;
private Charset requestUrlEncoding = ISO_8859_1; private Charset requestUrlEncoding = ISO_8859_1;
private String httpReferer; private String httpReferer = null;
private boolean httpPost = false; private boolean httpPost = false;
private boolean suppressPositions = false; private boolean suppressPositions = false;
private boolean useRouteIndexAsConnectionId = true; private boolean useRouteIndexAsConnectionId = true;
private final XmlPullParserFactory parserFactory; private final XmlPullParserFactory parserFactory;
private static class Context implements QueryConnectionsContext private static class Context implements QueryConnectionsContext
@ -132,21 +133,21 @@ public abstract class AbstractEfaProvider extends AbstractNetworkProvider
public AbstractEfaProvider(final String apiBase, final String additionalQueryParameter) public AbstractEfaProvider(final String apiBase, final String additionalQueryParameter)
{ {
this(apiBase, null, null, null, null, additionalQueryParameter, false); this(apiBase, null, null, null, null, additionalQueryParameter);
} }
public AbstractEfaProvider(final String apiBase, final String departureMonitorEndpoint, final String tripEndpoint, public AbstractEfaProvider(final String apiBase, final String departureMonitorEndpoint, final String tripEndpoint,
final String stopFinderEndpoint, final String coordEndpoint, final String additionalQueryParameter, final boolean needsSpEncId) final String stopFinderEndpoint, final String coordEndpoint, final String additionalQueryParameter)
{ {
this(apiBase + (departureMonitorEndpoint != null ? departureMonitorEndpoint : DEFAULT_DEPARTURE_MONITOR_ENDPOINT), // this(apiBase + (departureMonitorEndpoint != null ? departureMonitorEndpoint : DEFAULT_DEPARTURE_MONITOR_ENDPOINT), //
apiBase + (tripEndpoint != null ? tripEndpoint : DEFAULT_TRIP_ENDPOINT), // apiBase + (tripEndpoint != null ? tripEndpoint : DEFAULT_TRIP_ENDPOINT), //
apiBase + (stopFinderEndpoint != null ? stopFinderEndpoint : DEFAULT_STOPFINDER_ENDPOINT), // apiBase + (stopFinderEndpoint != null ? stopFinderEndpoint : DEFAULT_STOPFINDER_ENDPOINT), //
apiBase + (coordEndpoint != null ? coordEndpoint : DEFAULT_COORD_ENDPOINT), // apiBase + (coordEndpoint != null ? coordEndpoint : DEFAULT_COORD_ENDPOINT), //
additionalQueryParameter, needsSpEncId); additionalQueryParameter);
} }
public AbstractEfaProvider(final String departureMonitorEndpoint, final String tripEndpoint, final String stopFinderEndpoint, public AbstractEfaProvider(final String departureMonitorEndpoint, final String tripEndpoint, final String stopFinderEndpoint,
final String coordEndpoint, final String additionalQueryParameter, final boolean needsSpEncId) final String coordEndpoint, final String additionalQueryParameter)
{ {
try try
{ {
@ -163,7 +164,6 @@ public abstract class AbstractEfaProvider extends AbstractNetworkProvider
this.coordEndpoint = coordEndpoint; this.coordEndpoint = coordEndpoint;
this.additionalQueryParameter = additionalQueryParameter; this.additionalQueryParameter = additionalQueryParameter;
this.needsSpEncId = needsSpEncId;
} }
protected void setRequestUrlEncoding(final Charset requestUrlEncoding) protected void setRequestUrlEncoding(final Charset requestUrlEncoding)
@ -201,6 +201,11 @@ public abstract class AbstractEfaProvider extends AbstractNetworkProvider
this.canAcceptPoiId = canAcceptPoiId; this.canAcceptPoiId = canAcceptPoiId;
} }
protected void setNeedsSpEncId(final boolean needsSpEncId)
{
this.needsSpEncId = needsSpEncId;
}
protected TimeZone timeZone() protected TimeZone timeZone()
{ {
return TimeZone.getTimeZone("Europe/Berlin"); return TimeZone.getTimeZone("Europe/Berlin");

2
enabler/src/de/schildbach/pte/VgnProvider.java
View file

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

4
enabler/src/de/schildbach/pte/VrrProvider.java
View file

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

4
enabler/src/de/schildbach/pte/VvmProvider.java
View file

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