mirrors/public-transport-enabler
1
0
Fork 0
mirror of https://gitlab.com/oeffi/public-transport-enabler.git synced 2025-07-13 08:10:46 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

fixed encoding

Browse source 
git-svn-id: https://public-transport-enabler.googlecode.com/svn/trunk@29 0924bc21-9374-b0fa-ee44-9ff1593b38f0
This commit is contained in:
andreas.schildbach 2010-07-27 08:31:46 +00:00
parent 46479c07cf
commit 304cae4c55
2 changed files with 19 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

9
src/de/schildbach/pte/MvvProvider.java
View file

@ -38,6 +38,7 @@ public class MvvProvider implements NetworkProvider
public static final String NETWORK_ID = "efa.mvv-muenchen.de"; public static final String NETWORK_ID = "efa.mvv-muenchen.de";
private static final long PARSER_DAY_ROLLOVER_THRESHOLD_MS = 12 * 60 * 60 * 1000; private static final long PARSER_DAY_ROLLOVER_THRESHOLD_MS = 12 * 60 * 60 * 1000;
private static final String ENCODING = "ISO-8859-1";
public boolean hasCapabilities(Capability... capabilities) public boolean hasCapabilities(Capability... capabilities)
{ {
@ -54,7 +55,7 @@ public class MvvProvider implements NetworkProvider
public List<String> autoCompleteStationName(final CharSequence constraint) throws IOException public List<String> autoCompleteStationName(final CharSequence constraint) throws IOException
{ {
final CharSequence page = ParserUtils.scrape(AUTOCOMPLETE_NAME_URL + ParserUtils.urlEncode(constraint.toString())); final CharSequence page = ParserUtils.scrape(AUTOCOMPLETE_NAME_URL + ParserUtils.urlEncode(constraint.toString(), ENCODING));
final List<String> names = new ArrayList<String>(); final List<String> names = new ArrayList<String>();
@ -128,7 +129,7 @@ public class MvvProvider implements NetworkProvider
uri.append("&reducedAnyPostcodeObjFilter_origin=64"); uri.append("&reducedAnyPostcodeObjFilter_origin=64");
uri.append("&reducedAnyTooManyObjFilter_origin=2"); uri.append("&reducedAnyTooManyObjFilter_origin=2");
uri.append("&type_origin=stop"); // any|stop|poi|address uri.append("&type_origin=stop"); // any|stop|poi|address
uri.append("&name_origin=").append(ParserUtils.urlEncode(from)); // fine-grained location, e.g. stop name uri.append("&name_origin=").append(ParserUtils.urlEncode(from, ENCODING)); // fine-grained location
uri.append("&useHouseNumberList_destination=1"); uri.append("&useHouseNumberList_destination=1");
uri.append("&place_destination="); // coarse-grained location, e.g. city uri.append("&place_destination="); // coarse-grained location, e.g. city
@ -141,7 +142,7 @@ public class MvvProvider implements NetworkProvider
uri.append("&reducedAnyPostcodeObjFilter_destination=64"); uri.append("&reducedAnyPostcodeObjFilter_destination=64");
uri.append("&reducedAnyTooManyObjFilter_destination=2"); uri.append("&reducedAnyTooManyObjFilter_destination=2");
uri.append("&type_destination=stop"); // any|stop|poi|address uri.append("&type_destination=stop"); // any|stop|poi|address
uri.append("&name_destination=").append(ParserUtils.urlEncode(to)); // fine-grained location, e.g. stop name uri.append("&name_destination=").append(ParserUtils.urlEncode(to, ENCODING)); // fine-grained location
if (via != null) if (via != null)
{ {
@ -156,7 +157,7 @@ public class MvvProvider implements NetworkProvider
uri.append("&reducedAnyPostcodeObjFilter_via=64"); uri.append("&reducedAnyPostcodeObjFilter_via=64");
uri.append("&reducedAnyTooManyObjFilter_via=2"); uri.append("&reducedAnyTooManyObjFilter_via=2");
uri.append("&type_via=stop"); // any uri.append("&type_via=stop"); // any
uri.append("&name_via=").append(ParserUtils.urlEncode(via)); uri.append("&name_via=").append(ParserUtils.urlEncode(via, ENCODING));
} }
uri.append("&itdTripDateTimeDepArr=").append(dep ? "dep" : "arr"); uri.append("&itdTripDateTimeDepArr=").append(dep ? "dep" : "arr");

16
src/de/schildbach/pte/ParserUtils.java
View file

@ -157,11 +157,23 @@ public final class ParserUtils
System.out.println("group " + i + ":'" + m.group(i) + "'"); System.out.println("group " + i + ":'" + m.group(i) + "'");
} }
public static String urlEncode(String part) public static String urlEncode(final String str)
{ {
try try
{ {
return URLEncoder.encode(part, "utf-8"); return URLEncoder.encode(str, "utf-8");
}
catch (UnsupportedEncodingException x)
{
throw new RuntimeException(x);
}
}
public static String urlEncode(final String str, final String enc)
{
try
{
return URLEncoder.encode(str, enc);
} }
catch (UnsupportedEncodingException x) catch (UnsupportedEncodingException x)
{ {