From f6df2ff4996701cf96ed8633b0fa4f9082f4ff45 Mon Sep 17 00:00:00 2001 From: "andreas.schildbach@gmail.com" Date: Fri, 4 Feb 2011 23:06:20 +0000 Subject: [PATCH] encode uri git-svn-id: https://public-transport-enabler.googlecode.com/svn/trunk@482 0924bc21-9374-b0fa-ee44-9ff1593b38f0 --- src/de/schildbach/pte/NasaProvider.java | 2 +- src/de/schildbach/pte/NsProvider.java | 2 +- src/de/schildbach/pte/OebbProvider.java | 2 +- src/de/schildbach/pte/RmvProvider.java | 4 ++-- src/de/schildbach/pte/SbbProvider.java | 2 +- src/de/schildbach/pte/SncbProvider.java | 2 +- src/de/schildbach/pte/VgsProvider.java | 2 +- 7 files changed, 8 insertions(+), 8 deletions(-) diff --git a/src/de/schildbach/pte/NasaProvider.java b/src/de/schildbach/pte/NasaProvider.java index 132de1de..f4b9a816 100644 --- a/src/de/schildbach/pte/NasaProvider.java +++ b/src/de/schildbach/pte/NasaProvider.java @@ -80,7 +80,7 @@ public class NasaProvider extends AbstractHafasProvider @Override protected String nearbyStationUri(final String stationId) { - return String.format(NEARBY_URI, stationId); + return String.format(NEARBY_URI, ParserUtils.urlEncode(stationId)); } private String departuresQueryUri(final String stationId, final int maxDepartures) diff --git a/src/de/schildbach/pte/NsProvider.java b/src/de/schildbach/pte/NsProvider.java index f28e04a0..993f96cf 100644 --- a/src/de/schildbach/pte/NsProvider.java +++ b/src/de/schildbach/pte/NsProvider.java @@ -68,7 +68,7 @@ public class NsProvider extends AbstractHafasProvider @Override protected String nearbyStationUri(final String stationId) { - return String.format(NEARBY_URI, stationId); + return String.format(NEARBY_URI, ParserUtils.urlEncode(stationId)); } private String departuresQueryUri(final String stationId, final int maxDepartures) diff --git a/src/de/schildbach/pte/OebbProvider.java b/src/de/schildbach/pte/OebbProvider.java index 55a60cce..cff7a8a9 100644 --- a/src/de/schildbach/pte/OebbProvider.java +++ b/src/de/schildbach/pte/OebbProvider.java @@ -146,7 +146,7 @@ public class OebbProvider extends AbstractHafasProvider @Override protected String nearbyStationUri(final String stationId) { - return String.format(NEARBY_URI, stationId); + return String.format(NEARBY_URI, ParserUtils.urlEncode(stationId)); } private static final Map WALKSPEED_MAP = new HashMap(); diff --git a/src/de/schildbach/pte/RmvProvider.java b/src/de/schildbach/pte/RmvProvider.java index 87ccb4f9..0eb42747 100644 --- a/src/de/schildbach/pte/RmvProvider.java +++ b/src/de/schildbach/pte/RmvProvider.java @@ -71,7 +71,7 @@ public class RmvProvider extends AbstractHafasProvider } private static final String[] PLACES = { "Frankfurt (Main)", "Offenbach (Main)", "Mainz", "Wiesbaden", "Marburg", "Kassel", "Hanau", "Göttingen", - "Darmstadt", "Aschaffenburg", "Berlin" }; + "Darmstadt", "Aschaffenburg", "Berlin", "Fulda" }; @Override protected String[] splitNameAndPlace(final String name) @@ -116,7 +116,7 @@ public class RmvProvider extends AbstractHafasProvider @Override protected String nearbyStationUri(final String stationId) { - return String.format(NEARBY_URI, stationId); + return String.format(NEARBY_URI, ParserUtils.urlEncode(stationId)); } private static final Map WALKSPEED_MAP = new HashMap(); diff --git a/src/de/schildbach/pte/SbbProvider.java b/src/de/schildbach/pte/SbbProvider.java index aef095ab..4d869ada 100644 --- a/src/de/schildbach/pte/SbbProvider.java +++ b/src/de/schildbach/pte/SbbProvider.java @@ -70,7 +70,7 @@ public class SbbProvider extends AbstractHafasProvider @Override protected String nearbyStationUri(final String stationId) { - return String.format(NEARBY_URI, stationId); + return String.format(NEARBY_URI, ParserUtils.urlEncode(stationId)); } private String departuresQueryUri(final String stationId, final int maxDepartures) diff --git a/src/de/schildbach/pte/SncbProvider.java b/src/de/schildbach/pte/SncbProvider.java index 973ee112..11b0bdc9 100644 --- a/src/de/schildbach/pte/SncbProvider.java +++ b/src/de/schildbach/pte/SncbProvider.java @@ -68,7 +68,7 @@ public class SncbProvider extends AbstractHafasProvider @Override protected String nearbyStationUri(final String stationId) { - return String.format(NEARBY_URI, stationId); + return String.format(NEARBY_URI, ParserUtils.urlEncode(stationId)); } private String departuresQueryUri(final String stationId, final int maxDepartures) diff --git a/src/de/schildbach/pte/VgsProvider.java b/src/de/schildbach/pte/VgsProvider.java index 991fc420..14daf615 100644 --- a/src/de/schildbach/pte/VgsProvider.java +++ b/src/de/schildbach/pte/VgsProvider.java @@ -79,7 +79,7 @@ public class VgsProvider extends AbstractHafasProvider @Override protected String nearbyStationUri(final String stationId) { - return String.format(NEARBY_URI, stationId); + return String.format(NEARBY_URI, ParserUtils.urlEncode(stationId)); } private String departuresQueryUri(final String stationId, final int maxDepartures)