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

VBN: Sync to 5.1.1.

Browse source
This commit is contained in:
Andreas Schildbach 2019-01-05 16:52:35 +01:00
parent 651557ba0c
commit 3a053c517d
3 changed files with 7 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

5
enabler/src/de/schildbach/pte/VbnProvider.java
View file

@ -49,11 +49,12 @@ public class VbnProvider extends AbstractHafasClientInterfaceProvider {
Product.REGIONAL_TRAIN, Product.REGIONAL_TRAIN, Product.SUBURBAN_TRAIN, Product.BUS, Product.FERRY, Product.REGIONAL_TRAIN, Product.REGIONAL_TRAIN, Product.SUBURBAN_TRAIN, Product.BUS, Product.FERRY,
Product.SUBWAY, Product.TRAM, Product.ON_DEMAND }; Product.SUBWAY, Product.TRAM, Product.ON_DEMAND };
public VbnProvider(final String apiAuthorization) { public VbnProvider(final String apiAuthorization, final byte[] salt) {
super(NetworkId.VBN, API_BASE, PRODUCTS_MAP); super(NetworkId.VBN, API_BASE, PRODUCTS_MAP);
setApiVersion("1.13"); setApiVersion("1.24");
setApiClient("{\"id\":\"VBN\",\"type\":\"AND\"}"); setApiClient("{\"id\":\"VBN\",\"type\":\"AND\"}");
setApiAuthorization(apiAuthorization); setApiAuthorization(apiAuthorization);
setRequestMicMacSalt(salt);
setStyles(STYLES); setStyles(STYLES);
} }

4
enabler/test/de/schildbach/pte/live/VbnProviderLiveTest.java
View file

@ -26,6 +26,7 @@ import java.util.Date;
import org.junit.Test; import org.junit.Test;
import de.schildbach.pte.AbstractHafasClientInterfaceProvider;
import de.schildbach.pte.VbnProvider; import de.schildbach.pte.VbnProvider;
import de.schildbach.pte.dto.Location; import de.schildbach.pte.dto.Location;
import de.schildbach.pte.dto.LocationType; import de.schildbach.pte.dto.LocationType;
@ -39,7 +40,8 @@ import de.schildbach.pte.dto.SuggestLocationsResult;
*/ */
public class VbnProviderLiveTest extends AbstractProviderLiveTest { public class VbnProviderLiveTest extends AbstractProviderLiveTest {
public VbnProviderLiveTest() { public VbnProviderLiveTest() {
super(new VbnProvider(secretProperty("vbn.api_authorization"))); super(new VbnProvider(secretProperty("vbn.api_authorization"), AbstractHafasClientInterfaceProvider
.decryptSalt(secretProperty("vbn.encrypted_salt"), secretProperty("hci.salt_encryption_key"))));
} }
@Test @Test

1
enabler/test/de/schildbach/pte/live/secrets.properties.template
View file

@ -9,6 +9,7 @@ vbb.encrypted_salt =
nvv.api_authorization = nvv.api_authorization =
sh.api_authorization = sh.api_authorization =
vbn.api_authorization = vbn.api_authorization =
vbn.encrypted_salt =
nasa.api_authorization = nasa.api_authorization =
vgs.api_authorization = vgs.api_authorization =
vgs.encrypted_salt = vgs.encrypted_salt =