diff --git a/src/de/schildbach/pte/NetworkId.java b/src/de/schildbach/pte/NetworkId.java index 9fee2e873..c194c1a30 100644 --- a/src/de/schildbach/pte/NetworkId.java +++ b/src/de/schildbach/pte/NetworkId.java @@ -42,9 +42,6 @@ public enum NetworkId { // Spain SPAIN, - // Belgium - SNCB, - // Netherlands NS, NEGENTWEE, diff --git a/src/de/schildbach/pte/SncbProvider.java b/src/de/schildbach/pte/SncbProvider.java deleted file mode 100644 index d3da45ed9..000000000 --- a/src/de/schildbach/pte/SncbProvider.java +++ /dev/null @@ -1,72 +0,0 @@ -/* - * Copyright the original author or authors. - * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see . - */ - -package de.schildbach.pte; - -import java.util.Set; -import java.util.regex.Matcher; - -import de.schildbach.pte.dto.Product; - -import okhttp3.HttpUrl; - -/** - * Provider implementation for the Nationale Maatschappij der Belgische Spoorwegen (Belgium). - * - * @author Andreas Schildbach - */ -public class SncbProvider extends AbstractHafasClientInterfaceProvider { - private static final HttpUrl API_BASE = HttpUrl.parse("http://www.belgianrail.be/jp/sncb-nmbs-routeplanner/"); - private static final Product[] PRODUCTS_MAP = { Product.HIGH_SPEED_TRAIN, null, Product.HIGH_SPEED_TRAIN, null, - null, Product.BUS, Product.REGIONAL_TRAIN, null, Product.SUBWAY, Product.BUS, Product.TRAM, null, null, - null, null, null }; - private static final String DEFAULT_API_CLIENT = "{\"id\":\"SNCB\",\"type\":\"AND\"}"; - - 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(apiClient); - setApiAuthorization(apiAuthorization); - } - - private static final String[] PLACES = { "Antwerpen", "Gent", "Charleroi", "Liege", "Liège", "Brussel" }; - - @Override - protected String[] splitStationName(final String name) { - for (final String place : PLACES) - if (name.startsWith(place + " ") || name.startsWith(place + "-")) - return new String[] { place, name.substring(place.length() + 1) }; - return super.splitStationName(name); - } - - @Override - protected String[] splitAddress(final String address) { - final Matcher m = P_SPLIT_NAME_FIRST_COMMA.matcher(address); - if (m.matches()) - return new String[] { m.group(1), m.group(2) }; - return super.splitStationName(address); - } - - @Override - public Set defaultProducts() { - return Product.ALL; - } -} diff --git a/test/de/schildbach/pte/live/SncbProviderLiveTest.java b/test/de/schildbach/pte/live/SncbProviderLiveTest.java deleted file mode 100644 index d197f7977..000000000 --- a/test/de/schildbach/pte/live/SncbProviderLiveTest.java +++ /dev/null @@ -1,123 +0,0 @@ -/* - * Copyright the original author or authors. - * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see . - */ - -package de.schildbach.pte.live; - -import static org.junit.Assert.assertEquals; - -import java.util.Date; - -import org.junit.Test; - -import de.schildbach.pte.SncbProvider; -import de.schildbach.pte.dto.Location; -import de.schildbach.pte.dto.LocationType; -import de.schildbach.pte.dto.NearbyLocationsResult; -import de.schildbach.pte.dto.Point; -import de.schildbach.pte.dto.QueryDeparturesResult; -import de.schildbach.pte.dto.QueryTripsResult; -import de.schildbach.pte.dto.SuggestLocationsResult; - -/** - * @author Andreas Schildbach - */ -public class SncbProviderLiveTest extends AbstractProviderLiveTest { - public SncbProviderLiveTest() { - super(new SncbProvider(secretProperty("sncb.api_authorization"))); - } - - @Test - public void nearbyStations() throws Exception { - final NearbyLocationsResult result = queryNearbyStations(new Location(LocationType.STATION, "8813003")); - print(result); - } - - @Test - public void nearbyStationsByCoordinate() throws Exception { - final NearbyLocationsResult result = queryNearbyStations(Location.coord(50748017, 3407118)); - print(result); - } - - @Test - public void queryDepartures() throws Exception { - final QueryDeparturesResult result1 = queryDepartures("240229", false); - print(result1); - - final QueryDeparturesResult result2 = queryDepartures("8813003", false); - print(result2); - } - - @Test - public void queryDeparturesInvalidStation() throws Exception { - final QueryDeparturesResult result = queryDepartures("999999", false); - assertEquals(QueryDeparturesResult.Status.INVALID_STATION, result.status); - } - - @Test - public void suggestLocationsIncomplete() throws Exception { - final SuggestLocationsResult result = suggestLocations("Brussel S"); - print(result); - } - - @Test - public void suggestLocationsUmlaut() throws Exception { - final SuggestLocationsResult result = suggestLocations("Brüssel"); - print(result); - } - - @Test - public void suggestLocationsAddress() throws Exception { - final SuggestLocationsResult result = suggestLocations("Rue Paul Janson 9, 1030 Bruxelles"); - print(result); - } - - @Test - public void shortTrip() throws Exception { - final Location from = new Location(LocationType.STATION, "8821006", "Antwerpen", "Centraal"); - final Location to = new Location(LocationType.STATION, "8813003", "Brussel", "Centraal"); - final QueryTripsResult result = queryTrips(from, null, to, new Date(), true, null); - print(result); - final QueryTripsResult laterResult = queryMoreTrips(result.context, true); - print(laterResult); - } - - @Test - public void longTrip() throws Exception { - final Location from = new Location(LocationType.STATION, "207280", "Brussel", "Wannecouter"); - final Location to = new Location(LocationType.STATION, "207272", "Brussel", "Stadion"); - final QueryTripsResult result = queryTrips(from, null, to, new Date(), true, null); - print(result); - final QueryTripsResult laterResult = queryMoreTrips(result.context, true); - print(laterResult); - } - - @Test - public void tripFromAddress() throws Exception { - final Location from = new Location(LocationType.ADDRESS, null, null, "Bruxelles - Haren, Rue Paul Janson 9"); - final Location to = new Location(LocationType.STATION, "8500010", null, "Basel"); - final QueryTripsResult result = queryTrips(from, null, to, new Date(), true, null); - print(result); - } - - @Test - public void tripBetweenCoordinates() throws Exception { - final Location from = Location.coord(Point.fromDouble(50.8356748, 4.3362419)); // Brussels-Midi - final Location to = Location.coord(Point.fromDouble(50.8605993, 4.3612788)); // Brussel-Noord - final QueryTripsResult result = queryTrips(from, null, to, new Date(), true, null); - print(result); - } -} diff --git a/test/de/schildbach/pte/live/secrets.properties.template b/test/de/schildbach/pte/live/secrets.properties.template index e51e83202..f8093f9d0 100644 --- a/test/de/schildbach/pte/live/secrets.properties.template +++ b/test/de/schildbach/pte/live/secrets.properties.template @@ -26,7 +26,6 @@ vvt.api_authorization = vmobil.api_authorization = vao.api_authorization = zvv.api_authorization = -sncb.api_authorization = dsb.api_authorization = se.api_authorization = lu.api_authorization =