From f4974bc8f2440cbf457aa229f6862872b41dadb3 Mon Sep 17 00:00:00 2001
From: Andreas Schildbach <andreas@schildbach.de>
Date: Wed, 20 May 2015 13:33:35 +0200
Subject: [PATCH] EFA: Trip optimization for least duration, least changes or
 least walking.

---
 .../schildbach/pte/AbstractEfaProvider.java   | 26 ++++++++++++++-----
 .../schildbach/pte/AbstractHafasProvider.java |  4 +--
 .../pte/AbstractNavitiaProvider.java          |  4 +--
 .../schildbach/pte/AbstractTsiProvider.java   |  4 +--
 .../src/de/schildbach/pte/BayernProvider.java | 12 ++++-----
 .../de/schildbach/pte/EireannProvider.java    |  4 +--
 .../src/de/schildbach/pte/InvgProvider.java   |  4 +--
 .../de/schildbach/pte/NetworkProvider.java    | 10 ++++++-
 .../src/de/schildbach/pte/NriProvider.java    |  4 +--
 .../src/de/schildbach/pte/NvbwProvider.java   |  6 ++---
 .../src/de/schildbach/pte/SeptaProvider.java  |  4 +--
 .../src/de/schildbach/pte/SydneyProvider.java |  6 ++---
 .../src/de/schildbach/pte/VgnProvider.java    |  5 ++--
 .../src/de/schildbach/pte/VorProvider.java    |  6 ++---
 .../src/de/schildbach/pte/VrrProvider.java    |  6 ++---
 .../src/de/schildbach/pte/VrsProvider.java    |  8 +++---
 .../src/de/schildbach/pte/WienProvider.java   |  6 ++---
 .../pte/live/AbstractProviderLiveTest.java    |  2 +-
 .../pte/service/TripController.java           |  2 +-
 19 files changed, 73 insertions(+), 50 deletions(-)

diff --git a/enabler/src/de/schildbach/pte/AbstractEfaProvider.java b/enabler/src/de/schildbach/pte/AbstractEfaProvider.java
index 5f5a93f9..fc7e9954 100644
--- a/enabler/src/de/schildbach/pte/AbstractEfaProvider.java
+++ b/enabler/src/de/schildbach/pte/AbstractEfaProvider.java
@@ -46,6 +46,8 @@ import javax.annotation.Nullable;
 import org.json.JSONArray;
 import org.json.JSONException;
 import org.json.JSONObject;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 import org.xmlpull.v1.XmlPullParser;
 import org.xmlpull.v1.XmlPullParserException;
 import org.xmlpull.v1.XmlPullParserFactory;
@@ -114,6 +116,8 @@ public abstract class AbstractEfaProvider extends AbstractNetworkProvider
 
 	private final XmlPullParserFactory parserFactory;
 
