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

fixed geocoding of POIs even more

Browse source 
git-svn-id: https://public-transport-enabler.googlecode.com/svn/trunk@282 0924bc21-9374-b0fa-ee44-9ff1593b38f0
This commit is contained in:
andreas.schildbach 2010-10-11 12:48:09 +00:00
parent bd014ef2df
commit 6a49e57d0e
2 changed files with 19 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

8
src/de/schildbach/pte/AbstractEfaProvider.java
View file

@ -953,9 +953,9 @@ public abstract class AbstractEfaProvider implements NetworkProvider
uri.append("&calcNumberOfTrips=4"); uri.append("&calcNumberOfTrips=4");
} }
protected static final void appendLocation(final StringBuilder uri, final Location location, final String paramSuffix) protected void appendLocation(final StringBuilder uri, final Location location, final String paramSuffix)
{ {
if (location.type == LocationType.ADDRESS && location.lat != 0 && location.lon != 0) if ((location.type == LocationType.POI || location.type == LocationType.ADDRESS) && location.lat != 0 && location.lon != 0)
{ {
uri.append("&nameInfo_").append(paramSuffix).append("=").append(String.format("%2.6f:%2.6f", location.lon / 1E6, location.lat / 1E6)) uri.append("&nameInfo_").append(paramSuffix).append("=").append(String.format("%2.6f:%2.6f", location.lon / 1E6, location.lat / 1E6))
.append(":WGS84[DD.dddddd]"); .append(":WGS84[DD.dddddd]");
@ -976,7 +976,7 @@ public abstract class AbstractEfaProvider implements NetworkProvider
if (type == LocationType.ADDRESS) if (type == LocationType.ADDRESS)
return "any"; // strange, matches with anyObjFilter return "any"; // strange, matches with anyObjFilter
if (type == LocationType.POI) if (type == LocationType.POI)
return "any"; return "poi";
if (type == LocationType.ANY) if (type == LocationType.ANY)
return "any"; return "any";
throw new IllegalArgumentException(type.toString()); throw new IllegalArgumentException(type.toString());
@ -984,7 +984,7 @@ public abstract class AbstractEfaProvider implements NetworkProvider
protected static final String locationValue(final Location location) protected static final String locationValue(final Location location)
{ {
if (location.type == LocationType.STATION && location.id != 0) if ((location.type == LocationType.STATION || location.type == LocationType.POI) && location.id != 0)
return Integer.toString(location.id); return Integer.toString(location.id);
else else
return location.name; return location.name;

15
src/de/schildbach/pte/VvsProvider.java
View file

@ -21,6 +21,7 @@ import java.text.SimpleDateFormat;
import java.util.Date; import java.util.Date;
import de.schildbach.pte.dto.Location; import de.schildbach.pte.dto.Location;
import de.schildbach.pte.dto.LocationType;
import de.schildbach.pte.util.ParserUtils; import de.schildbach.pte.util.ParserUtils;
/** /**
@ -111,6 +112,20 @@ public class VvsProvider extends AbstractEfaProvider
return uri.toString(); return uri.toString();
} }
@Override
protected void appendLocation(final StringBuilder uri, final Location location, final String paramSuffix)
{
if (location.type == LocationType.POI && location.id != 0)
{
uri.append("&type_").append(paramSuffix).append("=poiID");
uri.append("&name_").append(paramSuffix).append("=").append(location.id);
}
else
{
super.appendLocation(uri, location, paramSuffix);
}
}
@Override @Override
protected String commandLink(final String sessionId, final String command) protected String commandLink(final String sessionId, final String command)
{ {