From 2ce0de8103b47576928cd02aaf66074805fcd236 Mon Sep 17 00:00:00 2001 From: Andreas Schildbach Date: Fri, 22 Mar 2013 14:43:41 +0100 Subject: [PATCH] don't use lineRestriction for London --- enabler/src/de/schildbach/pte/AbstractEfaProvider.java | 8 +++++++- enabler/src/de/schildbach/pte/TflProvider.java | 2 ++ 2 files changed, 9 insertions(+), 1 deletion(-) diff --git a/enabler/src/de/schildbach/pte/AbstractEfaProvider.java b/enabler/src/de/schildbach/pte/AbstractEfaProvider.java index 49ad99b0..47d863b6 100644 --- a/enabler/src/de/schildbach/pte/AbstractEfaProvider.java +++ b/enabler/src/de/schildbach/pte/AbstractEfaProvider.java @@ -100,6 +100,7 @@ public abstract class AbstractEfaProvider extends AbstractNetworkProvider private boolean httpPost = false; private boolean suppressPositions = false; private boolean useRouteIndexAsConnectionId = true; + private boolean useLineRestriction = true; private final XmlPullParserFactory parserFactory; @@ -197,6 +198,11 @@ public abstract class AbstractEfaProvider extends AbstractNetworkProvider this.useRouteIndexAsConnectionId = useRouteIndexAsConnectionId; } + protected void setUseLineRestriction(final boolean useLineRestriction) + { + this.useLineRestriction = useLineRestriction; + } + protected void setCanAcceptPoiId(final boolean canAcceptPoiId) { this.canAcceptPoiId = canAcceptPoiId; @@ -1852,7 +1858,7 @@ public abstract class AbstractEfaProvider extends AbstractNetworkProvider uri.append("&inclMOT_11=on"); // TODO always show 'others', for now // workaround for highspeed trains: fails when you want highspeed, but not regional - if (!hasI) + if (useLineRestriction && !hasI) uri.append("&lineRestriction=403"); // means: all but ice } diff --git a/enabler/src/de/schildbach/pte/TflProvider.java b/enabler/src/de/schildbach/pte/TflProvider.java index 22685410..f66b2305 100644 --- a/enabler/src/de/schildbach/pte/TflProvider.java +++ b/enabler/src/de/schildbach/pte/TflProvider.java @@ -34,6 +34,8 @@ public class TflProvider extends AbstractEfaProvider public TflProvider() { super(API_BASE); + + setUseLineRestriction(false); } public NetworkId id()