Rename FrenchSouthWestProvider to FranceSouthWestProvider and NetworkId.FRENCHSOUTHWEST to NetworkId.FRANCESOUTHWEST.

This is done to be consistent with the other France providers.
This commit is contained in:
Andreas Schildbach 2016-09-23 19:11:01 +02:00
parent c6cb7bcfef
commit 670a63e0f9
3 changed files with 10 additions and 10 deletions

View file

@ -24,17 +24,17 @@ import de.schildbach.pte.dto.Style.Shape;
/**
* @author Nicolas Derive
*/
public class FrenchSouthWestProvider extends AbstractNavitiaProvider {
public class FranceSouthWestProvider extends AbstractNavitiaProvider {
private static String API_REGION = "fr-sw";
public FrenchSouthWestProvider(final String apiBase, final String authorization) {
super(NetworkId.FRENCHSOUTHWEST, apiBase, authorization);
public FranceSouthWestProvider(final String apiBase, final String authorization) {
super(NetworkId.FRANCESOUTHWEST, apiBase, authorization);
setTimeZone("Europe/Paris");
}
public FrenchSouthWestProvider(final String authorization) {
super(NetworkId.FRENCHSOUTHWEST, authorization);
public FranceSouthWestProvider(final String authorization) {
super(NetworkId.FRANCESOUTHWEST, authorization);
setTimeZone("Europe/Paris");
}

View file

@ -34,7 +34,7 @@ public enum NetworkId {
SBB, BVB, VBL, ZVV,
// France
PACA, PARIS, FRENCHSOUTHWEST, FRANCESOUTHEAST, FRANCENORTHWEST, FRANCENORTHEAST,
PACA, PARIS, FRANCESOUTHWEST, FRANCESOUTHEAST, FRANCENORTHWEST, FRANCENORTHEAST,
// Belgium
SNCB,

View file

@ -21,15 +21,15 @@ import static org.junit.Assert.assertTrue;
import org.junit.Test;
import de.schildbach.pte.FrenchSouthWestProvider;
import de.schildbach.pte.FranceSouthWestProvider;
import de.schildbach.pte.dto.Point;
/**
* @author Nicolas Derive
*/
public class FrenchSouthWestProviderLiveTest extends AbstractNavitiaProviderLiveTest {
public FrenchSouthWestProviderLiveTest() {
super(new FrenchSouthWestProvider(secretProperty("navitia.authorization")));
public class FranceSouthWestProviderLiveTest extends AbstractNavitiaProviderLiveTest {
public FranceSouthWestProviderLiveTest() {
super(new FranceSouthWestProvider(secretProperty("navitia.authorization")));
}
@Test