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

VGS: Migrate to Hafas client interface.

Browse source
This commit is contained in:
Andreas Schildbach 2018-12-17 12:55:43 +01:00
parent 998d1fc880
commit ef9c452166
3 changed files with 10 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

15
enabler/src/de/schildbach/pte/VgsProvider.java
View file

@ -26,18 +26,17 @@ import okhttp3.HttpUrl;
/** /**
* @author Andreas Schildbach * @author Andreas Schildbach
*/ */
public class VgsProvider extends AbstractHafasLegacyProvider { public class VgsProvider extends AbstractHafasClientInterfaceProvider {
private static final HttpUrl API_BASE = HttpUrl.parse("https://www.saarfahrplan.de/cgi-bin/"); private static final HttpUrl API_BASE = HttpUrl.parse("https://saarfahrplan.de/bin/");
// http://www.vgs-online.de/cgi-bin/
private static final Product[] PRODUCTS_MAP = { Product.HIGH_SPEED_TRAIN, Product.HIGH_SPEED_TRAIN, private static final Product[] PRODUCTS_MAP = { Product.HIGH_SPEED_TRAIN, Product.HIGH_SPEED_TRAIN,
Product.HIGH_SPEED_TRAIN, Product.REGIONAL_TRAIN, Product.SUBURBAN_TRAIN, Product.SUBWAY, Product.TRAM, Product.HIGH_SPEED_TRAIN, Product.REGIONAL_TRAIN, Product.SUBURBAN_TRAIN, Product.SUBWAY, Product.TRAM,
Product.BUS, Product.CABLECAR, Product.ON_DEMAND, Product.BUS }; Product.BUS, Product.CABLECAR, Product.ON_DEMAND, Product.BUS };
public VgsProvider() { public VgsProvider(final String jsonApiAuthorization) {
super(NetworkId.VGS, API_BASE, "dn", PRODUCTS_MAP); super(NetworkId.VGS, API_BASE, PRODUCTS_MAP);
setStationBoardHasStationTable(false); setApiVersion("1.21");
httpClient.setTrustAllCertificates(true); setApiClient("{\"id\":\"ZPS-SAAR\",\"type\":\"AND\"}");
httpClient.setSslAcceptAllHostnames(true); setApiAuthorization(jsonApiAuthorization);
} }
@Override @Override

2
enabler/test/de/schildbach/pte/live/VgsProviderLiveTest.java
View file

@ -36,7 +36,7 @@ import de.schildbach.pte.dto.SuggestLocationsResult;
*/ */
public class VgsProviderLiveTest extends AbstractProviderLiveTest { public class VgsProviderLiveTest extends AbstractProviderLiveTest {
public VgsProviderLiveTest() { public VgsProviderLiveTest() {
super(new VgsProvider()); super(new VgsProvider(secretProperty("vgs.api_authorization")));
} }
@Test @Test

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

@ -3,8 +3,9 @@ navitia.authorization =
db.api_authorization = db.api_authorization =
bvg.api_authorization = bvg.api_authorization =
nvv.api_authorization = nvv.api_authorization =
vbn.api_authorization =
sh.api_authorization = sh.api_authorization =
vbn.api_authorization =
vgs.api_authorization =
vmt.api_authorization = vmt.api_authorization =
invg.api_authorization = invg.api_authorization =
avv_aachen.api_authorization = avv_aachen.api_authorization =