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

LU: Migrate to Hafas client interface.

Browse source
This commit is contained in:
Andreas Schildbach 2018-11-17 02:02:49 +01:00
parent ec05c0a519
commit bab9b0d39f
3 changed files with 21 additions and 41 deletions
Download patch file Download diff file Expand all files Collapse all files

38
enabler/src/de/schildbach/pte/LuProvider.java
View file

@ -1,5 +1,5 @@
/* /*
* Copyright 2010-2015 the original author or authors. * Copyright the original author or authors.
* *
* This program is free software: you can redistribute it and/or modify * 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 * it under the terms of the GNU General Public License as published by
@ -19,8 +19,6 @@ package de.schildbach.pte;
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 okhttp3.HttpUrl; import okhttp3.HttpUrl;
@ -28,18 +26,17 @@ import okhttp3.HttpUrl;
/** /**
* @author Andreas Schildbach * @author Andreas Schildbach
*/ */
public class LuProvider extends AbstractHafasLegacyProvider { public class LuProvider extends AbstractHafasClientInterfaceProvider {
private static final HttpUrl API_BASE = HttpUrl.parse("https://travelplanner.mobiliteit.lu/hafas/"); private static final HttpUrl API_BASE = HttpUrl.parse("https://travelplanner.mobiliteit.lu/hafas/");
// https://mobiliteitszentral.hafas.de/hafas/
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.REGIONAL_TRAIN, Product.BUS, Product.BUS, Product.HIGH_SPEED_TRAIN, Product.REGIONAL_TRAIN, Product.REGIONAL_TRAIN, Product.BUS, Product.BUS,
Product.BUS, Product.BUS }; Product.BUS, Product.BUS };
public LuProvider() { public LuProvider(final String apiAuthorization) {
super(NetworkId.LU, API_BASE, "fn", PRODUCTS_MAP); super(NetworkId.LU, API_BASE, PRODUCTS_MAP);
setApiVersion("1.16");
setRequestUrlEncoding(Charsets.UTF_8); setApiClient("{\"id\":\"CDT\",\"type\":\"AND\"}");
setJsonNearbyLocationsEncoding(Charsets.UTF_8); setApiAuthorization(apiAuthorization);
} }
@Override @Override
@ -47,7 +44,6 @@ public class LuProvider extends AbstractHafasLegacyProvider {
final Matcher m = P_SPLIT_NAME_FIRST_COMMA.matcher(name); final Matcher m = P_SPLIT_NAME_FIRST_COMMA.matcher(name);
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(name); return super.splitStationName(name);
} }
@ -56,26 +52,6 @@ public class LuProvider 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);
} }
@Override
protected Product normalizeType(final String type) {
final String ucType = type.toUpperCase();
if ("CRE".equals(ucType))
return Product.REGIONAL_TRAIN;
if ("CITYBUS".equals(ucType))
return Product.BUS;
if ("NIGHTBUS".equals(ucType))
return Product.BUS;
if ("DIFFBUS".equals(ucType))
return Product.BUS;
if ("NAVETTE".equals(ucType))
return Product.BUS;
return super.normalizeType(type);
}
} }

23
enabler/test/de/schildbach/pte/live/LuProviderLiveTest.java
View file

@ -37,13 +37,7 @@ import de.schildbach.pte.dto.SuggestLocationsResult;
*/ */
public class LuProviderLiveTest extends AbstractProviderLiveTest { public class LuProviderLiveTest extends AbstractProviderLiveTest {
public LuProviderLiveTest() { public LuProviderLiveTest() {
super(new LuProvider()); super(new LuProvider(secretProperty("lu.api_authorization")));
}
@Test
public void nearbyStations() throws Exception {
final NearbyLocationsResult result = queryNearbyStations(new Location(LocationType.STATION, "200501001"));
print(result);
} }
@Test @Test
@ -72,9 +66,9 @@ public class LuProviderLiveTest 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, "200416001", null, "Cité Aéroport");
new Location(LocationType.STATION, "200416001", null, "Cité Aéroport"), null, final Location to = new Location(LocationType.STATION, "200405035", "Luxembourg", "Gare Centrale");
new Location(LocationType.STATION, "200405035", "Luxembourg", "Gare Centrale"), new Date(), true, null); final QueryTripsResult result = queryTrips(from, null, to, new Date(), true, null);
print(result); print(result);
final QueryTripsResult laterResult = queryMoreTrips(result.context, true); final QueryTripsResult laterResult = queryMoreTrips(result.context, true);
print(laterResult); print(laterResult);
@ -90,4 +84,13 @@ public class LuProviderLiveTest extends AbstractProviderLiveTest {
final QueryTripsResult laterResult = queryMoreTrips(result.context, true); final QueryTripsResult laterResult = queryMoreTrips(result.context, true);
print(laterResult); print(laterResult);
} }
@Test
public void tripBetweenCoordinates() throws Exception {
final Location from = Location.coord(Point.fromDouble(49.5999681, 6.1342493)); // Luxembourg Central
// Station
final Location to = Location.coord(Point.fromDouble(49.5956369, 6.1200199)); // Hollerich
final QueryTripsResult result = queryTrips(from, null, to, new Date(), true, null);
print(result);
}
} }

1
enabler/test/de/schildbach/pte/live/secrets.properties.template
View file

@ -17,5 +17,6 @@ vao.api_authorization =
zvv.api_authorization = zvv.api_authorization =
dsb.api_authorization = dsb.api_authorization =
se.api_authorization = se.api_authorization =
lu.api_authorization =
hsl.usertoken = hsl.usertoken =
hsl.passphrase = hsl.passphrase =