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

Navitia: Add new commercial modes.

Browse source
This commit is contained in:
Antonio El Khoury 2014-12-20 14:14:45 +01:00 • committed by Andreas Schildbach
parent 6255bd1d76
commit 11ccd099ec
2 changed files with 16 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

6
enabler/src/de/schildbach/pte/AbstractNavitiaProvider.java
View file

@ -91,7 +91,7 @@ public abstract class AbstractNavitiaProvider extends AbstractNetworkProvider
private enum CommercialMode private enum CommercialMode
{ {
BUS, TRAIN, TRAM, TRAMWAY, METRO, FERRY, CABLECAR, DEFAULT_COMMERCIAL_MODE BUS, TRAIN, TRAM, TRAMWAY, METRO, FERRY, CABLECAR, RAPIDTRANSIT, FUNICULAR, DEFAULT_COMMERCIAL_MODE
} }
private static class Context implements QueryTripsContext private static class Context implements QueryTripsContext
@ -602,6 +602,7 @@ public abstract class AbstractNavitiaProvider extends AbstractNetworkProvider
{ {
case BUS: case BUS:
return 'B'; return 'B';
case RAPIDTRANSIT:
case TRAIN: case TRAIN:
return 'S'; return 'S';
case TRAM: case TRAM:
@ -611,6 +612,7 @@ public abstract class AbstractNavitiaProvider extends AbstractNetworkProvider
return 'U'; return 'U';
case FERRY: case FERRY:
return 'F'; return 'F';
case FUNICULAR:
case CABLECAR: case CABLECAR:
return 'C'; return 'C';
case DEFAULT_COMMERCIAL_MODE: case DEFAULT_COMMERCIAL_MODE:
@ -1025,6 +1027,7 @@ public abstract class AbstractNavitiaProvider extends AbstractNetworkProvider
if (!products.contains(Product.SUBURBAN_TRAIN)) if (!products.contains(Product.SUBURBAN_TRAIN))
{ {
queryUri.append("&forbidden_uris[]=commercial_mode:train"); queryUri.append("&forbidden_uris[]=commercial_mode:train");
queryUri.append("&forbidden_uris[]=commercial_mode:rapidtransit");
} }
if (!products.contains(Product.SUBWAY)) if (!products.contains(Product.SUBWAY))
{ {
@ -1044,6 +1047,7 @@ public abstract class AbstractNavitiaProvider extends AbstractNetworkProvider
} }
if (!products.contains(Product.CABLECAR)) if (!products.contains(Product.CABLECAR))
{ {
queryUri.append("&forbidden_uris[]=commercial_mode:funicular");
queryUri.append("&forbidden_uris[]=commercial_mode:cablecar"); queryUri.append("&forbidden_uris[]=commercial_mode:cablecar");
} }
} }

11
enabler/test/de/schildbach/pte/live/ParisProviderLiveTest.java
View file

@ -227,6 +227,17 @@ public class ParisProviderLiveTest extends AbstractProviderLiveTest
print(result); print(result);
} }
@Test
public void queryTripStationsRapidTransit() throws Exception
{
final QueryTripsResult result = queryTrips(new Location(LocationType.STATION, "stop_area:RTP:SA:1866"), null, new Location(
LocationType.STATION, "stop_area:RTP:SA:2045"), new Date(), true, Product.ALL, WalkSpeed.NORMAL, Accessibility.NEUTRAL);
assertEquals(QueryTripsResult.Status.OK, result.status);
print(result);
}
@Test @Test
public void queryTripNoSolution() throws Exception public void queryTripNoSolution() throws Exception
{ {