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

Rename AbstractHafasMobileProvider to AbstractHafasClientInterfaceProvider.

Browse source
This commit is contained in:
Andreas Schildbach 2018-10-27 17:43:54 +02:00
parent f659d19acc
commit fe86c0498c
13 changed files with 20 additions and 19 deletions
Download patch file Download diff file Expand all files Collapse all files

15
enabler/src/de/schildbach/pte/AbstractHafasMobileProvider.java → enabler/src/de/schildbach/pte/AbstractHafasClientInterfaceProvider.java
View file

@ -77,7 +77,7 @@ import okhttp3.HttpUrl;
* *
* @author Andreas Schildbach * @author Andreas Schildbach
*/ */
public abstract class AbstractHafasMobileProvider extends AbstractHafasProvider { public abstract class AbstractHafasClientInterfaceProvider extends AbstractHafasProvider {
public HttpUrl mgateEndpoint; public HttpUrl mgateEndpoint;
@Nullable @Nullable
public String apiVersion; public String apiVersion;
@ -93,33 +93,34 @@ public abstract class AbstractHafasMobileProvider extends AbstractHafasProvider
private static final HashFunction MD5 = Hashing.md5(); private static final HashFunction MD5 = Hashing.md5();
private static final BaseEncoding HEX = BaseEncoding.base16().lowerCase(); private static final BaseEncoding HEX = BaseEncoding.base16().lowerCase();
public AbstractHafasMobileProvider(final NetworkId network, final HttpUrl apiBase, final Product[] productsMap) { public AbstractHafasClientInterfaceProvider(final NetworkId network, final HttpUrl apiBase,
final Product[] productsMap) {
super(network, productsMap); super(network, productsMap);
this.mgateEndpoint = apiBase.newBuilder().addPathSegment("mgate.exe").build(); this.mgateEndpoint = apiBase.newBuilder().addPathSegment("mgate.exe").build();
} }
protected AbstractHafasMobileProvider setApiVersion(final String apiVersion) { protected AbstractHafasClientInterfaceProvider setApiVersion(final String apiVersion) {
checkArgument(apiVersion.compareToIgnoreCase("1.11") >= 0, "apiVersion must be 1.11 or higher"); checkArgument(apiVersion.compareToIgnoreCase("1.11") >= 0, "apiVersion must be 1.11 or higher");
this.apiVersion = apiVersion; this.apiVersion = apiVersion;
return this; return this;
} }
protected AbstractHafasMobileProvider setApiAuthorization(final String apiAuthorization) { protected AbstractHafasClientInterfaceProvider setApiAuthorization(final String apiAuthorization) {
this.apiAuthorization = apiAuthorization; this.apiAuthorization = apiAuthorization;
return this; return this;
} }
protected AbstractHafasMobileProvider setApiClient(final String apiClient) { protected AbstractHafasClientInterfaceProvider setApiClient(final String apiClient) {
this.apiClient = apiClient; this.apiClient = apiClient;
return this; return this;
} }
protected AbstractHafasMobileProvider setRequestChecksumSalt(final String requestChecksumSalt) { protected AbstractHafasClientInterfaceProvider setRequestChecksumSalt(final String requestChecksumSalt) {
this.requestChecksumSalt = requestChecksumSalt; this.requestChecksumSalt = requestChecksumSalt;
return this; return this;
} }
protected AbstractHafasMobileProvider setRequestMicMacSalt(final String requestMicMacSalt) { protected AbstractHafasClientInterfaceProvider setRequestMicMacSalt(final String requestMicMacSalt) {
this.requestMicMacSalt = requestMicMacSalt; this.requestMicMacSalt = requestMicMacSalt;
return this; return this;
} }

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

@ -38,7 +38,7 @@ import okhttp3.HttpUrl;
/** /**
* @author Andreas Schildbach * @author Andreas Schildbach
*/ */
public final class BvgProvider extends AbstractHafasMobileProvider { public final class BvgProvider extends AbstractHafasClientInterfaceProvider {
private static final HttpUrl API_BASE = HttpUrl.parse("https://bvg-apps.hafas.de/bin/"); private static final HttpUrl API_BASE = HttpUrl.parse("https://bvg-apps.hafas.de/bin/");
private static final Product[] PRODUCTS_MAP = { Product.SUBURBAN_TRAIN, Product.SUBWAY, Product.TRAM, Product.BUS, private static final Product[] PRODUCTS_MAP = { Product.SUBURBAN_TRAIN, Product.SUBWAY, Product.TRAM, Product.BUS,
Product.FERRY, Product.HIGH_SPEED_TRAIN, Product.REGIONAL_TRAIN, Product.ON_DEMAND, null, null }; Product.FERRY, Product.HIGH_SPEED_TRAIN, Product.REGIONAL_TRAIN, Product.ON_DEMAND, null, null };

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

@ -24,7 +24,7 @@ import okhttp3.HttpUrl;
/** /**
* @author Colin Murphy * @author Colin Murphy
*/ */
public class CmtaProvider extends AbstractHafasMobileProvider { public class CmtaProvider extends AbstractHafasClientInterfaceProvider {
private static final HttpUrl API_BASE = HttpUrl.parse("https://capmetro.hafas.cloud/bin/"); private static final HttpUrl API_BASE = HttpUrl.parse("https://capmetro.hafas.cloud/bin/");
// MetroRail: 8, MetroBus: 32, MetroRapid: 4096 // MetroRail: 8, MetroBus: 32, MetroRapid: 4096
private static final Product[] PRODUCTS_MAP = { null, null, null, Product.REGIONAL_TRAIN, null, Product.BUS, null, private static final Product[] PRODUCTS_MAP = { null, null, null, Product.REGIONAL_TRAIN, null, Product.BUS, null,

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

@ -26,7 +26,7 @@ import okhttp3.HttpUrl;
/** /**
* @author Andreas Schildbach * @author Andreas Schildbach
*/ */
public class NasaProvider extends AbstractHafasMobileProvider { public class NasaProvider extends AbstractHafasClientInterfaceProvider {
private static final HttpUrl API_BASE = HttpUrl.parse("https://reiseauskunft.insa.de/bin/"); private static final HttpUrl API_BASE = HttpUrl.parse("https://reiseauskunft.insa.de/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.REGIONAL_TRAIN, Product.REGIONAL_TRAIN, Product.SUBURBAN_TRAIN, Product.TRAM, Product.BUS, Product.REGIONAL_TRAIN, Product.REGIONAL_TRAIN, Product.SUBURBAN_TRAIN, Product.TRAM, Product.BUS,

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

@ -28,7 +28,7 @@ import okhttp3.HttpUrl;
/** /**
* @author Andreas Schildbach * @author Andreas Schildbach
*/ */
public class OoevvProvider extends AbstractHafasMobileProvider { public class OoevvProvider extends AbstractHafasClientInterfaceProvider {
private static final HttpUrl API_BASE = HttpUrl.parse("https://verkehrsauskunft.ooevv.at/bin/"); private static final HttpUrl API_BASE = HttpUrl.parse("https://verkehrsauskunft.ooevv.at/bin/");
private static final Product[] PRODUCTS_MAP = { Product.HIGH_SPEED_TRAIN, Product.SUBURBAN_TRAIN, Product.SUBWAY, private static final Product[] PRODUCTS_MAP = { Product.HIGH_SPEED_TRAIN, Product.SUBURBAN_TRAIN, Product.SUBWAY,
null, Product.TRAM, Product.REGIONAL_TRAIN, Product.BUS, Product.BUS, Product.TRAM, Product.FERRY, null, Product.TRAM, Product.REGIONAL_TRAIN, Product.BUS, Product.BUS, Product.TRAM, Product.FERRY,

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

@ -34,7 +34,7 @@ import okhttp3.HttpUrl;
/** /**
* @author Andreas Schildbach * @author Andreas Schildbach
*/ */
public class ShProvider extends AbstractHafasMobileProvider { public class ShProvider extends AbstractHafasClientInterfaceProvider {
private static final HttpUrl API_BASE = HttpUrl.parse("https://nah.sh.hafas.de/bin/"); private static final HttpUrl API_BASE = HttpUrl.parse("https://nah.sh.hafas.de/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.BUS, Product.FERRY, Product.HIGH_SPEED_TRAIN, Product.REGIONAL_TRAIN, Product.SUBURBAN_TRAIN, Product.BUS, Product.FERRY,

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

@ -31,7 +31,7 @@ import okhttp3.HttpUrl;
/** /**
* @author Andreas Schildbach * @author Andreas Schildbach
*/ */
public class SvvProvider extends AbstractHafasMobileProvider { public class SvvProvider extends AbstractHafasClientInterfaceProvider {
private static final HttpUrl API_BASE = HttpUrl.parse("https://fahrplan.salzburg-verkehr.at/bin/"); private static final HttpUrl API_BASE = HttpUrl.parse("https://fahrplan.salzburg-verkehr.at/bin/");
private static final Product[] PRODUCTS_MAP = { Product.HIGH_SPEED_TRAIN, Product.SUBURBAN_TRAIN, Product.SUBWAY, private static final Product[] PRODUCTS_MAP = { Product.HIGH_SPEED_TRAIN, Product.SUBURBAN_TRAIN, Product.SUBWAY,
null, Product.TRAM, Product.REGIONAL_TRAIN, Product.BUS, Product.BUS, Product.TRAM, Product.FERRY, null, Product.TRAM, Product.REGIONAL_TRAIN, Product.BUS, Product.BUS, Product.TRAM, Product.FERRY,

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

@ -31,7 +31,7 @@ import okhttp3.HttpUrl;
/** /**
* @author Andreas Schildbach * @author Andreas Schildbach
*/ */
public class VaoProvider extends AbstractHafasMobileProvider { public class VaoProvider extends AbstractHafasClientInterfaceProvider {
private static final HttpUrl API_BASE = HttpUrl.parse("https://app.verkehrsauskunft.at/bin/"); private static final HttpUrl API_BASE = HttpUrl.parse("https://app.verkehrsauskunft.at/bin/");
private static final Product[] PRODUCTS_MAP = { Product.HIGH_SPEED_TRAIN, Product.SUBURBAN_TRAIN, Product.SUBWAY, private static final Product[] PRODUCTS_MAP = { Product.HIGH_SPEED_TRAIN, Product.SUBURBAN_TRAIN, Product.SUBWAY,
null, Product.TRAM, Product.REGIONAL_TRAIN, Product.BUS, Product.BUS, Product.TRAM, Product.FERRY, null, Product.TRAM, Product.REGIONAL_TRAIN, Product.BUS, Product.BUS, Product.TRAM, Product.FERRY,

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

@ -35,7 +35,7 @@ import okhttp3.HttpUrl;
/** /**
* @author Andreas Schildbach * @author Andreas Schildbach
*/ */
public class VbnProvider extends AbstractHafasMobileProvider { public class VbnProvider extends AbstractHafasClientInterfaceProvider {
private static final HttpUrl API_BASE = HttpUrl.parse("https://fahrplaner.vbn.de/hafas/"); private static final HttpUrl API_BASE = HttpUrl.parse("https://fahrplaner.vbn.de/hafas/");
// http://fahrplaner.vsninfo.de/hafas/ // http://fahrplaner.vsninfo.de/hafas/
// http://fahrplan.rsag-online.de/hafas/ // http://fahrplan.rsag-online.de/hafas/

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

@ -28,7 +28,7 @@ import okhttp3.HttpUrl;
/** /**
* @author Andreas Schildbach * @author Andreas Schildbach
*/ */
public class VmobilProvider extends AbstractHafasMobileProvider { public class VmobilProvider extends AbstractHafasClientInterfaceProvider {
private static final HttpUrl API_BASE = HttpUrl.parse("https://fahrplan.vmobil.at/bin/"); private static final HttpUrl API_BASE = HttpUrl.parse("https://fahrplan.vmobil.at/bin/");
private static final Product[] PRODUCTS_MAP = { Product.HIGH_SPEED_TRAIN, Product.SUBURBAN_TRAIN, Product.SUBWAY, private static final Product[] PRODUCTS_MAP = { Product.HIGH_SPEED_TRAIN, Product.SUBURBAN_TRAIN, Product.SUBWAY,
null, Product.TRAM, Product.REGIONAL_TRAIN, Product.BUS, Product.BUS, Product.TRAM, Product.FERRY, null, Product.TRAM, Product.REGIONAL_TRAIN, Product.BUS, Product.BUS, Product.TRAM, Product.FERRY,

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

@ -26,7 +26,7 @@ import okhttp3.HttpUrl;
/** /**
* @author Andreas Schildbach * @author Andreas Schildbach
*/ */
public class VmtProvider extends AbstractHafasMobileProvider { public class VmtProvider extends AbstractHafasClientInterfaceProvider {
private static final HttpUrl API_BASE = HttpUrl.parse("https://vmt.hafas.de/bin/"); private static final HttpUrl API_BASE = HttpUrl.parse("https://vmt.hafas.de/bin/");
// http://www.routenplaner.nahverkehr-jena.de/bin/ // http://www.routenplaner.nahverkehr-jena.de/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,

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

@ -31,7 +31,7 @@ import okhttp3.HttpUrl;
/** /**
* @author Andreas Schildbach * @author Andreas Schildbach
*/ */
public class VorProvider extends AbstractHafasMobileProvider { public class VorProvider extends AbstractHafasClientInterfaceProvider {
private static final HttpUrl API_BASE = HttpUrl.parse("https://anachb.vor.at/bin/"); private static final HttpUrl API_BASE = HttpUrl.parse("https://anachb.vor.at/bin/");
private static final Product[] PRODUCTS_MAP = { Product.HIGH_SPEED_TRAIN, Product.SUBURBAN_TRAIN, Product.SUBWAY, private static final Product[] PRODUCTS_MAP = { Product.HIGH_SPEED_TRAIN, Product.SUBURBAN_TRAIN, Product.SUBWAY,
null, Product.TRAM, Product.REGIONAL_TRAIN, Product.BUS, Product.BUS, Product.TRAM, Product.FERRY, null, Product.TRAM, Product.REGIONAL_TRAIN, Product.BUS, Product.BUS, Product.TRAM, Product.FERRY,

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

@ -28,7 +28,7 @@ import okhttp3.HttpUrl;
/** /**
* @author Andreas Schildbach * @author Andreas Schildbach
*/ */
public class VvtProvider extends AbstractHafasMobileProvider { public class VvtProvider extends AbstractHafasClientInterfaceProvider {
private static final HttpUrl API_BASE = HttpUrl.parse("https://fahrplan.vvt.at/bin/"); private static final HttpUrl API_BASE = HttpUrl.parse("https://fahrplan.vvt.at/bin/");
private static final Product[] PRODUCTS_MAP = { Product.HIGH_SPEED_TRAIN, Product.SUBURBAN_TRAIN, Product.SUBWAY, private static final Product[] PRODUCTS_MAP = { Product.HIGH_SPEED_TRAIN, Product.SUBURBAN_TRAIN, Product.SUBWAY,
null, Product.TRAM, Product.REGIONAL_TRAIN, Product.BUS, Product.BUS, Product.TRAM, Product.FERRY, null, Product.TRAM, Product.REGIONAL_TRAIN, Product.BUS, Product.BUS, Product.TRAM, Product.FERRY,