From f15eaab4f528647555f7b977f1480b904c807c04 Mon Sep 17 00:00:00 2001 From: "andreas.schildbach" Date: Sat, 9 Oct 2010 20:49:45 +0000 Subject: [PATCH] always query 4 connections at a time for efa based providers git-svn-id: https://public-transport-enabler.googlecode.com/svn/trunk@265 0924bc21-9374-b0fa-ee44-9ff1593b38f0 --- src/de/schildbach/pte/AbstractEfaProvider.java | 7 +++++++ src/de/schildbach/pte/GvhProvider.java | 4 ++-- src/de/schildbach/pte/LinzProvider.java | 4 ++-- src/de/schildbach/pte/MvvProvider.java | 4 ++-- src/de/schildbach/pte/VrnProvider.java | 4 ++-- src/de/schildbach/pte/VrrProvider.java | 4 ++-- 6 files changed, 17 insertions(+), 10 deletions(-) diff --git a/src/de/schildbach/pte/AbstractEfaProvider.java b/src/de/schildbach/pte/AbstractEfaProvider.java index 0d70dc33..a2dd81c5 100644 --- a/src/de/schildbach/pte/AbstractEfaProvider.java +++ b/src/de/schildbach/pte/AbstractEfaProvider.java @@ -868,6 +868,13 @@ public abstract class AbstractEfaProvider implements NetworkProvider protected abstract String commandLink(String sessionId, String command); + protected static final void appendCommonConnectionParams(final StringBuilder uri) + { + uri.append("&outputFormat=XML"); + uri.append("&coordOutputFormat=WGS84"); + uri.append("&calcNumberOfTrips=4"); + } + protected static final void appendLocation(final StringBuilder uri, final Location location, final String paramSuffix) { if (location.type == LocationType.ADDRESS && location.lat != 0 && location.lon != 0) diff --git a/src/de/schildbach/pte/GvhProvider.java b/src/de/schildbach/pte/GvhProvider.java index 9721f58a..48f59413 100644 --- a/src/de/schildbach/pte/GvhProvider.java +++ b/src/de/schildbach/pte/GvhProvider.java @@ -89,8 +89,7 @@ public class GvhProvider extends AbstractEfaProvider uri.append("XSLT_TRIP_REQUEST2"); uri.append("?language=de"); - uri.append("&outputFormat=XML"); - uri.append("&coordOutputFormat=WGS84"); + appendCommonConnectionParams(uri); appendLocation(uri, from, "origin"); appendLocation(uri, to, "destination"); @@ -117,6 +116,7 @@ public class GvhProvider extends AbstractEfaProvider uri.append(API_BASE); uri.append("XSLT_TRIP_REQUEST2"); uri.append("?sessionID=").append(sessionId); + appendCommonConnectionParams(uri); uri.append("&command=").append(command); return uri.toString(); } diff --git a/src/de/schildbach/pte/LinzProvider.java b/src/de/schildbach/pte/LinzProvider.java index 2fdf44ab..f2c56a1c 100644 --- a/src/de/schildbach/pte/LinzProvider.java +++ b/src/de/schildbach/pte/LinzProvider.java @@ -82,8 +82,7 @@ public class LinzProvider extends AbstractEfaProvider uri.append("XSLT_TRIP_REQUEST2"); uri.append("?language=de"); - uri.append("&outputFormat=XML"); - uri.append("&coordOutputFormat=WGS84"); + appendCommonConnectionParams(uri); appendLocation(uri, from, "origin"); appendLocation(uri, to, "destination"); @@ -108,6 +107,7 @@ public class LinzProvider extends AbstractEfaProvider uri.append(API_BASE); uri.append("XSLT_TRIP_REQUEST2"); uri.append("?sessionID=").append(sessionId); + appendCommonConnectionParams(uri); uri.append("&command=").append(command); return uri.toString(); } diff --git a/src/de/schildbach/pte/MvvProvider.java b/src/de/schildbach/pte/MvvProvider.java index 62c324e6..ade0be24 100644 --- a/src/de/schildbach/pte/MvvProvider.java +++ b/src/de/schildbach/pte/MvvProvider.java @@ -136,8 +136,7 @@ public class MvvProvider extends AbstractEfaProvider uri.append("XSLT_TRIP_REQUEST2"); uri.append("?language=de"); - uri.append("&outputFormat=XML"); - uri.append("&coordOutputFormat=WGS84"); + appendCommonConnectionParams(uri); appendLocation(uri, from, "origin"); appendLocation(uri, to, "destination"); @@ -164,6 +163,7 @@ public class MvvProvider extends AbstractEfaProvider uri.append(API_BASE); uri.append("XSLT_TRIP_REQUEST2"); uri.append("?sessionID=").append(sessionId); + appendCommonConnectionParams(uri); uri.append("&command=").append(command); return uri.toString(); } diff --git a/src/de/schildbach/pte/VrnProvider.java b/src/de/schildbach/pte/VrnProvider.java index ea4808a9..ed9f1f97 100644 --- a/src/de/schildbach/pte/VrnProvider.java +++ b/src/de/schildbach/pte/VrnProvider.java @@ -89,8 +89,7 @@ public class VrnProvider extends AbstractEfaProvider uri.append("XSLT_TRIP_REQUEST2"); uri.append("?language=de"); - uri.append("&outputFormat=XML"); - uri.append("&coordOutputFormat=WGS84"); + appendCommonConnectionParams(uri); appendLocation(uri, from, "origin"); appendLocation(uri, to, "destination"); @@ -117,6 +116,7 @@ public class VrnProvider extends AbstractEfaProvider uri.append(API_BASE); uri.append("XSLT_TRIP_REQUEST2"); uri.append("?sessionID=").append(sessionId); + appendCommonConnectionParams(uri); uri.append("&command=").append(command); return uri.toString(); } diff --git a/src/de/schildbach/pte/VrrProvider.java b/src/de/schildbach/pte/VrrProvider.java index d0ac3902..88e70423 100644 --- a/src/de/schildbach/pte/VrrProvider.java +++ b/src/de/schildbach/pte/VrrProvider.java @@ -89,8 +89,7 @@ public class VrrProvider extends AbstractEfaProvider uri.append("XSLT_TRIP_REQUEST2"); uri.append("?language=de"); - uri.append("&outputFormat=XML"); - uri.append("&coordOutputFormat=WGS84"); + appendCommonConnectionParams(uri); appendLocation(uri, from, "origin"); appendLocation(uri, to, "destination"); @@ -117,6 +116,7 @@ public class VrrProvider extends AbstractEfaProvider uri.append(API_BASE); uri.append("XSLT_TRIP_REQUEST2"); uri.append("?sessionID=").append(sessionId); + appendCommonConnectionParams(uri); uri.append("&command=").append(command); return uri.toString(); }