From cfae3fc11c34896d6348cc93e6ced801c9d55283 Mon Sep 17 00:00:00 2001 From: Andreas Schildbach Date: Mon, 4 May 2015 08:07:36 +0200 Subject: [PATCH] Bayern: Enable more products for trips. --- enabler/src/de/schildbach/pte/BayernProvider.java | 13 +++++++++++++ .../schildbach/pte/live/BayernProviderLiveTest.java | 10 ++++++++++ 2 files changed, 23 insertions(+) diff --git a/enabler/src/de/schildbach/pte/BayernProvider.java b/enabler/src/de/schildbach/pte/BayernProvider.java index dffd908d..2a8a6889 100644 --- a/enabler/src/de/schildbach/pte/BayernProvider.java +++ b/enabler/src/de/schildbach/pte/BayernProvider.java @@ -140,7 +140,20 @@ public class BayernProvider extends AbstractEfaProvider final StringBuilder uri = new StringBuilder(super.xsltTripRequestParameters(from, via, to, time, dep, products, walkSpeed, accessibility, options)); + if (products != null) + { + for (final Product p : products) + { + if (p == Product.HIGH_SPEED_TRAIN) + uri.append("&inclMOT_15=on&inclMOT_16=on"); + + if (p == Product.REGIONAL_TRAIN) + uri.append("&inclMOT_13=on"); + } + } + uri.append("&inclMOT_11=on"); + uri.append("&inclMOT_14=on"); return uri.toString(); } diff --git a/enabler/test/de/schildbach/pte/live/BayernProviderLiveTest.java b/enabler/test/de/schildbach/pte/live/BayernProviderLiveTest.java index 0058f6ca..0187ac51 100644 --- a/enabler/test/de/schildbach/pte/live/BayernProviderLiveTest.java +++ b/enabler/test/de/schildbach/pte/live/BayernProviderLiveTest.java @@ -188,4 +188,14 @@ public class BayernProviderLiveTest extends AbstractProviderLiveTest final QueryTripsResult laterResult = queryMoreTrips(result.context, true); print(laterResult); } + + @Test + public void tripRegensburg() throws Exception + { + final QueryTripsResult result = queryTrips(new Location(LocationType.STATION, "4014051", "Regensburg", "Klenzestraße"), null, new Location( + LocationType.STATION, "4014080", "Regensburg", "Universität"), new Date(), true, Product.ALL, WalkSpeed.NORMAL, Accessibility.NEUTRAL); + print(result); + final QueryTripsResult laterResult = queryMoreTrips(result.context, true); + print(laterResult); + } }