From b031cfd2a8149bea735b3045f4b548be4b9c064b Mon Sep 17 00:00:00 2001
From: Andreas Schildbach <andreas@schildbach.de>
Date: Sat, 31 Jan 2015 20:37:03 +0100
Subject: [PATCH] =?UTF-8?q?Use=20mobile=20trip=20endpoint=20for=20Baden-W?=
 =?UTF-8?q?=C3=BCrttemberg,=20Constance=20&=20Basel.=20The=20standard=20en?=
 =?UTF-8?q?dpoint=20doesn't=20serve=20intermediate=20stops.?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/de/schildbach/pte/NvbwProvider.java   | 30 +++++++++++++++++--
 1 file changed, 27 insertions(+), 3 deletions(-)

diff --git a/enabler/src/de/schildbach/pte/NvbwProvider.java b/enabler/src/de/schildbach/pte/NvbwProvider.java
index 254d9758..88c0caf3 100644
--- a/enabler/src/de/schildbach/pte/NvbwProvider.java
+++ b/enabler/src/de/schildbach/pte/NvbwProvider.java
@@ -17,23 +17,34 @@
 
 package de.schildbach.pte;
 
+import java.io.IOException;
+import java.util.Date;
+import java.util.Set;
+
+import de.schildbach.pte.dto.Location;
+import de.schildbach.pte.dto.Product;
+import de.schildbach.pte.dto.QueryTripsContext;
+import de.schildbach.pte.dto.QueryTripsResult;
+
 /**
  * @author Andreas Schildbach
  */
 public class NvbwProvider extends AbstractEfaProvider
 {
 	public static final NetworkId NETWORK_ID = NetworkId.NVBW;
-	private final static String API_BASE = "http://www.efa-bw.de/nvbw/";
+	private final static String API_BASE = "http://www.efa-bw.de/nvbw/"; // no intermeditate stops
+	private final static String API_BASE_MOBILE = "http://www.efa-bw.de/android/";
 
-	// http://www.efa-bw.de/android/
 	// http://efa2.naldo.de/naldo/
 
 	public NvbwProvider()
 	{
-		super(API_BASE);
+		super(API_BASE + DEFAULT_DEPARTURE_MONITOR_ENDPOINT, API_BASE_MOBILE + DEFAULT_TRIP_ENDPOINT, API_BASE + DEFAULT_STOPFINDER_ENDPOINT,
+				API_BASE + DEFAULT_COORD_ENDPOINT);
 
 		setIncludeRegionId(false);
 		setUseRouteIndexAsTripId(false);
+		setNumTripsRequested(12);
 	}
 
 	public NetworkId id()
@@ -77,4 +88,17 @@ public class NvbwProvider extends AbstractEfaProvider
 
 		return super.parseLine(mot, symbol, name, longName, trainType, trainNum, trainName);
 	}
+
+	@Override
+	public QueryTripsResult queryTrips(final Location from, final Location via, final Location to, final Date date, final boolean dep,
+			final Set<Product> products, final WalkSpeed walkSpeed, final Accessibility accessibility, final Set<Option> options) throws IOException
+	{
+		return queryTripsMobile(from, via, to, date, dep, products, walkSpeed, accessibility, options);
+	}
+
+	@Override
+	public QueryTripsResult queryMoreTrips(final QueryTripsContext contextObj, final boolean later) throws IOException
+	{
+		return queryMoreTripsMobile(contextObj, later);
+	}
 }