From 1be4366acbf066294aae93a4c7bf1963c1e4b1a6 Mon Sep 17 00:00:00 2001
From: Andreas Schildbach <andreas@schildbach.de>
Date: Fri, 30 May 2014 23:33:03 +0200
Subject: [PATCH] Migrate Switzerland to binary trips query.

---
 .../src/de/schildbach/pte/SbbProvider.java    | 29 ++++++++++++++++---
 .../pte/live/SbbProviderLiveTest.java         |  2 +-
 .../schildbach/pte/live/Secrets.java.template |  1 -
 3 files changed, 26 insertions(+), 6 deletions(-)

diff --git a/enabler/src/de/schildbach/pte/SbbProvider.java b/enabler/src/de/schildbach/pte/SbbProvider.java
index c2b71a24..3742c9bb 100644
--- a/enabler/src/de/schildbach/pte/SbbProvider.java
+++ b/enabler/src/de/schildbach/pte/SbbProvider.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
@@ -35,12 +39,9 @@ public class SbbProvider extends AbstractHafasProvider
 	public static final NetworkId NETWORK_ID = NetworkId.SBB;
 	private static final String API_BASE = "http://fahrplan.sbb.ch/bin/";
 
-	public SbbProvider(final String accessId)
+	public SbbProvider()
 	{
 		super(API_BASE + "stboard.exe/dn", API_BASE + "ajax-getstop.exe/dn", API_BASE + "query.exe/dn", 10);
-
-		setAccessId(accessId);
-		setExtXmlEndpoint(API_BASE + "extxml.exe");
 	}
 
 	public NetworkId id()
@@ -142,6 +143,26 @@ 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/test/de/schildbach/pte/live/SbbProviderLiveTest.java b/enabler/test/de/schildbach/pte/live/SbbProviderLiveTest.java
index e18cc553..7bae87ec 100644
--- a/enabler/test/de/schildbach/pte/live/SbbProviderLiveTest.java
+++ b/enabler/test/de/schildbach/pte/live/SbbProviderLiveTest.java
@@ -41,7 +41,7 @@ public class SbbProviderLiveTest extends AbstractProviderLiveTest
 {
 	public SbbProviderLiveTest()
 	{
-		super(new SbbProvider(Secrets.SBB_ACCESS_ID));
+		super(new SbbProvider());
 	}
 
 	@Test
diff --git a/enabler/test/de/schildbach/pte/live/Secrets.java.template b/enabler/test/de/schildbach/pte/live/Secrets.java.template
index 2a36f23e..8ee8659d 100644
--- a/enabler/test/de/schildbach/pte/live/Secrets.java.template
+++ b/enabler/test/de/schildbach/pte/live/Secrets.java.template
@@ -22,6 +22,5 @@ package de.schildbach.pte.live;
  */
 public final class Secrets
 {
-	public static final String SBB_ACCESS_ID = "insert your access id here";
 	public static final String VGN_API_BASE = "insert vgn base here";
 }