From 8bcdc7aa14eb2469114eed4175daf80cc61946f2 Mon Sep 17 00:00:00 2001
From: Andreas Schildbach <andreas@schildbach.de>
Date: Sat, 31 May 2014 00:23:36 +0200
Subject: [PATCH] Default to binary trips query for Hafas based providers.

---
 .../schildbach/pte/AbstractHafasProvider.java |  5 ++--
 .../src/de/schildbach/pte/BahnProvider.java   | 24 -----------------
 .../src/de/schildbach/pte/BvgProvider.java    | 20 +-------------
 .../src/de/schildbach/pte/DsbProvider.java    | 24 -----------------
 .../de/schildbach/pte/EireannProvider.java    | 24 +++++++++++++++++
 .../src/de/schildbach/pte/InvgProvider.java   | 24 +++++++++++++++++
 .../src/de/schildbach/pte/JetProvider.java    | 25 -----------------
 enabler/src/de/schildbach/pte/LuProvider.java | 25 -----------------
 .../src/de/schildbach/pte/NasaProvider.java   | 25 -----------------
 .../src/de/schildbach/pte/NriProvider.java    | 23 ++++++++++++++++
 enabler/src/de/schildbach/pte/NsProvider.java | 24 -----------------
 .../src/de/schildbach/pte/NvvProvider.java    | 25 -----------------
 .../src/de/schildbach/pte/OebbProvider.java   | 24 -----------------
 enabler/src/de/schildbach/pte/PlProvider.java | 24 -----------------
 enabler/src/de/schildbach/pte/RtProvider.java | 24 -----------------
 .../src/de/schildbach/pte/SbbProvider.java    | 24 -----------------
 enabler/src/de/schildbach/pte/SeProvider.java | 24 -----------------
 .../src/de/schildbach/pte/SeptaProvider.java  | 24 +++++++++++++++++
 enabler/src/de/schildbach/pte/ShProvider.java | 25 -----------------
 .../src/de/schildbach/pte/SncbProvider.java   | 24 -----------------
 .../de/schildbach/pte/StockholmProvider.java  | 23 ++--------------
 .../src/de/schildbach/pte/VbbProvider.java    | 27 ++-----------------
 .../src/de/schildbach/pte/VbnProvider.java    | 25 -----------------
 .../src/de/schildbach/pte/VgsProvider.java    | 25 -----------------
 .../src/de/schildbach/pte/ZvvProvider.java    | 25 -----------------
 25 files changed, 103 insertions(+), 483 deletions(-)

