From 4d70ac385ecfb15f13cd7e1e38590c6f9c4f2deb Mon Sep 17 00:00:00 2001 From: "andreas.schildbach@gmail.com" Date: Sun, 8 May 2011 06:31:43 +0000 Subject: [PATCH] disable equivs on all departures git-svn-id: https://public-transport-enabler.googlecode.com/svn/trunk@625 0924bc21-9374-b0fa-ee44-9ff1593b38f0 --- src/de/schildbach/pte/BahnProvider.java | 1 + src/de/schildbach/pte/DsbProvider.java | 1 + src/de/schildbach/pte/LuProvider.java | 1 + src/de/schildbach/pte/OebbProvider.java | 2 -- src/de/schildbach/pte/PlProvider.java | 1 + src/de/schildbach/pte/ZvvProvider.java | 1 + 6 files changed, 5 insertions(+), 2 deletions(-) diff --git a/src/de/schildbach/pte/BahnProvider.java b/src/de/schildbach/pte/BahnProvider.java index a10e4517..ae93ef00 100644 --- a/src/de/schildbach/pte/BahnProvider.java +++ b/src/de/schildbach/pte/BahnProvider.java @@ -496,6 +496,7 @@ public final class BahnProvider extends AbstractHafasProvider uri.append(API_BASE).append("bhftafel.exe/dn"); uri.append("?productsFilter=").append(allProductsString()); uri.append("&boardType=dep"); + uri.append("&disableEquivs=").append(equivs ? "no" : "yes"); // don't use nearby stations uri.append("&maxJourneys=50"); // ignore maxDepartures because result contains other stations uri.append("&start=yes"); uri.append("&L=vs_java3"); diff --git a/src/de/schildbach/pte/DsbProvider.java b/src/de/schildbach/pte/DsbProvider.java index 109a672b..a8d00d71 100644 --- a/src/de/schildbach/pte/DsbProvider.java +++ b/src/de/schildbach/pte/DsbProvider.java @@ -173,6 +173,7 @@ public class DsbProvider extends AbstractHafasProvider uri.append(API_BASE).append("stboard.exe/mn"); uri.append("?productsFilter=").append(allProductsString()); uri.append("&boardType=dep"); + uri.append("&disableEquivs=").append(equivs ? "no" : "yes"); // don't use nearby stations uri.append("&maxJourneys=50"); // ignore maxDepartures because result contains other stations uri.append("&start=yes"); uri.append("&L=vs_java3"); diff --git a/src/de/schildbach/pte/LuProvider.java b/src/de/schildbach/pte/LuProvider.java index 9fe7e130..57d7c7e7 100644 --- a/src/de/schildbach/pte/LuProvider.java +++ b/src/de/schildbach/pte/LuProvider.java @@ -120,6 +120,7 @@ public class LuProvider extends AbstractHafasProvider uri.append(API_BASE).append("stboard.exe/dn"); uri.append("?productsFilter=").append(allProductsString()); uri.append("&boardType=dep"); + uri.append("&disableEquivs=").append(equivs ? "no" : "yes"); // don't use nearby stations uri.append("&maxJourneys=50"); // ignore maxDepartures because result contains other stations uri.append("&start=yes"); uri.append("&L=vs_java3"); diff --git a/src/de/schildbach/pte/OebbProvider.java b/src/de/schildbach/pte/OebbProvider.java index 98df0c82..3f72df9e 100644 --- a/src/de/schildbach/pte/OebbProvider.java +++ b/src/de/schildbach/pte/OebbProvider.java @@ -841,8 +841,6 @@ public class OebbProvider extends AbstractHafasProvider return 'F'; if (ucType.equals("F")) // Fähre return 'F'; - if (ucType.equals("FÄHRE")) // via JSON API - return 'F'; if (ucType.equals("LIF")) return 'C'; diff --git a/src/de/schildbach/pte/PlProvider.java b/src/de/schildbach/pte/PlProvider.java index 5709a7a5..95195d23 100644 --- a/src/de/schildbach/pte/PlProvider.java +++ b/src/de/schildbach/pte/PlProvider.java @@ -317,6 +317,7 @@ public class PlProvider extends AbstractHafasProvider uri.append(API_BASE).append("stboard.exe/pn"); uri.append("?productsFilter=").append(allProductsString()); uri.append("&boardType=dep"); + uri.append("&disableEquivs=").append(equivs ? "no" : "yes"); // don't use nearby stations uri.append("&maxJourneys=50"); // ignore maxDepartures because result contains other stations uri.append("&start=yes"); uri.append("&L=vs_java3"); diff --git a/src/de/schildbach/pte/ZvvProvider.java b/src/de/schildbach/pte/ZvvProvider.java index 29b39eb8..15a4d281 100644 --- a/src/de/schildbach/pte/ZvvProvider.java +++ b/src/de/schildbach/pte/ZvvProvider.java @@ -195,6 +195,7 @@ public class ZvvProvider extends AbstractHafasProvider uri.append(API_BASE).append("stboard.exe/dn"); uri.append("?productsFilter=").append(allProductsString()); uri.append("&boardType=dep"); + uri.append("&disableEquivs=").append(equivs ? "no" : "yes"); // don't use nearby stations uri.append("&maxJourneys=50"); // ignore maxDepartures because result contains other stations uri.append("&start=yes"); uri.append("&L=vs_java3");