extract some common efa parameters

git-svn-id: https://public-transport-enabler.googlecode.com/svn/trunk@484 0924bc21-9374-b0fa-ee44-9ff1593b38f0

src/de/schildbach/pte/AbstractEfaProvider.java

@@ -742,7 +742,7 @@ public abstract class AbstractEfaProvider implements NetworkProvider
 				return 'S' + str;
 			if (type.equals("LO")) // London Overground, GB
 				return 'S' + str;
-			if ("A".equals(name) || "B".equals(name)) // SES
+			if ("A".equals(name) || "B".equals(name) || "C".equals(name)) // SES
 				return 'S' + str;
 
 			if (P_LINE_U.matcher(type).matches())
@@ -839,7 +839,8 @@ public abstract class AbstractEfaProvider implements NetworkProvider
 
 	public QueryDeparturesResult queryDepartures(final String stationId, final int maxDepartures) throws IOException
 	{
-		final String uri = departuresQueryUri(stationId, maxDepartures) + "&deleteAssignedStops_dm=1";
+		final String uri = departuresQueryUri(stationId, maxDepartures)
+				+ "&outputFormat=XML&coordOutputFormat=WGS84&deleteAssignedStops_dm=1&mode=direct";
 
 		InputStream is = null;
 		try

src/de/schildbach/pte/AtcProvider.java

@@ -76,11 +76,8 @@ public class AtcProvider extends AbstractEfaProvider
 	{
 		final StringBuilder uri = new StringBuilder();
 		uri.append(API_BASE).append("XSLT_DM_REQUEST");
-		uri.append("?outputFormat=XML");
+		uri.append("?type_dm=stop");
-		uri.append("&coordOutputFormat=WGS84");
+		uri.append("&name_dm=").append(ParserUtils.urlEncode(stationId));
-		uri.append("&type_dm=stop");
-		uri.append("&name_dm=").append(stationId);
-		uri.append("&mode=direct");
 		uri.append("&useRealtime=1");
 		return uri.toString();
 	}

src/de/schildbach/pte/AvvProvider.java

@@ -77,11 +77,8 @@ public class AvvProvider extends AbstractEfaProvider
 	{
 		final StringBuilder uri = new StringBuilder();
 		uri.append(API_BASE).append("XSLT_DM_REQUEST");
-		uri.append("?outputFormat=XML");
+		uri.append("?type_dm=stop");
-		uri.append("&coordOutputFormat=WGS84");
+		uri.append("&name_dm=").append(ParserUtils.urlEncode(stationId));
-		uri.append("&type_dm=stop");
-		uri.append("&name_dm=").append(stationId);
-		uri.append("&mode=direct");
 		uri.append("&useRealtime=1");
 		return uri.toString();
 	}

src/de/schildbach/pte/BsvagProvider.java

@@ -77,11 +77,8 @@ public class BsvagProvider extends AbstractEfaProvider
 	{
 		final StringBuilder uri = new StringBuilder();
 		uri.append(API_BASE).append("XSLT_DM_REQUEST");
-		uri.append("?outputFormat=XML");
+		uri.append("?type_dm=stop");
-		uri.append("&coordOutputFormat=WGS84");
+		uri.append("&name_dm=").append(ParserUtils.urlEncode(stationId));
-		uri.append("&type_dm=stop");
-		uri.append("&name_dm=").append(stationId);
-		uri.append("&mode=direct");
 		uri.append("&useRealtime=1");
 		return uri.toString();
 	}

src/de/schildbach/pte/BvbProvider.java

@@ -77,11 +77,8 @@ public class BvbProvider extends AbstractEfaProvider
 	{
 		final StringBuilder uri = new StringBuilder();
 		uri.append(API_BASE).append("XSLT_DM_REQUEST");
-		uri.append("?outputFormat=XML");
+		uri.append("?type_dm=stop");
-		uri.append("&coordOutputFormat=WGS84");
+		uri.append("&name_dm=").append(ParserUtils.urlEncode(stationId));
-		uri.append("&type_dm=stop");
-		uri.append("&name_dm=").append(stationId);
-		uri.append("&mode=direct");
 		uri.append("&useRealtime=1");
 		return uri.toString();
 	}

src/de/schildbach/pte/DingProvider.java

@@ -77,11 +77,8 @@ public class DingProvider extends AbstractEfaProvider
 	{
 		final StringBuilder uri = new StringBuilder();
 		uri.append(API_BASE).append("XSLT_DM_REQUEST");
-		uri.append("?outputFormat=XML");
+		uri.append("?type_dm=stop");
-		uri.append("&coordOutputFormat=WGS84");
+		uri.append("&name_dm=").append(ParserUtils.urlEncode(stationId));
-		uri.append("&type_dm=stop");
-		uri.append("&name_dm=").append(stationId);
-		uri.append("&mode=direct");
 		uri.append("&useRealtime=1");
 		return uri.toString();
 	}

src/de/schildbach/pte/DubProvider.java

@@ -84,11 +84,8 @@ public class DubProvider extends AbstractEfaProvider
 	{
 		final StringBuilder uri = new StringBuilder();
 		uri.append(API_BASE).append("XSLT_DM_REQUEST");
-		uri.append("?outputFormat=XML");
+		uri.append("?type_dm=stop");
-		uri.append("&coordOutputFormat=WGS84");
+		uri.append("&name_dm=").append(ParserUtils.urlEncode(stationId));
-		uri.append("&type_dm=stop");
-		uri.append("&name_dm=").append(stationId);
-		uri.append("&mode=direct");
 		uri.append("&useRealtime=1");
 		return uri.toString();
 	}

src/de/schildbach/pte/GvhProvider.java

@@ -79,11 +79,8 @@ public class GvhProvider extends AbstractEfaProvider
 	{
 		final StringBuilder uri = new StringBuilder();
 		uri.append(API_BASE).append("XSLT_DM_REQUEST");
-		uri.append("?outputFormat=XML");
+		uri.append("?type_dm=stop");
-		uri.append("&coordOutputFormat=WGS84");
+		uri.append("&name_dm=").append(ParserUtils.urlEncode(stationId));
-		uri.append("&type_dm=stop");
-		uri.append("&name_dm=").append(stationId);
-		uri.append("&mode=direct");
 		uri.append("&useRealtime=1");
 		return uri.toString();
 	}

src/de/schildbach/pte/IvbProvider.java

@@ -77,11 +77,8 @@ public class IvbProvider extends AbstractEfaProvider
 	{
 		final StringBuilder uri = new StringBuilder();
 		uri.append(API_BASE).append("XSLT_DM_REQUEST");
-		uri.append("?outputFormat=XML");
+		uri.append("?type_dm=stop");
-		uri.append("&coordOutputFormat=WGS84");
+		uri.append("&name_dm=").append(ParserUtils.urlEncode(stationId));
-		uri.append("&type_dm=stop");
-		uri.append("&name_dm=").append(stationId);
-		uri.append("&mode=direct");
 		uri.append("&useRealtime=1");
 		return uri.toString();
 	}

src/de/schildbach/pte/KvvProvider.java

@@ -76,11 +76,8 @@ public class KvvProvider extends AbstractEfaProvider
 	{
 		final StringBuilder uri = new StringBuilder();
 		uri.append(API_BASE).append("XSLT_DM_REQUEST");
-		uri.append("?outputFormat=XML");
+		uri.append("?type_dm=stop");
-		uri.append("&coordOutputFormat=WGS84");
+		uri.append("&name_dm=").append(ParserUtils.urlEncode(stationId));
-		uri.append("&type_dm=stop");
-		uri.append("&name_dm=").append(stationId);
-		uri.append("&mode=direct");
 		uri.append("&useRealtime=1");
 		return uri.toString();
 	}

src/de/schildbach/pte/LinzProvider.java

@@ -82,11 +82,8 @@ public class LinzProvider extends AbstractEfaProvider
 	{
 		final StringBuilder uri = new StringBuilder();
 		uri.append(API_BASE).append("XSLT_DM_REQUEST");
-		uri.append("?outputFormat=XML");
+		uri.append("?type_dm=stop");
-		uri.append("&coordOutputFormat=WGS84");
+		uri.append("&name_dm=").append(ParserUtils.urlEncode(stationId));
-		uri.append("&type_dm=stop");
-		uri.append("&name_dm=").append(stationId);
-		uri.append("&mode=direct");
 		uri.append("&useRealtime=1");
 		return uri.toString();
 	}

src/de/schildbach/pte/MariborProvider.java

@@ -76,11 +76,8 @@ public class MariborProvider extends AbstractEfaProvider
 	{
 		final StringBuilder uri = new StringBuilder();
 		uri.append(API_BASE).append("XSLT_DM_REQUEST");
-		uri.append("?outputFormat=XML");
+		uri.append("?type_dm=stop");
-		uri.append("&coordOutputFormat=WGS84");
+		uri.append("&name_dm=").append(ParserUtils.urlEncode(stationId));
-		uri.append("&type_dm=stop");
-		uri.append("&name_dm=").append(stationId);
-		uri.append("&mode=direct");
 		uri.append("&useRealtime=1");
 		return uri.toString();
 	}

src/de/schildbach/pte/MvvProvider.java

@@ -80,11 +80,8 @@ public class MvvProvider extends AbstractEfaProvider
 	{
 		final StringBuilder uri = new StringBuilder();
 		uri.append(API_BASE).append("XSLT_DM_REQUEST");
-		uri.append("?outputFormat=XML");
+		uri.append("?type_dm=stop");
-		uri.append("&coordOutputFormat=WGS84");
+		uri.append("&name_dm=").append(ParserUtils.urlEncode(stationId));
-		uri.append("&type_dm=stop");
-		uri.append("&name_dm=").append(stationId);
-		uri.append("&mode=direct");
 		uri.append("&useRealtime=1");
 		return uri.toString();
 	}

src/de/schildbach/pte/NaldoProvider.java

@@ -76,11 +76,8 @@ public class NaldoProvider extends AbstractEfaProvider
 	{
 		final StringBuilder uri = new StringBuilder();
 		uri.append(API_BASE).append("XSLT_DM_REQUEST");
-		uri.append("?outputFormat=XML");
+		uri.append("?type_dm=stop");
-		uri.append("&coordOutputFormat=WGS84");
+		uri.append("&name_dm=").append(ParserUtils.urlEncode(stationId));
-		uri.append("&type_dm=stop");
-		uri.append("&name_dm=").append(stationId);
-		uri.append("&mode=direct");
 		uri.append("&useRealtime=1");
 		return uri.toString();
 	}

src/de/schildbach/pte/SfProvider.java

@@ -98,11 +98,8 @@ public class SfProvider extends AbstractEfaProvider
 	{
 		final StringBuilder uri = new StringBuilder();
 		uri.append(API_BASE).append("XSLT_DM_REQUEST");
-		uri.append("?outputFormat=XML");
+		uri.append("?type_dm=stop");
-		uri.append("&coordOutputFormat=WGS84");
+		uri.append("&name_dm=").append(ParserUtils.urlEncode(stationId));
-		uri.append("&type_dm=stop");
-		uri.append("&name_dm=").append(stationId);
-		uri.append("&mode=direct");
 		uri.append("&useRealtime=1");
 		return uri.toString();
 	}

src/de/schildbach/pte/StvProvider.java

@@ -76,11 +76,8 @@ public class StvProvider extends AbstractEfaProvider
 	{
 		final StringBuilder uri = new StringBuilder();
 		uri.append(API_BASE).append("XSLT_DM_REQUEST");
-		uri.append("?outputFormat=XML");
+		uri.append("?type_dm=stop");
-		uri.append("&coordOutputFormat=WGS84");
+		uri.append("&name_dm=").append(ParserUtils.urlEncode(stationId));
-		uri.append("&type_dm=stop");
-		uri.append("&name_dm=").append(stationId);
-		uri.append("&mode=direct");
 		uri.append("&useRealtime=1");
 		return uri.toString();
 	}

src/de/schildbach/pte/SvvProvider.java

@@ -76,11 +76,8 @@ public class SvvProvider extends AbstractEfaProvider
 	{
 		final StringBuilder uri = new StringBuilder();
 		uri.append(API_BASE).append("XSLT_DM_REQUEST");
-		uri.append("?outputFormat=XML");
+		uri.append("?type_dm=stop");
-		uri.append("&coordOutputFormat=WGS84");
+		uri.append("&name_dm=").append(ParserUtils.urlEncode(stationId));
-		uri.append("&type_dm=stop");
-		uri.append("&name_dm=").append(stationId);
-		uri.append("&mode=direct");
 		uri.append("&useRealtime=1");
 		return uri.toString();
 	}

src/de/schildbach/pte/TflProvider.java

@@ -86,11 +86,8 @@ public class TflProvider extends AbstractEfaProvider
 	{
 		final StringBuilder uri = new StringBuilder();
 		uri.append(API_BASE).append("XSLT_DM_REQUEST");
-		uri.append("?outputFormat=XML");
+		uri.append("?type_dm=stop");
-		uri.append("&coordOutputFormat=WGS84");
+		uri.append("&name_dm=").append(ParserUtils.urlEncode(stationId));
-		uri.append("&type_dm=stop");
-		uri.append("&name_dm=").append(stationId);
-		uri.append("&mode=direct");
 		uri.append("&useRealtime=1");
 		return uri.toString();
 	}

src/de/schildbach/pte/TleaProvider.java

@@ -84,11 +84,8 @@ public class TleaProvider extends AbstractEfaProvider
 	{
 		final StringBuilder uri = new StringBuilder();
 		uri.append(API_BASE).append("XSLT_DM_REQUEST");
-		uri.append("?outputFormat=XML");
+		uri.append("?type_dm=stop");
-		uri.append("&coordOutputFormat=WGS84");
+		uri.append("&name_dm=").append(ParserUtils.urlEncode(stationId));
-		uri.append("&type_dm=stop");
-		uri.append("&name_dm=").append(stationId);
-		uri.append("&mode=direct");
 		uri.append("&useRealtime=1");
 		return uri.toString();
 	}

src/de/schildbach/pte/TlemProvider.java

@@ -84,11 +84,8 @@ public class TlemProvider extends AbstractEfaProvider
 	{
 		final StringBuilder uri = new StringBuilder();
 		uri.append(API_BASE).append("XSLT_DM_REQUEST");
-		uri.append("?outputFormat=XML");
+		uri.append("?type_dm=stop");
-		uri.append("&coordOutputFormat=WGS84");
+		uri.append("&name_dm=").append(ParserUtils.urlEncode(stationId));
-		uri.append("&type_dm=stop");
-		uri.append("&name_dm=").append(stationId);
-		uri.append("&mode=direct");
 		uri.append("&useRealtime=1");
 		return uri.toString();
 	}

src/de/schildbach/pte/TlseProvider.java

@@ -84,11 +84,8 @@ public class TlseProvider extends AbstractEfaProvider
 	{
 		final StringBuilder uri = new StringBuilder();
 		uri.append(API_BASE).append("XSLT_DM_REQUEST");
-		uri.append("?outputFormat=XML");
+		uri.append("?type_dm=stop");
-		uri.append("&coordOutputFormat=WGS84");
+		uri.append("&name_dm=").append(ParserUtils.urlEncode(stationId));
-		uri.append("&type_dm=stop");
-		uri.append("&name_dm=").append(stationId);
-		uri.append("&mode=direct");
 		uri.append("&useRealtime=1");
 		return uri.toString();
 	}

src/de/schildbach/pte/TlswProvider.java

@@ -83,11 +83,8 @@ public class TlswProvider extends AbstractEfaProvider
 	{
 		final StringBuilder uri = new StringBuilder();
 		uri.append(API_BASE).append("XSLT_DM_REQUEST");
-		uri.append("?outputFormat=XML");
+		uri.append("?type_dm=stop");
-		uri.append("&coordOutputFormat=WGS84");
+		uri.append("&name_dm=").append(ParserUtils.urlEncode(stationId));
-		uri.append("&type_dm=stop");
-		uri.append("&name_dm=").append(stationId);
-		uri.append("&mode=direct");
 		uri.append("&useRealtime=1");
 		return uri.toString();
 	}

src/de/schildbach/pte/VblProvider.java

@@ -76,11 +76,8 @@ public class VblProvider extends AbstractEfaProvider
 	{
 		final StringBuilder uri = new StringBuilder();
 		uri.append(API_BASE).append("XSLT_DM_REQUEST");
-		uri.append("?outputFormat=XML");
+		uri.append("?type_dm=stop");
-		uri.append("&coordOutputFormat=WGS84");
+		uri.append("&name_dm=").append(ParserUtils.urlEncode(stationId));
-		uri.append("&type_dm=stop");
-		uri.append("&name_dm=").append(stationId);
-		uri.append("&mode=direct");
 		uri.append("&useRealtime=1");
 		return uri.toString();
 	}

src/de/schildbach/pte/VmsProvider.java

@@ -76,11 +76,8 @@ public class VmsProvider extends AbstractEfaProvider
 	{
 		final StringBuilder uri = new StringBuilder();
 		uri.append(API_BASE).append("XSLT_DM_REQUEST");
-		uri.append("?outputFormat=XML");
+		uri.append("?type_dm=stop");
-		uri.append("&coordOutputFormat=WGS84");
+		uri.append("&name_dm=").append(ParserUtils.urlEncode(stationId));
-		uri.append("&type_dm=stop");
-		uri.append("&name_dm=").append(stationId);
-		uri.append("&mode=direct");
 		uri.append("&useRealtime=1");
 		return uri.toString();
 	}

src/de/schildbach/pte/VmvProvider.java

@@ -77,11 +77,8 @@ public class VmvProvider extends AbstractEfaProvider
 	{
 		final StringBuilder uri = new StringBuilder();
 		uri.append(API_BASE).append("XSLT_DM_REQUEST");
-		uri.append("?outputFormat=XML");
+		uri.append("?type_dm=stop");
-		uri.append("&coordOutputFormat=WGS84");
+		uri.append("&name_dm=").append(ParserUtils.urlEncode(stationId));
-		uri.append("&type_dm=stop");
-		uri.append("&name_dm=").append(stationId);
-		uri.append("&mode=direct");
 		uri.append("&useRealtime=1");
 		return uri.toString();
 	}

src/de/schildbach/pte/VorProvider.java

@@ -76,11 +76,8 @@ public class VorProvider extends AbstractEfaProvider
 	{
 		final StringBuilder uri = new StringBuilder();
 		uri.append(API_BASE).append("XSLT_DM_REQUEST");
-		uri.append("?outputFormat=XML");
+		uri.append("?type_dm=stop");
-		uri.append("&coordOutputFormat=WGS84");
+		uri.append("&name_dm=").append(ParserUtils.urlEncode(stationId));
-		uri.append("&type_dm=stop");
-		uri.append("&name_dm=").append(stationId);
-		uri.append("&mode=direct");
 		uri.append("&useRealtime=1");
 		return uri.toString();
 	}

src/de/schildbach/pte/VrnProvider.java

@@ -76,11 +76,8 @@ public class VrnProvider extends AbstractEfaProvider
 	{
 		final StringBuilder uri = new StringBuilder();
 		uri.append(API_BASE).append("XSLT_DM_REQUEST");
-		uri.append("?outputFormat=XML");
+		uri.append("?type_dm=stop");
-		uri.append("&coordOutputFormat=WGS84");
+		uri.append("&name_dm=").append(ParserUtils.urlEncode(stationId));
-		uri.append("&type_dm=stop");
-		uri.append("&name_dm=").append(stationId);
-		uri.append("&mode=direct");
 		uri.append("&useRealtime=1");
 		return uri.toString();
 	}

src/de/schildbach/pte/VrrProvider.java

@@ -82,11 +82,8 @@ public class VrrProvider extends AbstractEfaProvider
 	{
 		final StringBuilder uri = new StringBuilder();
 		uri.append(API_BASE).append("XSLT_DM_REQUEST");
-		uri.append("?outputFormat=XML");
+		uri.append("?type_dm=stop");
-		uri.append("&coordOutputFormat=WGS84");
+		uri.append("&name_dm=").append(ParserUtils.urlEncode(stationId));
-		uri.append("&type_dm=stop");
-		uri.append("&name_dm=").append(stationId);
-		uri.append("&mode=direct");
 		uri.append("&useRealtime=1");
 		return uri.toString();
 	}

src/de/schildbach/pte/VrtProvider.java

@@ -76,11 +76,8 @@ public class VrtProvider extends AbstractEfaProvider
 	{
 		final StringBuilder uri = new StringBuilder();
 		uri.append(API_BASE).append("XSLT_DM_REQUEST");
-		uri.append("?outputFormat=XML");
+		uri.append("?type_dm=stop");
-		uri.append("&coordOutputFormat=WGS84");
+		uri.append("&name_dm=").append(ParserUtils.urlEncode(stationId));
-		uri.append("&type_dm=stop");
-		uri.append("&name_dm=").append(stationId);
-		uri.append("&mode=direct");
 		uri.append("&useRealtime=1");
 		return uri.toString();
 	}

src/de/schildbach/pte/VvmProvider.java

@@ -76,11 +76,8 @@ public class VvmProvider extends AbstractEfaProvider
 	{
 		final StringBuilder uri = new StringBuilder();
 		uri.append(API_BASE).append("XSLT_DM_REQUEST");
-		uri.append("?outputFormat=XML");
+		uri.append("?type_dm=stop");
-		uri.append("&coordOutputFormat=WGS84");
+		uri.append("&name_dm=").append(ParserUtils.urlEncode(stationId));
-		uri.append("&type_dm=stop");
-		uri.append("&name_dm=").append(stationId);
-		uri.append("&mode=direct");
 		uri.append("&useRealtime=1");
 		return uri.toString();
 	}

src/de/schildbach/pte/VvoProvider.java

@@ -76,11 +76,8 @@ public class VvoProvider extends AbstractEfaProvider
 	{
 		final StringBuilder uri = new StringBuilder();
 		uri.append(API_BASE).append("XSLT_DM_REQUEST");
-		uri.append("?outputFormat=XML");
+		uri.append("?type_dm=stop");
-		uri.append("&coordOutputFormat=WGS84");
+		uri.append("&name_dm=").append(ParserUtils.urlEncode(stationId));
-		uri.append("&type_dm=stop");
-		uri.append("&name_dm=").append(stationId);
-		uri.append("&mode=direct");
 		uri.append("&useRealtime=1");
 		return uri.toString();
 	}

src/de/schildbach/pte/VvsProvider.java

@@ -77,11 +77,8 @@ public class VvsProvider extends AbstractEfaProvider
 	{
 		final StringBuilder uri = new StringBuilder();
 		uri.append(API_BASE).append("XSLT_DM_REQUEST");
-		uri.append("?outputFormat=XML");
+		uri.append("?type_dm=stop");
-		uri.append("&coordOutputFormat=WGS84");
+		uri.append("&name_dm=").append(ParserUtils.urlEncode(stationId));
-		uri.append("&type_dm=stop");
-		uri.append("&name_dm=").append(stationId);
-		uri.append("&mode=direct");
 		uri.append("&useRealtime=1");
 		return uri.toString();
 	}