From 3a060c0f5be1279bc5ea83ae490df9105146ad1c Mon Sep 17 00:00:00 2001 From: "andreas.schildbach" Date: Sat, 9 Oct 2010 20:26:47 +0000 Subject: [PATCH] fixed product filter for all efa based providers git-svn-id: https://public-transport-enabler.googlecode.com/svn/trunk@263 0924bc21-9374-b0fa-ee44-9ff1593b38f0 --- src/de/schildbach/pte/GvhProvider.java | 3 +-- src/de/schildbach/pte/LinzProvider.java | 3 +-- src/de/schildbach/pte/MvvProvider.java | 3 +-- src/de/schildbach/pte/VrnProvider.java | 3 +-- src/de/schildbach/pte/VrrProvider.java | 3 +-- 5 files changed, 5 insertions(+), 10 deletions(-) diff --git a/src/de/schildbach/pte/GvhProvider.java b/src/de/schildbach/pte/GvhProvider.java index 7682c01f..9721f58a 100644 --- a/src/de/schildbach/pte/GvhProvider.java +++ b/src/de/schildbach/pte/GvhProvider.java @@ -101,10 +101,9 @@ public class GvhProvider extends AbstractEfaProvider uri.append("&itdTime=").append(ParserUtils.urlEncode(TIME_FORMAT.format(date))); uri.append("&itdTripDateTimeDepArr=").append(dep ? "dep" : "arr"); - // TODO products - uri.append("&ptOptionsActive=1"); uri.append("&changeSpeed=").append(WALKSPEED_MAP.get(walkSpeed)); + uri.append(productParams(products)); uri.append("&locationServerActive=1"); diff --git a/src/de/schildbach/pte/LinzProvider.java b/src/de/schildbach/pte/LinzProvider.java index 9af4737c..2fdf44ab 100644 --- a/src/de/schildbach/pte/LinzProvider.java +++ b/src/de/schildbach/pte/LinzProvider.java @@ -94,10 +94,9 @@ public class LinzProvider extends AbstractEfaProvider uri.append("&itdTime=").append(ParserUtils.urlEncode(TIME_FORMAT.format(date))); uri.append("&itdTripDateTimeDepArr=").append(dep ? "dep" : "arr"); - // TODO products - uri.append("&ptOptionsActive=1"); uri.append("&changeSpeed=").append(WALKSPEED_MAP.get(walkSpeed)); + uri.append(productParams(products)); return uri.toString(); } diff --git a/src/de/schildbach/pte/MvvProvider.java b/src/de/schildbach/pte/MvvProvider.java index 00edca93..62c324e6 100644 --- a/src/de/schildbach/pte/MvvProvider.java +++ b/src/de/schildbach/pte/MvvProvider.java @@ -148,10 +148,9 @@ public class MvvProvider extends AbstractEfaProvider uri.append("&itdTime=").append(ParserUtils.urlEncode(TIME_FORMAT.format(date))); uri.append("&itdTripDateTimeDepArr=").append(dep ? "dep" : "arr"); - uri.append(productParams(products)); - uri.append("&ptOptionsActive=1"); uri.append("&changeSpeed=").append(WALKSPEED_MAP.get(walkSpeed)); + uri.append(productParams(products)); uri.append("&locationServerActive=1"); diff --git a/src/de/schildbach/pte/VrnProvider.java b/src/de/schildbach/pte/VrnProvider.java index 87cec779..ea4808a9 100644 --- a/src/de/schildbach/pte/VrnProvider.java +++ b/src/de/schildbach/pte/VrnProvider.java @@ -101,10 +101,9 @@ public class VrnProvider extends AbstractEfaProvider uri.append("&itdTime=").append(ParserUtils.urlEncode(TIME_FORMAT.format(date))); uri.append("&itdTripDateTimeDepArr=").append(dep ? "dep" : "arr"); - // TODO products - uri.append("&ptOptionsActive=1"); uri.append("&changeSpeed=").append(WALKSPEED_MAP.get(walkSpeed)); + uri.append(productParams(products)); uri.append("&locationServerActive=1"); diff --git a/src/de/schildbach/pte/VrrProvider.java b/src/de/schildbach/pte/VrrProvider.java index 92242f0d..d0ac3902 100644 --- a/src/de/schildbach/pte/VrrProvider.java +++ b/src/de/schildbach/pte/VrrProvider.java @@ -101,10 +101,9 @@ public class VrrProvider extends AbstractEfaProvider uri.append("&itdTime=").append(ParserUtils.urlEncode(TIME_FORMAT.format(date))); uri.append("&itdTripDateTimeDepArr=").append(dep ? "dep" : "arr"); - // TODO products - uri.append("&ptOptionsActive=1"); uri.append("&changeSpeed=").append(WALKSPEED_MAP.get(walkSpeed)); + uri.append(productParams(products)); uri.append("&locationServerActive=1");