From e43c676a34296c3efe109f31fee6893ceae8edef Mon Sep 17 00:00:00 2001 From: Andreas Schildbach Date: Fri, 13 Mar 2015 13:32:25 +0100 Subject: [PATCH] EFA: More explicit handling of inclMOT_11 parameter. --- .../schildbach/pte/AbstractEfaProvider.java | 2 -- .../src/de/schildbach/pte/BayernProvider.java | 14 ++++++++++ .../src/de/schildbach/pte/SydneyProvider.java | 24 +++++++++++++++++ .../src/de/schildbach/pte/VorProvider.java | 27 +++++++++++++++++++ .../src/de/schildbach/pte/VrrProvider.java | 26 ++++++++++++++++++ .../src/de/schildbach/pte/WienProvider.java | 27 +++++++++++++++++++ 6 files changed, 118 insertions(+), 2 deletions(-) diff --git a/enabler/src/de/schildbach/pte/AbstractEfaProvider.java b/enabler/src/de/schildbach/pte/AbstractEfaProvider.java index 7238d4ba..f72ebe55 100644 --- a/enabler/src/de/schildbach/pte/AbstractEfaProvider.java +++ b/enabler/src/de/schildbach/pte/AbstractEfaProvider.java @@ -2062,8 +2062,6 @@ public abstract class AbstractEfaProvider extends AbstractNetworkProvider uri.append("&inclMOT_8=on"); } - uri.append("&inclMOT_11=on"); // TODO always show 'others', for now - // workaround for highspeed trains: fails when you want highspeed, but not regional if (useLineRestriction && !hasI) uri.append("&lineRestriction=403"); // means: all but ice diff --git a/enabler/src/de/schildbach/pte/BayernProvider.java b/enabler/src/de/schildbach/pte/BayernProvider.java index 5cddcc0b..dffd908d 100644 --- a/enabler/src/de/schildbach/pte/BayernProvider.java +++ b/enabler/src/de/schildbach/pte/BayernProvider.java @@ -20,6 +20,7 @@ package de.schildbach.pte; import static com.google.common.base.Preconditions.checkNotNull; import java.io.IOException; +import java.util.Collection; import java.util.Date; import java.util.EnumSet; import java.util.Set; @@ -131,6 +132,19 @@ public class BayernProvider extends AbstractEfaProvider return mobileStopfinderRequest(new Location(LocationType.ANY, null, null, constraint.toString())); } + @Override + protected String xsltTripRequestParameters(final Location from, final @Nullable Location via, final Location to, final Date time, + final boolean dep, final @Nullable Collection products, final @Nullable WalkSpeed walkSpeed, + final @Nullable Accessibility accessibility, final @Nullable Set