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

SNCB: Migrate to Hafas client interface.

Browse source
This commit is contained in:
Andreas Schildbach 2018-11-16 12:27:33 +01:00
parent 87a327cedb
commit 2e8edc117d
2 changed files with 31 additions and 60 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -17,32 +17,31 @@
package de.schildbach.pte; package de.schildbach.pte;
import java.util.Calendar;
import java.util.Set; import java.util.Set;
import java.util.regex.Matcher; import java.util.regex.Matcher;
import com.google.common.base.Charsets;
import de.schildbach.pte.dto.Product; import de.schildbach.pte.dto.Product;
import de.schildbach.pte.util.ParserUtils;
import okhttp3.HttpUrl; import okhttp3.HttpUrl;
/** /**
* @author Andreas Schildbach * @author Andreas Schildbach
*/ */
public class SncbProvider extends AbstractHafasLegacyProvider { public class SncbProvider extends AbstractHafasClientInterfaceProvider {
private static final HttpUrl API_BASE = HttpUrl.parse("http://www.belgianrail.be/jp/sncb-nmbs-routeplanner/"); private static final HttpUrl API_BASE = HttpUrl.parse("http://www.belgianrail.be/jp/sncb-nmbs-routeplanner/");
// http://hari.b-rail.be/hafas/bin/
private static final Product[] PRODUCTS_MAP = { Product.HIGH_SPEED_TRAIN, null, Product.HIGH_SPEED_TRAIN, null, 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, Product.BUS, Product.REGIONAL_TRAIN, null, Product.SUBWAY, Product.BUS, Product.TRAM, null, null,
null, null, null }; null, null, null };
public SncbProvider() { public SncbProvider() {
super(NetworkId.SNCB, API_BASE, "nn", PRODUCTS_MAP); this("{\"type\":\"AID\",\"aid\":\"sncb-mobi\"}");
setRequestUrlEncoding(Charsets.UTF_8); }
setJsonNearbyLocationsEncoding(Charsets.UTF_8);
setStationBoardHasLocation(true); public SncbProvider(final String jsonApiAuthorization) {
super(NetworkId.SNCB, API_BASE, PRODUCTS_MAP);
setApiVersion("1.14");
setApiClient("{\"id\":\"SNCB\",\"type\":\"AND\"}");
setApiAuthorization(jsonApiAuthorization);
} }
private static final String[] PLACES = { "Antwerpen", "Gent", "Charleroi", "Liege", "Liège", "Brussel" }; private static final String[] PLACES = { "Antwerpen", "Gent", "Charleroi", "Liege", "Liège", "Brussel" };
@ -52,7 +51,6 @@ public class SncbProvider extends AbstractHafasLegacyProvider {
for (final String place : PLACES) for (final String place : PLACES)
if (name.startsWith(place + " ") || name.startsWith(place + "-")) if (name.startsWith(place + " ") || name.startsWith(place + "-"))
return new String[] { place, name.substring(place.length() + 1) }; return new String[] { place, name.substring(place.length() + 1) };
return super.splitStationName(name); return super.splitStationName(name);
} }
@ -61,7 +59,6 @@ public class SncbProvider extends AbstractHafasLegacyProvider {
final Matcher m = P_SPLIT_NAME_FIRST_COMMA.matcher(address); final Matcher m = P_SPLIT_NAME_FIRST_COMMA.matcher(address);
if (m.matches()) if (m.matches())
return new String[] { m.group(1), m.group(2) }; return new String[] { m.group(1), m.group(2) };
return super.splitStationName(address); return super.splitStationName(address);
} }
@ -69,28 +66,4 @@ public class SncbProvider extends AbstractHafasLegacyProvider {
public Set<Product> defaultProducts() { public Set<Product> defaultProducts() {
return Product.ALL; return Product.ALL;
} }
@Override
protected Product normalizeType(final String type) {
final String ucType = type.toUpperCase();
if ("THALYS".equals(ucType))
return Product.HIGH_SPEED_TRAIN;
if ("L".equals(ucType))
return Product.REGIONAL_TRAIN;
if ("MÉTRO".equals(ucType))
return Product.SUBWAY;
if ("TRAMWAY".equals(ucType))
return Product.TRAM;
return super.normalizeType(type);
}
@Override
protected void parseXmlStationBoardDate(final Calendar calendar, final String dateStr) {
ParserUtils.parseGermanDate(calendar, dateStr);
}
} }

