From 67a33dc391439d884180f7239fd258e5e8c43f50 Mon Sep 17 00:00:00 2001 From: Andreas Schildbach Date: Fri, 10 Aug 2012 14:30:52 +0200 Subject: [PATCH] migrated Austria to binary connections query --- .../src/de/schildbach/pte/OebbProvider.java | 29 ++++++++++++++----- 1 file changed, 22 insertions(+), 7 deletions(-) diff --git a/enabler/src/de/schildbach/pte/OebbProvider.java b/enabler/src/de/schildbach/pte/OebbProvider.java index 8d828473..aa76019e 100644 --- a/enabler/src/de/schildbach/pte/OebbProvider.java +++ b/enabler/src/de/schildbach/pte/OebbProvider.java @@ -18,13 +18,15 @@ package de.schildbach.pte; import java.io.IOException; -import java.util.HashMap; +import java.util.Date; import java.util.List; -import java.util.Map; +import java.util.Set; import de.schildbach.pte.dto.Location; import de.schildbach.pte.dto.LocationType; import de.schildbach.pte.dto.NearbyStationsResult; +import de.schildbach.pte.dto.QueryConnectionsContext; +import de.schildbach.pte.dto.QueryConnectionsResult; import de.schildbach.pte.dto.QueryDeparturesResult; import de.schildbach.pte.util.ParserUtils; @@ -190,12 +192,25 @@ public class OebbProvider extends AbstractHafasProvider return jsonGetStops(uri); } - private static final Map WALKSPEED_MAP = new HashMap(); - static + @Override + protected void appendCustomConnectionsQueryBinaryUri(final StringBuilder uri) { - WALKSPEED_MAP.put(WalkSpeed.SLOW, "115"); - WALKSPEED_MAP.put(WalkSpeed.NORMAL, "100"); - WALKSPEED_MAP.put(WalkSpeed.FAST, "85"); + uri.append("&h2g-direct=11"); + } + + @Override + public QueryConnectionsResult queryConnections(final Location from, final Location via, final Location to, final Date date, final boolean dep, + final int maxNumConnections, final String products, final WalkSpeed walkSpeed, final Accessibility accessibility, + final Set