From 8817f4a35dbda37a0eac56c260accad59a5845e7 Mon Sep 17 00:00:00 2001 From: Andreas Schildbach Date: Fri, 22 Nov 2013 10:08:59 +0100 Subject: [PATCH] Don't use realtime for Dresden --- .../src/de/schildbach/pte/AbstractEfaProvider.java | 12 ++++++++++-- enabler/src/de/schildbach/pte/VvoProvider.java | 1 + .../de/schildbach/pte/live/VvoProviderLiveTest.java | 2 +- 3 files changed, 12 insertions(+), 3 deletions(-) diff --git a/enabler/src/de/schildbach/pte/AbstractEfaProvider.java b/enabler/src/de/schildbach/pte/AbstractEfaProvider.java index 7c76d3d0..013e4ed8 100644 --- a/enabler/src/de/schildbach/pte/AbstractEfaProvider.java +++ b/enabler/src/de/schildbach/pte/AbstractEfaProvider.java @@ -95,6 +95,7 @@ public abstract class AbstractEfaProvider extends AbstractNetworkProvider private final String coordEndpoint; private String additionalQueryParameter = null; + private boolean useRealtime = true; private boolean canAcceptPoiId = false; private boolean needsSpEncId = false; private boolean includeRegionId = true; @@ -192,6 +193,11 @@ public abstract class AbstractEfaProvider extends AbstractNetworkProvider this.httpPost = httpPost; } + protected void setUseRealtime(final boolean useRealtime) + { + this.useRealtime = useRealtime; + } + protected void setIncludeRegionId(final boolean includeRegionId) { this.includeRegionId = includeRegionId; @@ -1413,7 +1419,8 @@ public abstract class AbstractEfaProvider extends AbstractNetworkProvider appendCommonRequestParams(parameters, "XML"); parameters.append("&type_dm=stop"); parameters.append("&name_dm=").append(stationId); - parameters.append("&useRealtime=1"); + if (useRealtime) + parameters.append("&useRealtime=1"); parameters.append("&mode=direct"); parameters.append("&ptOptionsActive=1"); parameters.append("&deleteAssignedStops_dm=").append(equivs ? '0' : '1'); @@ -2069,7 +2076,8 @@ public abstract class AbstractEfaProvider extends AbstractNetworkProvider uri.append("&bikeTakeAlong=1"); uri.append("&locationServerActive=1"); - uri.append("&useRealtime=1"); + if (useRealtime) + uri.append("&useRealtime=1"); uri.append("&useProxFootSearch=1"); // walk if it makes journeys quicker uri.append("&nextDepsPerLeg=1"); // next departure in case previous was missed diff --git a/enabler/src/de/schildbach/pte/VvoProvider.java b/enabler/src/de/schildbach/pte/VvoProvider.java index 246dc64f..4ebaa6f1 100644 --- a/enabler/src/de/schildbach/pte/VvoProvider.java +++ b/enabler/src/de/schildbach/pte/VvoProvider.java @@ -40,6 +40,7 @@ public class VvoProvider extends AbstractEfaProvider { super(apiBase); + setUseRealtime(false); setRequestUrlEncoding(UTF_8); } diff --git a/enabler/test/de/schildbach/pte/live/VvoProviderLiveTest.java b/enabler/test/de/schildbach/pte/live/VvoProviderLiveTest.java index 903fb949..b811a987 100644 --- a/enabler/test/de/schildbach/pte/live/VvoProviderLiveTest.java +++ b/enabler/test/de/schildbach/pte/live/VvoProviderLiveTest.java @@ -48,7 +48,7 @@ public class VvoProviderLiveTest extends AbstractProviderLiveTest @Test public void nearbyStations() throws Exception { - final NearbyStationsResult result = provider.queryNearbyStations(new Location(LocationType.STATION, 100), 0, 0); + final NearbyStationsResult result = provider.queryNearbyStations(new Location(LocationType.STATION, 33000013), 0, 0); System.out.println(result.status + " " + result.stations.size() + " " + result.stations); }