From f0a665076a45dc254538e24561f025d7e3686d76 Mon Sep 17 00:00:00 2001 From: Andreas Schildbach Date: Wed, 22 Oct 2014 11:19:15 +0200 Subject: [PATCH] =?UTF-8?q?Update=20API=20base=20and=20fix=20products=20fo?= =?UTF-8?q?r=20Bremen,=20Bremerhaven=20&=20Osnabr=C3=BCck.?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/de/schildbach/pte/VbnProvider.java | 33 +++++++++++++++++-- 1 file changed, 30 insertions(+), 3 deletions(-) diff --git a/enabler/src/de/schildbach/pte/VbnProvider.java b/enabler/src/de/schildbach/pte/VbnProvider.java index 190d64b9..7b6377a8 100644 --- a/enabler/src/de/schildbach/pte/VbnProvider.java +++ b/enabler/src/de/schildbach/pte/VbnProvider.java @@ -25,13 +25,13 @@ import de.schildbach.pte.dto.Product; public class VbnProvider extends AbstractHafasProvider { public static final NetworkId NETWORK_ID = NetworkId.VBN; - private static final String API_BASE = "http://www.fahrplaner.de/hafas/"; + private static final String API_BASE = "http://fahrplaner.vbn.de/hafas/"; public VbnProvider() { - super(API_BASE + "stboard.exe/dn", API_BASE + "ajax-getstop.exe/dny", API_BASE + "query.exe/dn", 10); + super(API_BASE + "stboard.exe/dn", API_BASE + "ajax-getstop.exe/dny", API_BASE + "query.exe/dn", 10, UTF_8); - setStationBoardHasStationTable(false); + setStationBoardHasStationTable(true); } public NetworkId id() @@ -39,6 +39,33 @@ public class VbnProvider extends AbstractHafasProvider return NETWORK_ID; } + @Override + protected char intToProduct(final int value) + { + if (value == 1) + return 'I'; + if (value == 2) + return 'I'; + if (value == 4) + return 'R'; + if (value == 8) + return 'R'; + if (value == 16) + return 'S'; + if (value == 32) + return 'B'; + if (value == 64) + return 'F'; + if (value == 128) + return 'U'; + if (value == 256) + return 'T'; + if (value == 512) + return 'P'; + + throw new IllegalArgumentException("cannot handle: " + value); + } + @Override protected void setProductBits(final StringBuilder productBits, final Product product) {