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

Navitia: queryNearbyLocations() with distance of 0 now means "unlimited" (50km).

Browse source
This commit is contained in:
Torsten Grote 2016-01-31 19:39:42 +01:00 • committed by Andreas Schildbach
parent abad1694bc
commit 4f9fb0cab2
3 changed files with 19 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -760,7 +760,7 @@ public abstract class AbstractNavitiaProvider extends AbstractNetworkProvider
return false; return false;
} }
public NearbyLocationsResult queryNearbyLocations(final EnumSet<LocationType> types, final Location location, final int maxDistance, public NearbyLocationsResult queryNearbyLocations(final EnumSet<LocationType> types, final Location location, int maxDistance,
final int maxLocations) throws IOException final int maxLocations) throws IOException
{ {
final ResultHeader resultHeader = new ResultHeader(network, SERVER_PRODUCT, SERVER_VERSION, 0, null); final ResultHeader resultHeader = new ResultHeader(network, SERVER_PRODUCT, SERVER_VERSION, 0, null);
@ -799,6 +799,9 @@ public abstract class AbstractNavitiaProvider extends AbstractNetworkProvider
throw new IllegalArgumentException("Unhandled location type: " + location.type); throw new IllegalArgumentException("Unhandled location type: " + location.type);
} }
if (maxDistance == 0)
maxDistance = 50000;
final String queryUri = uri() + queryUriType + "places_nearby?type[]=stop_point" + "&distance=" + maxDistance + "&count=" + maxLocations final String queryUri = uri() + queryUriType + "places_nearby?type[]=stop_point" + "&distance=" + maxDistance + "&count=" + maxLocations
+ "&depth=0"; + "&depth=0";
final CharSequence page = httpClient.get(queryUri); final CharSequence page = httpClient.get(queryUri);

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

@ -79,6 +79,15 @@ public abstract class AbstractNavitiaProviderLiveTest extends AbstractProviderLi
print(result); print(result);
} }
protected final void nearbyStationsStationDistance(final String stationId) throws IOException
{
final NearbyLocationsResult result = queryNearbyLocations(EnumSet.of(LocationType.STATION), new Location(LocationType.STATION, stationId), 0,
10);
assertEquals(NearbyLocationsResult.Status.OK, result.status);
assertTrue(result.locations.size() > 1);
print(result);
}
protected final void nearbyStationsInvalidStation(final String stationId) throws IOException protected final void nearbyStationsInvalidStation(final String stationId) throws IOException
{ {
final NearbyLocationsResult result = queryNearbyLocations(EnumSet.of(LocationType.STATION), new Location(LocationType.STATION, stationId), final NearbyLocationsResult result = queryNearbyLocations(EnumSet.of(LocationType.STATION), new Location(LocationType.STATION, stationId),

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

@ -64,6 +64,12 @@ public class ParisProviderLiveTest extends AbstractNavitiaProviderLiveTest
nearbyStationsAny(48877523, 2378353); nearbyStationsAny(48877523, 2378353);
} }
@Test
public void nearbyStationsDistance() throws Exception
{
nearbyStationsStationDistance("stop_point:OIF:SP:80:137");
}
@Test @Test
public void nearbyStationsInvalidStation() throws Exception public void nearbyStationsInvalidStation() throws Exception
{ {