+	private static final Logger log = LoggerFactory.getLogger(AbstractEfaProvider.class);
+
 	@SuppressWarnings("serial")
 	private static class Context implements QueryTripsContext
 	{
@@ -1999,7 +2003,7 @@ public abstract class AbstractEfaProvider extends AbstractNetworkProvider
 	}
 
 	protected String xsltTripRequestParameters(final Location from, final @Nullable Location via, final Location to, final Date time,
-			final boolean dep, final @Nullable Collection<Product> products, final @Nullable WalkSpeed walkSpeed,
+			final boolean dep, final @Nullable Collection<Product> products, final @Nullable Optimize optimize, final @Nullable WalkSpeed walkSpeed,
 			final @Nullable Accessibility accessibility, final @Nullable Set<Option> options)
 	{
 		final StringBuilder uri = new StringBuilder();
@@ -2023,6 +2027,16 @@ public abstract class AbstractEfaProvider extends AbstractNetworkProvider
 
 		uri.append("&ptOptionsActive=1"); // enable public transport options
 		uri.append("&itOptionsActive=1"); // enable individual transport options
+
+		if (optimize == Optimize.LEAST_DURATION)
+			uri.append("&routeType=LEASTTIME");
+		else if (optimize == Optimize.LEAST_CHANGES)
+			uri.append("&routeType=LEASTINTERCHANGE");
+		else if (optimize == Optimize.LEAST_WALKING)
+			uri.append("&routeType=LEASTWALKING");
+		else if (optimize != null)
+			log.info("Cannot handle " + optimize + ", ignoring.");
+
 		uri.append("&changeSpeed=").append(WALKSPEED_MAP.get(walkSpeed));
 
 		if (accessibility == Accessibility.BARRIER_FREE)
@@ -2105,11 +2119,11 @@ public abstract class AbstractEfaProvider extends AbstractNetworkProvider
 	}
 
 	public QueryTripsResult queryTrips(final Location from, final @Nullable Location via, final Location to, final Date date, final boolean dep,
-			final @Nullable Set<Product> products, final @Nullable WalkSpeed walkSpeed, final @Nullable Accessibility accessibility,
-			final @Nullable Set<Option> options) throws IOException
+			final @Nullable Set<Product> products, final @Nullable Optimize optimize, final @Nullable WalkSpeed walkSpeed,
+			final @Nullable Accessibility accessibility, final @Nullable Set<Option> options) throws IOException
 	{
 
-		final String parameters = xsltTripRequestParameters(from, via, to, date, dep, products, walkSpeed, accessibility, options);
+		final String parameters = xsltTripRequestParameters(from, via, to, date, dep, products, optimize, walkSpeed, accessibility, options);
 
 		final StringBuilder uri = new StringBuilder(tripEndpoint);
 		if (!httpPost)
@@ -2141,11 +2155,11 @@ public abstract class AbstractEfaProvider extends AbstractNetworkProvider
 	}
 
 	protected QueryTripsResult queryTripsMobile(final Location from, final @Nullable Location via, final Location to, final Date date,
-			final boolean dep, final @Nullable Collection<Product> products, final @Nullable WalkSpeed walkSpeed,
+			final boolean dep, final @Nullable Collection<Product> products, final @Nullable Optimize optimize, final @Nullable WalkSpeed walkSpeed,
 			final @Nullable Accessibility accessibility, final @Nullable Set<Option> options) throws IOException
 	{
 
-		final String parameters = xsltTripRequestParameters(from, via, to, date, dep, products, walkSpeed, accessibility, options);
+		final String parameters = xsltTripRequestParameters(from, via, to, date, dep, products, optimize, walkSpeed, accessibility, options);
 
 		final StringBuilder uri = new StringBuilder(tripEndpoint);
 		if (!httpPost)
diff --git a/enabler/src/de/schildbach/pte/AbstractHafasProvider.java b/enabler/src/de/schildbach/pte/AbstractHafasProvider.java
index d2587e4a..54884f0f 100644
--- a/enabler/src/de/schildbach/pte/AbstractHafasProvider.java
+++ b/enabler/src/de/schildbach/pte/AbstractHafasProvider.java
@@ -756,8 +756,8 @@ public abstract class AbstractHafasProvider extends AbstractNetworkProvider
 	}
 
 	public QueryTripsResult queryTrips(final Location from, final @Nullable Location via, final Location to, final Date date, final boolean dep,
-			final @Nullable Set<Product> products, final @Nullable WalkSpeed walkSpeed, final @Nullable Accessibility accessibility,
-			final @Nullable Set<Option> options) throws IOException
+			final @Nullable Set<Product> products, final @Nullable Optimize optimize, final @Nullable WalkSpeed walkSpeed,
+			final @Nullable Accessibility accessibility, final @Nullable Set<Option> options) throws IOException
 	{
 		return queryTripsBinary(from, via, to, date, dep, products, walkSpeed, accessibility, options);
 	}
