From a1c8b1caa1186a424b2a5ca5c07a2d5cb82b867f Mon Sep 17 00:00:00 2001 From: Andreas Schildbach Date: Mon, 26 Oct 2020 11:32:37 +0100 Subject: [PATCH] AbstractEfaProvider: Include mot 14, 15 and 16 if high-speed train is requested in appendTripRequestParameters(). --- src/de/schildbach/pte/AbstractEfaProvider.java | 4 ++++ src/de/schildbach/pte/AvvProvider.java | 3 --- src/de/schildbach/pte/BayernProvider.java | 7 ------- src/de/schildbach/pte/SydneyProvider.java | 3 --- src/de/schildbach/pte/VmsProvider.java | 3 --- src/de/schildbach/pte/VrrProvider.java | 3 --- 6 files changed, 4 insertions(+), 19 deletions(-) diff --git a/src/de/schildbach/pte/AbstractEfaProvider.java b/src/de/schildbach/pte/AbstractEfaProvider.java index fd98c8a1..60a0b340 100644 --- a/src/de/schildbach/pte/AbstractEfaProvider.java +++ b/src/de/schildbach/pte/AbstractEfaProvider.java @@ -2023,6 +2023,10 @@ public abstract class AbstractEfaProvider extends AbstractNetworkProvider { hasI = true; } + if (p == Product.HIGH_SPEED_TRAIN) + url.addEncodedQueryParameter("inclMOT_14", "on").addEncodedQueryParameter("inclMOT_15", "on") + .addEncodedQueryParameter("inclMOT_16", "on"); + if (p == Product.REGIONAL_TRAIN) url.addEncodedQueryParameter("inclMOT_13", "on"); diff --git a/src/de/schildbach/pte/AvvProvider.java b/src/de/schildbach/pte/AvvProvider.java index f834abce..0170bd67 100644 --- a/src/de/schildbach/pte/AvvProvider.java +++ b/src/de/schildbach/pte/AvvProvider.java @@ -52,9 +52,6 @@ public class AvvProvider extends AbstractEfaProvider { final @Nullable TripOptions options) { super.appendTripRequestParameters(url, from, via, to, time, dep, options); url.addEncodedQueryParameter("inclMOT_11", "on"); // night bus - url.addEncodedQueryParameter("inclMOT_14", "on"); - url.addEncodedQueryParameter("inclMOT_15", "on"); - url.addEncodedQueryParameter("inclMOT_16", "on"); url.addEncodedQueryParameter("inclMOT_17", "on"); } diff --git a/src/de/schildbach/pte/BayernProvider.java b/src/de/schildbach/pte/BayernProvider.java index 4784c567..658cd8f3 100644 --- a/src/de/schildbach/pte/BayernProvider.java +++ b/src/de/schildbach/pte/BayernProvider.java @@ -145,14 +145,7 @@ public class BayernProvider extends AbstractEfaProvider { final @Nullable Location via, final Location to, final Date time, final boolean dep, final @Nullable TripOptions options) { super.appendTripRequestParameters(url, from, via, to, time, dep, options); - if (options != null && options.products != null) { - for (final Product p : options.products) { - if (p == Product.HIGH_SPEED_TRAIN) - url.addEncodedQueryParameter("inclMOT_15", "on").addEncodedQueryParameter("inclMOT_16", "on"); - } - } url.addEncodedQueryParameter("inclMOT_11", "on"); - url.addEncodedQueryParameter("inclMOT_14", "on"); url.addEncodedQueryParameter("calcOneDirection", "1"); } diff --git a/src/de/schildbach/pte/SydneyProvider.java b/src/de/schildbach/pte/SydneyProvider.java index 342a057c..bfd46cca 100644 --- a/src/de/schildbach/pte/SydneyProvider.java +++ b/src/de/schildbach/pte/SydneyProvider.java @@ -58,9 +58,6 @@ public class SydneyProvider extends AbstractEfaProvider { url.addEncodedQueryParameter("inclMOT_11", "on"); // school bus } } - url.addEncodedQueryParameter("inclMOT_14", "on"); - url.addEncodedQueryParameter("inclMOT_15", "on"); - url.addEncodedQueryParameter("inclMOT_16", "on"); url.addEncodedQueryParameter("inclMOT_17", "on"); } diff --git a/src/de/schildbach/pte/VmsProvider.java b/src/de/schildbach/pte/VmsProvider.java index d2cc4cb7..b69aa157 100644 --- a/src/de/schildbach/pte/VmsProvider.java +++ b/src/de/schildbach/pte/VmsProvider.java @@ -52,9 +52,6 @@ public class VmsProvider extends AbstractEfaProvider { final @Nullable TripOptions options) { super.appendTripRequestParameters(url, from, via, to, time, dep, options); url.addEncodedQueryParameter("inclMOT_11", "on"); - url.addEncodedQueryParameter("inclMOT_14", "on"); - url.addEncodedQueryParameter("inclMOT_15", "on"); - url.addEncodedQueryParameter("inclMOT_16", "on"); url.addEncodedQueryParameter("inclMOT_17", "on"); } diff --git a/src/de/schildbach/pte/VrrProvider.java b/src/de/schildbach/pte/VrrProvider.java index b18a4065..dd80a5ab 100644 --- a/src/de/schildbach/pte/VrrProvider.java +++ b/src/de/schildbach/pte/VrrProvider.java @@ -65,9 +65,6 @@ public class VrrProvider extends AbstractEfaProvider { for (final Product p : options.products) { if (p == Product.CABLECAR) url.addEncodedQueryParameter("inclMOT_11", "on"); // Schwebebahn - if (p == Product.HIGH_SPEED_TRAIN) - url.addEncodedQueryParameter("inclMOT_14", "on") - .addEncodedQueryParameter("inclMOT_16", "on"); } } }