From 69ca0a5f94a03edf827fddbfd65a21680f0955b5 Mon Sep 17 00:00:00 2001 From: "andreas.schildbach@gmail.com" Date: Tue, 14 Feb 2012 10:34:23 +0000 Subject: [PATCH] query previous connections for EFA based providers git-svn-id: https://public-transport-enabler.googlecode.com/svn/trunk@944 0924bc21-9374-b0fa-ee44-9ff1593b38f0 --- src/de/schildbach/pte/AbstractEfaProvider.java | 14 ++++++++------ src/de/schildbach/pte/AbstractHafasProvider.java | 12 ++++++------ src/de/schildbach/pte/BahnProvider.java | 3 ++- src/de/schildbach/pte/BvgProvider.java | 3 ++- src/de/schildbach/pte/NetworkProvider.java | 4 +++- .../schildbach/pte/live/AtcProviderLiveTest.java | 2 +- .../schildbach/pte/live/AvvProviderLiveTest.java | 2 +- .../schildbach/pte/live/BahnProviderLiveTest.java | 6 +++--- .../pte/live/BayernProviderLiveTest.java | 10 +++++----- .../schildbach/pte/live/BsagProviderLiveTest.java | 2 +- .../schildbach/pte/live/BsvagProviderLiveTest.java | 2 +- .../schildbach/pte/live/BvbProviderLiveTest.java | 2 +- .../schildbach/pte/live/BvgProviderLiveTest.java | 14 +++++++------- .../schildbach/pte/live/DingProviderLiveTest.java | 2 +- .../schildbach/pte/live/DsbProviderLiveTest.java | 2 +- .../schildbach/pte/live/DubProviderLiveTest.java | 2 +- .../schildbach/pte/live/GvhProviderLiveTest.java | 6 +++--- .../schildbach/pte/live/InvgProviderLiveTest.java | 2 +- .../schildbach/pte/live/IvbProviderLiveTest.java | 2 +- .../schildbach/pte/live/KvvProviderLiveTest.java | 2 +- .../schildbach/pte/live/LinzProviderLiveTest.java | 4 ++-- .../de/schildbach/pte/live/LuProviderLiveTest.java | 4 ++-- .../pte/live/MariborProviderLiveTest.java | 2 +- .../schildbach/pte/live/MetProviderLiveTest.java | 2 +- .../schildbach/pte/live/MvgProviderLiveTest.java | 2 +- .../schildbach/pte/live/MvvProviderLiveTest.java | 14 ++++++++------ .../schildbach/pte/live/NaldoProviderLiveTest.java | 2 +- .../schildbach/pte/live/NasaProviderLiveTest.java | 4 ++-- .../schildbach/pte/live/NphProviderLiveTest.java | 2 +- .../schildbach/pte/live/NriProviderLiveTest.java | 2 +- .../schildbach/pte/live/NvbwProviderLiveTest.java | 2 +- .../schildbach/pte/live/NvvProviderLiveTest.java | 2 +- .../schildbach/pte/live/OebbProviderLiveTest.java | 8 ++++---- .../de/schildbach/pte/live/PlProviderLiveTest.java | 2 +- .../schildbach/pte/live/RmvProviderLiveTest.java | 2 +- .../de/schildbach/pte/live/RtProviderLiveTest.java | 10 +++++----- .../schildbach/pte/live/SbbProviderLiveTest.java | 8 ++++---- .../de/schildbach/pte/live/SeProviderLiveTest.java | 2 +- .../schildbach/pte/live/SeptaProviderLiveTest.java | 4 ++-- .../de/schildbach/pte/live/SfProviderLiveTest.java | 2 +- .../de/schildbach/pte/live/ShProviderLiveTest.java | 2 +- .../schildbach/pte/live/SncbProviderLiveTest.java | 6 +++--- .../pte/live/StockholmProviderLiveTest.java | 2 +- .../schildbach/pte/live/StvProviderLiveTest.java | 2 +- .../schildbach/pte/live/SvvProviderLiveTest.java | 2 +- .../pte/live/SydneyProviderLiveTest.java | 2 +- .../schildbach/pte/live/TflProviderLiveTest.java | 2 +- .../schildbach/pte/live/TleaProviderLiveTest.java | 2 +- .../schildbach/pte/live/TlemProviderLiveTest.java | 2 +- .../schildbach/pte/live/TlseProviderLiveTest.java | 2 +- .../schildbach/pte/live/TlswProviderLiveTest.java | 2 +- .../schildbach/pte/live/VagfrProviderLiveTest.java | 2 +- .../schildbach/pte/live/VbbProviderLiveTest.java | 12 ++++++------ .../schildbach/pte/live/VblProviderLiveTest.java | 2 +- .../schildbach/pte/live/VbnProviderLiveTest.java | 2 +- .../schildbach/pte/live/VgnProviderLiveTest.java | 2 +- .../schildbach/pte/live/VgsProviderLiveTest.java | 2 +- .../pte/live/VmobilProviderLiveTest.java | 2 +- .../schildbach/pte/live/VmsProviderLiveTest.java | 2 +- .../schildbach/pte/live/VmvProviderLiveTest.java | 2 +- .../schildbach/pte/live/VorProviderLiveTest.java | 2 +- .../schildbach/pte/live/VrnProviderLiveTest.java | 2 +- .../schildbach/pte/live/VrrProviderLiveTest.java | 2 +- .../schildbach/pte/live/VrtProviderLiveTest.java | 2 +- .../schildbach/pte/live/VvmProviderLiveTest.java | 2 +- .../schildbach/pte/live/VvoProviderLiveTest.java | 2 +- .../schildbach/pte/live/VvsProviderLiveTest.java | 2 +- .../schildbach/pte/live/VvtProviderLiveTest.java | 2 +- .../schildbach/pte/live/ZvvProviderLiveTest.java | 2 +- 69 files changed, 127 insertions(+), 119 deletions(-) diff --git a/src/de/schildbach/pte/AbstractEfaProvider.java b/src/de/schildbach/pte/AbstractEfaProvider.java index 5d0f2124..f3893080 100644 --- a/src/de/schildbach/pte/AbstractEfaProvider.java +++ b/src/de/schildbach/pte/AbstractEfaProvider.java @@ -1612,7 +1612,7 @@ public abstract class AbstractEfaProvider extends AbstractNetworkProvider return uri.toString(); } - private String commandLink(final String sessionId, final String requestId, final String command) + private String commandLink(final String sessionId, final String requestId) { final StringBuilder uri = new StringBuilder(apiBase); uri.append(tripEndpoint); @@ -1620,7 +1620,6 @@ public abstract class AbstractEfaProvider extends AbstractNetworkProvider uri.append("?sessionID=").append(sessionId); uri.append("&requestID=").append(requestId); appendCommonXsltTripRequest2Params(uri); - uri.append("&command=").append(command); return uri.toString(); } @@ -1653,13 +1652,16 @@ public abstract class AbstractEfaProvider extends AbstractNetworkProvider } } - public QueryConnectionsResult queryMoreConnections(final String uri) throws IOException + public QueryConnectionsResult queryMoreConnections(final String commandUri, final boolean next) throws IOException { + final StringBuilder uri = new StringBuilder(commandUri); + uri.append("&command=").append(next ? "tripNext" : "tripPrev"); + InputStream is = null; try { - is = ParserUtils.scrapeInputStream(uri, null, "NSC_", 3); - return queryConnections(uri, is); + is = ParserUtils.scrapeInputStream(uri.toString(), null, "NSC_", 3); + return queryConnections(uri.toString(), is); } catch (final XmlPullParserException x) { @@ -2052,7 +2054,7 @@ public abstract class AbstractEfaProvider extends AbstractNetworkProvider XmlPullUtil.exit(pp, "itdRouteList"); - return new QueryConnectionsResult(header, uri, from, via, to, commandLink(context, requestId, "tripNext"), connections); + return new QueryConnectionsResult(header, uri, from, via, to, commandLink(context, requestId), connections); } else { diff --git a/src/de/schildbach/pte/AbstractHafasProvider.java b/src/de/schildbach/pte/AbstractHafasProvider.java index 1d6ea456..7a88cf52 100644 --- a/src/de/schildbach/pte/AbstractHafasProvider.java +++ b/src/de/schildbach/pte/AbstractHafasProvider.java @@ -752,7 +752,6 @@ public abstract class AbstractHafasProvider extends AbstractNetworkProvider } final StringBuilder request = new StringBuilder(""); - request.append("").append(locationXml(from)); request.append(""); request.append(""); @@ -773,13 +772,14 @@ public abstract class AbstractHafasProvider extends AbstractNetworkProvider return queryConnections(request.toString(), from, via, to); } - public QueryConnectionsResult queryMoreConnections(final String context) throws IOException + public QueryConnectionsResult queryMoreConnections(final String context, final boolean next) throws IOException { - final String request = "" // - + "" + context + "" // - + ""; + final StringBuilder request = new StringBuilder(""); + request.append("").append(context).append(""); + request.append(""); + // TODO handle next/prev - return queryConnections(request, null, null, null); + return queryConnections(request.toString(), null, null, null); } private QueryConnectionsResult queryConnections(final String request, final Location from, final Location via, final Location to) diff --git a/src/de/schildbach/pte/BahnProvider.java b/src/de/schildbach/pte/BahnProvider.java index a02f6c09..7b845917 100644 --- a/src/de/schildbach/pte/BahnProvider.java +++ b/src/de/schildbach/pte/BahnProvider.java @@ -295,9 +295,10 @@ public final class BahnProvider extends AbstractHafasProvider } @Override - public QueryConnectionsResult queryMoreConnections(final String uri) throws IOException + public QueryConnectionsResult queryMoreConnections(final String uri, final boolean next) throws IOException { final CharSequence page = ParserUtils.scrape(uri); + // TODO handle next/prev return queryConnections(uri, page); } diff --git a/src/de/schildbach/pte/BvgProvider.java b/src/de/schildbach/pte/BvgProvider.java index 857b5dd0..56a25e8e 100644 --- a/src/de/schildbach/pte/BvgProvider.java +++ b/src/de/schildbach/pte/BvgProvider.java @@ -606,9 +606,10 @@ public final class BvgProvider extends AbstractHafasProvider } @Override - public QueryConnectionsResult queryMoreConnections(final String uri) throws IOException + public QueryConnectionsResult queryMoreConnections(final String uri, final boolean next) throws IOException { final CharSequence page = ParserUtils.scrape(uri); + // TODO handle next/prev return queryConnections(uri, page); } diff --git a/src/de/schildbach/pte/NetworkProvider.java b/src/de/schildbach/pte/NetworkProvider.java index 21c6eeb1..fc190b4f 100644 --- a/src/de/schildbach/pte/NetworkProvider.java +++ b/src/de/schildbach/pte/NetworkProvider.java @@ -123,10 +123,12 @@ public interface NetworkProvider * * @param context * context to query more connections from + * @param next + * {@code true} for get next connections, {@code false} for get previous connections * @return result object that contains possible connections * @throws IOException */ - QueryConnectionsResult queryMoreConnections(String context) throws IOException; + QueryConnectionsResult queryMoreConnections(String context, boolean next) throws IOException; /** * Get details about a connection diff --git a/test/de/schildbach/pte/live/AtcProviderLiveTest.java b/test/de/schildbach/pte/live/AtcProviderLiveTest.java index 2298c3a4..120b74d5 100644 --- a/test/de/schildbach/pte/live/AtcProviderLiveTest.java +++ b/test/de/schildbach/pte/live/AtcProviderLiveTest.java @@ -85,7 +85,7 @@ public class AtcProviderLiveTest extends AbstractProviderLiveTest final QueryConnectionsResult result = provider.queryConnections(new Location(LocationType.STATION, 0, null, "Hauptwache"), null, new Location(LocationType.STATION, 0, null, "Südbahnhof"), new Date(), true, ALL_PRODUCTS, WalkSpeed.NORMAL, Accessibility.NEUTRAL); System.out.println(result); - final QueryConnectionsResult moreResult = provider.queryMoreConnections(result.context); + final QueryConnectionsResult moreResult = provider.queryMoreConnections(result.context, true); System.out.println(moreResult); } } diff --git a/test/de/schildbach/pte/live/AvvProviderLiveTest.java b/test/de/schildbach/pte/live/AvvProviderLiveTest.java index 33d3f23f..8cd74515 100644 --- a/test/de/schildbach/pte/live/AvvProviderLiveTest.java +++ b/test/de/schildbach/pte/live/AvvProviderLiveTest.java @@ -85,7 +85,7 @@ public class AvvProviderLiveTest extends AbstractProviderLiveTest new Location(LocationType.STATION, 100, null, "Hauptbahnhof"), new Date(), true, ALL_PRODUCTS, WalkSpeed.NORMAL, Accessibility.NEUTRAL); System.out.println(result); - final QueryConnectionsResult moreResult = provider.queryMoreConnections(result.context); + final QueryConnectionsResult moreResult = provider.queryMoreConnections(result.context, true); System.out.println(moreResult); } } diff --git a/test/de/schildbach/pte/live/BahnProviderLiveTest.java b/test/de/schildbach/pte/live/BahnProviderLiveTest.java index 1d81d966..01de1db2 100644 --- a/test/de/schildbach/pte/live/BahnProviderLiveTest.java +++ b/test/de/schildbach/pte/live/BahnProviderLiveTest.java @@ -86,7 +86,7 @@ public class BahnProviderLiveTest extends AbstractProviderLiveTest new Location(LocationType.STATION, 8010205, null, "Leipzig Hbf"), new Date(), true, ALL_PRODUCTS, WalkSpeed.NORMAL, Accessibility.NEUTRAL); System.out.println(result); - final QueryConnectionsResult moreResult = provider.queryMoreConnections(result.context); + final QueryConnectionsResult moreResult = provider.queryMoreConnections(result.context, true); for (final Connection connection : result.connections) provider.getConnectionDetails(connection.link); System.out.println(moreResult); @@ -99,7 +99,7 @@ public class BahnProviderLiveTest extends AbstractProviderLiveTest new Location(LocationType.ANY, 0, null, "Tutzinger-Hof-Platz, Starnberg"), new Date(), true, ALL_PRODUCTS, WalkSpeed.NORMAL, Accessibility.NEUTRAL); System.out.println(result); - final QueryConnectionsResult moreResult = provider.queryMoreConnections(result.context); + final QueryConnectionsResult moreResult = provider.queryMoreConnections(result.context, true); for (final Connection connection : result.connections) provider.getConnectionDetails(connection.link); System.out.println(moreResult); @@ -113,7 +113,7 @@ public class BahnProviderLiveTest extends AbstractProviderLiveTest new Date(), true, ALL_PRODUCTS, WalkSpeed.NORMAL, Accessibility.NEUTRAL); System.out.println(result); - final QueryConnectionsResult moreResult = provider.queryMoreConnections(result.context); + final QueryConnectionsResult moreResult = provider.queryMoreConnections(result.context, true); for (final Connection connection : result.connections) provider.getConnectionDetails(connection.link); System.out.println(moreResult); diff --git a/test/de/schildbach/pte/live/BayernProviderLiveTest.java b/test/de/schildbach/pte/live/BayernProviderLiveTest.java index 1f43a05a..9be10f33 100644 --- a/test/de/schildbach/pte/live/BayernProviderLiveTest.java +++ b/test/de/schildbach/pte/live/BayernProviderLiveTest.java @@ -85,7 +85,7 @@ public class BayernProviderLiveTest extends AbstractProviderLiveTest new Location(LocationType.STATION, 80000799, "München", "Pasing"), new Date(), true, ALL_PRODUCTS, WalkSpeed.NORMAL, Accessibility.NEUTRAL); System.out.println(result); - final QueryConnectionsResult moreResult = provider.queryMoreConnections(result.context); + final QueryConnectionsResult moreResult = provider.queryMoreConnections(result.context, true); System.out.println(moreResult); } @@ -105,7 +105,7 @@ public class BayernProviderLiveTest extends AbstractProviderLiveTest final QueryConnectionsResult result = provider.queryConnections(new Location(LocationType.ADDRESS, 0, 48165238, 11577473), null, new Location(LocationType.ADDRESS, 0, 47987199, 11326532), new Date(), true, ALL_PRODUCTS, WalkSpeed.NORMAL, Accessibility.NEUTRAL); System.out.println(result); - final QueryConnectionsResult moreResult = provider.queryMoreConnections(result.context); + final QueryConnectionsResult moreResult = provider.queryMoreConnections(result.context, true); System.out.println(moreResult); } @@ -115,7 +115,7 @@ public class BayernProviderLiveTest extends AbstractProviderLiveTest final QueryConnectionsResult result = provider.queryConnections(new Location(LocationType.ADDRESS, 0, 48238341, 11478230), null, new Location(LocationType.ANY, 0, null, "Ostbahnhof"), new Date(), true, ALL_PRODUCTS, WalkSpeed.NORMAL, Accessibility.NEUTRAL); System.out.println(result); - final QueryConnectionsResult moreResult = provider.queryMoreConnections(result.context); + final QueryConnectionsResult moreResult = provider.queryMoreConnections(result.context, true); System.out.println(moreResult); } @@ -126,7 +126,7 @@ public class BayernProviderLiveTest extends AbstractProviderLiveTest null, new Location(LocationType.ADDRESS, 0, null, "Starnberg, Jahnstraße 50"), new Date(), true, ALL_PRODUCTS, WalkSpeed.NORMAL, Accessibility.NEUTRAL); System.out.println(result); - final QueryConnectionsResult moreResult = provider.queryMoreConnections(result.context); + final QueryConnectionsResult moreResult = provider.queryMoreConnections(result.context, true); System.out.println(moreResult); } @@ -137,7 +137,7 @@ public class BayernProviderLiveTest extends AbstractProviderLiveTest new Location(LocationType.ADDRESS, 0, 48188018, 11574239, null, "München Frankfurter Ring 35"), new Date(), true, ALL_PRODUCTS, WalkSpeed.NORMAL, Accessibility.NEUTRAL); System.out.println(result); - final QueryConnectionsResult moreResult = provider.queryMoreConnections(result.context); + final QueryConnectionsResult moreResult = provider.queryMoreConnections(result.context, true); System.out.println(moreResult); } } diff --git a/test/de/schildbach/pte/live/BsagProviderLiveTest.java b/test/de/schildbach/pte/live/BsagProviderLiveTest.java index c4985974..aeeda3b1 100644 --- a/test/de/schildbach/pte/live/BsagProviderLiveTest.java +++ b/test/de/schildbach/pte/live/BsagProviderLiveTest.java @@ -85,7 +85,7 @@ public class BsagProviderLiveTest extends AbstractProviderLiveTest null, new Location(LocationType.STATION, 28000512, null, "Herdentor"), new Date(), true, ALL_PRODUCTS, WalkSpeed.NORMAL, Accessibility.NEUTRAL); System.out.println(result); - final QueryConnectionsResult moreResult = provider.queryMoreConnections(result.context); + final QueryConnectionsResult moreResult = provider.queryMoreConnections(result.context, true); System.out.println(moreResult); } } diff --git a/test/de/schildbach/pte/live/BsvagProviderLiveTest.java b/test/de/schildbach/pte/live/BsvagProviderLiveTest.java index d39d40b5..d5748794 100644 --- a/test/de/schildbach/pte/live/BsvagProviderLiveTest.java +++ b/test/de/schildbach/pte/live/BsvagProviderLiveTest.java @@ -76,7 +76,7 @@ public class BsvagProviderLiveTest extends AbstractProviderLiveTest new Location(LocationType.STATION, 26000322, null, "Packhof"), new Date(), true, ALL_PRODUCTS, WalkSpeed.NORMAL, Accessibility.NEUTRAL); System.out.println(result); - final QueryConnectionsResult moreResult = provider.queryMoreConnections(result.context); + final QueryConnectionsResult moreResult = provider.queryMoreConnections(result.context, true); System.out.println(moreResult); } } diff --git a/test/de/schildbach/pte/live/BvbProviderLiveTest.java b/test/de/schildbach/pte/live/BvbProviderLiveTest.java index 5a049d2c..10dd6316 100644 --- a/test/de/schildbach/pte/live/BvbProviderLiveTest.java +++ b/test/de/schildbach/pte/live/BvbProviderLiveTest.java @@ -84,7 +84,7 @@ public class BvbProviderLiveTest extends AbstractProviderLiveTest final QueryConnectionsResult result = provider.queryConnections(new Location(LocationType.STATION, 10000, null, "Bahnhof"), null, new Location(LocationType.STATION, 86, null, "Markthalle"), new Date(), true, ALL_PRODUCTS, WalkSpeed.NORMAL, Accessibility.NEUTRAL); System.out.println(result); - final QueryConnectionsResult moreResult = provider.queryMoreConnections(result.context); + final QueryConnectionsResult moreResult = provider.queryMoreConnections(result.context, true); System.out.println(moreResult); } } diff --git a/test/de/schildbach/pte/live/BvgProviderLiveTest.java b/test/de/schildbach/pte/live/BvgProviderLiveTest.java index c5d07cc0..32323358 100644 --- a/test/de/schildbach/pte/live/BvgProviderLiveTest.java +++ b/test/de/schildbach/pte/live/BvgProviderLiveTest.java @@ -92,7 +92,7 @@ public class BvgProviderLiveTest extends AbstractProviderLiveTest null, new Location(LocationType.STATION, 9013103, "Berlin", "Prinzenstraße"), new Date(), true, ALL_PRODUCTS, WalkSpeed.NORMAL, Accessibility.NEUTRAL); System.out.println(result); - final QueryConnectionsResult moreResult = provider.queryMoreConnections(result.context); + final QueryConnectionsResult moreResult = provider.queryMoreConnections(result.context, true); System.out.println(moreResult); } @@ -103,7 +103,7 @@ public class BvgProviderLiveTest extends AbstractProviderLiveTest new Location(LocationType.STATION, 9044202, "Berlin", "Bundesplatz"), new Location(LocationType.STATION, 9013103, "Berlin", "Prinzenstraße"), new Date(), true, ALL_PRODUCTS, WalkSpeed.NORMAL, Accessibility.NEUTRAL); System.out.println(result); - final QueryConnectionsResult moreResult = provider.queryMoreConnections(result.context); + final QueryConnectionsResult moreResult = provider.queryMoreConnections(result.context, true); System.out.println(moreResult); } @@ -114,7 +114,7 @@ public class BvgProviderLiveTest extends AbstractProviderLiveTest new Location(LocationType.ADDRESS, 0, 52513639, 13568648, null, null), new Date(), true, ALL_PRODUCTS, WalkSpeed.NORMAL, Accessibility.NEUTRAL); System.out.println(result); - final QueryConnectionsResult moreResult = provider.queryMoreConnections(result.context); + final QueryConnectionsResult moreResult = provider.queryMoreConnections(result.context, true); System.out.println(moreResult); } @@ -125,7 +125,7 @@ public class BvgProviderLiveTest extends AbstractProviderLiveTest "Christburger Straße 1, 10405 Berlin, Deutschland"), null, new Location(LocationType.ADDRESS, 0, 52486400, 13350744, null, "Eisenacher Straße 70, 10823 Berlin, Deutschland"), new Date(), true, ALL_PRODUCTS, WalkSpeed.NORMAL, Accessibility.NEUTRAL); System.out.println(result); - final QueryConnectionsResult moreResult = provider.queryMoreConnections(result.context); + final QueryConnectionsResult moreResult = provider.queryMoreConnections(result.context, true); System.out.println(moreResult); } @@ -136,7 +136,7 @@ public class BvgProviderLiveTest extends AbstractProviderLiveTest new Location(LocationType.ADDRESS, 0, 52479868, 13324247, null, null), new Location(LocationType.ADDRESS, 0, 52513639, 13568648, null, null), new Date(), true, ALL_PRODUCTS, WalkSpeed.NORMAL, Accessibility.NEUTRAL); System.out.println(result); - final QueryConnectionsResult moreResult = provider.queryMoreConnections(result.context); + final QueryConnectionsResult moreResult = provider.queryMoreConnections(result.context, true); System.out.println(moreResult); } @@ -147,7 +147,7 @@ public class BvgProviderLiveTest extends AbstractProviderLiveTest "10715 Bln Charlb.-Wilm., Weimarische Str. 7"), null, new Location(LocationType.ADDRESS, 0, null, "10178 Bln Mitte, Sophienstr. 24"), new Date(), true, ALL_PRODUCTS, WalkSpeed.NORMAL, Accessibility.NEUTRAL); System.out.println(result); - final QueryConnectionsResult moreResult = provider.queryMoreConnections(result.context); + final QueryConnectionsResult moreResult = provider.queryMoreConnections(result.context, true); System.out.println(moreResult); } @@ -159,7 +159,7 @@ public class BvgProviderLiveTest extends AbstractProviderLiveTest new Location(LocationType.ADDRESS, 0, null, "10178 Bln Mitte, Sophienstr. 24"), new Date(), true, ALL_PRODUCTS, WalkSpeed.NORMAL, Accessibility.NEUTRAL); System.out.println(result); - final QueryConnectionsResult moreResult = provider.queryMoreConnections(result.context); + final QueryConnectionsResult moreResult = provider.queryMoreConnections(result.context, true); System.out.println(moreResult); } } diff --git a/test/de/schildbach/pte/live/DingProviderLiveTest.java b/test/de/schildbach/pte/live/DingProviderLiveTest.java index cfe0f4e3..1adc880c 100644 --- a/test/de/schildbach/pte/live/DingProviderLiveTest.java +++ b/test/de/schildbach/pte/live/DingProviderLiveTest.java @@ -85,7 +85,7 @@ public class DingProviderLiveTest extends AbstractProviderLiveTest .queryConnections(new Location(LocationType.STATION, 9001011, null, "Justizgebäude"), null, new Location(LocationType.STATION, 2504524, null, "Theater"), new Date(), true, ALL_PRODUCTS, WalkSpeed.NORMAL, Accessibility.NEUTRAL); System.out.println(result); - final QueryConnectionsResult moreResult = provider.queryMoreConnections(result.context); + final QueryConnectionsResult moreResult = provider.queryMoreConnections(result.context, true); System.out.println(moreResult); } } diff --git a/test/de/schildbach/pte/live/DsbProviderLiveTest.java b/test/de/schildbach/pte/live/DsbProviderLiveTest.java index eebf7de6..55444c95 100644 --- a/test/de/schildbach/pte/live/DsbProviderLiveTest.java +++ b/test/de/schildbach/pte/live/DsbProviderLiveTest.java @@ -77,7 +77,7 @@ public class DsbProviderLiveTest extends AbstractProviderLiveTest null, new Location(LocationType.STATION, 551922500, null, "Billund Airport"), new Date(), true, ALL_PRODUCTS, WalkSpeed.NORMAL, Accessibility.NEUTRAL); System.out.println(result); - final QueryConnectionsResult moreResult = provider.queryMoreConnections(result.context); + final QueryConnectionsResult moreResult = provider.queryMoreConnections(result.context, true); System.out.println(moreResult); } } diff --git a/test/de/schildbach/pte/live/DubProviderLiveTest.java b/test/de/schildbach/pte/live/DubProviderLiveTest.java index 6e6846cb..2aa72499 100644 --- a/test/de/schildbach/pte/live/DubProviderLiveTest.java +++ b/test/de/schildbach/pte/live/DubProviderLiveTest.java @@ -68,7 +68,7 @@ public class DubProviderLiveTest extends AbstractProviderLiveTest "Airport Terminal 1, Arrival"), null, new Location(LocationType.STATION, 3505445, null, "Airport Terminal 3"), new Date(), true, ALL_PRODUCTS, WalkSpeed.NORMAL, Accessibility.NEUTRAL); System.out.println(result); - final QueryConnectionsResult moreResult = provider.queryMoreConnections(result.context); + final QueryConnectionsResult moreResult = provider.queryMoreConnections(result.context, true); System.out.println(moreResult); } } diff --git a/test/de/schildbach/pte/live/GvhProviderLiveTest.java b/test/de/schildbach/pte/live/GvhProviderLiveTest.java index e88cf3b8..5c494efa 100644 --- a/test/de/schildbach/pte/live/GvhProviderLiveTest.java +++ b/test/de/schildbach/pte/live/GvhProviderLiveTest.java @@ -117,7 +117,7 @@ public class GvhProviderLiveTest extends AbstractProviderLiveTest null, new Location(LocationType.STATION, 25001141, null, "Hannover Bismarckstraße"), new Date(), true, ALL_PRODUCTS, WalkSpeed.FAST, Accessibility.NEUTRAL); System.out.println(result); - final QueryConnectionsResult moreResult = provider.queryMoreConnections(result.context); + final QueryConnectionsResult moreResult = provider.queryMoreConnections(result.context, true); System.out.println(moreResult); } @@ -128,7 +128,7 @@ public class GvhProviderLiveTest extends AbstractProviderLiveTest "bremen, neustadtswall 12"), null, new Location(LocationType.ADDRESS, 0, 53104124, 8788575, null, "Bremen Glücksburger Straße 37"), new Date(), true, ALL_PRODUCTS, WalkSpeed.NORMAL, Accessibility.NEUTRAL); System.out.println(result); - final QueryConnectionsResult moreResult = provider.queryMoreConnections(result.context); + final QueryConnectionsResult moreResult = provider.queryMoreConnections(result.context, true); System.out.println(moreResult); } @@ -139,7 +139,7 @@ public class GvhProviderLiveTest extends AbstractProviderLiveTest "Zamenhofweg 14, 22159 Hamburg, Deutschland"), null, new Location(LocationType.ADDRESS, 0, 53734260, 9674990, null, "Lehmkuhlen 5, 25337 Elmshorn, Deutschland"), new Date(), true, ALL_PRODUCTS, WalkSpeed.NORMAL, Accessibility.NEUTRAL); System.out.println(result); - final QueryConnectionsResult moreResult = provider.queryMoreConnections(result.context); + final QueryConnectionsResult moreResult = provider.queryMoreConnections(result.context, true); System.out.println(moreResult); } } diff --git a/test/de/schildbach/pte/live/InvgProviderLiveTest.java b/test/de/schildbach/pte/live/InvgProviderLiveTest.java index f80c2710..a7094c09 100644 --- a/test/de/schildbach/pte/live/InvgProviderLiveTest.java +++ b/test/de/schildbach/pte/live/InvgProviderLiveTest.java @@ -77,7 +77,7 @@ public class InvgProviderLiveTest extends AbstractProviderLiveTest "Ingolstadt, Hauptbahnhof Stadteinwärts"), null, new Location(LocationType.STATION, 181102, null, "Elisabethstraße"), new Date(), true, ALL_PRODUCTS, WalkSpeed.NORMAL, Accessibility.NEUTRAL); System.out.println(result); - final QueryConnectionsResult moreResult = provider.queryMoreConnections(result.context); + final QueryConnectionsResult moreResult = provider.queryMoreConnections(result.context, true); System.out.println(moreResult); } } diff --git a/test/de/schildbach/pte/live/IvbProviderLiveTest.java b/test/de/schildbach/pte/live/IvbProviderLiveTest.java index 9b8bcb26..db2e77ae 100644 --- a/test/de/schildbach/pte/live/IvbProviderLiveTest.java +++ b/test/de/schildbach/pte/live/IvbProviderLiveTest.java @@ -85,7 +85,7 @@ public class IvbProviderLiveTest extends AbstractProviderLiveTest new Location(LocationType.STATION, 60461679, null, "Messe/Zeughaus"), new Date(), true, ALL_PRODUCTS, WalkSpeed.NORMAL, Accessibility.NEUTRAL); System.out.println(result); - final QueryConnectionsResult moreResult = provider.queryMoreConnections(result.context); + final QueryConnectionsResult moreResult = provider.queryMoreConnections(result.context, true); System.out.println(moreResult); } } diff --git a/test/de/schildbach/pte/live/KvvProviderLiveTest.java b/test/de/schildbach/pte/live/KvvProviderLiveTest.java index 5b6b1fb4..a11db473 100644 --- a/test/de/schildbach/pte/live/KvvProviderLiveTest.java +++ b/test/de/schildbach/pte/live/KvvProviderLiveTest.java @@ -85,7 +85,7 @@ public class KvvProviderLiveTest extends AbstractProviderLiveTest "Konstanzer Straße 17, 76199 Karlsruhe, Deutschland"), null, new Location(LocationType.ADDRESS, 0, 49007706, 8356358, null, "Durmersheimer Straße 6, 76185 Karlsruhe, Deutschland"), new Date(), true, ALL_PRODUCTS, WalkSpeed.NORMAL, Accessibility.NEUTRAL); System.out.println(result); - final QueryConnectionsResult moreResult = provider.queryMoreConnections(result.context); + final QueryConnectionsResult moreResult = provider.queryMoreConnections(result.context, true); System.out.println(moreResult); } } diff --git a/test/de/schildbach/pte/live/LinzProviderLiveTest.java b/test/de/schildbach/pte/live/LinzProviderLiveTest.java index 90408740..430bae31 100644 --- a/test/de/schildbach/pte/live/LinzProviderLiveTest.java +++ b/test/de/schildbach/pte/live/LinzProviderLiveTest.java @@ -107,7 +107,7 @@ public class LinzProviderLiveTest extends AbstractProviderLiveTest final QueryConnectionsResult result = provider.queryConnections(new Location(LocationType.STATION, 0, null, "Linz Hauptbahnhof"), null, new Location(LocationType.STATION, 0, null, "Linz Auwiesen"), new Date(), true, ALL_PRODUCTS, WalkSpeed.FAST, Accessibility.NEUTRAL); System.out.println(result); - final QueryConnectionsResult moreResult = provider.queryMoreConnections(result.context); + final QueryConnectionsResult moreResult = provider.queryMoreConnections(result.context, true); System.out.println(moreResult); } @@ -117,7 +117,7 @@ public class LinzProviderLiveTest extends AbstractProviderLiveTest final QueryConnectionsResult result = provider.queryConnections(new Location(LocationType.STATION, 0, null, "Linz Auwiesen"), null, new Location(LocationType.STATION, 0, null, "Linz Hafen"), new Date(), true, ALL_PRODUCTS, WalkSpeed.SLOW, Accessibility.NEUTRAL); System.out.println(result); - // final QueryConnectionsResult moreResult = provider.queryMoreConnections(result.context); + // final QueryConnectionsResult moreResult = provider.queryMoreConnections(result.context, true); // System.out.println(moreResult); } } diff --git a/test/de/schildbach/pte/live/LuProviderLiveTest.java b/test/de/schildbach/pte/live/LuProviderLiveTest.java index c3f170ee..5db7aa11 100644 --- a/test/de/schildbach/pte/live/LuProviderLiveTest.java +++ b/test/de/schildbach/pte/live/LuProviderLiveTest.java @@ -77,7 +77,7 @@ public class LuProviderLiveTest extends AbstractProviderLiveTest null, new Location(LocationType.STATION, 9440001, null, "Echternach, Gare"), new Date(), true, ALL_PRODUCTS, WalkSpeed.NORMAL, Accessibility.NEUTRAL); System.out.println(result); - final QueryConnectionsResult moreResult = provider.queryMoreConnections(result.context); + final QueryConnectionsResult moreResult = provider.queryMoreConnections(result.context, true); System.out.println(moreResult); } @@ -88,7 +88,7 @@ public class LuProviderLiveTest extends AbstractProviderLiveTest "Luxembourg, Rue Génistre 2"), null, new Location(LocationType.STATION, 9217081, null, "Luxembourg, Gare Centrale"), new Date(), true, ALL_PRODUCTS, WalkSpeed.NORMAL, Accessibility.NEUTRAL); System.out.println(result); - final QueryConnectionsResult moreResult = provider.queryMoreConnections(result.context); + final QueryConnectionsResult moreResult = provider.queryMoreConnections(result.context, true); System.out.println(moreResult); } } diff --git a/test/de/schildbach/pte/live/MariborProviderLiveTest.java b/test/de/schildbach/pte/live/MariborProviderLiveTest.java index eba23aee..67baf5e7 100644 --- a/test/de/schildbach/pte/live/MariborProviderLiveTest.java +++ b/test/de/schildbach/pte/live/MariborProviderLiveTest.java @@ -77,7 +77,7 @@ public class MariborProviderLiveTest extends AbstractProviderLiveTest null, new Location(LocationType.STATION, 63201746, null, "Flughafen Graz Bahnhof"), new Date(), true, ALL_PRODUCTS, WalkSpeed.NORMAL, Accessibility.NEUTRAL); System.out.println(result); - final QueryConnectionsResult moreResult = provider.queryMoreConnections(result.context); + final QueryConnectionsResult moreResult = provider.queryMoreConnections(result.context, true); System.out.println(moreResult); } } diff --git a/test/de/schildbach/pte/live/MetProviderLiveTest.java b/test/de/schildbach/pte/live/MetProviderLiveTest.java index 9b3ca7da..66a4ccc2 100644 --- a/test/de/schildbach/pte/live/MetProviderLiveTest.java +++ b/test/de/schildbach/pte/live/MetProviderLiveTest.java @@ -76,7 +76,7 @@ public class MetProviderLiveTest extends AbstractProviderLiveTest final QueryConnectionsResult result = provider.queryConnections(new Location(LocationType.STATION, 0, null, "Hauptwache"), null, new Location(LocationType.STATION, 0, null, "Südbahnhof"), new Date(), true, ALL_PRODUCTS, WalkSpeed.NORMAL, Accessibility.NEUTRAL); System.out.println(result); - final QueryConnectionsResult moreResult = provider.queryMoreConnections(result.context); + final QueryConnectionsResult moreResult = provider.queryMoreConnections(result.context, true); System.out.println(moreResult); } } diff --git a/test/de/schildbach/pte/live/MvgProviderLiveTest.java b/test/de/schildbach/pte/live/MvgProviderLiveTest.java index e7bb4b94..e26a0734 100644 --- a/test/de/schildbach/pte/live/MvgProviderLiveTest.java +++ b/test/de/schildbach/pte/live/MvgProviderLiveTest.java @@ -85,7 +85,7 @@ public class MvgProviderLiveTest extends AbstractProviderLiveTest new Location(LocationType.STATION, 24064226, null, "Schützenhalle"), new Date(), true, ALL_PRODUCTS, WalkSpeed.NORMAL, Accessibility.NEUTRAL); System.out.println(result); - final QueryConnectionsResult moreResult = provider.queryMoreConnections(result.context); + final QueryConnectionsResult moreResult = provider.queryMoreConnections(result.context, true); System.out.println(moreResult); } } diff --git a/test/de/schildbach/pte/live/MvvProviderLiveTest.java b/test/de/schildbach/pte/live/MvvProviderLiveTest.java index e6498054..ef3b19c2 100644 --- a/test/de/schildbach/pte/live/MvvProviderLiveTest.java +++ b/test/de/schildbach/pte/live/MvvProviderLiveTest.java @@ -84,8 +84,10 @@ public class MvvProviderLiveTest extends AbstractProviderLiveTest final QueryConnectionsResult result = provider.queryConnections(new Location(LocationType.ANY, 0, null, "Marienplatz"), null, new Location( LocationType.ANY, 0, null, "Pasing"), new Date(), true, ALL_PRODUCTS, WalkSpeed.NORMAL, Accessibility.NEUTRAL); System.out.println(result); - final QueryConnectionsResult moreResult = provider.queryMoreConnections(result.context); - System.out.println(moreResult); + final QueryConnectionsResult nextResult = provider.queryMoreConnections(result.context, true); + System.out.println(nextResult); + final QueryConnectionsResult prevResult = provider.queryMoreConnections(nextResult.context, false); + System.out.println(prevResult); } @Test @@ -104,7 +106,7 @@ public class MvvProviderLiveTest extends AbstractProviderLiveTest final QueryConnectionsResult result = provider.queryConnections(new Location(LocationType.ADDRESS, 0, 48165238, 11577473), null, new Location(LocationType.ADDRESS, 0, 47987199, 11326532), new Date(), true, ALL_PRODUCTS, WalkSpeed.NORMAL, Accessibility.NEUTRAL); System.out.println(result); - final QueryConnectionsResult moreResult = provider.queryMoreConnections(result.context); + final QueryConnectionsResult moreResult = provider.queryMoreConnections(result.context, true); System.out.println(moreResult); } @@ -114,7 +116,7 @@ public class MvvProviderLiveTest extends AbstractProviderLiveTest final QueryConnectionsResult result = provider.queryConnections(new Location(LocationType.ADDRESS, 0, 48238341, 11478230), null, new Location(LocationType.ANY, 0, null, "Ostbahnhof"), new Date(), true, ALL_PRODUCTS, WalkSpeed.NORMAL, Accessibility.NEUTRAL); System.out.println(result); - final QueryConnectionsResult moreResult = provider.queryMoreConnections(result.context); + final QueryConnectionsResult moreResult = provider.queryMoreConnections(result.context, true); System.out.println(moreResult); } @@ -125,7 +127,7 @@ public class MvvProviderLiveTest extends AbstractProviderLiveTest null, new Location(LocationType.ADDRESS, 0, null, "Starnberg, Jahnstraße 50"), new Date(), true, ALL_PRODUCTS, WalkSpeed.NORMAL, Accessibility.NEUTRAL); System.out.println(result); - final QueryConnectionsResult moreResult = provider.queryMoreConnections(result.context); + final QueryConnectionsResult moreResult = provider.queryMoreConnections(result.context, true); System.out.println(moreResult); } @@ -136,7 +138,7 @@ public class MvvProviderLiveTest extends AbstractProviderLiveTest new Location(LocationType.ADDRESS, 0, 48188018, 11574239, null, "München Frankfurter Ring 35"), new Date(), true, ALL_PRODUCTS, WalkSpeed.NORMAL, Accessibility.NEUTRAL); System.out.println(result); - final QueryConnectionsResult moreResult = provider.queryMoreConnections(result.context); + final QueryConnectionsResult moreResult = provider.queryMoreConnections(result.context, true); System.out.println(moreResult); } } diff --git a/test/de/schildbach/pte/live/NaldoProviderLiveTest.java b/test/de/schildbach/pte/live/NaldoProviderLiveTest.java index ca65065e..48f3fb7d 100644 --- a/test/de/schildbach/pte/live/NaldoProviderLiveTest.java +++ b/test/de/schildbach/pte/live/NaldoProviderLiveTest.java @@ -85,7 +85,7 @@ public class NaldoProviderLiveTest extends AbstractProviderLiveTest null, new Location(LocationType.STATION, 3019500, null, "Amberg Bahnhof"), new Date(), true, ALL_PRODUCTS, WalkSpeed.NORMAL, Accessibility.NEUTRAL); System.out.println(result); - final QueryConnectionsResult moreResult = provider.queryMoreConnections(result.context); + final QueryConnectionsResult moreResult = provider.queryMoreConnections(result.context, true); System.out.println(moreResult); } } diff --git a/test/de/schildbach/pte/live/NasaProviderLiveTest.java b/test/de/schildbach/pte/live/NasaProviderLiveTest.java index 79e1e980..4c111aaf 100644 --- a/test/de/schildbach/pte/live/NasaProviderLiveTest.java +++ b/test/de/schildbach/pte/live/NasaProviderLiveTest.java @@ -69,7 +69,7 @@ public class NasaProviderLiveTest extends AbstractProviderLiveTest null, new Location(LocationType.STATION, 8010205, null, "Leipzig Hbf"), new Date(), true, ALL_PRODUCTS, WalkSpeed.NORMAL, Accessibility.NEUTRAL); System.out.println(result); - final QueryConnectionsResult moreResult = provider.queryMoreConnections(result.context); + final QueryConnectionsResult moreResult = provider.queryMoreConnections(result.context, true); System.out.println(moreResult); } @@ -80,7 +80,7 @@ public class NasaProviderLiveTest extends AbstractProviderLiveTest "04319 Leipzig-Engelsdorf", "August-Bebel-Platz"), null, new Location(LocationType.STATION, 8010205, null, "Leipzig Hbf"), new Date(), true, ALL_PRODUCTS, WalkSpeed.NORMAL, Accessibility.NEUTRAL); System.out.println(result); - final QueryConnectionsResult moreResult = provider.queryMoreConnections(result.context); + final QueryConnectionsResult moreResult = provider.queryMoreConnections(result.context, true); System.out.println(moreResult); } } diff --git a/test/de/schildbach/pte/live/NphProviderLiveTest.java b/test/de/schildbach/pte/live/NphProviderLiveTest.java index 1f678cd4..f4e004b8 100644 --- a/test/de/schildbach/pte/live/NphProviderLiveTest.java +++ b/test/de/schildbach/pte/live/NphProviderLiveTest.java @@ -85,7 +85,7 @@ public class NphProviderLiveTest extends AbstractProviderLiveTest null, new Location(LocationType.STATION, 23007700, "Höxter", "Bahnhof / Rathaus"), new Date(), true, ALL_PRODUCTS, WalkSpeed.NORMAL, Accessibility.NEUTRAL); System.out.println(result); - final QueryConnectionsResult moreResult = provider.queryMoreConnections(result.context); + final QueryConnectionsResult moreResult = provider.queryMoreConnections(result.context, true); System.out.println(moreResult); } } diff --git a/test/de/schildbach/pte/live/NriProviderLiveTest.java b/test/de/schildbach/pte/live/NriProviderLiveTest.java index 31ecf2b2..890c51dd 100644 --- a/test/de/schildbach/pte/live/NriProviderLiveTest.java +++ b/test/de/schildbach/pte/live/NriProviderLiveTest.java @@ -76,7 +76,7 @@ public class NriProviderLiveTest extends AbstractProviderLiveTest final QueryConnectionsResult result = provider.queryConnections(new Location(LocationType.STATION, 8059, null, "Oslo"), null, new Location( LocationType.STATION, 6642, null, "Bergen BGO"), new Date(), true, ALL_PRODUCTS, WalkSpeed.NORMAL, Accessibility.NEUTRAL); System.out.println(result); - final QueryConnectionsResult moreResult = provider.queryMoreConnections(result.context); + final QueryConnectionsResult moreResult = provider.queryMoreConnections(result.context, true); System.out.println(moreResult); } } diff --git a/test/de/schildbach/pte/live/NvbwProviderLiveTest.java b/test/de/schildbach/pte/live/NvbwProviderLiveTest.java index b9d143b2..e8170764 100644 --- a/test/de/schildbach/pte/live/NvbwProviderLiveTest.java +++ b/test/de/schildbach/pte/live/NvbwProviderLiveTest.java @@ -85,7 +85,7 @@ public class NvbwProviderLiveTest extends AbstractProviderLiveTest new Location(LocationType.STATION, 17009001, null, "Bahnhof"), new Date(), true, ALL_PRODUCTS, WalkSpeed.NORMAL, Accessibility.NEUTRAL); System.out.println(result); - final QueryConnectionsResult moreResult = provider.queryMoreConnections(result.context); + final QueryConnectionsResult moreResult = provider.queryMoreConnections(result.context, true); System.out.println(moreResult); } } diff --git a/test/de/schildbach/pte/live/NvvProviderLiveTest.java b/test/de/schildbach/pte/live/NvvProviderLiveTest.java index 06e2293c..d217bc97 100644 --- a/test/de/schildbach/pte/live/NvvProviderLiveTest.java +++ b/test/de/schildbach/pte/live/NvvProviderLiveTest.java @@ -77,7 +77,7 @@ public class NvvProviderLiveTest extends AbstractProviderLiveTest null, new Location(LocationType.STATION, 2200278, null, "Kassel Wilhelmshöher Weg"), new Date(), true, ALL_PRODUCTS, WalkSpeed.NORMAL, Accessibility.NEUTRAL); System.out.println(result); - final QueryConnectionsResult moreResult = provider.queryMoreConnections(result.context); + final QueryConnectionsResult moreResult = provider.queryMoreConnections(result.context, true); System.out.println(moreResult); } } diff --git a/test/de/schildbach/pte/live/OebbProviderLiveTest.java b/test/de/schildbach/pte/live/OebbProviderLiveTest.java index d3224f2c..09a45f49 100644 --- a/test/de/schildbach/pte/live/OebbProviderLiveTest.java +++ b/test/de/schildbach/pte/live/OebbProviderLiveTest.java @@ -86,7 +86,7 @@ public class OebbProviderLiveTest extends AbstractProviderLiveTest System.out.println(result); assertEquals(QueryConnectionsResult.Status.OK, result.status); assertTrue(result.connections.size() > 0); - final QueryConnectionsResult moreResult = provider.queryMoreConnections(result.context); + final QueryConnectionsResult moreResult = provider.queryMoreConnections(result.context, true); System.out.println(moreResult); } @@ -98,7 +98,7 @@ public class OebbProviderLiveTest extends AbstractProviderLiveTest System.out.println(result); assertEquals(QueryConnectionsResult.Status.OK, result.status); assertTrue(result.connections.size() > 0); - final QueryConnectionsResult moreResult = provider.queryMoreConnections(result.context); + final QueryConnectionsResult moreResult = provider.queryMoreConnections(result.context, true); System.out.println(moreResult); } @@ -111,7 +111,7 @@ public class OebbProviderLiveTest extends AbstractProviderLiveTest System.out.println(result); assertEquals(QueryConnectionsResult.Status.OK, result.status); assertTrue(result.connections.size() > 0); - final QueryConnectionsResult moreResult = provider.queryMoreConnections(result.context); + final QueryConnectionsResult moreResult = provider.queryMoreConnections(result.context, true); System.out.println(moreResult); } @@ -124,7 +124,7 @@ public class OebbProviderLiveTest extends AbstractProviderLiveTest System.out.println(result); assertEquals(QueryConnectionsResult.Status.OK, result.status); assertTrue(result.connections.size() > 0); - final QueryConnectionsResult moreResult = provider.queryMoreConnections(result.context); + final QueryConnectionsResult moreResult = provider.queryMoreConnections(result.context, true); System.out.println(moreResult); } } diff --git a/test/de/schildbach/pte/live/PlProviderLiveTest.java b/test/de/schildbach/pte/live/PlProviderLiveTest.java index 5606d397..278a8f47 100644 --- a/test/de/schildbach/pte/live/PlProviderLiveTest.java +++ b/test/de/schildbach/pte/live/PlProviderLiveTest.java @@ -77,7 +77,7 @@ public class PlProviderLiveTest extends AbstractProviderLiveTest new Location(LocationType.STATION, 5196003, null, "WARSZAWA"), new Date(), true, ALL_PRODUCTS, WalkSpeed.NORMAL, Accessibility.NEUTRAL); System.out.println(result); - final QueryConnectionsResult moreResult = provider.queryMoreConnections(result.context); + final QueryConnectionsResult moreResult = provider.queryMoreConnections(result.context, true); System.out.println(moreResult); } } diff --git a/test/de/schildbach/pte/live/RmvProviderLiveTest.java b/test/de/schildbach/pte/live/RmvProviderLiveTest.java index be670943..5b931a13 100644 --- a/test/de/schildbach/pte/live/RmvProviderLiveTest.java +++ b/test/de/schildbach/pte/live/RmvProviderLiveTest.java @@ -77,7 +77,7 @@ public class RmvProviderLiveTest extends AbstractProviderLiveTest new Location(LocationType.STATION, 3000912, null, "Südbahnhof"), new Date(), true, ALL_PRODUCTS, WalkSpeed.NORMAL, Accessibility.NEUTRAL); System.out.println(result); - final QueryConnectionsResult moreResult = provider.queryMoreConnections(result.context); + final QueryConnectionsResult moreResult = provider.queryMoreConnections(result.context, true); System.out.println(moreResult); } diff --git a/test/de/schildbach/pte/live/RtProviderLiveTest.java b/test/de/schildbach/pte/live/RtProviderLiveTest.java index 6b8ab51d..f3cd123c 100644 --- a/test/de/schildbach/pte/live/RtProviderLiveTest.java +++ b/test/de/schildbach/pte/live/RtProviderLiveTest.java @@ -85,7 +85,7 @@ public class RtProviderLiveTest extends AbstractProviderLiveTest new Location(LocationType.STATION, 8507785, null, "Bern, Hauptbahnhof"), new Date(), true, ALL_PRODUCTS, WalkSpeed.NORMAL, Accessibility.NEUTRAL); System.out.println(result); - final QueryConnectionsResult moreResult = provider.queryMoreConnections(result.context); + final QueryConnectionsResult moreResult = provider.queryMoreConnections(result.context, true); System.out.println(moreResult); } @@ -96,7 +96,7 @@ public class RtProviderLiveTest extends AbstractProviderLiveTest .queryConnections(new Location(LocationType.ANY, 0, null, "Schocherswil, Alte Post!"), null, new Location(LocationType.ANY, 0, null, "Laconnex, Mollach"), new Date(), true, ALL_PRODUCTS, WalkSpeed.NORMAL, Accessibility.NEUTRAL); System.out.println(result); - final QueryConnectionsResult moreResult = provider.queryMoreConnections(result.context); + final QueryConnectionsResult moreResult = provider.queryMoreConnections(result.context, true); System.out.println(moreResult); } @@ -107,7 +107,7 @@ public class RtProviderLiveTest extends AbstractProviderLiveTest new Location(LocationType.ADDRESS, 0, null, "Einsiedeln, Erlenmoosweg 24"), new Date(), true, ALL_PRODUCTS, WalkSpeed.NORMAL, Accessibility.NEUTRAL); System.out.println(result); - final QueryConnectionsResult moreResult = provider.queryMoreConnections(result.context); + final QueryConnectionsResult moreResult = provider.queryMoreConnections(result.context, true); System.out.println(moreResult); } @@ -118,7 +118,7 @@ public class RtProviderLiveTest extends AbstractProviderLiveTest "26 Coopers Close, Poplar, Greater London E1 4, Vereinigtes Königreich"), null, new Location(LocationType.STATION, 8096022, 50941312, 6967206, null, "COLOGNE"), new Date(), true, ALL_PRODUCTS, WalkSpeed.NORMAL, Accessibility.NEUTRAL); System.out.println(result); - final QueryConnectionsResult moreResult = provider.queryMoreConnections(result.context); + final QueryConnectionsResult moreResult = provider.queryMoreConnections(result.context, true); System.out.println(moreResult); } @@ -129,7 +129,7 @@ public class RtProviderLiveTest extends AbstractProviderLiveTest new Location(LocationType.STATION, 8400058, null, "Amsterdam Centraal"), new Location(LocationType.STATION, 8000085, null, "Düsseldorf Hbf"), new Date(), true, ALL_PRODUCTS, WalkSpeed.NORMAL, Accessibility.NEUTRAL); System.out.println(result); - final QueryConnectionsResult moreResult = provider.queryMoreConnections(result.context); + final QueryConnectionsResult moreResult = provider.queryMoreConnections(result.context, true); System.out.println(moreResult); } } diff --git a/test/de/schildbach/pte/live/SbbProviderLiveTest.java b/test/de/schildbach/pte/live/SbbProviderLiveTest.java index 88ecb05f..67e56038 100644 --- a/test/de/schildbach/pte/live/SbbProviderLiveTest.java +++ b/test/de/schildbach/pte/live/SbbProviderLiveTest.java @@ -85,7 +85,7 @@ public class SbbProviderLiveTest extends AbstractProviderLiveTest new Location(LocationType.STATION, 8507785, null, "Bern, Hauptbahnhof"), new Date(), true, ALL_PRODUCTS, WalkSpeed.NORMAL, Accessibility.NEUTRAL); System.out.println(result); - final QueryConnectionsResult moreResult = provider.queryMoreConnections(result.context); + final QueryConnectionsResult moreResult = provider.queryMoreConnections(result.context, true); System.out.println(moreResult); } @@ -96,7 +96,7 @@ public class SbbProviderLiveTest extends AbstractProviderLiveTest .queryConnections(new Location(LocationType.ANY, 0, null, "Schocherswil, Alte Post!"), null, new Location(LocationType.ANY, 0, null, "Laconnex, Mollach"), new Date(), true, ALL_PRODUCTS, WalkSpeed.NORMAL, Accessibility.NEUTRAL); System.out.println(result); - final QueryConnectionsResult moreResult = provider.queryMoreConnections(result.context); + final QueryConnectionsResult moreResult = provider.queryMoreConnections(result.context, true); System.out.println(moreResult); } @@ -107,7 +107,7 @@ public class SbbProviderLiveTest extends AbstractProviderLiveTest new Location(LocationType.ADDRESS, 0, null, "Einsiedeln, Erlenmoosweg 24"), new Date(), true, ALL_PRODUCTS, WalkSpeed.NORMAL, Accessibility.NEUTRAL); System.out.println(result); - final QueryConnectionsResult moreResult = provider.queryMoreConnections(result.context); + final QueryConnectionsResult moreResult = provider.queryMoreConnections(result.context, true); System.out.println(moreResult); } @@ -118,7 +118,7 @@ public class SbbProviderLiveTest extends AbstractProviderLiveTest "Dorfstrasse 10, Dällikon, Schweiz"), null, new Location(LocationType.STATION, 8500010, null, "Basel"), new Date(), true, ALL_PRODUCTS, WalkSpeed.NORMAL, Accessibility.NEUTRAL); System.out.println(result); - final QueryConnectionsResult moreResult = provider.queryMoreConnections(result.context); + final QueryConnectionsResult moreResult = provider.queryMoreConnections(result.context, true); System.out.println(moreResult); } } diff --git a/test/de/schildbach/pte/live/SeProviderLiveTest.java b/test/de/schildbach/pte/live/SeProviderLiveTest.java index d104fca7..2d03974f 100644 --- a/test/de/schildbach/pte/live/SeProviderLiveTest.java +++ b/test/de/schildbach/pte/live/SeProviderLiveTest.java @@ -77,7 +77,7 @@ public class SeProviderLiveTest extends AbstractProviderLiveTest new Location(LocationType.STATION, 7498000, null, "STOCKHOLM"), new Date(), true, ALL_PRODUCTS, WalkSpeed.NORMAL, Accessibility.NEUTRAL); System.out.println(result); - final QueryConnectionsResult moreResult = provider.queryMoreConnections(result.context); + final QueryConnectionsResult moreResult = provider.queryMoreConnections(result.context, true); System.out.println(moreResult); } } diff --git a/test/de/schildbach/pte/live/SeptaProviderLiveTest.java b/test/de/schildbach/pte/live/SeptaProviderLiveTest.java index 450c846f..fce584cc 100644 --- a/test/de/schildbach/pte/live/SeptaProviderLiveTest.java +++ b/test/de/schildbach/pte/live/SeptaProviderLiveTest.java @@ -77,7 +77,7 @@ public class SeptaProviderLiveTest extends AbstractProviderLiveTest new Location(LocationType.STATION, 1015755, null, "Harbison Av + Unruh Av"), new Date(), true, ALL_PRODUCTS, WalkSpeed.NORMAL, Accessibility.NEUTRAL); System.out.println(result); - final QueryConnectionsResult moreResult = provider.queryMoreConnections(result.context); + final QueryConnectionsResult moreResult = provider.queryMoreConnections(result.context, true); System.out.println(moreResult); } @@ -88,7 +88,7 @@ public class SeptaProviderLiveTest extends AbstractProviderLiveTest "Philadelphia 19127", "3601 Main St"), null, new Location(LocationType.STATION, 2090227, null, "Main Street"), new Date(), true, ALL_PRODUCTS, WalkSpeed.NORMAL, Accessibility.NEUTRAL); System.out.println(result); - final QueryConnectionsResult moreResult = provider.queryMoreConnections(result.context); + final QueryConnectionsResult moreResult = provider.queryMoreConnections(result.context, true); System.out.println(moreResult); } } diff --git a/test/de/schildbach/pte/live/SfProviderLiveTest.java b/test/de/schildbach/pte/live/SfProviderLiveTest.java index 53433c77..684202db 100644 --- a/test/de/schildbach/pte/live/SfProviderLiveTest.java +++ b/test/de/schildbach/pte/live/SfProviderLiveTest.java @@ -76,7 +76,7 @@ public class SfProviderLiveTest extends AbstractProviderLiveTest final QueryConnectionsResult result = provider.queryConnections(new Location(LocationType.STATION, 0, null, "Hauptwache"), null, new Location(LocationType.STATION, 0, null, "Südbahnhof"), new Date(), true, ALL_PRODUCTS, WalkSpeed.NORMAL, Accessibility.NEUTRAL); System.out.println(result); - final QueryConnectionsResult moreResult = provider.queryMoreConnections(result.context); + final QueryConnectionsResult moreResult = provider.queryMoreConnections(result.context, true); System.out.println(moreResult); } } diff --git a/test/de/schildbach/pte/live/ShProviderLiveTest.java b/test/de/schildbach/pte/live/ShProviderLiveTest.java index 7ac628c8..b7c0f6d0 100644 --- a/test/de/schildbach/pte/live/ShProviderLiveTest.java +++ b/test/de/schildbach/pte/live/ShProviderLiveTest.java @@ -77,7 +77,7 @@ public class ShProviderLiveTest extends AbstractProviderLiveTest new Location(LocationType.STATION, 715210, null, "Flughafen, Lübeck"), new Date(), true, ALL_PRODUCTS, WalkSpeed.NORMAL, Accessibility.NEUTRAL); System.out.println(result); - final QueryConnectionsResult moreResult = provider.queryMoreConnections(result.context); + final QueryConnectionsResult moreResult = provider.queryMoreConnections(result.context, true); System.out.println(moreResult); } } diff --git a/test/de/schildbach/pte/live/SncbProviderLiveTest.java b/test/de/schildbach/pte/live/SncbProviderLiveTest.java index ca739127..2cc4ad65 100644 --- a/test/de/schildbach/pte/live/SncbProviderLiveTest.java +++ b/test/de/schildbach/pte/live/SncbProviderLiveTest.java @@ -87,7 +87,7 @@ public class SncbProviderLiveTest extends AbstractProviderLiveTest if (result.context != null) { - final QueryConnectionsResult moreResult = provider.queryMoreConnections(result.context); + final QueryConnectionsResult moreResult = provider.queryMoreConnections(result.context, true); System.out.println(moreResult.status + " " + moreResult.connections); } } @@ -101,7 +101,7 @@ public class SncbProviderLiveTest extends AbstractProviderLiveTest if (result.context != null) { - final QueryConnectionsResult moreResult = provider.queryMoreConnections(result.context); + final QueryConnectionsResult moreResult = provider.queryMoreConnections(result.context, true); System.out.println(moreResult.status + " " + moreResult.connections); } } @@ -116,7 +116,7 @@ public class SncbProviderLiveTest extends AbstractProviderLiveTest if (result.context != null) { - final QueryConnectionsResult moreResult = provider.queryMoreConnections(result.context); + final QueryConnectionsResult moreResult = provider.queryMoreConnections(result.context, true); System.out.println(moreResult.status + " " + moreResult.connections); } } diff --git a/test/de/schildbach/pte/live/StockholmProviderLiveTest.java b/test/de/schildbach/pte/live/StockholmProviderLiveTest.java index 59c68a52..f5628b02 100644 --- a/test/de/schildbach/pte/live/StockholmProviderLiveTest.java +++ b/test/de/schildbach/pte/live/StockholmProviderLiveTest.java @@ -77,7 +77,7 @@ public class StockholmProviderLiveTest extends AbstractProviderLiveTest null, new Location(LocationType.STATION, 200101221, "Stockholm", "Abrahamsberg"), new Date(), true, ALL_PRODUCTS, WalkSpeed.NORMAL, Accessibility.NEUTRAL); System.out.println(result); - final QueryConnectionsResult moreResult = provider.queryMoreConnections(result.context); + final QueryConnectionsResult moreResult = provider.queryMoreConnections(result.context, true); System.out.println(moreResult); } } diff --git a/test/de/schildbach/pte/live/StvProviderLiveTest.java b/test/de/schildbach/pte/live/StvProviderLiveTest.java index 7b5542e1..29eb9f65 100644 --- a/test/de/schildbach/pte/live/StvProviderLiveTest.java +++ b/test/de/schildbach/pte/live/StvProviderLiveTest.java @@ -84,7 +84,7 @@ public class StvProviderLiveTest extends AbstractProviderLiveTest final QueryConnectionsResult result = provider.queryConnections(new Location(LocationType.STATION, 0, null, "Hauptwache"), null, new Location(LocationType.STATION, 0, null, "Südbahnhof"), new Date(), true, ALL_PRODUCTS, WalkSpeed.NORMAL, Accessibility.NEUTRAL); System.out.println(result); - final QueryConnectionsResult moreResult = provider.queryMoreConnections(result.context); + final QueryConnectionsResult moreResult = provider.queryMoreConnections(result.context, true); System.out.println(moreResult); } } diff --git a/test/de/schildbach/pte/live/SvvProviderLiveTest.java b/test/de/schildbach/pte/live/SvvProviderLiveTest.java index 3eec70c5..86b4df25 100644 --- a/test/de/schildbach/pte/live/SvvProviderLiveTest.java +++ b/test/de/schildbach/pte/live/SvvProviderLiveTest.java @@ -76,7 +76,7 @@ public class SvvProviderLiveTest extends AbstractProviderLiveTest final QueryConnectionsResult result = provider.queryConnections(new Location(LocationType.STATION, 0, null, "Hauptwache"), null, new Location(LocationType.STATION, 0, null, "Südbahnhof"), new Date(), true, ALL_PRODUCTS, WalkSpeed.NORMAL, Accessibility.NEUTRAL); System.out.println(result); - final QueryConnectionsResult moreResult = provider.queryMoreConnections(result.context); + final QueryConnectionsResult moreResult = provider.queryMoreConnections(result.context, true); System.out.println(moreResult); } } diff --git a/test/de/schildbach/pte/live/SydneyProviderLiveTest.java b/test/de/schildbach/pte/live/SydneyProviderLiveTest.java index 8e62aa06..0ee72bc0 100644 --- a/test/de/schildbach/pte/live/SydneyProviderLiveTest.java +++ b/test/de/schildbach/pte/live/SydneyProviderLiveTest.java @@ -77,7 +77,7 @@ public class SydneyProviderLiveTest extends AbstractProviderLiveTest null, new Location(LocationType.STATION, 0, "Sydney", "Capitol Square"), new Date(), true, ALL_PRODUCTS, WalkSpeed.NORMAL, Accessibility.NEUTRAL); System.out.println(result); - final QueryConnectionsResult moreResult = provider.queryMoreConnections(result.context); + final QueryConnectionsResult moreResult = provider.queryMoreConnections(result.context, true); System.out.println(moreResult); } } diff --git a/test/de/schildbach/pte/live/TflProviderLiveTest.java b/test/de/schildbach/pte/live/TflProviderLiveTest.java index 67eb3888..944b0f37 100644 --- a/test/de/schildbach/pte/live/TflProviderLiveTest.java +++ b/test/de/schildbach/pte/live/TflProviderLiveTest.java @@ -77,7 +77,7 @@ public class TflProviderLiveTest extends AbstractProviderLiveTest null, new Location(LocationType.STATION, 1006433, null, "Edinburgh Court"), new Date(), true, ALL_PRODUCTS, WalkSpeed.NORMAL, Accessibility.NEUTRAL); System.out.println(result); - final QueryConnectionsResult moreResult = provider.queryMoreConnections(result.context); + final QueryConnectionsResult moreResult = provider.queryMoreConnections(result.context, true); System.out.println(moreResult); } diff --git a/test/de/schildbach/pte/live/TleaProviderLiveTest.java b/test/de/schildbach/pte/live/TleaProviderLiveTest.java index a23093d9..f01eca5a 100644 --- a/test/de/schildbach/pte/live/TleaProviderLiveTest.java +++ b/test/de/schildbach/pte/live/TleaProviderLiveTest.java @@ -77,7 +77,7 @@ public class TleaProviderLiveTest extends AbstractProviderLiveTest null, new Location(LocationType.STATION, 1006433, null, "Edinburgh Court"), new Date(), true, ALL_PRODUCTS, WalkSpeed.NORMAL, Accessibility.NEUTRAL); System.out.println(result); - final QueryConnectionsResult moreResult = provider.queryMoreConnections(result.context); + final QueryConnectionsResult moreResult = provider.queryMoreConnections(result.context, true); System.out.println(moreResult); } } diff --git a/test/de/schildbach/pte/live/TlemProviderLiveTest.java b/test/de/schildbach/pte/live/TlemProviderLiveTest.java index 00fa9310..d747c68d 100644 --- a/test/de/schildbach/pte/live/TlemProviderLiveTest.java +++ b/test/de/schildbach/pte/live/TlemProviderLiveTest.java @@ -77,7 +77,7 @@ public class TlemProviderLiveTest extends AbstractProviderLiveTest null, new Location(LocationType.STATION, 1006433, null, "Edinburgh Court"), new Date(), true, ALL_PRODUCTS, WalkSpeed.NORMAL, Accessibility.NEUTRAL); System.out.println(result); - final QueryConnectionsResult moreResult = provider.queryMoreConnections(result.context); + final QueryConnectionsResult moreResult = provider.queryMoreConnections(result.context, true); System.out.println(moreResult); } } diff --git a/test/de/schildbach/pte/live/TlseProviderLiveTest.java b/test/de/schildbach/pte/live/TlseProviderLiveTest.java index 0c89c77c..67af9876 100644 --- a/test/de/schildbach/pte/live/TlseProviderLiveTest.java +++ b/test/de/schildbach/pte/live/TlseProviderLiveTest.java @@ -77,7 +77,7 @@ public class TlseProviderLiveTest extends AbstractProviderLiveTest null, new Location(LocationType.STATION, 1006433, null, "Edinburgh Court"), new Date(), true, ALL_PRODUCTS, WalkSpeed.NORMAL, Accessibility.NEUTRAL); System.out.println(result); - final QueryConnectionsResult moreResult = provider.queryMoreConnections(result.context); + final QueryConnectionsResult moreResult = provider.queryMoreConnections(result.context, true); System.out.println(moreResult); } } diff --git a/test/de/schildbach/pte/live/TlswProviderLiveTest.java b/test/de/schildbach/pte/live/TlswProviderLiveTest.java index 4ff54c97..3864125c 100644 --- a/test/de/schildbach/pte/live/TlswProviderLiveTest.java +++ b/test/de/schildbach/pte/live/TlswProviderLiveTest.java @@ -76,7 +76,7 @@ public class TlswProviderLiveTest extends AbstractProviderLiveTest final QueryConnectionsResult result = provider.queryConnections(new Location(LocationType.STATION, 0, null, "70003023"), null, new Location( LocationType.STATION, 0, null, "70003025"), new Date(), true, ALL_PRODUCTS, WalkSpeed.NORMAL, Accessibility.NEUTRAL); System.out.println(result); - final QueryConnectionsResult moreResult = provider.queryMoreConnections(result.context); + final QueryConnectionsResult moreResult = provider.queryMoreConnections(result.context, true); System.out.println(moreResult); } } diff --git a/test/de/schildbach/pte/live/VagfrProviderLiveTest.java b/test/de/schildbach/pte/live/VagfrProviderLiveTest.java index a951536a..8f3f9918 100644 --- a/test/de/schildbach/pte/live/VagfrProviderLiveTest.java +++ b/test/de/schildbach/pte/live/VagfrProviderLiveTest.java @@ -76,7 +76,7 @@ public class VagfrProviderLiveTest extends AbstractProviderLiveTest final QueryConnectionsResult result = provider.queryConnections(new Location(LocationType.STATION, 0, null, "Hauptwache"), null, new Location(LocationType.STATION, 0, null, "Südbahnhof"), new Date(), true, ALL_PRODUCTS, WalkSpeed.NORMAL, Accessibility.NEUTRAL); System.out.println(result); - final QueryConnectionsResult moreResult = provider.queryMoreConnections(result.context); + final QueryConnectionsResult moreResult = provider.queryMoreConnections(result.context, true); System.out.println(moreResult); } } diff --git a/test/de/schildbach/pte/live/VbbProviderLiveTest.java b/test/de/schildbach/pte/live/VbbProviderLiveTest.java index 15ba871b..214ab48d 100644 --- a/test/de/schildbach/pte/live/VbbProviderLiveTest.java +++ b/test/de/schildbach/pte/live/VbbProviderLiveTest.java @@ -77,7 +77,7 @@ public class VbbProviderLiveTest extends AbstractProviderLiveTest null, new Location(LocationType.STATION, 9013103, "Berlin", "Prinzenstraße"), new Date(), true, ALL_PRODUCTS, WalkSpeed.NORMAL, Accessibility.NEUTRAL); System.out.println(result); - final QueryConnectionsResult moreResult = provider.queryMoreConnections(result.context); + final QueryConnectionsResult moreResult = provider.queryMoreConnections(result.context, true); System.out.println(moreResult); } @@ -88,7 +88,7 @@ public class VbbProviderLiveTest extends AbstractProviderLiveTest new Location(LocationType.STATION, 9044202, "Berlin", "Bundesplatz"), new Location(LocationType.STATION, 9013103, "Berlin", "Prinzenstraße"), new Date(), true, ALL_PRODUCTS, WalkSpeed.NORMAL, Accessibility.NEUTRAL); System.out.println(result); - final QueryConnectionsResult moreResult = provider.queryMoreConnections(result.context); + final QueryConnectionsResult moreResult = provider.queryMoreConnections(result.context, true); System.out.println(moreResult); } @@ -99,7 +99,7 @@ public class VbbProviderLiveTest extends AbstractProviderLiveTest new Location(LocationType.ADDRESS, 0, 52513639, 13568648, null, null), new Date(), true, ALL_PRODUCTS, WalkSpeed.NORMAL, Accessibility.NEUTRAL); System.out.println(result); - final QueryConnectionsResult moreResult = provider.queryMoreConnections(result.context); + final QueryConnectionsResult moreResult = provider.queryMoreConnections(result.context, true); System.out.println(moreResult); } @@ -110,7 +110,7 @@ public class VbbProviderLiveTest extends AbstractProviderLiveTest new Location(LocationType.ADDRESS, 0, 52479868, 13324247, null, null), new Location(LocationType.ADDRESS, 0, 52513639, 13568648, null, null), new Date(), true, ALL_PRODUCTS, WalkSpeed.NORMAL, Accessibility.NEUTRAL); System.out.println(result); - final QueryConnectionsResult moreResult = provider.queryMoreConnections(result.context); + final QueryConnectionsResult moreResult = provider.queryMoreConnections(result.context, true); System.out.println(moreResult); } @@ -121,7 +121,7 @@ public class VbbProviderLiveTest extends AbstractProviderLiveTest "10715 Bln Charlb.-Wilm., Weimarische Str. 7"), null, new Location(LocationType.ADDRESS, 0, null, "10178 Bln Mitte, Sophienstr. 24"), new Date(), true, ALL_PRODUCTS, WalkSpeed.NORMAL, Accessibility.NEUTRAL); System.out.println(result); - final QueryConnectionsResult moreResult = provider.queryMoreConnections(result.context); + final QueryConnectionsResult moreResult = provider.queryMoreConnections(result.context, true); System.out.println(moreResult); } @@ -133,7 +133,7 @@ public class VbbProviderLiveTest extends AbstractProviderLiveTest new Location(LocationType.ADDRESS, 0, null, "10178 Bln Mitte, Sophienstr. 24"), new Date(), true, ALL_PRODUCTS, WalkSpeed.NORMAL, Accessibility.NEUTRAL); System.out.println(result); - final QueryConnectionsResult moreResult = provider.queryMoreConnections(result.context); + final QueryConnectionsResult moreResult = provider.queryMoreConnections(result.context, true); System.out.println(moreResult); } } diff --git a/test/de/schildbach/pte/live/VblProviderLiveTest.java b/test/de/schildbach/pte/live/VblProviderLiveTest.java index 29f1a12e..92e42fe7 100644 --- a/test/de/schildbach/pte/live/VblProviderLiveTest.java +++ b/test/de/schildbach/pte/live/VblProviderLiveTest.java @@ -84,7 +84,7 @@ public class VblProviderLiveTest extends AbstractProviderLiveTest final QueryConnectionsResult result = provider.queryConnections(new Location(LocationType.STATION, 0, null, "Hauptwache"), null, new Location(LocationType.STATION, 0, null, "Südbahnhof"), new Date(), true, ALL_PRODUCTS, WalkSpeed.NORMAL, Accessibility.NEUTRAL); System.out.println(result); - final QueryConnectionsResult moreResult = provider.queryMoreConnections(result.context); + final QueryConnectionsResult moreResult = provider.queryMoreConnections(result.context, true); System.out.println(moreResult); } } diff --git a/test/de/schildbach/pte/live/VbnProviderLiveTest.java b/test/de/schildbach/pte/live/VbnProviderLiveTest.java index c7ae53e4..ee2bd521 100644 --- a/test/de/schildbach/pte/live/VbnProviderLiveTest.java +++ b/test/de/schildbach/pte/live/VbnProviderLiveTest.java @@ -80,7 +80,7 @@ public class VbnProviderLiveTest extends AbstractProviderLiveTest Accessibility.NEUTRAL); assertEquals(QueryConnectionsResult.Status.OK, result.status); System.out.println(result); - final QueryConnectionsResult moreResult = provider.queryMoreConnections(result.context); + final QueryConnectionsResult moreResult = provider.queryMoreConnections(result.context, true); System.out.println(moreResult); } diff --git a/test/de/schildbach/pte/live/VgnProviderLiveTest.java b/test/de/schildbach/pte/live/VgnProviderLiveTest.java index 7669ada1..f25e4d5b 100644 --- a/test/de/schildbach/pte/live/VgnProviderLiveTest.java +++ b/test/de/schildbach/pte/live/VgnProviderLiveTest.java @@ -85,7 +85,7 @@ public class VgnProviderLiveTest extends AbstractProviderLiveTest new Location(LocationType.STATION, 510, "Nürnberg", "Hauptbahnhof"), new Date(), true, ALL_PRODUCTS, WalkSpeed.NORMAL, Accessibility.NEUTRAL); System.out.println(result); - final QueryConnectionsResult moreResult = provider.queryMoreConnections(result.context); + final QueryConnectionsResult moreResult = provider.queryMoreConnections(result.context, true); System.out.println(moreResult); } } diff --git a/test/de/schildbach/pte/live/VgsProviderLiveTest.java b/test/de/schildbach/pte/live/VgsProviderLiveTest.java index d2cde3d9..db83689f 100644 --- a/test/de/schildbach/pte/live/VgsProviderLiveTest.java +++ b/test/de/schildbach/pte/live/VgsProviderLiveTest.java @@ -76,7 +76,7 @@ public class VgsProviderLiveTest extends AbstractProviderLiveTest final QueryConnectionsResult result = provider.queryConnections(new Location(LocationType.STATION, 0, null, "Hauptwache"), null, new Location(LocationType.STATION, 0, null, "Südbahnhof"), new Date(), true, ALL_PRODUCTS, WalkSpeed.NORMAL, Accessibility.NEUTRAL); System.out.println(result); - final QueryConnectionsResult moreResult = provider.queryMoreConnections(result.context); + final QueryConnectionsResult moreResult = provider.queryMoreConnections(result.context, true); System.out.println(moreResult); } } diff --git a/test/de/schildbach/pte/live/VmobilProviderLiveTest.java b/test/de/schildbach/pte/live/VmobilProviderLiveTest.java index e4d8e18c..81d4dfad 100644 --- a/test/de/schildbach/pte/live/VmobilProviderLiveTest.java +++ b/test/de/schildbach/pte/live/VmobilProviderLiveTest.java @@ -84,7 +84,7 @@ public class VmobilProviderLiveTest extends AbstractProviderLiveTest final QueryConnectionsResult result = provider.queryConnections(new Location(LocationType.STATION, 0, null, "Hauptwache"), null, new Location(LocationType.STATION, 0, null, "Südbahnhof"), new Date(), true, ALL_PRODUCTS, WalkSpeed.NORMAL, Accessibility.NEUTRAL); System.out.println(result); - final QueryConnectionsResult moreResult = provider.queryMoreConnections(result.context); + final QueryConnectionsResult moreResult = provider.queryMoreConnections(result.context, true); System.out.println(moreResult); } } diff --git a/test/de/schildbach/pte/live/VmsProviderLiveTest.java b/test/de/schildbach/pte/live/VmsProviderLiveTest.java index ce6a4c1f..bed33b79 100644 --- a/test/de/schildbach/pte/live/VmsProviderLiveTest.java +++ b/test/de/schildbach/pte/live/VmsProviderLiveTest.java @@ -76,7 +76,7 @@ public class VmsProviderLiveTest extends AbstractProviderLiveTest final QueryConnectionsResult result = provider.queryConnections(new Location(LocationType.STATION, 0, null, "Hauptwache"), null, new Location(LocationType.STATION, 0, null, "Südbahnhof"), new Date(), true, ALL_PRODUCTS, WalkSpeed.NORMAL, Accessibility.NEUTRAL); System.out.println(result); - final QueryConnectionsResult moreResult = provider.queryMoreConnections(result.context); + final QueryConnectionsResult moreResult = provider.queryMoreConnections(result.context, true); System.out.println(moreResult); } } diff --git a/test/de/schildbach/pte/live/VmvProviderLiveTest.java b/test/de/schildbach/pte/live/VmvProviderLiveTest.java index 510fa06a..f6da3172 100644 --- a/test/de/schildbach/pte/live/VmvProviderLiveTest.java +++ b/test/de/schildbach/pte/live/VmvProviderLiveTest.java @@ -76,7 +76,7 @@ public class VmvProviderLiveTest extends AbstractProviderLiveTest final QueryConnectionsResult result = provider.queryConnections(new Location(LocationType.STATION, 0, null, "Hauptwache"), null, new Location(LocationType.STATION, 0, null, "Südbahnhof"), new Date(), true, ALL_PRODUCTS, WalkSpeed.NORMAL, Accessibility.NEUTRAL); System.out.println(result); - final QueryConnectionsResult moreResult = provider.queryMoreConnections(result.context); + final QueryConnectionsResult moreResult = provider.queryMoreConnections(result.context, true); System.out.println(moreResult); } } diff --git a/test/de/schildbach/pte/live/VorProviderLiveTest.java b/test/de/schildbach/pte/live/VorProviderLiveTest.java index 7ab47b68..24d3e7b1 100644 --- a/test/de/schildbach/pte/live/VorProviderLiveTest.java +++ b/test/de/schildbach/pte/live/VorProviderLiveTest.java @@ -84,7 +84,7 @@ public class VorProviderLiveTest extends AbstractProviderLiveTest final QueryConnectionsResult result = provider.queryConnections(new Location(LocationType.STATION, 0, null, "Hauptwache"), null, new Location(LocationType.STATION, 0, null, "Südbahnhof"), new Date(), true, ALL_PRODUCTS, WalkSpeed.NORMAL, Accessibility.NEUTRAL); System.out.println(result); - final QueryConnectionsResult moreResult = provider.queryMoreConnections(result.context); + final QueryConnectionsResult moreResult = provider.queryMoreConnections(result.context, true); System.out.println(moreResult); } } diff --git a/test/de/schildbach/pte/live/VrnProviderLiveTest.java b/test/de/schildbach/pte/live/VrnProviderLiveTest.java index 8b766d4c..eb86c13b 100644 --- a/test/de/schildbach/pte/live/VrnProviderLiveTest.java +++ b/test/de/schildbach/pte/live/VrnProviderLiveTest.java @@ -108,7 +108,7 @@ public class VrnProviderLiveTest extends AbstractProviderLiveTest final QueryConnectionsResult result = provider.queryConnections(new Location(LocationType.STATION, 0, null, "Hauptwache"), null, new Location(LocationType.STATION, 0, null, "Südbahnhof"), new Date(), true, ALL_PRODUCTS, WalkSpeed.NORMAL, Accessibility.NEUTRAL); System.out.println(result); - final QueryConnectionsResult moreResult = provider.queryMoreConnections(result.context); + final QueryConnectionsResult moreResult = provider.queryMoreConnections(result.context, true); System.out.println(moreResult); } } diff --git a/test/de/schildbach/pte/live/VrrProviderLiveTest.java b/test/de/schildbach/pte/live/VrrProviderLiveTest.java index 26ef64a1..2a444462 100644 --- a/test/de/schildbach/pte/live/VrrProviderLiveTest.java +++ b/test/de/schildbach/pte/live/VrrProviderLiveTest.java @@ -101,7 +101,7 @@ public class VrrProviderLiveTest extends AbstractProviderLiveTest new Location(LocationType.STATION, 20009161, "Essen", "Bismarckplatz"), new Date(), true, ALL_PRODUCTS, WalkSpeed.NORMAL, Accessibility.NEUTRAL); System.out.println(result); - final QueryConnectionsResult moreResult = provider.queryMoreConnections(result.context); + final QueryConnectionsResult moreResult = provider.queryMoreConnections(result.context, true); System.out.println(moreResult); } } diff --git a/test/de/schildbach/pte/live/VrtProviderLiveTest.java b/test/de/schildbach/pte/live/VrtProviderLiveTest.java index fc029889..45cc2938 100644 --- a/test/de/schildbach/pte/live/VrtProviderLiveTest.java +++ b/test/de/schildbach/pte/live/VrtProviderLiveTest.java @@ -77,7 +77,7 @@ public class VrtProviderLiveTest extends AbstractProviderLiveTest new Location(LocationType.STATION, 17009001, null, "Bahnhof"), new Date(), true, ALL_PRODUCTS, WalkSpeed.NORMAL, Accessibility.NEUTRAL); System.out.println(result); - final QueryConnectionsResult moreResult = provider.queryMoreConnections(result.context); + final QueryConnectionsResult moreResult = provider.queryMoreConnections(result.context, true); System.out.println(moreResult); } } diff --git a/test/de/schildbach/pte/live/VvmProviderLiveTest.java b/test/de/schildbach/pte/live/VvmProviderLiveTest.java index cdc78a4b..772f8b95 100644 --- a/test/de/schildbach/pte/live/VvmProviderLiveTest.java +++ b/test/de/schildbach/pte/live/VvmProviderLiveTest.java @@ -84,7 +84,7 @@ public class VvmProviderLiveTest extends AbstractProviderLiveTest final QueryConnectionsResult result = provider.queryConnections(new Location(LocationType.STATION, 0, null, "Hauptwache"), null, new Location(LocationType.STATION, 0, null, "Südbahnhof"), new Date(), true, ALL_PRODUCTS, WalkSpeed.NORMAL, Accessibility.NEUTRAL); System.out.println(result); - final QueryConnectionsResult moreResult = provider.queryMoreConnections(result.context); + final QueryConnectionsResult moreResult = provider.queryMoreConnections(result.context, true); System.out.println(moreResult); } } diff --git a/test/de/schildbach/pte/live/VvoProviderLiveTest.java b/test/de/schildbach/pte/live/VvoProviderLiveTest.java index f6fd09bf..076122be 100644 --- a/test/de/schildbach/pte/live/VvoProviderLiveTest.java +++ b/test/de/schildbach/pte/live/VvoProviderLiveTest.java @@ -76,7 +76,7 @@ public class VvoProviderLiveTest extends AbstractProviderLiveTest final QueryConnectionsResult result = provider.queryConnections(new Location(LocationType.STATION, 0, null, "Hauptwache"), null, new Location(LocationType.STATION, 0, null, "Südbahnhof"), new Date(), true, ALL_PRODUCTS, WalkSpeed.NORMAL, Accessibility.NEUTRAL); System.out.println(result); - final QueryConnectionsResult moreResult = provider.queryMoreConnections(result.context); + final QueryConnectionsResult moreResult = provider.queryMoreConnections(result.context, true); System.out.println(moreResult); } } diff --git a/test/de/schildbach/pte/live/VvsProviderLiveTest.java b/test/de/schildbach/pte/live/VvsProviderLiveTest.java index 92112cf2..457981df 100644 --- a/test/de/schildbach/pte/live/VvsProviderLiveTest.java +++ b/test/de/schildbach/pte/live/VvsProviderLiveTest.java @@ -84,7 +84,7 @@ public class VvsProviderLiveTest extends AbstractProviderLiveTest final QueryConnectionsResult result = provider.queryConnections(new Location(LocationType.STATION, 0, null, "Hauptwache"), null, new Location(LocationType.STATION, 0, null, "Südbahnhof"), new Date(), true, ALL_PRODUCTS, WalkSpeed.NORMAL, Accessibility.NEUTRAL); System.out.println(result); - final QueryConnectionsResult moreResult = provider.queryMoreConnections(result.context); + final QueryConnectionsResult moreResult = provider.queryMoreConnections(result.context, true); System.out.println(moreResult); } } diff --git a/test/de/schildbach/pte/live/VvtProviderLiveTest.java b/test/de/schildbach/pte/live/VvtProviderLiveTest.java index 78f0c38d..9b12f89b 100644 --- a/test/de/schildbach/pte/live/VvtProviderLiveTest.java +++ b/test/de/schildbach/pte/live/VvtProviderLiveTest.java @@ -84,7 +84,7 @@ public class VvtProviderLiveTest extends AbstractProviderLiveTest final QueryConnectionsResult result = provider.queryConnections(new Location(LocationType.STATION, 0, null, "Hauptwache"), null, new Location(LocationType.STATION, 0, null, "Südbahnhof"), new Date(), true, ALL_PRODUCTS, WalkSpeed.NORMAL, Accessibility.NEUTRAL); System.out.println(result); - final QueryConnectionsResult moreResult = provider.queryMoreConnections(result.context); + final QueryConnectionsResult moreResult = provider.queryMoreConnections(result.context, true); System.out.println(moreResult); } } diff --git a/test/de/schildbach/pte/live/ZvvProviderLiveTest.java b/test/de/schildbach/pte/live/ZvvProviderLiveTest.java index 72c5ab70..482549ec 100644 --- a/test/de/schildbach/pte/live/ZvvProviderLiveTest.java +++ b/test/de/schildbach/pte/live/ZvvProviderLiveTest.java @@ -77,7 +77,7 @@ public class ZvvProviderLiveTest extends AbstractProviderLiveTest new Location(LocationType.STATION, 8507785, null, "Bern, Hauptbahnhof"), new Date(), true, ALL_PRODUCTS, WalkSpeed.NORMAL, Accessibility.NEUTRAL); System.out.println(result); - final QueryConnectionsResult moreResult = provider.queryMoreConnections(result.context); + final QueryConnectionsResult moreResult = provider.queryMoreConnections(result.context, true); System.out.println(moreResult); } }