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

Navitia: Fix location type handling in queryNearbyLocations.

Browse source
This commit is contained in:
Antonio El Khoury 2015-02-25 23:50:00 +01:00 • committed by Andreas Schildbach
parent 026b1fb111
commit 82e367a08b
2 changed files with 22 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

18
enabler/src/de/schildbach/pte/AbstractNavitiaProvider.java
View file

@ -765,14 +765,14 @@ public abstract class AbstractNavitiaProvider extends AbstractNetworkProvider
{ {
final ResultHeader resultHeader = new ResultHeader(network, SERVER_PRODUCT, SERVER_VERSION, 0, null); 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. // Build query uri depending of location type.
final String queryUriType; 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 lon = location.lon / 1E6;
final double lat = location.lat / 1E6; final double lat = location.lat / 1E6;
@ -780,10 +780,18 @@ public abstract class AbstractNavitiaProvider extends AbstractNetworkProvider
} }
else if (location.type == LocationType.STATION) else if (location.type == LocationType.STATION)
{ {
if (!location.isIdentified())
{
throw new IllegalArgumentException();
}
queryUriType = "stop_point/" + location.id + "/"; queryUriType = "stop_point/" + location.id + "/";
} }
else if (location.type == LocationType.POI) else if (location.type == LocationType.POI)
{ {
if (!location.isIdentified())
{
throw new IllegalArgumentException();
}
queryUriType = "poi/" + location.id + "/"; queryUriType = "poi/" + location.id + "/";
} }
else else

9
enabler/test/de/schildbach/pte/live/ParisProviderLiveTest.java
View file

@ -89,6 +89,15 @@ public class ParisProviderLiveTest extends AbstractProviderLiveTest
print(result); print(result);
} }
@Test
public void nearbyStationsAny() throws Exception
{
final NearbyLocationsResult result = queryNearbyLocations(EnumSet.of(LocationType.STATION),
new Location(LocationType.ANY, 48877523, 2378353), 700, 10);
assertEquals(NearbyLocationsResult.Status.OK, result.status);
print(result);
}
@Test @Test
public void nearbyStationsInvalidStation() throws Exception public void nearbyStationsInvalidStation() throws Exception
{ {