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

AbstractHafasClientInterfaceProvider implementations: Provide constructor variant that takes the API client.

Browse source
This commit is contained in:
Andreas Schildbach 2019-04-02 14:16:11 +02:00
parent 22b1ce454a
commit 61cba8193e
25 changed files with 141 additions and 41 deletions
Download patch file Download diff file Expand all files Collapse all files

10
enabler/src/de/schildbach/pte/AvvAachenProvider.java
View file

@ -35,11 +35,15 @@ public class AvvAachenProvider extends AbstractHafasClientInterfaceProvider {
Product.BUS, Product.ON_DEMAND, Product.FERRY };
private static final String DEFAULT_API_CLIENT = "{\"id\":\"AVV_AACHEN\",\"type\":\"AND\"}";
public AvvAachenProvider(final String jsonApiAuthorization) {
public AvvAachenProvider(final String apiAuthorization) {
this(DEFAULT_API_CLIENT, apiAuthorization);
}
public AvvAachenProvider(final String apiClient, final String apiAuthorization) {
super(NetworkId.AVV_AACHEN, API_BASE, PRODUCTS_MAP);
setApiVersion("1.16");
setApiClient(DEFAULT_API_CLIENT);
setApiAuthorization(jsonApiAuthorization);
setApiClient(apiClient);
setApiAuthorization(apiAuthorization);
}
@Override

10
enabler/src/de/schildbach/pte/AvvAugsburgProvider.java
View file

@ -33,12 +33,16 @@ public class AvvAugsburgProvider extends AbstractHafasClientInterfaceProvider {
Product.SUBWAY, Product.TRAM, Product.ON_DEMAND };
private static final String DEFAULT_API_CLIENT = "{\"id\":\"DB-REGIO-AVV\",\"v\":\"100\",\"type\":\"AND\",\"name\":\"RegioNavigator\"}";
public AvvAugsburgProvider(final String jsonApiAuthorization) {
public AvvAugsburgProvider(final String apiAuthorization) {
this(DEFAULT_API_CLIENT, apiAuthorization);
}
public AvvAugsburgProvider(final String apiClient, final String apiAuthorization) {
super(NetworkId.AVV_AUGSBURG, API_BASE, PRODUCTS_MAP);
setApiVersion("1.18");
setApiExt("DB.R16.12.a");
setApiClient(DEFAULT_API_CLIENT);
setApiAuthorization(jsonApiAuthorization);
setApiClient(apiClient);
setApiAuthorization(apiAuthorization);
}
private static final String[] PLACES = { "Augsburg (Bayern)", "Augsburg" };

10
enabler/src/de/schildbach/pte/BvgProvider.java
View file

@ -46,12 +46,16 @@ public final class BvgProvider extends AbstractHafasClientInterfaceProvider {
Product.FERRY, Product.HIGH_SPEED_TRAIN, Product.REGIONAL_TRAIN, Product.ON_DEMAND, null, null };
private static final String DEFAULT_API_CLIENT = "{\"id\":\"BVG\",\"type\":\"AND\"}";
public BvgProvider(final String jsonApiAuthorization) {
public BvgProvider(final String apiAuthorization) {
this(DEFAULT_API_CLIENT, apiAuthorization);
}
public BvgProvider(final String apiClient, final String apiAuthorization) {
super(NetworkId.BVG, API_BASE, PRODUCTS_MAP);
setApiVersion("1.18");
setApiExt("BVG.1");
setApiClient(DEFAULT_API_CLIENT);
setApiAuthorization(jsonApiAuthorization);
setApiClient(apiClient);
setApiAuthorization(apiAuthorization);
setStyles(STYLES);
}

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

@ -34,10 +34,14 @@ public class CmtaProvider extends AbstractHafasClientInterfaceProvider {
private static final String DEFAULT_API_CLIENT = "{\"id\":\"CMTA\",\"type\":\"AND\"}";
public CmtaProvider() {
this(DEFAULT_API_CLIENT);
}
public CmtaProvider(final String apiClient) {
super(NetworkId.CMTA, API_BASE, PRODUCTS_MAP);
setTimeZone("America/Chicago");
setApiVersion("1.14");
setApiExt("SBB.TZT.1");
setApiClient(DEFAULT_API_CLIENT);
setApiClient(apiClient);
}
}

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

@ -46,10 +46,14 @@ public final class DbProvider extends AbstractHafasClientInterfaceProvider {
private static final String DEFAULT_API_CLIENT = "{\"id\":\"DB\",\"v\":\"16040000\",\"type\":\"AND\",\"name\":\"DB Navigator\"}";
public DbProvider(final String apiAuthorization, final byte[] salt) {
this(DEFAULT_API_CLIENT, apiAuthorization, salt);
}
public DbProvider(final String apiClient, final String apiAuthorization, final byte[] salt) {
super(NetworkId.DB, API_BASE, PRODUCTS_MAP);
setApiVersion("1.15");
setApiExt("DB.R18.06.a");
setApiClient(DEFAULT_API_CLIENT);
setApiClient(apiClient);
setApiAuthorization(apiAuthorization);
setRequestChecksumSalt(salt);
}

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

@ -37,11 +37,15 @@ public class DsbProvider extends AbstractHafasClientInterfaceProvider {
private static final String DEFAULT_API_CLIENT = "{\"id\":\"DK\",\"type\":\"AND\"}";
public DsbProvider(final String apiAuthorization) {
this(DEFAULT_API_CLIENT, apiAuthorization);
}
public DsbProvider(final String apiClient, final String apiAuthorization) {
super(NetworkId.DSB, API_BASE, PRODUCTS_MAP);
setApiEndpoint("iphone.exe");
setApiVersion("1.15");
setApiExt("DK.9");
setApiClient(DEFAULT_API_CLIENT);
setApiClient(apiClient);
setApiAuthorization(apiAuthorization);
}

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

@ -37,9 +37,13 @@ public class InvgProvider extends AbstractHafasClientInterfaceProvider {
private static final String DEFAULT_API_CLIENT = "{\"id\":\"INVG\",\"type\":\"AND\"}";
public InvgProvider(final String apiAuthorization, final byte[] salt) {
this(DEFAULT_API_CLIENT, apiAuthorization, salt);
}
public InvgProvider(final String apiClient, final String apiAuthorization, final byte[] salt) {
super(NetworkId.INVG, API_BASE, PRODUCTS_MAP);
setApiVersion("1.16");
setApiClient(DEFAULT_API_CLIENT);
setApiClient(apiClient);
setApiAuthorization(apiAuthorization);
setRequestMicMacSalt(salt);
setStyles(STYLES);

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

@ -36,9 +36,13 @@ public class LuProvider extends AbstractHafasClientInterfaceProvider {
private static final String DEFAULT_API_CLIENT = "{\"id\":\"CDT\",\"type\":\"AND\"}";
public LuProvider(final String apiAuthorization) {
this(DEFAULT_API_CLIENT, apiAuthorization);
}
public LuProvider(final String apiClient, final String apiAuthorization) {
super(NetworkId.LU, API_BASE, PRODUCTS_MAP);
setApiVersion("1.18");
setApiClient(DEFAULT_API_CLIENT);
setApiClient(apiClient);
setApiAuthorization(apiAuthorization);
}

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

@ -36,9 +36,13 @@ public class NasaProvider extends AbstractHafasClientInterfaceProvider {
private static final String DEFAULT_API_CLIENT = "{\"id\":\"NASA\",\"type\":\"AND\"}";
public NasaProvider(final String apiAuthorization) {
this(DEFAULT_API_CLIENT, apiAuthorization);
}
public NasaProvider(final String apiClient, final String apiAuthorization) {
super(NetworkId.NASA, API_BASE, PRODUCTS_MAP);
setApiVersion("1.15");
setApiClient(DEFAULT_API_CLIENT);
setApiClient(apiClient);
setApiAuthorization(apiAuthorization);
}

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

@ -36,10 +36,14 @@ public class NvvProvider extends AbstractHafasClientInterfaceProvider {
private static final String DEFAULT_API_CLIENT = "{\"id\":\"NVV\",\"type\":\"AND\"}";
public NvvProvider(final String apiAuthorization) {
this(DEFAULT_API_CLIENT, apiAuthorization);
}
public NvvProvider(final String apiClient, final String apiAuthorization) {
super(NetworkId.NVV, API_BASE, PRODUCTS_MAP);
setApiVersion("1.18");
setApiExt("NVV.6.0");
setApiClient(DEFAULT_API_CLIENT);
setApiClient(apiClient);
setApiAuthorization(apiAuthorization);
httpClient.setTrustAllCertificates(true);
}

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

@ -38,9 +38,13 @@ public class OebbProvider extends AbstractHafasClientInterfaceProvider {
private static final String DEFAULT_API_CLIENT = "{\"id\":\"OEBB\",\"type\":\"AND\"}";
public OebbProvider(final String apiAuthorization) {
this(DEFAULT_API_CLIENT, apiAuthorization);
}
public OebbProvider(final String apiClient, final String apiAuthorization) {
super(NetworkId.OEBB, API_BASE, PRODUCTS_MAP);
setApiVersion("1.16");
setApiClient(DEFAULT_API_CLIENT);
setApiClient(apiClient);
setApiAuthorization(apiAuthorization);
}

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

@ -38,10 +38,14 @@ public class OoevvProvider extends AbstractHafasClientInterfaceProvider {
private static final String DEFAULT_API_CLIENT = "{\"id\":\"VAO\",\"l\":\"vs_ooevv\",\"type\":\"AND\"}";
public OoevvProvider(final String apiAuthorization) {
this(DEFAULT_API_CLIENT, apiAuthorization);
}
public OoevvProvider(final String apiClient, final String apiAuthorization) {
super(NetworkId.OOEVV, API_BASE, PRODUCTS_MAP);
setApiVersion("1.18");
setApiExt("VAO.6");
setApiClient(DEFAULT_API_CLIENT);
setApiClient(apiClient);
setApiAuthorization(apiAuthorization);
httpClient.setSslAcceptAllHostnames(true);
}

10
enabler/src/de/schildbach/pte/SeProvider.java
View file

@ -38,11 +38,15 @@ public class SeProvider extends AbstractHafasClientInterfaceProvider {
Product.FERRY, Product.ON_DEMAND /* Taxi */ };
private static final String DEFAULT_API_CLIENT = "{\"id\":\"SAMTRAFIKEN\",\"type\":\"AND\"}";
public SeProvider(final String jsonApiAuthorization) {
public SeProvider(final String apiAuthorization) {
this(DEFAULT_API_CLIENT, apiAuthorization);
}
public SeProvider(final String apiClient, final String apiAuthorization) {
super(NetworkId.SE, API_BASE, PRODUCTS_MAP);
setApiVersion("1.18");
setApiClient(DEFAULT_API_CLIENT);
setApiAuthorization(jsonApiAuthorization);
setApiClient(apiClient);
setApiAuthorization(apiAuthorization);
}
private static final Pattern P_SPLIT_NAME_PAREN = Pattern.compile("(.*) \\((.{3,}?) kn\\)");

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

@ -39,9 +39,13 @@ public class ShProvider extends AbstractHafasClientInterfaceProvider {
private static final String DEFAULT_API_CLIENT = "{\"id\":\"NAHSH\",\"type\":\"AND\"}";
public ShProvider(final String apiAuthorization) {
this(DEFAULT_API_CLIENT, apiAuthorization);
}
public ShProvider(final String apiClient, final String apiAuthorization) {
super(NetworkId.SH, API_BASE, PRODUCTS_MAP);
setApiVersion("1.18");
setApiClient(DEFAULT_API_CLIENT);
setApiClient(apiClient);
setApiAuthorization(apiAuthorization);
setStyles(STYLES);
}

10
enabler/src/de/schildbach/pte/SncbProvider.java
View file

@ -36,11 +36,15 @@ public class SncbProvider extends AbstractHafasClientInterfaceProvider {
null, null, null };
private static final String DEFAULT_API_CLIENT = "{\"id\":\"SNCB\",\"type\":\"AND\"}";
public SncbProvider(final String jsonApiAuthorization) {
public SncbProvider(final String apiAuthorization) {
this(DEFAULT_API_CLIENT, apiAuthorization);
}
public SncbProvider(final String apiClient, final String apiAuthorization) {
super(NetworkId.SNCB, API_BASE, PRODUCTS_MAP);
setApiVersion("1.15");
setApiClient(DEFAULT_API_CLIENT);
setApiAuthorization(jsonApiAuthorization);
setApiClient(apiClient);
setApiAuthorization(apiAuthorization);
}
private static final String[] PLACES = { "Antwerpen", "Gent", "Charleroi", "Liege", "Liège", "Brussel" };

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

@ -41,10 +41,14 @@ public class SvvProvider extends AbstractHafasClientInterfaceProvider {
private static final String DEFAULT_API_CLIENT = "{\"id\":\"VAO\",\"l\":\"vs_svv\",\"type\":\"AND\"}";
public SvvProvider(final String apiAuthorization) {
this(DEFAULT_API_CLIENT, apiAuthorization);
}
public SvvProvider(final String apiClient, final String apiAuthorization) {
super(NetworkId.SVV, API_BASE, PRODUCTS_MAP);
setApiVersion("1.18");
setApiExt("VAO.6");
setApiClient(DEFAULT_API_CLIENT);
setApiClient(apiClient);
setApiAuthorization(apiAuthorization);
setStyles(STYLES);
httpClient.setTrustAllCertificates(true);

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

@ -41,10 +41,14 @@ public class VaoProvider extends AbstractHafasClientInterfaceProvider {
private static final String DEFAULT_API_CLIENT = "{\"id\":\"VAO\",\"l\":\"vs_vao\",\"type\":\"AND\"}";
public VaoProvider(final String apiAuthorization) {
this(DEFAULT_API_CLIENT, apiAuthorization);
}
public VaoProvider(final String apiClient, final String apiAuthorization) {
super(NetworkId.VAO, API_BASE, PRODUCTS_MAP);
setApiVersion("1.18");
setApiExt("VAO.6");
setApiClient(DEFAULT_API_CLIENT);
setApiClient(apiClient);
setApiAuthorization(apiAuthorization);
setStyles(STYLES);
}

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

@ -40,10 +40,14 @@ public class VbbProvider extends AbstractHafasClientInterfaceProvider {
private static final String DEFAULT_API_CLIENT = "{\"id\":\"VBB\",\"type\":\"AND\"}";
public VbbProvider(final String apiAuthorization, final byte[] salt) {
this(DEFAULT_API_CLIENT, apiAuthorization, salt);
}
public VbbProvider(final String apiClient, final String apiAuthorization, final byte[] salt) {
super(NetworkId.VBB, API_BASE, PRODUCTS_MAP);
setApiVersion("1.18");
setApiExt("VBB.4");
setApiClient(DEFAULT_API_CLIENT);
setApiClient(apiClient);
setApiAuthorization(apiAuthorization);
setRequestMicMacSalt(salt);
httpClient.setTrustAllCertificates(true);

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

@ -57,9 +57,13 @@ public class VbnProvider extends AbstractHafasClientInterfaceProvider {
private static final String DEFAULT_API_CLIENT = "{\"id\":\"VBN\",\"type\":\"AND\"}";
public VbnProvider(final String apiAuthorization, final byte[] salt) {
this(DEFAULT_API_CLIENT, apiAuthorization, salt);
}
public VbnProvider(final String apiClient, final String apiAuthorization, final byte[] salt) {
super(NetworkId.VBN, API_BASE, PRODUCTS_MAP);
setApiVersion("1.18");
setApiClient(DEFAULT_API_CLIENT);
setApiClient(apiClient);
setApiAuthorization(apiAuthorization);
setRequestMicMacSalt(salt);
setStyles(STYLES);

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

@ -35,11 +35,15 @@ public class VgsProvider extends AbstractHafasClientInterfaceProvider {
Product.BUS, Product.CABLECAR, Product.ON_DEMAND, Product.BUS };
private static final String DEFAULT_API_CLIENT = "{\"id\":\"ZPS-SAAR\",\"type\":\"AND\"}";
public VgsProvider(final String jsonApiAuthorization, final byte[] salt) {
public VgsProvider(final String apiAuthorization, final byte[] salt) {
this(DEFAULT_API_CLIENT, apiAuthorization, salt);
}
public VgsProvider(final String apiClient, final String apiAuthorization, final byte[] salt) {
super(NetworkId.VGS, API_BASE, PRODUCTS_MAP);
setApiVersion("1.21");
setApiClient(DEFAULT_API_CLIENT);
setApiAuthorization(jsonApiAuthorization);
setApiClient(apiClient);
setApiAuthorization(apiAuthorization);
setRequestMicMacSalt(salt);
}

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

@ -38,10 +38,14 @@ public class VmobilProvider extends AbstractHafasClientInterfaceProvider {
private static final String DEFAULT_API_CLIENT = "{\"id\":\"VAO\",\"l\":\"vs_vvv\",\"type\":\"AND\"}";
public VmobilProvider(final String apiAuthorization) {
this(DEFAULT_API_CLIENT, apiAuthorization);
}
public VmobilProvider(final String apiClient, final String apiAuthorization) {
super(NetworkId.VMOBIL, API_BASE, PRODUCTS_MAP);
setApiVersion("1.18");
setApiExt("VAO.6");
setApiClient(DEFAULT_API_CLIENT);
setApiClient(apiClient);
setApiAuthorization(apiAuthorization);
}

10
enabler/src/de/schildbach/pte/VmtProvider.java
View file

@ -36,11 +36,15 @@ public class VmtProvider extends AbstractHafasClientInterfaceProvider {
Product.BUS /* guessing */, Product.BUS, null };
private static final String DEFAULT_API_CLIENT = "{\"name\":\"VMT\",\"type\":\"AND\"}";
public VmtProvider(final String jsonApiAuthorization) {
public VmtProvider(final String apiAuthorization) {
this(DEFAULT_API_CLIENT, apiAuthorization);
}
public VmtProvider(final String apiClient, final String apiAuthorization) {
super(NetworkId.VMT, API_BASE, PRODUCTS_MAP);
setApiVersion("1.15");
setApiClient(DEFAULT_API_CLIENT);
setApiAuthorization(jsonApiAuthorization);
setApiClient(apiClient);
setApiAuthorization(apiAuthorization);
}
private static final String[] PLACES = { "Erfurt", "Jena", "Gera", "Weimar", "Gotha" };

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

@ -41,10 +41,14 @@ public class VorProvider extends AbstractHafasClientInterfaceProvider {
private static final String DEFAULT_API_CLIENT = "{\"id\":\"VAO\",\"l\":\"vs_anachb\",\"type\":\"AND\"}";
public VorProvider(final String apiAuthorization) {
this(DEFAULT_API_CLIENT, apiAuthorization);
}
public VorProvider(final String apiClient, final String apiAuthorization) {
super(NetworkId.VOR, API_BASE, PRODUCTS_MAP);
setApiVersion("1.18");
setApiExt("VAO.9");
setApiClient(DEFAULT_API_CLIENT);
setApiClient(apiClient);
setApiAuthorization(apiAuthorization);
setStyles(STYLES);
}

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

@ -38,10 +38,14 @@ public class VvtProvider extends AbstractHafasClientInterfaceProvider {
private static final String DEFAULT_API_CLIENT = "{\"id\":\"VAO\",\"l\":\"vs_vvt\",\"type\":\"AND\"}";
public VvtProvider(final String apiAuthorization) {
this(DEFAULT_API_CLIENT, apiAuthorization);
}
public VvtProvider(final String apiClient, final String apiAuthorization) {
super(NetworkId.VVT, API_BASE, PRODUCTS_MAP);
setApiVersion("1.18");
setApiExt("VAO.6");
setApiClient(DEFAULT_API_CLIENT);
setApiClient(apiClient);
setApiAuthorization(apiAuthorization);
}

10
enabler/src/de/schildbach/pte/ZvvProvider.java
View file

@ -40,12 +40,16 @@ public class ZvvProvider extends AbstractHafasClientInterfaceProvider {
private static final HttpUrl API_BASE = HttpUrl.parse("https://online.fahrplan.zvv.ch/bin/");
private static final String DEFAULT_API_CLIENT = "{\"id\":\"ZVV\",\"type\":\"AND\"}";
public ZvvProvider(final String jsonApiAuthorization) {
public ZvvProvider(final String apiAuthorization) {
this(DEFAULT_API_CLIENT, apiAuthorization);
}
public ZvvProvider(final String apiClient, final String apiAuthorization) {
super(NetworkId.ZVV, API_BASE, PRODUCTS_MAP);
setApiVersion("1.15");
setApiExt("ZVV.2");
setApiClient(DEFAULT_API_CLIENT);
setApiAuthorization(jsonApiAuthorization);
setApiClient(apiClient);
setApiAuthorization(apiAuthorization);
setStyles(STYLES);
}