diff --git a/enabler/src/de/schildbach/pte/AbstractHafasProvider.java b/enabler/src/de/schildbach/pte/AbstractHafasProvider.java
index 00d754a1..d8ae68a6 100644
--- a/enabler/src/de/schildbach/pte/AbstractHafasProvider.java
+++ b/enabler/src/de/schildbach/pte/AbstractHafasProvider.java
@@ -819,12 +819,12 @@ public abstract class AbstractHafasProvider extends AbstractNetworkProvider
 			final Collection<Product> products, final WalkSpeed walkSpeed, final Accessibility accessibility, final Set<Option> options)
 			throws IOException
 	{
-		return queryTripsXml(from, via, to, date, dep, products, walkSpeed, accessibility, options);
+		return queryTripsBinary(from, via, to, date, dep, products, walkSpeed, accessibility, options);
 	}
 
 	public QueryTripsResult queryMoreTrips(final QueryTripsContext context, final boolean later) throws IOException
 	{
-		return queryMoreTripsXml(context, later);
+		return queryMoreTripsBinary(context, later);
 	}
 
 	protected final void appendTripsQueryUri(final StringBuilder uri, final Location from, final Location via, final Location to, final Date date,
@@ -1519,6 +1519,7 @@ public abstract class AbstractHafasProvider extends AbstractNetworkProvider
 
 	protected void appendCustomTripsQueryBinaryUri(final StringBuilder uri)
 	{
+		uri.append("&h2g-direct=11");
 	}
 
 	private final static int QUERY_TRIPS_BINARY_BUFFER_SIZE = 384 * 1024;
diff --git a/enabler/src/de/schildbach/pte/BahnProvider.java b/enabler/src/de/schildbach/pte/BahnProvider.java
index 19ef5faf..51f469de 100644
--- a/enabler/src/de/schildbach/pte/BahnProvider.java
+++ b/enabler/src/de/schildbach/pte/BahnProvider.java
@@ -19,9 +19,7 @@ package de.schildbach.pte;
 
 import java.io.IOException;
 import java.util.Collection;
-import java.util.Date;
 import java.util.List;
-import java.util.Set;
 import java.util.regex.Matcher;
 import java.util.regex.Pattern;
 
@@ -30,8 +28,6 @@ import de.schildbach.pte.dto.LocationType;
 import de.schildbach.pte.dto.NearbyStationsResult;
 import de.schildbach.pte.dto.Product;
 import de.schildbach.pte.dto.QueryDeparturesResult;
-import de.schildbach.pte.dto.QueryTripsContext;
-import de.schildbach.pte.dto.QueryTripsResult;
 
 /**
  * @author Andreas Schildbach
@@ -178,26 +174,6 @@ public final class BahnProvider extends AbstractHafasProvider
 		return Product.ALL;
 	}
 
-	@Override
-	protected void appendCustomTripsQueryBinaryUri(final StringBuilder uri)
-	{
-		uri.append("&h2g-direct=11");
-	}
-
-	@Override
-	public QueryTripsResult queryTrips(final Location from, final Location via, final Location to, final Date date, final boolean dep,
-			final Collection<Product> products, final WalkSpeed walkSpeed, final Accessibility accessibility, final Set<Option> options)
-			throws IOException
-	{
-		return queryTripsBinary(from, via, to, date, dep, products, walkSpeed, accessibility, options);
-	}
-
-	@Override
-	public QueryTripsResult queryMoreTrips(final QueryTripsContext contextObj, final boolean later) throws IOException
-	{
-		return queryMoreTripsBinary(contextObj, later);
-	}
-
 	private static final Pattern P_NORMALIZE_LINE_NAME_TRAM = Pattern.compile("str\\s+(.*)", Pattern.CASE_INSENSITIVE);
 
 	@Override
diff --git a/enabler/src/de/schildbach/pte/BvgProvider.java b/enabler/src/de/schildbach/pte/BvgProvider.java
index 6d667c1f..3baf89b5 100644
--- a/enabler/src/de/schildbach/pte/BvgProvider.java
+++ b/enabler/src/de/schildbach/pte/BvgProvider.java
@@ -20,13 +20,11 @@ package de.schildbach.pte;
 import java.io.IOException;
 import java.util.ArrayList;
 import java.util.Calendar;
-import java.util.Collection;
 import java.util.Date;
 import java.util.GregorianCalendar;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
-import java.util.Set;
 import java.util.regex.Matcher;
 import java.util.regex.Pattern;
 
@@ -40,8 +38,6 @@ import de.schildbach.pte.dto.Point;
 import de.schildbach.pte.dto.Position;
 import de.schildbach.pte.dto.Product;
 import de.schildbach.pte.dto.QueryDeparturesResult;
-import de.schildbach.pte.dto.QueryTripsContext;
-import de.schildbach.pte.dto.QueryTripsResult;
 import de.schildbach.pte.dto.ResultHeader;
 import de.schildbach.pte.dto.StationDepartures;
 import de.schildbach.pte.dto.Style;
@@ -529,25 +525,11 @@ public final class BvgProvider extends AbstractHafasProvider
 	@Override
 	protected void appendCustomTripsQueryBinaryUri(final StringBuilder uri)
 	{
-		uri.append("&h2g-direct=11");
+		super.appendCustomTripsQueryBinaryUri(uri);
 		if (additionalQueryParameter != null)
 			uri.append('&').append(additionalQueryParameter);
 	}
 
-	@Override
-	public QueryTripsResult queryTrips(final Location from, final Location via, final Location to, final Date date, final boolean dep,
-			final Collection<Product> products, final WalkSpeed walkSpeed, final Accessibility accessibility, final Set<Option> options)
-			throws IOException
-	{
-		return queryTripsBinary(from, via, to, date, dep, products, walkSpeed, accessibility, options);
-	}
-
-	@Override
-	public QueryTripsResult queryMoreTrips(final QueryTripsContext contextObj, final boolean later) throws IOException
-	{
-		return queryMoreTripsBinary(contextObj, later);
-	}
-
 	private static final Pattern P_NORMALIZE_LINE_NAME_TRAM = Pattern.compile("(?:tra|tram)\\s+(.*)", Pattern.CASE_INSENSITIVE);
 
 	@Override
diff --git a/enabler/src/de/schildbach/pte/DsbProvider.java b/enabler/src/de/schildbach/pte/DsbProvider.java
index 5d607112..f4600074 100644
--- a/enabler/src/de/schildbach/pte/DsbProvider.java
+++ b/enabler/src/de/schildbach/pte/DsbProvider.java
@@ -19,18 +19,14 @@ package de.schildbach.pte;
 
 import java.io.IOException;
 import java.util.Collection;
-import java.util.Date;
 import java.util.List;
 import java.util.Locale;
-import java.util.Set;
 
 import de.schildbach.pte.dto.Location;
 import de.schildbach.pte.dto.LocationType;
 import de.schildbach.pte.dto.NearbyStationsResult;
 import de.schildbach.pte.dto.Product;
 import de.schildbach.pte.dto.QueryDeparturesResult;
-import de.schildbach.pte.dto.QueryTripsContext;
-import de.schildbach.pte.dto.QueryTripsResult;
 import de.schildbach.pte.util.ParserUtils;
 
 /**
@@ -162,26 +158,6 @@ public class DsbProvider extends AbstractHafasProvider
 		return Product.ALL;
 	}
 
-	@Override
-	protected void appendCustomTripsQueryBinaryUri(final StringBuilder uri)
-	{
-		uri.append("&h2g-direct=11");
-	}
-
-	@Override
-	public QueryTripsResult queryTrips(final Location from, final Location via, final Location to, final Date date, final boolean dep,
-			final Collection<Product> products, final WalkSpeed walkSpeed, final Accessibility accessibility, final Set<Option> options)
-			throws IOException
-	{
-		return queryTripsBinary(from, via, to, date, dep, products, walkSpeed, accessibility, options);
-	}
-
-	@Override
-	public QueryTripsResult queryMoreTrips(final QueryTripsContext contextObj, final boolean later) throws IOException
-	{
-		return queryMoreTripsBinary(contextObj, later);
-	}
-
 	@Override
 	protected char normalizeType(final String type)
 	{
diff --git a/enabler/src/de/schildbach/pte/EireannProvider.java b/enabler/src/de/schildbach/pte/EireannProvider.java
index e88fe1f2..f8f1186e 100644
--- a/enabler/src/de/schildbach/pte/EireannProvider.java
+++ b/enabler/src/de/schildbach/pte/EireannProvider.java
@@ -18,7 +18,10 @@
 package de.schildbach.pte;
 
 import java.io.IOException;
+import java.util.Collection;
+import java.util.Date;
 import java.util.List;
+import java.util.Set;
 import java.util.regex.Matcher;
 import java.util.regex.Pattern;
 
@@ -28,6 +31,8 @@ import de.schildbach.pte.dto.LocationType;
 import de.schildbach.pte.dto.NearbyStationsResult;
 import de.schildbach.pte.dto.Product;
 import de.schildbach.pte.dto.QueryDeparturesResult;
+import de.schildbach.pte.dto.QueryTripsContext;
+import de.schildbach.pte.dto.QueryTripsResult;
 
 /**
  * Ireland, Dublin
@@ -133,6 +138,25 @@ public class EireannProvider extends AbstractHafasProvider
 		return jsonGetStops(uri.toString());
 	}
 
+	@Override
+	protected void appendCustomTripsQueryBinaryUri(final StringBuilder uri)
+	{
+	}
+
+	@Override
+	public QueryTripsResult queryTrips(final Location from, final Location via, final Location to, final Date date, final boolean dep,
+			final Collection<Product> products, final WalkSpeed walkSpeed, final Accessibility accessibility, final Set<Option> options)
+			throws IOException
+	{
+		return queryTripsXml(from, via, to, date, dep, products, walkSpeed, accessibility, options);
+	}
+
+	@Override
+	public QueryTripsResult queryMoreTrips(final QueryTripsContext context, final boolean later) throws IOException
+	{
+		return queryMoreTripsXml(context, later);
+	}
+
 	private static final Pattern P_NORMALIZE_LINE = Pattern.compile("([^#]+)#");
 
 	@Override
diff --git a/enabler/src/de/schildbach/pte/InvgProvider.java b/enabler/src/de/schildbach/pte/InvgProvider.java
index ccb8e424..2c3f1295 100644
--- a/enabler/src/de/schildbach/pte/InvgProvider.java
+++ b/enabler/src/de/schildbach/pte/InvgProvider.java
@@ -20,11 +20,14 @@ package de.schildbach.pte;
 import java.io.IOException;
 import java.util.ArrayList;
 import java.util.Calendar;
+import java.util.Collection;
 import java.util.Collections;
+import java.util.Date;
 import java.util.GregorianCalendar;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
+import java.util.Set;
 import java.util.regex.Matcher;
 import java.util.regex.Pattern;
 
@@ -37,6 +40,8 @@ import de.schildbach.pte.dto.Position;
 import de.schildbach.pte.dto.Product;
 import de.schildbach.pte.dto.QueryDeparturesResult;
 import de.schildbach.pte.dto.QueryDeparturesResult.Status;
+import de.schildbach.pte.dto.QueryTripsContext;
+import de.schildbach.pte.dto.QueryTripsResult;
 import de.schildbach.pte.dto.ResultHeader;
 import de.schildbach.pte.dto.StationDepartures;
 import de.schildbach.pte.dto.Style;
@@ -279,6 +284,25 @@ public class InvgProvider extends AbstractHafasProvider
 		return xmlMLcReq(constraint);
 	}
 
+	@Override
+	protected void appendCustomTripsQueryBinaryUri(final StringBuilder uri)
+	{
+	}
+
+	@Override
+	public QueryTripsResult queryTrips(final Location from, final Location via, final Location to, final Date date, final boolean dep,
+			final Collection<Product> products, final WalkSpeed walkSpeed, final Accessibility accessibility, final Set<Option> options)
+			throws IOException
+	{
+		return queryTripsXml(from, via, to, date, dep, products, walkSpeed, accessibility, options);
+	}
+
+	@Override
+	public QueryTripsResult queryMoreTrips(final QueryTripsContext context, final boolean later) throws IOException
+	{
+		return queryMoreTripsXml(context, later);
+	}
+
 	protected static final Pattern P_NORMALIZE_LINE_BUS = Pattern.compile("Bus\\s*(\\d+)");
 	protected static final Pattern P_NORMALIZE_LINE_NACHTBUS = Pattern.compile("Bus\\s*N\\s*(\\d+)");
 	protected static final Pattern P_NORMALIZE_LINE_BUS_S = Pattern.compile("Bus\\s*S\\s*(\\d+)");
diff --git a/enabler/src/de/schildbach/pte/JetProvider.java b/enabler/src/de/schildbach/pte/JetProvider.java
index f7414db7..4258d9cd 100644
--- a/enabler/src/de/schildbach/pte/JetProvider.java
+++ b/enabler/src/de/schildbach/pte/JetProvider.java
@@ -18,10 +18,7 @@
 package de.schildbach.pte;
 
 import java.io.IOException;
-import java.util.Collection;
-import java.util.Date;
 import java.util.List;
-import java.util.Set;
 import java.util.regex.Matcher;
 import java.util.regex.Pattern;
 
@@ -31,8 +28,6 @@ import de.schildbach.pte.dto.LocationType;
 import de.schildbach.pte.dto.NearbyStationsResult;
 import de.schildbach.pte.dto.Product;
 import de.schildbach.pte.dto.QueryDeparturesResult;
-import de.schildbach.pte.dto.QueryTripsContext;
-import de.schildbach.pte.dto.QueryTripsResult;
 
 /**
  * Jesuralem? JET = Jerusalem Eternal Tours?
@@ -152,26 +147,6 @@ public class JetProvider extends AbstractHafasProvider
 		return jsonGetStops(uri.toString());
 	}
 
-	@Override
-	protected void appendCustomTripsQueryBinaryUri(final StringBuilder uri)
-	{
-		uri.append("&h2g-direct=11");
-	}
-
-	@Override
-	public QueryTripsResult queryTrips(final Location from, final Location via, final Location to, final Date date, final boolean dep,
-			final Collection<Product> products, final WalkSpeed walkSpeed, final Accessibility accessibility, final Set<Option> options)
-			throws IOException
-	{
-		return queryTripsBinary(from, via, to, date, dep, products, walkSpeed, accessibility, options);
-	}
-
-	@Override
-	public QueryTripsResult queryMoreTrips(final QueryTripsContext contextObj, final boolean later) throws IOException
-	{
-		return queryMoreTripsBinary(contextObj, later);
-	}
-
 	private static final Pattern P_NORMALIZE_BUS = Pattern.compile("([א]?\\d{1,3})#");
 
 	@Override
diff --git a/enabler/src/de/schildbach/pte/LuProvider.java b/enabler/src/de/schildbach/pte/LuProvider.java
index 12293901..b9f352f2 100644
--- a/enabler/src/de/schildbach/pte/LuProvider.java
+++ b/enabler/src/de/schildbach/pte/LuProvider.java
@@ -18,18 +18,13 @@
 package de.schildbach.pte;
 
 import java.io.IOException;
-import java.util.Collection;
-import java.util.Date;
 import java.util.List;
-import java.util.Set;
 
 import de.schildbach.pte.dto.Location;
 import de.schildbach.pte.dto.LocationType;
 import de.schildbach.pte.dto.NearbyStationsResult;
 import de.schildbach.pte.dto.Product;
 import de.schildbach.pte.dto.QueryDeparturesResult;
-import de.schildbach.pte.dto.QueryTripsContext;
-import de.schildbach.pte.dto.QueryTripsResult;
 
 /**
  * @author Andreas Schildbach
@@ -155,26 +150,6 @@ public class LuProvider extends AbstractHafasProvider
 		return xmlMLcReq(constraint);
 	}
 
-	@Override
-	protected void appendCustomTripsQueryBinaryUri(final StringBuilder uri)
-	{
-		uri.append("&h2g-direct=11");
-	}
-
-	@Override
-	public QueryTripsResult queryTrips(final Location from, final Location via, final Location to, final Date date, final boolean dep,
-			final Collection<Product> products, final WalkSpeed walkSpeed, final Accessibility accessibility, final Set<Option> options)
-			throws IOException
-	{
-		return queryTripsBinary(from, via, to, date, dep, products, walkSpeed, accessibility, options);
-	}
-
-	@Override
-	public QueryTripsResult queryMoreTrips(final QueryTripsContext contextObj, final boolean later) throws IOException
-	{
-		return queryMoreTripsBinary(contextObj, later);
-	}
-
 	@Override
 	protected char normalizeType(final String type)
 	{
diff --git a/enabler/src/de/schildbach/pte/NasaProvider.java b/enabler/src/de/schildbach/pte/NasaProvider.java
index fb4daccc..d555e2a3 100644
--- a/enabler/src/de/schildbach/pte/NasaProvider.java
+++ b/enabler/src/de/schildbach/pte/NasaProvider.java
@@ -18,18 +18,13 @@
 package de.schildbach.pte;
 
 import java.io.IOException;
-import java.util.Collection;
-import java.util.Date;
 import java.util.List;
-import java.util.Set;
 
 import de.schildbach.pte.dto.Location;
 import de.schildbach.pte.dto.LocationType;
 import de.schildbach.pte.dto.NearbyStationsResult;
 import de.schildbach.pte.dto.Product;
 import de.schildbach.pte.dto.QueryDeparturesResult;
-import de.schildbach.pte.dto.QueryTripsContext;
-import de.schildbach.pte.dto.QueryTripsResult;
 
 /**
  * @author Andreas Schildbach
@@ -171,26 +166,6 @@ public class NasaProvider extends AbstractHafasProvider
 		return xmlMLcReq(constraint);
 	}
 
-	@Override
-	protected void appendCustomTripsQueryBinaryUri(final StringBuilder uri)
-	{
-		uri.append("&h2g-direct=11");
-	}
-
-	@Override
-	public QueryTripsResult queryTrips(final Location from, final Location via, final Location to, final Date date, final boolean dep,
-			final Collection<Product> products, final WalkSpeed walkSpeed, final Accessibility accessibility, final Set<Option> options)
-			throws IOException
-	{
-		return queryTripsBinary(from, via, to, date, dep, products, walkSpeed, accessibility, options);
-	}
-
-	@Override
-	public QueryTripsResult queryMoreTrips(final QueryTripsContext contextObj, final boolean later) throws IOException
-	{
-		return queryMoreTripsBinary(contextObj, later);
-	}
-
 	@Override
 	protected char normalizeType(String type)
 	{
diff --git a/enabler/src/de/schildbach/pte/NriProvider.java b/enabler/src/de/schildbach/pte/NriProvider.java
index a844e630..ec64c2aa 100644
--- a/enabler/src/de/schildbach/pte/NriProvider.java
+++ b/enabler/src/de/schildbach/pte/NriProvider.java
@@ -19,13 +19,17 @@ package de.schildbach.pte;
 
 import java.io.IOException;
 import java.util.Collection;
+import java.util.Date;
 import java.util.List;
+import java.util.Set;
 
 import de.schildbach.pte.dto.Location;
 import de.schildbach.pte.dto.LocationType;
 import de.schildbach.pte.dto.NearbyStationsResult;
 import de.schildbach.pte.dto.Product;
 import de.schildbach.pte.dto.QueryDeparturesResult;
+import de.schildbach.pte.dto.QueryTripsContext;
+import de.schildbach.pte.dto.QueryTripsResult;
 
 /**
  * @author Andreas Schildbach
@@ -175,6 +179,25 @@ public class NriProvider extends AbstractHafasProvider
 		return Product.ALL;
 	}
 
+	@Override
+	protected void appendCustomTripsQueryBinaryUri(final StringBuilder uri)
+	{
+	}
+
+	@Override
+	public QueryTripsResult queryTrips(final Location from, final Location via, final Location to, final Date date, final boolean dep,
+			final Collection<Product> products, final WalkSpeed walkSpeed, final Accessibility accessibility, final Set<Option> options)
+			throws IOException
+	{
+		return queryTripsXml(from, via, to, date, dep, products, walkSpeed, accessibility, options);
+	}
+
+	@Override
+	public QueryTripsResult queryMoreTrips(final QueryTripsContext context, final boolean later) throws IOException
+	{
+		return queryMoreTripsXml(context, later);
+	}
+
 	@Override
 	protected char normalizeType(final String type)
 	{
diff --git a/enabler/src/de/schildbach/pte/NsProvider.java b/enabler/src/de/schildbach/pte/NsProvider.java
index 5a300ef5..e2187a3b 100644
--- a/enabler/src/de/schildbach/pte/NsProvider.java
+++ b/enabler/src/de/schildbach/pte/NsProvider.java
@@ -19,17 +19,13 @@ package de.schildbach.pte;
 
 import java.io.IOException;
 import java.util.Collection;
-import java.util.Date;
 import java.util.List;
-import java.util.Set;
 
 import de.schildbach.pte.dto.Location;
 import de.schildbach.pte.dto.LocationType;
 import de.schildbach.pte.dto.NearbyStationsResult;
 import de.schildbach.pte.dto.Product;
 import de.schildbach.pte.dto.QueryDeparturesResult;
-import de.schildbach.pte.dto.QueryTripsContext;
-import de.schildbach.pte.dto.QueryTripsResult;
 
 /**
  * @author Andreas Schildbach
@@ -155,26 +151,6 @@ public class NsProvider extends AbstractHafasProvider
 		return Product.ALL;
 	}
 
-	@Override
-	protected void appendCustomTripsQueryBinaryUri(final StringBuilder uri)
-	{
-		uri.append("&h2g-direct=11");
-	}
-
-	@Override
-	public QueryTripsResult queryTrips(final Location from, final Location via, final Location to, final Date date, final boolean dep,
-			final Collection<Product> products, final WalkSpeed walkSpeed, final Accessibility accessibility, final Set<Option> options)
-			throws IOException
-	{
-		return queryTripsBinary(from, via, to, date, dep, products, walkSpeed, accessibility, options);
-	}
-
-	@Override
-	public QueryTripsResult queryMoreTrips(final QueryTripsContext contextObj, final boolean later) throws IOException
-	{
-		return queryMoreTripsBinary(contextObj, later);
-	}
-
 	@Override
 	protected char normalizeType(final String type)
 	{
diff --git a/enabler/src/de/schildbach/pte/NvvProvider.java b/enabler/src/de/schildbach/pte/NvvProvider.java
index e0310251..b8b1d14a 100644
--- a/enabler/src/de/schildbach/pte/NvvProvider.java
+++ b/enabler/src/de/schildbach/pte/NvvProvider.java
@@ -18,18 +18,13 @@
 package de.schildbach.pte;
 
 import java.io.IOException;
-import java.util.Collection;
-import java.util.Date;
 import java.util.List;
-import java.util.Set;
 
 import de.schildbach.pte.dto.Location;
 import de.schildbach.pte.dto.LocationType;
 import de.schildbach.pte.dto.NearbyStationsResult;
 import de.schildbach.pte.dto.Product;
 import de.schildbach.pte.dto.QueryDeparturesResult;
-import de.schildbach.pte.dto.QueryTripsContext;
-import de.schildbach.pte.dto.QueryTripsResult;
 import de.schildbach.pte.util.StringReplaceReader;
 
 /**
@@ -205,26 +200,6 @@ public class NvvProvider extends AbstractHafasProvider
 		return jsonGetStops(uri.toString());
 	}
 
-	@Override
-	protected void appendCustomTripsQueryBinaryUri(final StringBuilder uri)
-	{
-		uri.append("&h2g-direct=11");
-	}
-
-	@Override
-	public QueryTripsResult queryTrips(final Location from, final Location via, final Location to, final Date date, final boolean dep,
-			final Collection<Product> products, final WalkSpeed walkSpeed, final Accessibility accessibility, final Set<Option> options)
-			throws IOException
-	{
-		return queryTripsBinary(from, via, to, date, dep, products, walkSpeed, accessibility, options);
-	}
-
-	@Override
-	public QueryTripsResult queryMoreTrips(final QueryTripsContext contextObj, final boolean later) throws IOException
-	{
-		return queryMoreTripsBinary(contextObj, later);
-	}
-
 	@Override
 	protected char normalizeType(final String type)
 	{
diff --git a/enabler/src/de/schildbach/pte/OebbProvider.java b/enabler/src/de/schildbach/pte/OebbProvider.java
index 37e95a11..ce2af3f9 100644
--- a/enabler/src/de/schildbach/pte/OebbProvider.java
+++ b/enabler/src/de/schildbach/pte/OebbProvider.java
@@ -19,17 +19,13 @@ package de.schildbach.pte;
 
 import java.io.IOException;
 import java.util.Collection;
-import java.util.Date;
 import java.util.List;
-import java.util.Set;
 
 import de.schildbach.pte.dto.Location;
 import de.schildbach.pte.dto.LocationType;
 import de.schildbach.pte.dto.NearbyStationsResult;
 import de.schildbach.pte.dto.Product;
 import de.schildbach.pte.dto.QueryDeparturesResult;
-import de.schildbach.pte.dto.QueryTripsContext;
-import de.schildbach.pte.dto.QueryTripsResult;
 
 /**
  * @author Andreas Schildbach
@@ -190,26 +186,6 @@ public class OebbProvider extends AbstractHafasProvider
 		return Product.ALL;
 	}
 
-	@Override
-	protected void appendCustomTripsQueryBinaryUri(final StringBuilder uri)
-	{
-		uri.append("&h2g-direct=11");
-	}
-
-	@Override
-	public QueryTripsResult queryTrips(final Location from, final Location via, final Location to, final Date date, final boolean dep,
-			final Collection<Product> products, final WalkSpeed walkSpeed, final Accessibility accessibility, final Set<Option> options)
-			throws IOException
-	{
-		return queryTripsBinary(from, via, to, date, dep, products, walkSpeed, accessibility, options);
-	}
-
-	@Override
-	public QueryTripsResult queryMoreTrips(final QueryTripsContext contextObj, final boolean later) throws IOException
-	{
-		return queryMoreTripsBinary(contextObj, later);
-	}
-
 	@Override
 	protected char normalizeType(final String type)
 	{
diff --git a/enabler/src/de/schildbach/pte/PlProvider.java b/enabler/src/de/schildbach/pte/PlProvider.java
index 268917f5..67c79500 100644
--- a/enabler/src/de/schildbach/pte/PlProvider.java
+++ b/enabler/src/de/schildbach/pte/PlProvider.java
@@ -19,17 +19,13 @@ package de.schildbach.pte;
 
 import java.io.IOException;
 import java.util.Collection;
-import java.util.Date;
 import java.util.List;
-import java.util.Set;
 
 import de.schildbach.pte.dto.Location;
 import de.schildbach.pte.dto.LocationType;
 import de.schildbach.pte.dto.NearbyStationsResult;
 import de.schildbach.pte.dto.Product;
 import de.schildbach.pte.dto.QueryDeparturesResult;
-import de.schildbach.pte.dto.QueryTripsContext;
-import de.schildbach.pte.dto.QueryTripsResult;
 import de.schildbach.pte.util.StringReplaceReader;
 
 /**
@@ -188,26 +184,6 @@ public class PlProvider extends AbstractHafasProvider
 		return Product.ALL;
 	}
 
-	@Override
-	protected void appendCustomTripsQueryBinaryUri(final StringBuilder uri)
-	{
-		uri.append("&h2g-direct=11");
-	}
-
-	@Override
-	public QueryTripsResult queryTrips(final Location from, final Location via, final Location to, final Date date, final boolean dep,
-			final Collection<Product> products, final WalkSpeed walkSpeed, final Accessibility accessibility, final Set<Option> options)
-			throws IOException
-	{
-		return queryTripsBinary(from, via, to, date, dep, products, walkSpeed, accessibility, options);
-	}
-
-	@Override
-	public QueryTripsResult queryMoreTrips(final QueryTripsContext contextObj, final boolean later) throws IOException
-	{
-		return queryMoreTripsBinary(contextObj, later);
-	}
-
 	@Override
 	protected char normalizeType(final String type)
 	{
diff --git a/enabler/src/de/schildbach/pte/RtProvider.java b/enabler/src/de/schildbach/pte/RtProvider.java
index 71322d34..de738677 100644
--- a/enabler/src/de/schildbach/pte/RtProvider.java
+++ b/enabler/src/de/schildbach/pte/RtProvider.java
@@ -19,17 +19,13 @@ package de.schildbach.pte;
 
 import java.io.IOException;
 import java.util.Collection;
-import java.util.Date;
 import java.util.List;
-import java.util.Set;
 
 import de.schildbach.pte.dto.Location;
 import de.schildbach.pte.dto.LocationType;
 import de.schildbach.pte.dto.NearbyStationsResult;
 import de.schildbach.pte.dto.Product;
 import de.schildbach.pte.dto.QueryDeparturesResult;
-import de.schildbach.pte.dto.QueryTripsContext;
-import de.schildbach.pte.dto.QueryTripsResult;
 
 /**
  * @author Andreas Schildbach
@@ -148,26 +144,6 @@ public class RtProvider extends AbstractHafasProvider
 		return Product.ALL;
 	}
 
-	@Override
-	protected void appendCustomTripsQueryBinaryUri(final StringBuilder uri)
-	{
-		uri.append("&h2g-direct=11");
-	}
-
-	@Override
-	public QueryTripsResult queryTrips(final Location from, final Location via, final Location to, final Date date, final boolean dep,
-			final Collection<Product> products, final WalkSpeed walkSpeed, final Accessibility accessibility, final Set<Option> options)
-			throws IOException
-	{
-		return queryTripsBinary(from, via, to, date, dep, products, walkSpeed, accessibility, options);
-	}
-
-	@Override
-	public QueryTripsResult queryMoreTrips(final QueryTripsContext contextObj, final boolean later) throws IOException
-	{
-		return queryMoreTripsBinary(contextObj, later);
-	}
-
 	@Override
 	protected char normalizeType(final String type)
 	{
diff --git a/enabler/src/de/schildbach/pte/SbbProvider.java b/enabler/src/de/schildbach/pte/SbbProvider.java
index 3742c9bb..53449fcc 100644
--- a/enabler/src/de/schildbach/pte/SbbProvider.java
+++ b/enabler/src/de/schildbach/pte/SbbProvider.java
@@ -19,17 +19,13 @@ package de.schildbach.pte;
 
 import java.io.IOException;
 import java.util.Collection;
-import java.util.Date;
 import java.util.List;
-import java.util.Set;
 
 import de.schildbach.pte.dto.Location;
 import de.schildbach.pte.dto.LocationType;
 import de.schildbach.pte.dto.NearbyStationsResult;
 import de.schildbach.pte.dto.Product;
 import de.schildbach.pte.dto.QueryDeparturesResult;
-import de.schildbach.pte.dto.QueryTripsContext;
-import de.schildbach.pte.dto.QueryTripsResult;
 
 /**
  * @author Andreas Schildbach
@@ -143,26 +139,6 @@ public class SbbProvider extends AbstractHafasProvider
 		return Product.ALL;
 	}
 
-	@Override
-	protected void appendCustomTripsQueryBinaryUri(final StringBuilder uri)
-	{
-		uri.append("&h2g-direct=11");
-	}
-
-	@Override
-	public QueryTripsResult queryTrips(final Location from, final Location via, final Location to, final Date date, final boolean dep,
-			final Collection<Product> products, final WalkSpeed walkSpeed, final Accessibility accessibility, final Set<Option> options)
-			throws IOException
-	{
-		return queryTripsBinary(from, via, to, date, dep, products, walkSpeed, accessibility, options);
-	}
-
-	@Override
-	public QueryTripsResult queryMoreTrips(final QueryTripsContext contextObj, final boolean later) throws IOException
-	{
-		return queryMoreTripsBinary(contextObj, later);
-	}
-
 	@Override
 	protected char normalizeType(final String type)
 	{
diff --git a/enabler/src/de/schildbach/pte/SeProvider.java b/enabler/src/de/schildbach/pte/SeProvider.java
index e6bc7320..feaa5b08 100644
--- a/enabler/src/de/schildbach/pte/SeProvider.java
+++ b/enabler/src/de/schildbach/pte/SeProvider.java
@@ -19,9 +19,7 @@ package de.schildbach.pte;
 
 import java.io.IOException;
 import java.util.Collection;
-import java.util.Date;
 import java.util.List;
-import java.util.Set;
 import java.util.regex.Matcher;
 import java.util.regex.Pattern;
 
@@ -31,8 +29,6 @@ import de.schildbach.pte.dto.LocationType;
 import de.schildbach.pte.dto.NearbyStationsResult;
 import de.schildbach.pte.dto.Product;
 import de.schildbach.pte.dto.QueryDeparturesResult;
-import de.schildbach.pte.dto.QueryTripsContext;
-import de.schildbach.pte.dto.QueryTripsResult;
 
 /**
  * @author Andreas Schildbach
@@ -192,26 +188,6 @@ public class SeProvider extends AbstractHafasProvider
 		return jsonGetStops(uri.toString());
 	}
 
-	@Override
-	protected void appendCustomTripsQueryBinaryUri(final StringBuilder uri)
-	{
-		uri.append("&h2g-direct=11");
-	}
-
-	@Override
-	public QueryTripsResult queryTrips(final Location from, final Location via, final Location to, final Date date, final boolean dep,
-			final Collection<Product> products, final WalkSpeed walkSpeed, final Accessibility accessibility, final Set<Option> options)
-			throws IOException
-	{
-		return queryTripsBinary(from, via, to, date, dep, products, walkSpeed, accessibility, options);
-	}
-
-	@Override
-	public QueryTripsResult queryMoreTrips(final QueryTripsContext contextObj, final boolean later) throws IOException
-	{
-		return queryMoreTripsBinary(contextObj, later);
-	}
-
 	@Override
 	public Collection<Product> defaultProducts()
 	{
diff --git a/enabler/src/de/schildbach/pte/SeptaProvider.java b/enabler/src/de/schildbach/pte/SeptaProvider.java
index 3285fcac..ba84aa02 100644
--- a/enabler/src/de/schildbach/pte/SeptaProvider.java
+++ b/enabler/src/de/schildbach/pte/SeptaProvider.java
@@ -20,10 +20,13 @@ package de.schildbach.pte;
 import java.io.IOException;
 import java.util.ArrayList;
 import java.util.Calendar;
+import java.util.Collection;
 import java.util.Collections;
+import java.util.Date;
 import java.util.GregorianCalendar;
 import java.util.List;
 import java.util.Locale;
+import java.util.Set;
 import java.util.TimeZone;
 import java.util.regex.Matcher;
 import java.util.regex.Pattern;
@@ -37,6 +40,8 @@ import de.schildbach.pte.dto.Position;
 import de.schildbach.pte.dto.Product;
 import de.schildbach.pte.dto.QueryDeparturesResult;
 import de.schildbach.pte.dto.QueryDeparturesResult.Status;
+import de.schildbach.pte.dto.QueryTripsContext;
+import de.schildbach.pte.dto.QueryTripsResult;
 import de.schildbach.pte.dto.ResultHeader;
 import de.schildbach.pte.dto.StationDepartures;
 import de.schildbach.pte.util.ParserUtils;
@@ -297,6 +302,25 @@ public class SeptaProvider extends AbstractHafasProvider
 		return jsonGetStops(uri.toString());
 	}
 
+	@Override
+	protected void appendCustomTripsQueryBinaryUri(final StringBuilder uri)
+	{
+	}
+
+	@Override
+	public QueryTripsResult queryTrips(final Location from, final Location via, final Location to, final Date date, final boolean dep,
+			final Collection<Product> products, final WalkSpeed walkSpeed, final Accessibility accessibility, final Set<Option> options)
+			throws IOException
+	{
+		return queryTripsXml(from, via, to, date, dep, products, walkSpeed, accessibility, options);
+	}
+
+	@Override
+	public QueryTripsResult queryMoreTrips(final QueryTripsContext context, final boolean later) throws IOException
+	{
+		return queryMoreTripsXml(context, later);
+	}
+
 	@Override
 	protected char normalizeType(final String type)
 	{
diff --git a/enabler/src/de/schildbach/pte/ShProvider.java b/enabler/src/de/schildbach/pte/ShProvider.java
index 737b99c3..9591e250 100644
--- a/enabler/src/de/schildbach/pte/ShProvider.java
+++ b/enabler/src/de/schildbach/pte/ShProvider.java
@@ -20,12 +20,9 @@ package de.schildbach.pte;
 import java.io.IOException;
 import java.util.ArrayList;
 import java.util.Calendar;
-import java.util.Collection;
 import java.util.Collections;
-import java.util.Date;
 import java.util.GregorianCalendar;
 import java.util.List;
-import java.util.Set;
 import java.util.regex.Matcher;
 import java.util.regex.Pattern;
 
@@ -38,8 +35,6 @@ import de.schildbach.pte.dto.Position;
 import de.schildbach.pte.dto.Product;
 import de.schildbach.pte.dto.QueryDeparturesResult;
 import de.schildbach.pte.dto.QueryDeparturesResult.Status;
-import de.schildbach.pte.dto.QueryTripsContext;
-import de.schildbach.pte.dto.QueryTripsResult;
 import de.schildbach.pte.dto.ResultHeader;
 import de.schildbach.pte.dto.StationDepartures;
 import de.schildbach.pte.util.ParserUtils;
@@ -261,26 +256,6 @@ public class ShProvider extends AbstractHafasProvider
 		return xmlMLcReq(constraint);
 	}
 
-	@Override
-	protected void appendCustomTripsQueryBinaryUri(final StringBuilder uri)
-	{
-		uri.append("&h2g-direct=11");
-	}
-
-	@Override
-	public QueryTripsResult queryTrips(final Location from, final Location via, final Location to, final Date date, final boolean dep,
-			final Collection<Product> products, final WalkSpeed walkSpeed, final Accessibility accessibility, final Set<Option> options)
-			throws IOException
-	{
-		return queryTripsBinary(from, via, to, date, dep, products, walkSpeed, accessibility, options);
-	}
-
-	@Override
-	public QueryTripsResult queryMoreTrips(final QueryTripsContext contextObj, final boolean later) throws IOException
-	{
-		return queryMoreTripsBinary(contextObj, later);
-	}
-
 	@Override
 	protected char normalizeType(final String type)
 	{
diff --git a/enabler/src/de/schildbach/pte/SncbProvider.java b/enabler/src/de/schildbach/pte/SncbProvider.java
index b5ba5d20..88877bbd 100644
--- a/enabler/src/de/schildbach/pte/SncbProvider.java
+++ b/enabler/src/de/schildbach/pte/SncbProvider.java
@@ -19,17 +19,13 @@ package de.schildbach.pte;
 
 import java.io.IOException;
 import java.util.Collection;
-import java.util.Date;
 import java.util.List;
-import java.util.Set;
 
 import de.schildbach.pte.dto.Location;
 import de.schildbach.pte.dto.LocationType;
 import de.schildbach.pte.dto.NearbyStationsResult;
 import de.schildbach.pte.dto.Product;
 import de.schildbach.pte.dto.QueryDeparturesResult;
-import de.schildbach.pte.dto.QueryTripsContext;
-import de.schildbach.pte.dto.QueryTripsResult;
 
 /**
  * @author Andreas Schildbach
@@ -174,26 +170,6 @@ public class SncbProvider extends AbstractHafasProvider
 		return Product.ALL;
 	}
 
-	@Override
-	protected void appendCustomTripsQueryBinaryUri(final StringBuilder uri)
-	{
-		uri.append("&h2g-direct=11");
-	}
-
-	@Override
-	public QueryTripsResult queryTrips(final Location from, final Location via, final Location to, final Date date, final boolean dep,
-			final Collection<Product> products, final WalkSpeed walkSpeed, final Accessibility accessibility, final Set<Option> options)
-			throws IOException
-	{
-		return queryTripsBinary(from, via, to, date, dep, products, walkSpeed, accessibility, options);
-	}
-
-	@Override
-	public QueryTripsResult queryMoreTrips(final QueryTripsContext contextObj, final boolean later) throws IOException
-	{
-		return queryMoreTripsBinary(contextObj, later);
-	}
-
 	@Override
 	protected char normalizeType(final String type)
 	{
diff --git a/enabler/src/de/schildbach/pte/StockholmProvider.java b/enabler/src/de/schildbach/pte/StockholmProvider.java
index 2e21db3b..7c101a4b 100644
--- a/enabler/src/de/schildbach/pte/StockholmProvider.java
+++ b/enabler/src/de/schildbach/pte/StockholmProvider.java
@@ -18,12 +18,9 @@
 package de.schildbach.pte;
 
 import java.io.IOException;
-import java.util.Collection;
-import java.util.Date;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
-import java.util.Set;
 import java.util.regex.Matcher;
 import java.util.regex.Pattern;
 
@@ -33,8 +30,6 @@ import de.schildbach.pte.dto.LocationType;
 import de.schildbach.pte.dto.NearbyStationsResult;
 import de.schildbach.pte.dto.Product;
 import de.schildbach.pte.dto.QueryDeparturesResult;
-import de.schildbach.pte.dto.QueryTripsContext;
-import de.schildbach.pte.dto.QueryTripsResult;
 import de.schildbach.pte.dto.Style;
 import de.schildbach.pte.dto.Style.Shape;
 
@@ -184,27 +179,13 @@ public class StockholmProvider extends AbstractHafasProvider
 	@Override
 	protected void appendCustomTripsQueryBinaryUri(final StringBuilder uri)
 	{
-		uri.append("&h2g-direct=11"
-				+ "&REQ0HafasSearchIndividual=1&REQ0HafasSearchPublic=1"
+		super.appendCustomTripsQueryBinaryUri(uri);
+		uri.append("&REQ0HafasSearchIndividual=1&REQ0HafasSearchPublic=1"
 				+ "&existIntermodalDep_enable=yes&existIntermodalDest_enable=yes&existTotal_enable=yes"
 				+ "&REQ0JourneyDep_Foot_enable=1&REQ0JourneyDep_Foot_maxDist=5000&REQ0JourneyDep_Foot_minDist=0&REQ0JourneyDep_Foot_speed=100&REQ0JourneyDep_Bike_enable=0&REQ0JourneyDep_ParkRide_enable=0"
 				+ "&REQ0JourneyDest_Foot_enable=1&REQ0JourneyDest_Foot_maxDist=5000&REQ0JourneyDest_Foot_minDist=0&REQ0JourneyDest_Foot_speed=100&REQ0JourneyDest_Bike_enable=0&REQ0JourneyDest_ParkRide_enable=0");
 	}
 
-	@Override
-	public QueryTripsResult queryTrips(final Location from, final Location via, final Location to, final Date date, final boolean dep,
-			final Collection<Product> products, final WalkSpeed walkSpeed, final Accessibility accessibility, final Set<Option> options)
-			throws IOException
-	{
-		return queryTripsBinary(from, via, to, date, dep, products, walkSpeed, accessibility, options);
-	}
-
-	@Override
-	public QueryTripsResult queryMoreTrips(final QueryTripsContext contextObj, final boolean later) throws IOException
-	{
-		return queryMoreTripsBinary(contextObj, later);
-	}
-
 	@Override
 	protected Line parseLineAndType(final String lineAndType)
 	{
diff --git a/enabler/src/de/schildbach/pte/VbbProvider.java b/enabler/src/de/schildbach/pte/VbbProvider.java
index 791a1a9c..9da8488a 100644
--- a/enabler/src/de/schildbach/pte/VbbProvider.java
+++ b/enabler/src/de/schildbach/pte/VbbProvider.java
@@ -19,7 +19,6 @@ package de.schildbach.pte;
 
 import java.io.IOException;
 import java.util.Collection;
-import java.util.Date;
 import java.util.HashSet;
 import java.util.List;
 import java.util.Set;
@@ -32,8 +31,6 @@ import de.schildbach.pte.dto.LocationType;
 import de.schildbach.pte.dto.NearbyStationsResult;
 import de.schildbach.pte.dto.Product;
 import de.schildbach.pte.dto.QueryDeparturesResult;
-import de.schildbach.pte.dto.QueryTripsContext;
-import de.schildbach.pte.dto.QueryTripsResult;
 
 /**
  * @author Andreas Schildbach
@@ -181,12 +178,6 @@ public class VbbProvider extends AbstractHafasProvider
 		return xmlQueryDepartures(uri.toString(), stationId);
 	}
 
-	@Override
-	public Collection<Product> defaultProducts()
-	{
-		return ALL_EXCEPT_HIGHSPEED_AND_ONDEMAND;
-	}
-
 	public List<Location> autocompleteStations(final CharSequence constraint) throws IOException
 	{
 		final StringBuilder uri = new StringBuilder(getStopEndpoint);
@@ -196,23 +187,9 @@ public class VbbProvider extends AbstractHafasProvider
 	}
 
 	@Override
-	protected void appendCustomTripsQueryBinaryUri(final StringBuilder uri)
+	public Collection<Product> defaultProducts()
 	{
-		uri.append("&h2g-direct=11");
-	}
-
-	@Override
-	public QueryTripsResult queryTrips(final Location from, final Location via, final Location to, final Date date, final boolean dep,
-			final Collection<Product> products, final WalkSpeed walkSpeed, final Accessibility accessibility, final Set<Option> options)
-			throws IOException
-	{
-		return queryTripsBinary(from, via, to, date, dep, products, walkSpeed, accessibility, options);
-	}
-
-	@Override
-	public QueryTripsResult queryMoreTrips(final QueryTripsContext contextObj, final boolean later) throws IOException
-	{
-		return queryMoreTripsBinary(contextObj, later);
+		return ALL_EXCEPT_HIGHSPEED_AND_ONDEMAND;
 	}
 
 	@Override
diff --git a/enabler/src/de/schildbach/pte/VbnProvider.java b/enabler/src/de/schildbach/pte/VbnProvider.java
index 7d4c516e..bbcc08de 100644
--- a/enabler/src/de/schildbach/pte/VbnProvider.java
+++ b/enabler/src/de/schildbach/pte/VbnProvider.java
@@ -18,18 +18,13 @@
 package de.schildbach.pte;
 
 import java.io.IOException;
-import java.util.Collection;
-import java.util.Date;
 import java.util.List;
-import java.util.Set;
 
 import de.schildbach.pte.dto.Location;
 import de.schildbach.pte.dto.LocationType;
 import de.schildbach.pte.dto.NearbyStationsResult;
 import de.schildbach.pte.dto.Product;
 import de.schildbach.pte.dto.QueryDeparturesResult;
-import de.schildbach.pte.dto.QueryTripsContext;
-import de.schildbach.pte.dto.QueryTripsResult;
 
 /**
  * @author Andreas Schildbach
@@ -157,26 +152,6 @@ public class VbnProvider extends AbstractHafasProvider
 		return jsonGetStops(uri.toString());
 	}
 
-	@Override
-	protected void appendCustomTripsQueryBinaryUri(final StringBuilder uri)
-	{
-		uri.append("&h2g-direct=11");
-	}
-
-	@Override
-	public QueryTripsResult queryTrips(final Location from, final Location via, final Location to, final Date date, final boolean dep,
-			final Collection<Product> products, final WalkSpeed walkSpeed, final Accessibility accessibility, final Set<Option> options)
-			throws IOException
-	{
-		return queryTripsBinary(from, via, to, date, dep, products, walkSpeed, accessibility, options);
-	}
-
-	@Override
-	public QueryTripsResult queryMoreTrips(final QueryTripsContext contextObj, final boolean later) throws IOException
-	{
-		return queryMoreTripsBinary(contextObj, later);
-	}
-
 	@Override
 	protected char normalizeType(final String type)
 	{
diff --git a/enabler/src/de/schildbach/pte/VgsProvider.java b/enabler/src/de/schildbach/pte/VgsProvider.java
index df037b62..20dcef70 100644
--- a/enabler/src/de/schildbach/pte/VgsProvider.java
+++ b/enabler/src/de/schildbach/pte/VgsProvider.java
@@ -18,18 +18,13 @@
 package de.schildbach.pte;
 
 import java.io.IOException;
-import java.util.Collection;
-import java.util.Date;
 import java.util.List;
-import java.util.Set;
 
 import de.schildbach.pte.dto.Location;
 import de.schildbach.pte.dto.LocationType;
 import de.schildbach.pte.dto.NearbyStationsResult;
 import de.schildbach.pte.dto.Product;
 import de.schildbach.pte.dto.QueryDeparturesResult;
-import de.schildbach.pte.dto.QueryTripsContext;
-import de.schildbach.pte.dto.QueryTripsResult;
 
 /**
  * @author Andreas Schildbach
@@ -159,24 +154,4 @@ public class VgsProvider extends AbstractHafasProvider
 
 		return jsonGetStops(uri.toString());
 	}
-
-	@Override
-	protected void appendCustomTripsQueryBinaryUri(final StringBuilder uri)
-	{
-		uri.append("&h2g-direct=11");
-	}
-
-	@Override
-	public QueryTripsResult queryTrips(final Location from, final Location via, final Location to, final Date date, final boolean dep,
-			final Collection<Product> products, final WalkSpeed walkSpeed, final Accessibility accessibility, final Set<Option> options)
-			throws IOException
-	{
-		return queryTripsBinary(from, via, to, date, dep, products, walkSpeed, accessibility, options);
-	}
-
-	@Override
-	public QueryTripsResult queryMoreTrips(final QueryTripsContext contextObj, final boolean later) throws IOException
-	{
-		return queryMoreTripsBinary(contextObj, later);
-	}
 }
diff --git a/enabler/src/de/schildbach/pte/ZvvProvider.java b/enabler/src/de/schildbach/pte/ZvvProvider.java
index a0e039d2..07124523 100644
--- a/enabler/src/de/schildbach/pte/ZvvProvider.java
+++ b/enabler/src/de/schildbach/pte/ZvvProvider.java
@@ -18,12 +18,9 @@
 package de.schildbach.pte;
 
 import java.io.IOException;
-import java.util.Collection;
-import java.util.Date;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
-import java.util.Set;
 import java.util.regex.Matcher;
 
 import de.schildbach.pte.dto.Line;
@@ -32,8 +29,6 @@ import de.schildbach.pte.dto.LocationType;
 import de.schildbach.pte.dto.NearbyStationsResult;
 import de.schildbach.pte.dto.Product;
 import de.schildbach.pte.dto.QueryDeparturesResult;
-import de.schildbach.pte.dto.QueryTripsContext;
-import de.schildbach.pte.dto.QueryTripsResult;
 import de.schildbach.pte.dto.Style;
 import de.schildbach.pte.dto.Style.Shape;
 
@@ -202,26 +197,6 @@ public class ZvvProvider extends AbstractHafasProvider
 		return xmlMLcReq(constraint);
 	}
 
-	@Override
-	protected void appendCustomTripsQueryBinaryUri(final StringBuilder uri)
-	{
-		uri.append("&h2g-direct=11");
-	}
-
-	@Override
-	public QueryTripsResult queryTrips(final Location from, final Location via, final Location to, final Date date, final boolean dep,
-			final Collection<Product> products, final WalkSpeed walkSpeed, final Accessibility accessibility, final Set<Option> options)
-			throws IOException
-	{
-		return queryTripsBinary(from, via, to, date, dep, products, walkSpeed, accessibility, options);
-	}
-
-	@Override
-	public QueryTripsResult queryMoreTrips(final QueryTripsContext contextObj, final boolean later) throws IOException
-	{
-		return queryMoreTripsBinary(contextObj, later);
-	}
-
 	@Override
 	protected Line parseLineAndType(final String lineAndType)
 	{