diff --git a/enabler/src/de/schildbach/pte/AbstractNavitiaProvider.java b/enabler/src/de/schildbach/pte/AbstractNavitiaProvider.java
index ecb7c0a2..ea9e9051 100644
--- a/enabler/src/de/schildbach/pte/AbstractNavitiaProvider.java
+++ b/enabler/src/de/schildbach/pte/AbstractNavitiaProvider.java
@@ -992,8 +992,8 @@ public abstract class AbstractNavitiaProvider extends AbstractNetworkProvider
 	}
 
 	public QueryTripsResult queryTrips(final Location from, final @Nullable Location via, final Location to, final Date date, final boolean dep,
-			final @Nullable Set<Product> products, final @Nullable WalkSpeed walkSpeed, final @Nullable Accessibility accessibility,
-			final @Nullable Set<Option> options) throws IOException
+			final @Nullable Set<Product> products, final @Nullable Optimize optimize, final @Nullable WalkSpeed walkSpeed,
+			final @Nullable Accessibility accessibility, final @Nullable Set<Option> options) throws IOException
 	{
 		final ResultHeader resultHeader = new ResultHeader(network, SERVER_PRODUCT, SERVER_VERSION, 0, null);
 
diff --git a/enabler/src/de/schildbach/pte/AbstractTsiProvider.java b/enabler/src/de/schildbach/pte/AbstractTsiProvider.java
index 70c96395..cc20c289 100644
--- a/enabler/src/de/schildbach/pte/AbstractTsiProvider.java
+++ b/enabler/src/de/schildbach/pte/AbstractTsiProvider.java
@@ -640,8 +640,8 @@ public abstract class AbstractTsiProvider extends AbstractNetworkProvider
 	}
 
 	public QueryTripsResult queryTrips(final Location from, final @Nullable Location via, final Location to, final Date date, final boolean dep,
-			final @Nullable Set<Product> products, final @Nullable WalkSpeed walkSpeed, final @Nullable Accessibility accessibility,
-			final @Nullable Set<Option> options) throws IOException
+			final @Nullable Set<Product> products, final @Nullable Optimize optimize, final @Nullable WalkSpeed walkSpeed,
+			final @Nullable Accessibility accessibility, final @Nullable Set<Option> options) throws IOException
 	{
 		final ResultHeader header = new ResultHeader(network, SERVER_PRODUCT);
 		final List<Location> possibleFroms, possibleTos, possibleVias;
diff --git a/enabler/src/de/schildbach/pte/BayernProvider.java b/enabler/src/de/schildbach/pte/BayernProvider.java
index 2ce84d7c..7f4e4c83 100644
--- a/enabler/src/de/schildbach/pte/BayernProvider.java
+++ b/enabler/src/de/schildbach/pte/BayernProvider.java
@@ -139,11 +139,11 @@ public class BayernProvider extends AbstractEfaProvider
 
 	@Override
 	protected String xsltTripRequestParameters(final Location from, final @Nullable Location via, final Location to, final Date time,
-			final boolean dep, final @Nullable Collection<Product> products, final @Nullable WalkSpeed walkSpeed,
+			final boolean dep, final @Nullable Collection<Product> products, final @Nullable Optimize optimize, final @Nullable WalkSpeed walkSpeed,
 			final @Nullable Accessibility accessibility, final @Nullable Set<Option> options)
 	{
-		final StringBuilder uri = new StringBuilder(super.xsltTripRequestParameters(from, via, to, time, dep, products, walkSpeed, accessibility,
-				options));
+		final StringBuilder uri = new StringBuilder(super.xsltTripRequestParameters(from, via, to, time, dep, products, optimize, walkSpeed,
+				accessibility, options));
 
 		if (products != null)
 		{
@@ -165,10 +165,10 @@ public class BayernProvider extends AbstractEfaProvider
 
 	@Override
 	public QueryTripsResult queryTrips(final Location from, final @Nullable Location via, final Location to, final Date date, final boolean dep,
-			final @Nullable Set<Product> products, final @Nullable WalkSpeed walkSpeed, final @Nullable Accessibility accessibility,
-			final @Nullable Set<Option> options) throws IOException
+			final @Nullable Set<Product> products, final @Nullable Optimize optimize, final @Nullable WalkSpeed walkSpeed,
+			final @Nullable Accessibility accessibility, final @Nullable Set<Option> options) throws IOException
 	{
-		return queryTripsMobile(from, via, to, date, dep, products, walkSpeed, accessibility, options);
+		return queryTripsMobile(from, via, to, date, dep, products, optimize, walkSpeed, accessibility, options);
 	}
 
 	@Override
diff --git a/enabler/src/de/schildbach/pte/EireannProvider.java b/enabler/src/de/schildbach/pte/EireannProvider.java
index 3141a0de..06bb08cb 100644
--- a/enabler/src/de/schildbach/pte/EireannProvider.java
+++ b/enabler/src/de/schildbach/pte/EireannProvider.java
@@ -86,8 +86,8 @@ public class EireannProvider extends AbstractHafasProvider
 
 	@Override
 	public QueryTripsResult queryTrips(final Location from, final @Nullable Location via, final Location to, final Date date, final boolean dep,
-			final @Nullable Set<Product> products, final @Nullable WalkSpeed walkSpeed, final @Nullable Accessibility accessibility,
-			final @Nullable Set<Option> options) throws IOException
+			final @Nullable Set<Product> products, final @Nullable Optimize optimize, final @Nullable WalkSpeed walkSpeed,
+			final @Nullable Accessibility accessibility, final @Nullable Set<Option> options) throws IOException
 	{
 		return queryTripsXml(from, via, to, date, dep, products, walkSpeed, accessibility, options);
 	}
diff --git a/enabler/src/de/schildbach/pte/InvgProvider.java b/enabler/src/de/schildbach/pte/InvgProvider.java
index 8394d1c1..54450648 100644
--- a/enabler/src/de/schildbach/pte/InvgProvider.java
+++ b/enabler/src/de/schildbach/pte/InvgProvider.java
@@ -304,8 +304,8 @@ public class InvgProvider extends AbstractHafasProvider
 
 	@Override
 	public QueryTripsResult queryTrips(final Location from, final @Nullable Location via, final Location to, final Date date, final boolean dep,
-			final @Nullable Set<Product> products, final @Nullable WalkSpeed walkSpeed, final @Nullable Accessibility accessibility,
-			final @Nullable Set<Option> options) throws IOException
+			final @Nullable Set<Product> products, final @Nullable Optimize optimize, final @Nullable WalkSpeed walkSpeed,
+			final @Nullable Accessibility accessibility, final @Nullable Set<Option> options) throws IOException
 	{
 		return queryTripsXml(from, via, to, date, dep, products, walkSpeed, accessibility, options);
 	}
