mirror of
https://gitlab.com/oeffi/public-transport-enabler.git
synced 2025-07-19 16:59:51 +00:00
Navitia: Fix location type handling in queryNearbyLocations.
This commit is contained in:
parent
026b1fb111
commit
82e367a08b
2 changed files with 22 additions and 5 deletions
|
@ -765,14 +765,14 @@ public abstract class AbstractNavitiaProvider extends AbstractNetworkProvider
|
|||
{
|
||||
final ResultHeader resultHeader = new ResultHeader(network, SERVER_PRODUCT, SERVER_VERSION, 0, null);
|
||||
|
||||
// Check that Location object has coordinates.
|
||||
if (!location.isIdentified())
|
||||
throw new IllegalArgumentException();
|
||||
|
||||
// Build query uri depending of location type.
|
||||
final String queryUriType;
|
||||
if (location.type == LocationType.ADDRESS)
|
||||
if (location.type == LocationType.ADDRESS || location.type == LocationType.ANY)
|
||||
{
|
||||
if (!location.hasLocation())
|
||||
{
|
||||
throw new IllegalArgumentException();
|
||||
}
|
||||
final double lon = location.lon / 1E6;
|
||||
final double lat = location.lat / 1E6;
|
||||
|
||||
|
@ -780,10 +780,18 @@ public abstract class AbstractNavitiaProvider extends AbstractNetworkProvider
|
|||
}
|
||||
else if (location.type == LocationType.STATION)
|
||||
{
|
||||
if (!location.isIdentified())
|
||||
{
|
||||
throw new IllegalArgumentException();
|
||||
}
|
||||
queryUriType = "stop_point/" + location.id + "/";
|
||||
}
|
||||
else if (location.type == LocationType.POI)
|
||||
{
|
||||
if (!location.isIdentified())
|
||||
{
|
||||
throw new IllegalArgumentException();
|
||||
}
|
||||
queryUriType = "poi/" + location.id + "/";
|
||||
}
|
||||
else
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue