From 484146768c8957e7a63cac9f7dc4227c32c42e26 Mon Sep 17 00:00:00 2001 From: "andreas.schildbach@gmail.com" Date: Tue, 8 Feb 2011 00:01:28 +0000 Subject: [PATCH] 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 | 5 +++-- src/de/schildbach/pte/AtcProvider.java | 7 ++----- src/de/schildbach/pte/AvvProvider.java | 7 ++----- src/de/schildbach/pte/BsvagProvider.java | 7 ++----- src/de/schildbach/pte/BvbProvider.java | 7 ++----- src/de/schildbach/pte/DingProvider.java | 7 ++----- src/de/schildbach/pte/DubProvider.java | 7 ++----- src/de/schildbach/pte/GvhProvider.java | 7 ++----- src/de/schildbach/pte/IvbProvider.java | 7 ++----- src/de/schildbach/pte/KvvProvider.java | 7 ++----- src/de/schildbach/pte/LinzProvider.java | 7 ++----- src/de/schildbach/pte/MariborProvider.java | 7 ++----- src/de/schildbach/pte/MvvProvider.java | 7 ++----- src/de/schildbach/pte/NaldoProvider.java | 7 ++----- src/de/schildbach/pte/SfProvider.java | 7 ++----- src/de/schildbach/pte/StvProvider.java | 7 ++----- src/de/schildbach/pte/SvvProvider.java | 7 ++----- src/de/schildbach/pte/TflProvider.java | 7 ++----- src/de/schildbach/pte/TleaProvider.java | 7 ++----- src/de/schildbach/pte/TlemProvider.java | 7 ++----- src/de/schildbach/pte/TlseProvider.java | 7 ++----- src/de/schildbach/pte/TlswProvider.java | 7 ++----- src/de/schildbach/pte/VblProvider.java | 7 ++----- src/de/schildbach/pte/VmsProvider.java | 7 ++----- src/de/schildbach/pte/VmvProvider.java | 7 ++----- src/de/schildbach/pte/VorProvider.java | 7 ++----- src/de/schildbach/pte/VrnProvider.java | 7 ++----- src/de/schildbach/pte/VrrProvider.java | 7 ++----- src/de/schildbach/pte/VrtProvider.java | 7 ++----- src/de/schildbach/pte/VvmProvider.java | 7 ++----- src/de/schildbach/pte/VvoProvider.java | 7 ++----- src/de/schildbach/pte/VvsProvider.java | 7 ++----- 32 files changed, 65 insertions(+), 157 deletions(-) diff --git a/src/de/schildbach/pte/AbstractEfaProvider.java b/src/de/schildbach/pte/AbstractEfaProvider.java index cf0052e2..f41c2823 100644 --- a/src/de/schildbach/pte/AbstractEfaProvider.java +++ b/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 diff --git a/src/de/schildbach/pte/AtcProvider.java b/src/de/schildbach/pte/AtcProvider.java index 434de56a..7741266b 100644 --- a/src/de/schildbach/pte/AtcProvider.java +++ b/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("&coordOutputFormat=WGS84"); - uri.append("&type_dm=stop"); - uri.append("&name_dm=").append(stationId); - uri.append("&mode=direct"); + uri.append("?type_dm=stop"); + uri.append("&name_dm=").append(ParserUtils.urlEncode(stationId)); uri.append("&useRealtime=1"); return uri.toString(); } diff --git a/src/de/schildbach/pte/AvvProvider.java b/src/de/schildbach/pte/AvvProvider.java index 5e15bbfa..917ca77c 100644 --- a/src/de/schildbach/pte/AvvProvider.java +++ b/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("&coordOutputFormat=WGS84"); - uri.append("&type_dm=stop"); - uri.append("&name_dm=").append(stationId); - uri.append("&mode=direct"); + uri.append("?type_dm=stop"); + uri.append("&name_dm=").append(ParserUtils.urlEncode(stationId)); uri.append("&useRealtime=1"); return uri.toString(); } diff --git a/src/de/schildbach/pte/BsvagProvider.java b/src/de/schildbach/pte/BsvagProvider.java index bf307af6..5d345b51 100644 --- a/src/de/schildbach/pte/BsvagProvider.java +++ b/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("&coordOutputFormat=WGS84"); - uri.append("&type_dm=stop"); - uri.append("&name_dm=").append(stationId); - uri.append("&mode=direct"); + uri.append("?type_dm=stop"); + uri.append("&name_dm=").append(ParserUtils.urlEncode(stationId)); uri.append("&useRealtime=1"); return uri.toString(); } diff --git a/src/de/schildbach/pte/BvbProvider.java b/src/de/schildbach/pte/BvbProvider.java index df7eaa01..a983dd97 100644 --- a/src/de/schildbach/pte/BvbProvider.java +++ b/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("&coordOutputFormat=WGS84"); - uri.append("&type_dm=stop"); - uri.append("&name_dm=").append(stationId); - uri.append("&mode=direct"); + uri.append("?type_dm=stop"); + uri.append("&name_dm=").append(ParserUtils.urlEncode(stationId)); uri.append("&useRealtime=1"); return uri.toString(); } diff --git a/src/de/schildbach/pte/DingProvider.java b/src/de/schildbach/pte/DingProvider.java index 9d3e3458..7f7053c4 100644 --- a/src/de/schildbach/pte/DingProvider.java +++ b/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("&coordOutputFormat=WGS84"); - uri.append("&type_dm=stop"); - uri.append("&name_dm=").append(stationId); - uri.append("&mode=direct"); + uri.append("?type_dm=stop"); + uri.append("&name_dm=").append(ParserUtils.urlEncode(stationId)); uri.append("&useRealtime=1"); return uri.toString(); } diff --git a/src/de/schildbach/pte/DubProvider.java b/src/de/schildbach/pte/DubProvider.java index 0a51e5e1..6b218631 100644 --- a/src/de/schildbach/pte/DubProvider.java +++ b/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("&coordOutputFormat=WGS84"); - uri.append("&type_dm=stop"); - uri.append("&name_dm=").append(stationId); - uri.append("&mode=direct"); + uri.append("?type_dm=stop"); + uri.append("&name_dm=").append(ParserUtils.urlEncode(stationId)); uri.append("&useRealtime=1"); return uri.toString(); } diff --git a/src/de/schildbach/pte/GvhProvider.java b/src/de/schildbach/pte/GvhProvider.java index c6444707..73704b2a 100644 --- a/src/de/schildbach/pte/GvhProvider.java +++ b/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("&coordOutputFormat=WGS84"); - uri.append("&type_dm=stop"); - uri.append("&name_dm=").append(stationId); - uri.append("&mode=direct"); + uri.append("?type_dm=stop"); + uri.append("&name_dm=").append(ParserUtils.urlEncode(stationId)); uri.append("&useRealtime=1"); return uri.toString(); } diff --git a/src/de/schildbach/pte/IvbProvider.java b/src/de/schildbach/pte/IvbProvider.java index 7b065dca..4748a820 100644 --- a/src/de/schildbach/pte/IvbProvider.java +++ b/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("&coordOutputFormat=WGS84"); - uri.append("&type_dm=stop"); - uri.append("&name_dm=").append(stationId); - uri.append("&mode=direct"); + uri.append("?type_dm=stop"); + uri.append("&name_dm=").append(ParserUtils.urlEncode(stationId)); uri.append("&useRealtime=1"); return uri.toString(); } diff --git a/src/de/schildbach/pte/KvvProvider.java b/src/de/schildbach/pte/KvvProvider.java index c21446aa..fd683df4 100644 --- a/src/de/schildbach/pte/KvvProvider.java +++ b/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("&coordOutputFormat=WGS84"); - uri.append("&type_dm=stop"); - uri.append("&name_dm=").append(stationId); - uri.append("&mode=direct"); + uri.append("?type_dm=stop"); + uri.append("&name_dm=").append(ParserUtils.urlEncode(stationId)); uri.append("&useRealtime=1"); return uri.toString(); } diff --git a/src/de/schildbach/pte/LinzProvider.java b/src/de/schildbach/pte/LinzProvider.java index 3fbc6f9a..a04bd07e 100644 --- a/src/de/schildbach/pte/LinzProvider.java +++ b/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("&coordOutputFormat=WGS84"); - uri.append("&type_dm=stop"); - uri.append("&name_dm=").append(stationId); - uri.append("&mode=direct"); + uri.append("?type_dm=stop"); + uri.append("&name_dm=").append(ParserUtils.urlEncode(stationId)); uri.append("&useRealtime=1"); return uri.toString(); } diff --git a/src/de/schildbach/pte/MariborProvider.java b/src/de/schildbach/pte/MariborProvider.java index caadc13d..30fed1da 100644 --- a/src/de/schildbach/pte/MariborProvider.java +++ b/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("&coordOutputFormat=WGS84"); - uri.append("&type_dm=stop"); - uri.append("&name_dm=").append(stationId); - uri.append("&mode=direct"); + uri.append("?type_dm=stop"); + uri.append("&name_dm=").append(ParserUtils.urlEncode(stationId)); uri.append("&useRealtime=1"); return uri.toString(); } diff --git a/src/de/schildbach/pte/MvvProvider.java b/src/de/schildbach/pte/MvvProvider.java index f7d12ff5..7a0fa020 100644 --- a/src/de/schildbach/pte/MvvProvider.java +++ b/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("&coordOutputFormat=WGS84"); - uri.append("&type_dm=stop"); - uri.append("&name_dm=").append(stationId); - uri.append("&mode=direct"); + uri.append("?type_dm=stop"); + uri.append("&name_dm=").append(ParserUtils.urlEncode(stationId)); uri.append("&useRealtime=1"); return uri.toString(); } diff --git a/src/de/schildbach/pte/NaldoProvider.java b/src/de/schildbach/pte/NaldoProvider.java index 6bb4af34..6bf170a3 100644 --- a/src/de/schildbach/pte/NaldoProvider.java +++ b/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("&coordOutputFormat=WGS84"); - uri.append("&type_dm=stop"); - uri.append("&name_dm=").append(stationId); - uri.append("&mode=direct"); + uri.append("?type_dm=stop"); + uri.append("&name_dm=").append(ParserUtils.urlEncode(stationId)); uri.append("&useRealtime=1"); return uri.toString(); } diff --git a/src/de/schildbach/pte/SfProvider.java b/src/de/schildbach/pte/SfProvider.java index c29b7de0..f97d06b3 100644 --- a/src/de/schildbach/pte/SfProvider.java +++ b/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("&coordOutputFormat=WGS84"); - uri.append("&type_dm=stop"); - uri.append("&name_dm=").append(stationId); - uri.append("&mode=direct"); + uri.append("?type_dm=stop"); + uri.append("&name_dm=").append(ParserUtils.urlEncode(stationId)); uri.append("&useRealtime=1"); return uri.toString(); } diff --git a/src/de/schildbach/pte/StvProvider.java b/src/de/schildbach/pte/StvProvider.java index 705c868d..042175e1 100644 --- a/src/de/schildbach/pte/StvProvider.java +++ b/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("&coordOutputFormat=WGS84"); - uri.append("&type_dm=stop"); - uri.append("&name_dm=").append(stationId); - uri.append("&mode=direct"); + uri.append("?type_dm=stop"); + uri.append("&name_dm=").append(ParserUtils.urlEncode(stationId)); uri.append("&useRealtime=1"); return uri.toString(); } diff --git a/src/de/schildbach/pte/SvvProvider.java b/src/de/schildbach/pte/SvvProvider.java index 135417e6..803294cd 100644 --- a/src/de/schildbach/pte/SvvProvider.java +++ b/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("&coordOutputFormat=WGS84"); - uri.append("&type_dm=stop"); - uri.append("&name_dm=").append(stationId); - uri.append("&mode=direct"); + uri.append("?type_dm=stop"); + uri.append("&name_dm=").append(ParserUtils.urlEncode(stationId)); uri.append("&useRealtime=1"); return uri.toString(); } diff --git a/src/de/schildbach/pte/TflProvider.java b/src/de/schildbach/pte/TflProvider.java index 0b584fd0..6c4641e4 100644 --- a/src/de/schildbach/pte/TflProvider.java +++ b/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("&coordOutputFormat=WGS84"); - uri.append("&type_dm=stop"); - uri.append("&name_dm=").append(stationId); - uri.append("&mode=direct"); + uri.append("?type_dm=stop"); + uri.append("&name_dm=").append(ParserUtils.urlEncode(stationId)); uri.append("&useRealtime=1"); return uri.toString(); } diff --git a/src/de/schildbach/pte/TleaProvider.java b/src/de/schildbach/pte/TleaProvider.java index 539add96..7da89d47 100644 --- a/src/de/schildbach/pte/TleaProvider.java +++ b/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("&coordOutputFormat=WGS84"); - uri.append("&type_dm=stop"); - uri.append("&name_dm=").append(stationId); - uri.append("&mode=direct"); + uri.append("?type_dm=stop"); + uri.append("&name_dm=").append(ParserUtils.urlEncode(stationId)); uri.append("&useRealtime=1"); return uri.toString(); } diff --git a/src/de/schildbach/pte/TlemProvider.java b/src/de/schildbach/pte/TlemProvider.java index 679caa86..5c56d914 100644 --- a/src/de/schildbach/pte/TlemProvider.java +++ b/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("&coordOutputFormat=WGS84"); - uri.append("&type_dm=stop"); - uri.append("&name_dm=").append(stationId); - uri.append("&mode=direct"); + uri.append("?type_dm=stop"); + uri.append("&name_dm=").append(ParserUtils.urlEncode(stationId)); uri.append("&useRealtime=1"); return uri.toString(); } diff --git a/src/de/schildbach/pte/TlseProvider.java b/src/de/schildbach/pte/TlseProvider.java index 715640fc..9b5406d7 100644 --- a/src/de/schildbach/pte/TlseProvider.java +++ b/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("&coordOutputFormat=WGS84"); - uri.append("&type_dm=stop"); - uri.append("&name_dm=").append(stationId); - uri.append("&mode=direct"); + uri.append("?type_dm=stop"); + uri.append("&name_dm=").append(ParserUtils.urlEncode(stationId)); uri.append("&useRealtime=1"); return uri.toString(); } diff --git a/src/de/schildbach/pte/TlswProvider.java b/src/de/schildbach/pte/TlswProvider.java index 91ec5b52..aba1181d 100644 --- a/src/de/schildbach/pte/TlswProvider.java +++ b/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("&coordOutputFormat=WGS84"); - uri.append("&type_dm=stop"); - uri.append("&name_dm=").append(stationId); - uri.append("&mode=direct"); + uri.append("?type_dm=stop"); + uri.append("&name_dm=").append(ParserUtils.urlEncode(stationId)); uri.append("&useRealtime=1"); return uri.toString(); } diff --git a/src/de/schildbach/pte/VblProvider.java b/src/de/schildbach/pte/VblProvider.java index af76158c..88759855 100644 --- a/src/de/schildbach/pte/VblProvider.java +++ b/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("&coordOutputFormat=WGS84"); - uri.append("&type_dm=stop"); - uri.append("&name_dm=").append(stationId); - uri.append("&mode=direct"); + uri.append("?type_dm=stop"); + uri.append("&name_dm=").append(ParserUtils.urlEncode(stationId)); uri.append("&useRealtime=1"); return uri.toString(); } diff --git a/src/de/schildbach/pte/VmsProvider.java b/src/de/schildbach/pte/VmsProvider.java index 11f2716e..42a9976b 100644 --- a/src/de/schildbach/pte/VmsProvider.java +++ b/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("&coordOutputFormat=WGS84"); - uri.append("&type_dm=stop"); - uri.append("&name_dm=").append(stationId); - uri.append("&mode=direct"); + uri.append("?type_dm=stop"); + uri.append("&name_dm=").append(ParserUtils.urlEncode(stationId)); uri.append("&useRealtime=1"); return uri.toString(); } diff --git a/src/de/schildbach/pte/VmvProvider.java b/src/de/schildbach/pte/VmvProvider.java index c716d26d..c95551e3 100644 --- a/src/de/schildbach/pte/VmvProvider.java +++ b/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("&coordOutputFormat=WGS84"); - uri.append("&type_dm=stop"); - uri.append("&name_dm=").append(stationId); - uri.append("&mode=direct"); + uri.append("?type_dm=stop"); + uri.append("&name_dm=").append(ParserUtils.urlEncode(stationId)); uri.append("&useRealtime=1"); return uri.toString(); } diff --git a/src/de/schildbach/pte/VorProvider.java b/src/de/schildbach/pte/VorProvider.java index 56cad7d8..3116a76e 100644 --- a/src/de/schildbach/pte/VorProvider.java +++ b/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("&coordOutputFormat=WGS84"); - uri.append("&type_dm=stop"); - uri.append("&name_dm=").append(stationId); - uri.append("&mode=direct"); + uri.append("?type_dm=stop"); + uri.append("&name_dm=").append(ParserUtils.urlEncode(stationId)); uri.append("&useRealtime=1"); return uri.toString(); } diff --git a/src/de/schildbach/pte/VrnProvider.java b/src/de/schildbach/pte/VrnProvider.java index 2d09e136..3d48938c 100644 --- a/src/de/schildbach/pte/VrnProvider.java +++ b/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("&coordOutputFormat=WGS84"); - uri.append("&type_dm=stop"); - uri.append("&name_dm=").append(stationId); - uri.append("&mode=direct"); + uri.append("?type_dm=stop"); + uri.append("&name_dm=").append(ParserUtils.urlEncode(stationId)); uri.append("&useRealtime=1"); return uri.toString(); } diff --git a/src/de/schildbach/pte/VrrProvider.java b/src/de/schildbach/pte/VrrProvider.java index f6116f6a..105cca6c 100644 --- a/src/de/schildbach/pte/VrrProvider.java +++ b/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("&coordOutputFormat=WGS84"); - uri.append("&type_dm=stop"); - uri.append("&name_dm=").append(stationId); - uri.append("&mode=direct"); + uri.append("?type_dm=stop"); + uri.append("&name_dm=").append(ParserUtils.urlEncode(stationId)); uri.append("&useRealtime=1"); return uri.toString(); } diff --git a/src/de/schildbach/pte/VrtProvider.java b/src/de/schildbach/pte/VrtProvider.java index 237ead92..5311a8cc 100644 --- a/src/de/schildbach/pte/VrtProvider.java +++ b/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("&coordOutputFormat=WGS84"); - uri.append("&type_dm=stop"); - uri.append("&name_dm=").append(stationId); - uri.append("&mode=direct"); + uri.append("?type_dm=stop"); + uri.append("&name_dm=").append(ParserUtils.urlEncode(stationId)); uri.append("&useRealtime=1"); return uri.toString(); } diff --git a/src/de/schildbach/pte/VvmProvider.java b/src/de/schildbach/pte/VvmProvider.java index 54490c6b..e04796a4 100644 --- a/src/de/schildbach/pte/VvmProvider.java +++ b/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("&coordOutputFormat=WGS84"); - uri.append("&type_dm=stop"); - uri.append("&name_dm=").append(stationId); - uri.append("&mode=direct"); + uri.append("?type_dm=stop"); + uri.append("&name_dm=").append(ParserUtils.urlEncode(stationId)); uri.append("&useRealtime=1"); return uri.toString(); } diff --git a/src/de/schildbach/pte/VvoProvider.java b/src/de/schildbach/pte/VvoProvider.java index 51ff02eb..e59f9bd1 100644 --- a/src/de/schildbach/pte/VvoProvider.java +++ b/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("&coordOutputFormat=WGS84"); - uri.append("&type_dm=stop"); - uri.append("&name_dm=").append(stationId); - uri.append("&mode=direct"); + uri.append("?type_dm=stop"); + uri.append("&name_dm=").append(ParserUtils.urlEncode(stationId)); uri.append("&useRealtime=1"); return uri.toString(); } diff --git a/src/de/schildbach/pte/VvsProvider.java b/src/de/schildbach/pte/VvsProvider.java index ace98f02..3fc86757 100644 --- a/src/de/schildbach/pte/VvsProvider.java +++ b/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("&coordOutputFormat=WGS84"); - uri.append("&type_dm=stop"); - uri.append("&name_dm=").append(stationId); - uri.append("&mode=direct"); + uri.append("?type_dm=stop"); + uri.append("&name_dm=").append(ParserUtils.urlEncode(stationId)); uri.append("&useRealtime=1"); return uri.toString(); }