From 661bb1b32b5661c38b04f9fb65184307d6e09831 Mon Sep 17 00:00:00 2001
From: Andreas Schildbach <andreas@schildbach.de>
Date: Wed, 1 Aug 2012 01:13:03 +0200
Subject: [PATCH] build options in common connections query uri method

---
 enabler/src/de/schildbach/pte/AbstractHafasProvider.java | 5 ++++-
 enabler/src/de/schildbach/pte/BahnProvider.java          | 5 +----
 enabler/src/de/schildbach/pte/BvgProvider.java           | 7 ++++---
 3 files changed, 9 insertions(+), 8 deletions(-)

diff --git a/enabler/src/de/schildbach/pte/AbstractHafasProvider.java b/enabler/src/de/schildbach/pte/AbstractHafasProvider.java
index 3d7b19b0..935efbf5 100644
--- a/enabler/src/de/schildbach/pte/AbstractHafasProvider.java
+++ b/enabler/src/de/schildbach/pte/AbstractHafasProvider.java
@@ -746,7 +746,7 @@ public abstract class AbstractHafasProvider extends AbstractNetworkProvider
 	}
 
 	protected final void appendConnectionsQueryUri(final StringBuilder uri, final Location from, final Location via, final Location to,
-			final Date date, final boolean dep, final String products)
+			final Date date, final boolean dep, final String products, final Set<Option> options)
 	{
 		uri.append("?start=Suchen");
 
@@ -800,6 +800,9 @@ public abstract class AbstractHafasProvider extends AbstractNetworkProvider
 			productsStr.append(allProductsString());
 		}
 		uri.append("&REQ0JourneyProduct_prod_list_1=").append(productsStr);
+
+		if (options != null && options.contains(Option.BIKE))
+			uri.append("&REQ0JourneyProduct_opt3=1");
 	}
 
 	protected final QueryConnectionsResult queryConnectionsXml(Location from, Location via, Location to, final Date date, final boolean dep,
diff --git a/enabler/src/de/schildbach/pte/BahnProvider.java b/enabler/src/de/schildbach/pte/BahnProvider.java
index 319a6124..0ea31cf4 100644
--- a/enabler/src/de/schildbach/pte/BahnProvider.java
+++ b/enabler/src/de/schildbach/pte/BahnProvider.java
@@ -203,7 +203,7 @@ public final class BahnProvider extends AbstractHafasProvider
 		final StringBuilder uri = new StringBuilder(API_BASE);
 		uri.append("query.exe/dox");
 
-		appendConnectionsQueryUri(uri, from, via, to, date, dep, products);
+		appendConnectionsQueryUri(uri, from, via, to, date, dep, products, options);
 
 		uri.append("&REQ0HafasOptimize1=0:1");
 		uri.append("&REQ0Tariff_Class=2");
@@ -212,9 +212,6 @@ public final class BahnProvider extends AbstractHafasProvider
 		uri.append("&existOptimizePrice=1");
 		uri.append("&existProductNahverkehr=yes");
 
-		if (options != null && options.contains(Option.BIKE))
-			uri.append("&REQ0JourneyProduct_opt3=1");
-
 		return uri.toString();
 	}
 
diff --git a/enabler/src/de/schildbach/pte/BvgProvider.java b/enabler/src/de/schildbach/pte/BvgProvider.java
index 16f09718..211b3a40 100644
--- a/enabler/src/de/schildbach/pte/BvgProvider.java
+++ b/enabler/src/de/schildbach/pte/BvgProvider.java
@@ -31,6 +31,7 @@ import java.util.Set;
 import java.util.regex.Matcher;
 import java.util.regex.Pattern;
 
+import de.schildbach.pte.NetworkProvider.Option;
 import de.schildbach.pte.dto.Connection;
 import de.schildbach.pte.dto.Departure;
 import de.schildbach.pte.dto.Line;
@@ -492,12 +493,12 @@ public final class BvgProvider extends AbstractHafasProvider
 	}
 
 	private String connectionsQueryUri(final Location from, final Location via, final Location to, final Date date, final boolean dep,
-			final String products)
+			final String products, final Set<Option> options)
 	{
 		final StringBuilder uri = new StringBuilder(API_BASE);
 		uri.append("query.bin/dn");
 
-		appendConnectionsQueryUri(uri, from, via, to, date, dep, products);
+		appendConnectionsQueryUri(uri, from, via, to, date, dep, products, options);
 
 		if (additionalQueryParameter != null)
 			uri.append('&').append(additionalQueryParameter);
@@ -520,7 +521,7 @@ public final class BvgProvider extends AbstractHafasProvider
 			final int numConnections, final String products, final WalkSpeed walkSpeed, final Accessibility accessibility, final Set<Option> options)
 			throws IOException
 	{
-		final String uri = connectionsQueryUri(from, via, to, date, dep, products);
+		final String uri = connectionsQueryUri(from, via, to, date, dep, products, options);
 		final CharSequence page = ParserUtils.scrape(uri);
 
 		List<Location> fromAddresses = null;