From e179351115dae89c66fb53fbf533a9dfeec1b8f1 Mon Sep 17 00:00:00 2001 From: Torsten Grote Date: Tue, 5 Sep 2017 16:50:14 +0200 Subject: [PATCH] AbstractNavitiaProvider: Add Orlyval to Physical Modes. Without this patch, connections with the orlyval train cause an IllegalArgumentException. --- enabler/src/de/schildbach/pte/AbstractNavitiaProvider.java | 3 ++- .../test/de/schildbach/pte/live/ParisProviderLiveTest.java | 5 +++++ 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/enabler/src/de/schildbach/pte/AbstractNavitiaProvider.java b/enabler/src/de/schildbach/pte/AbstractNavitiaProvider.java index 594624da..5f242193 100644 --- a/enabler/src/de/schildbach/pte/AbstractNavitiaProvider.java +++ b/enabler/src/de/schildbach/pte/AbstractNavitiaProvider.java @@ -92,7 +92,7 @@ public abstract class AbstractNavitiaProvider extends AbstractNetworkProvider { } private enum PhysicalMode { - AIR, BOAT, BUS, BUSRAPIDTRANSIT, COACH, FERRY, FUNICULAR, LOCALTRAIN, LONGDISTANCETRAIN, METRO, RAPIDTRANSIT, SHUTTLE, TAXI, TRAIN, TRAMWAY, TRAM, OTHER + AIR, BOAT, BUS, BUSRAPIDTRANSIT, COACH, FERRY, FUNICULAR, LOCALTRAIN, LONGDISTANCETRAIN, METRO, RAPIDTRANSIT, SHUTTLE, TAXI, TRAIN, TRAMWAY, TRAM, VAL, OTHER } @SuppressWarnings("serial") @@ -609,6 +609,7 @@ public abstract class AbstractNavitiaProvider extends AbstractNetworkProvider { case TRAIN: case LOCALTRAIN: case LONGDISTANCETRAIN: + case VAL: return Product.SUBURBAN_TRAIN; case TRAMWAY: case TRAM: diff --git a/enabler/test/de/schildbach/pte/live/ParisProviderLiveTest.java b/enabler/test/de/schildbach/pte/live/ParisProviderLiveTest.java index 41c7a9ef..64688014 100644 --- a/enabler/test/de/schildbach/pte/live/ParisProviderLiveTest.java +++ b/enabler/test/de/schildbach/pte/live/ParisProviderLiveTest.java @@ -134,6 +134,11 @@ public class ParisProviderLiveTest extends AbstractNavitiaProviderLiveTest { queryTrip("Tour Eiffel", "Campo Formio"); } + @Test + public void queryTripStationsOrlyval() throws Exception { + queryTrip("Orly Sud", "Gare De Lyon"); + } + @Test public void queryTripStationsRapidTransit() throws Exception { queryTrip("Luxembourg Paris", "Antony Antony");