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 canAcceptPoiId from constructor of AbstractEfaProvider

Browse source
This commit is contained in:
Andreas Schildbach 2013-03-10 22:57:24 +01:00
parent a935fe19ef
commit 118a62b98f
6 changed files with 20 additions and 20 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -89,7 +89,7 @@ public abstract class AbstractEfaProvider extends AbstractNetworkProvider
private final String coordEndpoint;
private final String additionalQueryParameter;
private final boolean canAcceptPoiID;
private boolean canAcceptPoiId = false;
private final boolean needsSpEncId;
private boolean includeRegionId = true;
private Charset requestUrlEncoding = ISO_8859_1;
@ -132,27 +132,21 @@ public abstract class AbstractEfaProvider extends AbstractNetworkProvider
public AbstractEfaProvider(final String apiBase, final String additionalQueryParameter)
{
this(apiBase, additionalQueryParameter, false);
}
public AbstractEfaProvider(final String apiBase, final String additionalQueryParameter, final boolean canAcceptPoiID)
{
this(apiBase, null, null, null, null, additionalQueryParameter, false, false);
this(apiBase, null, null, null, null, additionalQueryParameter, false);
}
public AbstractEfaProvider(final String apiBase, final String departureMonitorEndpoint, final String tripEndpoint,
final String stopFinderEndpoint, final String coordEndpoint, final String additionalQueryParameter, final boolean canAcceptPoiID,
final boolean needsSpEncId)
final String stopFinderEndpoint, final String coordEndpoint, final String additionalQueryParameter, final boolean needsSpEncId)
{
this(apiBase + (departureMonitorEndpoint != null ? departureMonitorEndpoint : DEFAULT_DEPARTURE_MONITOR_ENDPOINT), //
apiBase + (tripEndpoint != null ? tripEndpoint : DEFAULT_TRIP_ENDPOINT), //
apiBase + (stopFinderEndpoint != null ? stopFinderEndpoint : DEFAULT_STOPFINDER_ENDPOINT), //
apiBase + (coordEndpoint != null ? coordEndpoint : DEFAULT_COORD_ENDPOINT), //
additionalQueryParameter, canAcceptPoiID, needsSpEncId);
additionalQueryParameter, needsSpEncId);
}
public AbstractEfaProvider(final String departureMonitorEndpoint, final String tripEndpoint, final String stopFinderEndpoint,
final String coordEndpoint, final String additionalQueryParameter, final boolean canAcceptPoiID, final boolean needsSpEncId)
final String coordEndpoint, final String additionalQueryParameter, final boolean needsSpEncId)
{
try
{
@ -169,7 +163,6 @@ public abstract class AbstractEfaProvider extends AbstractNetworkProvider
this.coordEndpoint = coordEndpoint;
this.additionalQueryParameter = additionalQueryParameter;
this.canAcceptPoiID = canAcceptPoiID;
this.needsSpEncId = needsSpEncId;
}
@ -198,11 +191,16 @@ public abstract class AbstractEfaProvider extends AbstractNetworkProvider
this.suppressPositions = suppressPositions;
}
public void setUseRouteIndexAsConnectionId(final boolean useRouteIndexAsConnectionId)
protected void setUseRouteIndexAsConnectionId(final boolean useRouteIndexAsConnectionId)
{
this.useRouteIndexAsConnectionId = useRouteIndexAsConnectionId;
}
protected void setCanAcceptPoiId(final boolean canAcceptPoiId)
{
this.canAcceptPoiId = canAcceptPoiId;
}
protected TimeZone timeZone()
{
return TimeZone.getTimeZone("Europe/Berlin");
@ -2583,7 +2581,7 @@ public abstract class AbstractEfaProvider extends AbstractNetworkProvider
private void appendLocation(final StringBuilder uri, final Location location, final String paramSuffix)
{
if (canAcceptPoiID && location.type == LocationType.POI && location.hasId())
if (canAcceptPoiId && location.type == LocationType.POI && location.hasId())
{
uri.append("&type_").append(paramSuffix).append("=poiID");
uri.append("&name_").append(paramSuffix).append("=").append(location.id);

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

@ -38,7 +38,7 @@ public class MvvProvider extends AbstractEfaProvider
public MvvProvider(final String apiBase)
{
super(apiBase, null, false);
super(apiBase, null);
}
public NetworkId id()

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

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

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

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

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

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

6
enabler/src/de/schildbach/pte/VvsProvider.java
View file

@ -29,12 +29,14 @@ public class VvsProvider extends AbstractEfaProvider
public VvsProvider()
{
super(API_BASE, null, true);
this(API_BASE);
}
public VvsProvider(final String apiBase)
{
super(apiBase, null, true);
super(apiBase, null);
setCanAcceptPoiId(true);
}
public NetworkId id()