From 7af27c855b9c396def64c189a1359105ff5a22e4 Mon Sep 17 00:00:00 2001 From: Andreas Schildbach Date: Tue, 29 Sep 2015 10:59:02 +0200 Subject: [PATCH] VVO: Use realtime data for Dresden again. --- .../src/de/schildbach/pte/AbstractEfaProvider.java | 12 ++---------- enabler/src/de/schildbach/pte/VvoProvider.java | 1 - 2 files changed, 2 insertions(+), 11 deletions(-) diff --git a/enabler/src/de/schildbach/pte/AbstractEfaProvider.java b/enabler/src/de/schildbach/pte/AbstractEfaProvider.java index d2c146b0..d67de11b 100644 --- a/enabler/src/de/schildbach/pte/AbstractEfaProvider.java +++ b/enabler/src/de/schildbach/pte/AbstractEfaProvider.java @@ -102,7 +102,6 @@ public abstract class AbstractEfaProvider extends AbstractNetworkProvider private String language = "de"; private @Nullable String additionalQueryParameter = null; - private boolean useRealtime = true; private boolean needsSpEncId = false; private boolean includeRegionId = true; private boolean useProxFootSearch = true; @@ -211,11 +210,6 @@ 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; @@ -1491,8 +1485,7 @@ public abstract class AbstractEfaProvider extends AbstractNetworkProvider parameters.append("&name_dm=").append(normalizeStationId(stationId)); if (time != null) appendItdDateTimeParameters(parameters, time); - if (useRealtime) - parameters.append("&useRealtime=1"); + parameters.append("&useRealtime=1"); parameters.append("&mode=direct"); parameters.append("&ptOptionsActive=1"); parameters.append("&deleteAssignedStops_dm=").append(equivs ? '0' : '1'); @@ -2116,8 +2109,7 @@ public abstract class AbstractEfaProvider extends AbstractNetworkProvider uri.append("&bikeTakeAlong=1"); uri.append("&locationServerActive=1"); - if (useRealtime) - uri.append("&useRealtime=1"); + uri.append("&useRealtime=1"); uri.append("&nextDepsPerLeg=1"); // next departure in case previous was missed return uri.toString(); diff --git a/enabler/src/de/schildbach/pte/VvoProvider.java b/enabler/src/de/schildbach/pte/VvoProvider.java index 7cc77d1e..2d234fd5 100644 --- a/enabler/src/de/schildbach/pte/VvoProvider.java +++ b/enabler/src/de/schildbach/pte/VvoProvider.java @@ -40,7 +40,6 @@ public class VvoProvider extends AbstractEfaProvider { super(NetworkId.VVO, apiBase); - setUseRealtime(false); setRequestUrlEncoding(Charsets.UTF_8); }