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

improved handling of addresses

Browse source 
git-svn-id: https://public-transport-enabler.googlecode.com/svn/trunk@117 0924bc21-9374-b0fa-ee44-9ff1593b38f0
This commit is contained in:
andreas.schildbach 2010-08-30 14:11:53 +00:00
parent 92644b5475
commit ce9a890986
9 changed files with 103 additions and 48 deletions
Download patch file Download diff file Expand all files Collapse all files

44
src/de/schildbach/pte/VbbProvider.java
View file

@ -164,46 +164,47 @@ public final class VbbProvider implements NetworkProvider
uri.append("?REQ0HafasInitialSelection=0");
// from
if (fromType == LocationType.ANY)
{
uri.append("&REQ0JourneyStopsS0A=255");
uri.append("&REQ0JourneyStopsS0G=").append(ParserUtils.urlEncode(from));
}
else
if (fromType == LocationType.WGS84)
{
final String[] parts = from.split(",\\s*", 2);
final double lat = Double.parseDouble(parts[0]);
final double lon = Double.parseDouble(parts[1]);
uri.append("&SID=").append(ParserUtils.urlEncode("A=16@X=" + latLonToInt(lon) + "@Y=" + latLonToInt(lat)));
}
else
{
uri.append("&REQ0JourneyStopsS0A=").append(locationType(fromType));
uri.append("&REQ0JourneyStopsS0G=").append(ParserUtils.urlEncode(from));
}
// via
if (via != null)
{
if (fromType == LocationType.ANY)
if (fromType == LocationType.WGS84)
{
uri.append("&REQ0JourneyStops1A=1");
uri.append("&REQ0JourneyStops1G=").append(ParserUtils.urlEncode(via));
// FIXME
throw new UnsupportedOperationException();
}
else
{
// FIXME
uri.append("&REQ0JourneyStops1A=255");
uri.append("&REQ0JourneyStops1G=").append(ParserUtils.urlEncode(via));
}
}
// to
if (toType == LocationType.ANY)
{
uri.append("&REQ0JourneyStopsZ0A=255");
uri.append("&REQ0JourneyStopsZ0G=").append(ParserUtils.urlEncode(to));
}
else
if (toType == LocationType.WGS84)
{
final String[] parts = to.split(",\\s*", 2);
final double lat = Double.parseDouble(parts[0]);
final double lon = Double.parseDouble(parts[1]);
uri.append("&ZID=").append(ParserUtils.urlEncode("A=16@X=" + latLonToInt(lon) + "@Y=" + latLonToInt(lat)));
}
else
{
uri.append("&REQ0JourneyStopsZ0A=").append(locationType(toType));
uri.append("&REQ0JourneyStopsZ0G=").append(ParserUtils.urlEncode(to));
}
uri.append("&REQ0HafasSearchForw=").append(dep ? "1" : "0");
uri.append("&REQ0JourneyDate=").append(ParserUtils.urlEncode(DATE_FORMAT.format(date)));
@ -213,7 +214,16 @@ public final class VbbProvider implements NetworkProvider
return uri.toString();
}
private static int latLonToInt(double value)
private static int locationType(final LocationType locationType)
{
if (locationType == LocationType.ADDRESS)
return 2;
if (locationType == LocationType.ANY)
return 255;
throw new IllegalArgumentException(locationType.toString());
}
private static int latLonToInt(final double value)
{
return (int) (value * 1000000);
}