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

AbstractHafasClientInterfaceProvider: Support for 'ext' configuration.

Browse source
This commit is contained in:
Andreas Schildbach 2019-01-04 13:10:22 +01:00
parent 43647e7c77
commit 12f597fe78
3 changed files with 17 additions and 0 deletions
Download patch file Download diff file Expand all files Collapse all files

8
enabler/src/de/schildbach/pte/AbstractHafasClientInterfaceProvider.java
View file

@ -87,6 +87,8 @@ public abstract class AbstractHafasClientInterfaceProvider extends AbstractHafas
@Nullable @Nullable
private String apiVersion; private String apiVersion;
@Nullable @Nullable
private String apiExt;
@Nullable
private String apiAuthorization; private String apiAuthorization;
@Nullable @Nullable
private String apiClient; private String apiClient;
@ -117,6 +119,11 @@ public abstract class AbstractHafasClientInterfaceProvider extends AbstractHafas
return this; return this;
} }
protected AbstractHafasClientInterfaceProvider setApiExt(final String apiExt) {
this.apiExt = checkNotNull(apiExt);
return this;
}
protected AbstractHafasClientInterfaceProvider setApiAuthorization(final String apiAuthorization) { protected AbstractHafasClientInterfaceProvider setApiAuthorization(final String apiAuthorization) {
this.apiAuthorization = apiAuthorization; this.apiAuthorization = apiAuthorization;
return this; return this;
@ -704,6 +711,7 @@ public abstract class AbstractHafasClientInterfaceProvider extends AbstractHafas
return "{" // return "{" //
+ (apiAuthorization != null ? "\"auth\":" + apiAuthorization + "," : "") // + (apiAuthorization != null ? "\"auth\":" + apiAuthorization + "," : "") //
+ "\"client\":" + checkNotNull(apiClient) + "," // + "\"client\":" + checkNotNull(apiClient) + "," //
+ (apiExt != null ? "\"ext\":\"" + apiExt + "\"," : "") //
+ "\"ver\":\"" + checkNotNull(apiVersion) + "\",\"lang\":\"eng\"," // + "\"ver\":\"" + checkNotNull(apiVersion) + "\",\"lang\":\"eng\"," //
+ "\"svcReqL\":[" // + "\"svcReqL\":[" //
+ "{\"meth\":\"ServerInfo\",\"req\":{\"getServerDateTime\":true,\"getTimeTablePeriod\":false}}," // + "{\"meth\":\"ServerInfo\",\"req\":{\"getServerDateTime\":true,\"getTimeTablePeriod\":false}}," //

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

@ -41,6 +41,7 @@ public final class DbProvider extends AbstractHafasClientInterfaceProvider {
public DbProvider(final String apiAuthorization) { public DbProvider(final String apiAuthorization) {
super(NetworkId.DB, API_BASE, PRODUCTS_MAP); super(NetworkId.DB, API_BASE, PRODUCTS_MAP);
setApiVersion("1.14"); setApiVersion("1.14");
setApiExt("DB.R15.12.a");
setApiClient("{\"id\":\"DB\",\"v\":\"16040000\",\"type\":\"AND\",\"name\":\"DB Navigator\"}"); setApiClient("{\"id\":\"DB\",\"v\":\"16040000\",\"type\":\"AND\",\"name\":\"DB Navigator\"}");
setApiAuthorization(apiAuthorization); setApiAuthorization(apiAuthorization);
setRequestChecksumSalt("bdI8UVj40K5fvxwf".getBytes(Charsets.UTF_8)); setRequestChecksumSalt("bdI8UVj40K5fvxwf".getBytes(Charsets.UTF_8));

8
enabler/test/de/schildbach/pte/live/DbProviderLiveTest.java
View file

@ -190,4 +190,12 @@ public class DbProviderLiveTest extends AbstractProviderLiveTest {
print(result); print(result);
assertEquals(QueryTripsResult.Status.INVALID_DATE, result.status); assertEquals(QueryTripsResult.Status.INVALID_DATE, result.status);
} }
@Test
public void tripBetweenAreas() throws Exception {
final Location from = new Location(LocationType.STATION, "8096021"); // FRANKFURT(MAIN)
final Location to = new Location(LocationType.STATION, "8096022"); // KÖLN
final QueryTripsResult result = queryTrips(from, null, to, new Date(), true, null);
print(result);
}
} }