diff --git a/enabler/src/de/schildbach/pte/AbstractNavitiaProvider.java b/enabler/src/de/schildbach/pte/AbstractNavitiaProvider.java index 6d59d524..e0bb6f52 100644 --- a/enabler/src/de/schildbach/pte/AbstractNavitiaProvider.java +++ b/enabler/src/de/schildbach/pte/AbstractNavitiaProvider.java @@ -77,7 +77,8 @@ public abstract class AbstractNavitiaProvider extends AbstractNetworkProvider { protected final static String SERVER_PRODUCT = "navitia"; protected final static String SERVER_VERSION = "v1"; - protected static final String API_BASE = "http://api.navitia.io/" + SERVER_VERSION + "/"; + + protected String apiBase = "http://api.navitia.io/" + SERVER_VERSION + "/"; private enum PlaceType { @@ -132,6 +133,13 @@ public abstract class AbstractNavitiaProvider extends AbstractNetworkProvider } } + public AbstractNavitiaProvider(final NetworkId network, final String apiBase, final String authorization) + { + this(network, authorization); + + this.apiBase = apiBase; + } + public AbstractNavitiaProvider(final NetworkId network, final String authorization) { super(network); @@ -154,12 +162,12 @@ public abstract class AbstractNavitiaProvider extends AbstractNetworkProvider private String uri() { - return API_BASE + "coverage/" + region() + "/"; + return apiBase + "coverage/" + region() + "/"; } private String tripUri() { - return API_BASE; + return apiBase; } private Point parseCoord(final JSONObject coord) throws IOException diff --git a/enabler/src/de/schildbach/pte/FrenchSouthWestProvider.java b/enabler/src/de/schildbach/pte/FrenchSouthWestProvider.java index 3d223e42..2682ca22 100644 --- a/enabler/src/de/schildbach/pte/FrenchSouthWestProvider.java +++ b/enabler/src/de/schildbach/pte/FrenchSouthWestProvider.java @@ -28,6 +28,13 @@ public class FrenchSouthWestProvider extends AbstractNavitiaProvider { private static String API_REGION = "fr-sw"; + public FrenchSouthWestProvider(final String apiBase, final String authorization) + { + super(NetworkId.FRENCHSOUTHWEST, apiBase, authorization); + + setTimeZone("Europe/Paris"); + } + public FrenchSouthWestProvider(final String authorization) { super(NetworkId.FRENCHSOUTHWEST, authorization); diff --git a/enabler/src/de/schildbach/pte/ItalyProvider.java b/enabler/src/de/schildbach/pte/ItalyProvider.java index 96bc7258..02b7652e 100644 --- a/enabler/src/de/schildbach/pte/ItalyProvider.java +++ b/enabler/src/de/schildbach/pte/ItalyProvider.java @@ -24,6 +24,13 @@ public class ItalyProvider extends AbstractNavitiaProvider { private static String API_REGION = "it"; + public ItalyProvider(final String apiBase, final String authorization) + { + super(NetworkId.IT, apiBase, authorization); + + setTimeZone("Europe/Rome"); + } + public ItalyProvider(final String authorization) { super(NetworkId.IT, authorization); diff --git a/enabler/src/de/schildbach/pte/ParisProvider.java b/enabler/src/de/schildbach/pte/ParisProvider.java index c79d4358..74be7278 100644 --- a/enabler/src/de/schildbach/pte/ParisProvider.java +++ b/enabler/src/de/schildbach/pte/ParisProvider.java @@ -28,6 +28,13 @@ public class ParisProvider extends AbstractNavitiaProvider { private static String API_REGION = "fr-idf"; + public ParisProvider(final String apiBase, final String authorization) + { + super(NetworkId.PARIS, apiBase, authorization); + + setTimeZone("Europe/Paris"); + } + public ParisProvider(final String authorization) { super(NetworkId.PARIS, authorization);