46
enabler/test/de/schildbach/pte/live/SncbProviderLiveTest.java
View file

@ -27,6 +27,7 @@ import de.schildbach.pte.SncbProvider;
import de.schildbach.pte.dto.Location; import de.schildbach.pte.dto.Location;
import de.schildbach.pte.dto.LocationType; import de.schildbach.pte.dto.LocationType;
import de.schildbach.pte.dto.NearbyLocationsResult; import de.schildbach.pte.dto.NearbyLocationsResult;
import de.schildbach.pte.dto.Point;
import de.schildbach.pte.dto.QueryDeparturesResult; import de.schildbach.pte.dto.QueryDeparturesResult;
import de.schildbach.pte.dto.QueryTripsResult; import de.schildbach.pte.dto.QueryTripsResult;
import de.schildbach.pte.dto.SuggestLocationsResult; import de.schildbach.pte.dto.SuggestLocationsResult;
@ -53,8 +54,11 @@ public class SncbProviderLiveTest extends AbstractProviderLiveTest {
@Test @Test
public void queryDepartures() throws Exception { public void queryDepartures() throws Exception {
final QueryDeparturesResult result = queryDepartures("8813003", false); final QueryDeparturesResult result1 = queryDepartures("240229", false);
print(result); print(result1);
final QueryDeparturesResult result2 = queryDepartures("8813003", false);
print(result2);
} }
@Test @Test
@ -83,43 +87,37 @@ public class SncbProviderLiveTest extends AbstractProviderLiveTest {
@Test @Test
public void shortTrip() throws Exception { public void shortTrip() throws Exception {
final QueryTripsResult result = queryTrips( final Location from = new Location(LocationType.STATION, "8821006", "Antwerpen", "Centraal");
new Location(LocationType.STATION, "8821006", "Antwerpen", "Centraal"), null, final Location to = new Location(LocationType.STATION, "8813003", "Brussel", "Centraal");
new Location(LocationType.STATION, "8813003", "Brussel", "Centraal"), new Date(), true, null); final QueryTripsResult result = queryTrips(from, null, to, new Date(), true, null);
print(result); print(result);
if (result.context == null)
return;
final QueryTripsResult laterResult = queryMoreTrips(result.context, true); final QueryTripsResult laterResult = queryMoreTrips(result.context, true);
print(laterResult); print(laterResult);
} }
@Test @Test
public void longTrip() throws Exception { public void longTrip() throws Exception {
final QueryTripsResult result = queryTrips( final Location from = new Location(LocationType.STATION, "207280", "Brussel", "Wannecouter");
new Location(LocationType.STATION, "207280", "Brussel", "Wannecouter"), null, final Location to = new Location(LocationType.STATION, "207272", "Brussel", "Stadion");
new Location(LocationType.STATION, "207272", "Brussel", "Stadion"), new Date(), true, null); final QueryTripsResult result = queryTrips(from, null, to, new Date(), true, null);
print(result); print(result);
if (result.context == null)
return;
final QueryTripsResult laterResult = queryMoreTrips(result.context, true); final QueryTripsResult laterResult = queryMoreTrips(result.context, true);
print(laterResult); print(laterResult);
} }
@Test @Test
public void tripFromAddress() throws Exception { public void tripFromAddress() throws Exception {
final QueryTripsResult result = queryTrips( final Location from = new Location(LocationType.ADDRESS, null, null, "Bruxelles - Haren, Rue Paul Janson 9");
new Location(LocationType.ADDRESS, null, null, "Bruxelles - Haren, Rue Paul Janson 9"), null, final Location to = new Location(LocationType.STATION, "8500010", null, "Basel");
new Location(LocationType.STATION, "8500010", null, "Basel"), new Date(), true, null); final QueryTripsResult result = queryTrips(from, null, to, new Date(), true, null);
print(result); print(result);
}
if (result.context == null) @Test
return; public void tripBetweenCoordinates() throws Exception {
final Location from = Location.coord(Point.fromDouble(50.8356748, 4.3362419)); // Brussels-Midi
final QueryTripsResult laterResult = queryMoreTrips(result.context, true); final Location to = Location.coord(Point.fromDouble(50.8605993, 4.3612788)); // Brussel-Noord
print(laterResult); final QueryTripsResult result = queryTrips(from, null, to, new Date(), true, null);
print(result);
} }
} }