diff --git a/enabler/src/de/schildbach/pte/NetworkProvider.java b/enabler/src/de/schildbach/pte/NetworkProvider.java
index 9a6f822a..0a5afda2 100644
--- a/enabler/src/de/schildbach/pte/NetworkProvider.java
+++ b/enabler/src/de/schildbach/pte/NetworkProvider.java
@@ -54,6 +54,11 @@ public interface NetworkProvider
 		TRIPS
 	}
 
+	public enum Optimize
+	{
+		LEAST_DURATION, LEAST_CHANGES, LEAST_WALKING
+	}
+
 	public enum WalkSpeed
 	{
 		SLOW, NORMAL, FAST
@@ -138,6 +143,8 @@ public interface NetworkProvider
 	 *            date is departure date? {@code true} for departure, {@code false} for arrival
 	 * @param products
 	 *            products to take into account, or {@code null} for the provider default
+	 * @param optimize
+	 *            optimize trip for one aspect, e.g. duration
 	 * @param walkSpeed
 	 *            walking ability, or {@code null} for the provider default
 	 * @param accessibility
@@ -148,7 +155,8 @@ public interface NetworkProvider
 	 * @throws IOException
 	 */
 	QueryTripsResult queryTrips(Location from, @Nullable Location via, Location to, Date date, boolean dep, @Nullable Set<Product> products,
-			@Nullable WalkSpeed walkSpeed, @Nullable Accessibility accessibility, @Nullable Set<Option> options) throws IOException;
+			@Nullable Optimize optimize, @Nullable WalkSpeed walkSpeed, @Nullable Accessibility accessibility, @Nullable Set<Option> options)
+			throws IOException;
 
 	/**
 	 * Query more trips (e.g. earlier or later)
diff --git a/enabler/src/de/schildbach/pte/NriProvider.java b/enabler/src/de/schildbach/pte/NriProvider.java
index e6e73100..9d3118dd 100644
--- a/enabler/src/de/schildbach/pte/NriProvider.java
+++ b/enabler/src/de/schildbach/pte/NriProvider.java
@@ -127,8 +127,8 @@ public class NriProvider extends AbstractHafasProvider
 
 	@Override
 	public QueryTripsResult queryTrips(final Location from, final @Nullable Location via, final Location to, final Date date, final boolean dep,
-			final @Nullable Set<Product> products, final @Nullable WalkSpeed walkSpeed, final @Nullable Accessibility accessibility,
-			final @Nullable Set<Option> options) throws IOException
+			final @Nullable Set<Product> products, final @Nullable Optimize optimize, final @Nullable WalkSpeed walkSpeed,
+			final @Nullable Accessibility accessibility, final @Nullable Set<Option> options) throws IOException
 	{
 		return queryTripsXml(from, via, to, date, dep, products, walkSpeed, accessibility, options);
 	}
diff --git a/enabler/src/de/schildbach/pte/NvbwProvider.java b/enabler/src/de/schildbach/pte/NvbwProvider.java
index 0a2a3c25..e5a5d91d 100644
--- a/enabler/src/de/schildbach/pte/NvbwProvider.java
+++ b/enabler/src/de/schildbach/pte/NvbwProvider.java
@@ -103,10 +103,10 @@ public class NvbwProvider extends AbstractEfaProvider
 
 	@Override
 	public QueryTripsResult queryTrips(final Location from, final @Nullable Location via, final Location to, final Date date, final boolean dep,
-			final @Nullable Set<Product> products, final @Nullable WalkSpeed walkSpeed, final @Nullable Accessibility accessibility,
-			final @Nullable Set<Option> options) throws IOException
+			final @Nullable Set<Product> products, final @Nullable Optimize optimize, final @Nullable WalkSpeed walkSpeed,
+			final @Nullable Accessibility accessibility, final @Nullable Set<Option> options) throws IOException
 	{
-		return queryTripsMobile(from, via, to, date, dep, products, walkSpeed, accessibility, options);
+		return queryTripsMobile(from, via, to, date, dep, products, optimize, walkSpeed, accessibility, options);
 	}
 
 	@Override
diff --git a/enabler/src/de/schildbach/pte/SeptaProvider.java b/enabler/src/de/schildbach/pte/SeptaProvider.java
index 98194878..b26e857d 100644
--- a/enabler/src/de/schildbach/pte/SeptaProvider.java
+++ b/enabler/src/de/schildbach/pte/SeptaProvider.java
@@ -282,8 +282,8 @@ public class SeptaProvider extends AbstractHafasProvider
 
 	@Override
 	public QueryTripsResult queryTrips(final Location from, final @Nullable Location via, final Location to, final Date date, final boolean dep,
-			final @Nullable Set<Product> products, final @Nullable WalkSpeed walkSpeed, final @Nullable Accessibility accessibility,
-			final @Nullable Set<Option> options) throws IOException
+			final @Nullable Set<Product> products, final @Nullable Optimize optimize, final @Nullable WalkSpeed walkSpeed,
+			final @Nullable Accessibility accessibility, final @Nullable Set<Option> options) throws IOException
 	{
 		return queryTripsXml(from, via, to, date, dep, products, walkSpeed, accessibility, options);
 	}
diff --git a/enabler/src/de/schildbach/pte/SydneyProvider.java b/enabler/src/de/schildbach/pte/SydneyProvider.java
index 1cbd0b16..f9f21cfe 100644
--- a/enabler/src/de/schildbach/pte/SydneyProvider.java
+++ b/enabler/src/de/schildbach/pte/SydneyProvider.java
@@ -50,11 +50,11 @@ public class SydneyProvider extends AbstractEfaProvider
 
 	@Override
 	protected String xsltTripRequestParameters(final Location from, final @Nullable Location via, final Location to, final Date time,
-			final boolean dep, final @Nullable Collection<Product> products, final @Nullable WalkSpeed walkSpeed,
+			final boolean dep, final @Nullable Collection<Product> products, final @Nullable Optimize optimize, final @Nullable WalkSpeed walkSpeed,
 			final @Nullable Accessibility accessibility, final @Nullable Set<Option> options)
 	{
-		final StringBuilder uri = new StringBuilder(super.xsltTripRequestParameters(from, via, to, time, dep, products, walkSpeed, accessibility,
-				options));
+		final StringBuilder uri = new StringBuilder(super.xsltTripRequestParameters(from, via, to, time, dep, products, optimize, walkSpeed,
+				accessibility, options));
 
 		if (products != null)
 		{
diff --git a/enabler/src/de/schildbach/pte/VgnProvider.java b/enabler/src/de/schildbach/pte/VgnProvider.java
index a2f49737..6549be96 100644
--- a/enabler/src/de/schildbach/pte/VgnProvider.java
+++ b/enabler/src/de/schildbach/pte/VgnProvider.java
@@ -60,9 +60,10 @@ public class VgnProvider extends AbstractEfaProvider
 
 	@Override
 	protected String xsltTripRequestParameters(final Location from, final @Nullable Location via, final Location to, final Date date,
-			final boolean dep, final @Nullable Collection<Product> products, final @Nullable WalkSpeed walkSpeed,
+			final boolean dep, final @Nullable Collection<Product> products, final @Nullable Optimize optimize, final @Nullable WalkSpeed walkSpeed,
 			final @Nullable Accessibility accessibility, final @Nullable Set<Option> options)
 	{
-		return super.xsltTripRequestParameters(from, via, to, date, dep, products, walkSpeed, accessibility, options) + "&itdLPxx_showTariffLevel=1";
+		return super.xsltTripRequestParameters(from, via, to, date, dep, products, optimize, walkSpeed, accessibility, options)
+				+ "&itdLPxx_showTariffLevel=1";
 	}
 }
diff --git a/enabler/src/de/schildbach/pte/VorProvider.java b/enabler/src/de/schildbach/pte/VorProvider.java
index 18ed253a..f0d01311 100644
--- a/enabler/src/de/schildbach/pte/VorProvider.java
+++ b/enabler/src/de/schildbach/pte/VorProvider.java
@@ -52,11 +52,11 @@ public class VorProvider extends AbstractEfaProvider
 
 	@Override
 	protected String xsltTripRequestParameters(final Location from, final @Nullable Location via, final Location to, final Date time,
-			final boolean dep, final @Nullable Collection<Product> products, final @Nullable WalkSpeed walkSpeed,
+			final boolean dep, final @Nullable Collection<Product> products, final @Nullable Optimize optimize, final @Nullable WalkSpeed walkSpeed,
 			final @Nullable Accessibility accessibility, final @Nullable Set<Option> options)
 	{
-		final StringBuilder uri = new StringBuilder(super.xsltTripRequestParameters(from, via, to, time, dep, products, walkSpeed, accessibility,
-				options));
+		final StringBuilder uri = new StringBuilder(super.xsltTripRequestParameters(from, via, to, time, dep, products, optimize, walkSpeed,
+				accessibility, options));
 
 		if (products != null)
 		{
diff --git a/enabler/src/de/schildbach/pte/VrrProvider.java b/enabler/src/de/schildbach/pte/VrrProvider.java
index 53164a31..e7e27f3f 100644
--- a/enabler/src/de/schildbach/pte/VrrProvider.java
+++ b/enabler/src/de/schildbach/pte/VrrProvider.java
@@ -55,11 +55,11 @@ public class VrrProvider extends AbstractEfaProvider
 
 	@Override
 	protected String xsltTripRequestParameters(final Location from, final @Nullable Location via, final Location to, final Date time,
-			final boolean dep, final @Nullable Collection<Product> products, final @Nullable WalkSpeed walkSpeed,
+			final boolean dep, final @Nullable Collection<Product> products, final @Nullable Optimize optimize, final @Nullable WalkSpeed walkSpeed,
 			final @Nullable Accessibility accessibility, final @Nullable Set<Option> options)
 	{
-		final StringBuilder uri = new StringBuilder(super.xsltTripRequestParameters(from, via, to, time, dep, products, walkSpeed, accessibility,
-				options));
+		final StringBuilder uri = new StringBuilder(super.xsltTripRequestParameters(from, via, to, time, dep, products, optimize, walkSpeed,
+				accessibility, options));
 
 		if (products != null)
 		{
diff --git a/enabler/src/de/schildbach/pte/VrsProvider.java b/enabler/src/de/schildbach/pte/VrsProvider.java
index dff14272..cb130774 100644
--- a/enabler/src/de/schildbach/pte/VrsProvider.java
+++ b/enabler/src/de/schildbach/pte/VrsProvider.java
@@ -694,8 +694,8 @@ public class VrsProvider extends AbstractNetworkProvider
 	// accessibility not supported.
 	// options not supported.
 	public QueryTripsResult queryTrips(final Location from, final @Nullable Location via, final Location to, Date date, boolean dep,
-			final @Nullable Set<Product> products, final @Nullable WalkSpeed walkSpeed, final @Nullable Accessibility accessibility,
-			@Nullable Set<Option> options) throws IOException
+			final @Nullable Set<Product> products, final @Nullable Optimize optimize, final @Nullable WalkSpeed walkSpeed,
+			final @Nullable Accessibility accessibility, @Nullable Set<Option> options) throws IOException
 	{
 		// The EXACT_POINTS feature generates an about 50% bigger API response, probably well compressible.
 		final boolean EXACT_POINTS = true;
@@ -1021,11 +1021,11 @@ public class VrsProvider extends AbstractNetworkProvider
 		Context ctx = (Context) context;
 		if (later)
 		{
-			return queryTrips(ctx.from, ctx.via, ctx.to, ctx.getLastDeparture(), true, ctx.products, null, null, null);
+			return queryTrips(ctx.from, ctx.via, ctx.to, ctx.getLastDeparture(), true, ctx.products, null, null, null, null);
 		}
 		else
 		{
-			return queryTrips(ctx.from, ctx.via, ctx.to, ctx.getFirstArrival(), false, ctx.products, null, null, null);
+			return queryTrips(ctx.from, ctx.via, ctx.to, ctx.getFirstArrival(), false, ctx.products, null, null, null, null);
 		}
 	}
 
diff --git a/enabler/src/de/schildbach/pte/WienProvider.java b/enabler/src/de/schildbach/pte/WienProvider.java
index 8c5c44a2..957ded36 100644
--- a/enabler/src/de/schildbach/pte/WienProvider.java
+++ b/enabler/src/de/schildbach/pte/WienProvider.java
@@ -49,11 +49,11 @@ public class WienProvider extends AbstractEfaProvider
 
 	@Override
 	protected String xsltTripRequestParameters(final Location from, final @Nullable Location via, final Location to, final Date time,
-			final boolean dep, final @Nullable Collection<Product> products, final @Nullable WalkSpeed walkSpeed,
+			final boolean dep, final @Nullable Collection<Product> products, final @Nullable Optimize optimize, final @Nullable WalkSpeed walkSpeed,
 			final @Nullable Accessibility accessibility, final @Nullable Set<Option> options)
 	{
-		final StringBuilder uri = new StringBuilder(super.xsltTripRequestParameters(from, via, to, time, dep, products, walkSpeed, accessibility,
-				options));
+		final StringBuilder uri = new StringBuilder(super.xsltTripRequestParameters(from, via, to, time, dep, products, optimize, walkSpeed,
+				accessibility, options));
 
 		if (products != null)
 		{
diff --git a/enabler/test/de/schildbach/pte/live/AbstractProviderLiveTest.java b/enabler/test/de/schildbach/pte/live/AbstractProviderLiveTest.java
index 2cdcba22..c568f8dd 100644
--- a/enabler/test/de/schildbach/pte/live/AbstractProviderLiveTest.java
+++ b/enabler/test/de/schildbach/pte/live/AbstractProviderLiveTest.java
@@ -132,7 +132,7 @@ public abstract class AbstractProviderLiveTest
 			final boolean dep, final @Nullable Set<Product> products, final @Nullable WalkSpeed walkSpeed, final @Nullable Accessibility accessibility)
 			throws IOException
 	{
-		return provider.queryTrips(from, via, to, date, dep, products, walkSpeed, accessibility, null);
+		return provider.queryTrips(from, via, to, date, dep, products, null, walkSpeed, accessibility, null);
 	}
 
 	protected final QueryTripsResult queryMoreTrips(final QueryTripsContext context, final boolean later) throws IOException
diff --git a/service/src/main/java/de/schildbach/pte/service/TripController.java b/service/src/main/java/de/schildbach/pte/service/TripController.java
index 653ac415..ffb42747 100644
--- a/service/src/main/java/de/schildbach/pte/service/TripController.java
+++ b/service/src/main/java/de/schildbach/pte/service/TripController.java
@@ -53,6 +53,6 @@ public class TripController
 	{
 		final Location fromLocation = new Location(fromType, fromId, null, from);
 		final Location toLocation = new Location(toType, toId, null, to);
-		return provider.queryTrips(fromLocation, null, toLocation, new Date(), true, Product.ALL, WalkSpeed.NORMAL, Accessibility.NEUTRAL, null);
+		return provider.queryTrips(fromLocation, null, toLocation, new Date(), true, Product.ALL, null, WalkSpeed.NORMAL, Accessibility.NEUTRAL, null);
 	}
 }