From 11ccd099ec9d7b7025d747c390eb11d15c884333 Mon Sep 17 00:00:00 2001
From: Antonio El Khoury <antonio.elkhoury@gmail.com>
Date: Sat, 20 Dec 2014 14:14:45 +0100
Subject: [PATCH] Navitia: Add new commercial modes.

---
 .../de/schildbach/pte/AbstractNavitiaProvider.java    |  6 +++++-
 .../de/schildbach/pte/live/ParisProviderLiveTest.java | 11 +++++++++++
 2 files changed, 16 insertions(+), 1 deletion(-)

diff --git a/enabler/src/de/schildbach/pte/AbstractNavitiaProvider.java b/enabler/src/de/schildbach/pte/AbstractNavitiaProvider.java
index 2577ba68..de03e783 100644
--- a/enabler/src/de/schildbach/pte/AbstractNavitiaProvider.java
+++ b/enabler/src/de/schildbach/pte/AbstractNavitiaProvider.java
@@ -91,7 +91,7 @@ public abstract class AbstractNavitiaProvider extends AbstractNetworkProvider
 
 	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
@@ -602,6 +602,7 @@ public abstract class AbstractNavitiaProvider extends AbstractNetworkProvider
 		{
 			case BUS:
 				return 'B';
+			case RAPIDTRANSIT:
 			case TRAIN:
 				return 'S';
 			case TRAM:
@@ -611,6 +612,7 @@ public abstract class AbstractNavitiaProvider extends AbstractNetworkProvider
 				return 'U';
 			case FERRY:
 				return 'F';
+			case FUNICULAR:
 			case CABLECAR:
 				return 'C';
 			case DEFAULT_COMMERCIAL_MODE:
@@ -1025,6 +1027,7 @@ public abstract class AbstractNavitiaProvider extends AbstractNetworkProvider
 					if (!products.contains(Product.SUBURBAN_TRAIN))
 					{
 						queryUri.append("&forbidden_uris[]=commercial_mode:train");
+						queryUri.append("&forbidden_uris[]=commercial_mode:rapidtransit");
 					}
 					if (!products.contains(Product.SUBWAY))
 					{
@@ -1044,6 +1047,7 @@ public abstract class AbstractNavitiaProvider extends AbstractNetworkProvider
 					}
 					if (!products.contains(Product.CABLECAR))
 					{
+						queryUri.append("&forbidden_uris[]=commercial_mode:funicular");
 						queryUri.append("&forbidden_uris[]=commercial_mode:cablecar");
 					}
 				}
diff --git a/enabler/test/de/schildbach/pte/live/ParisProviderLiveTest.java b/enabler/test/de/schildbach/pte/live/ParisProviderLiveTest.java
index 31137cc4..a6ca943e 100644
--- a/enabler/test/de/schildbach/pte/live/ParisProviderLiveTest.java
+++ b/enabler/test/de/schildbach/pte/live/ParisProviderLiveTest.java
@@ -227,6 +227,17 @@ public class ParisProviderLiveTest extends AbstractProviderLiveTest
 		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
 	public void queryTripNoSolution() throws Exception
 	{