Rename .queryNearbyStations() to .queryNearbyLocations() and make it find POIs too.

This commit is contained in:
Andreas Schildbach 2015-01-26 01:55:44 +01:00
parent 25c2eb6176
commit 8df79805d0
84 changed files with 565 additions and 665 deletions

View file

@ -28,7 +28,7 @@ import de.schildbach.pte.NetworkProvider.WalkSpeed;
import de.schildbach.pte.SbbProvider;
import de.schildbach.pte.dto.Location;
import de.schildbach.pte.dto.LocationType;
import de.schildbach.pte.dto.NearbyStationsResult;
import de.schildbach.pte.dto.NearbyLocationsResult;
import de.schildbach.pte.dto.Product;
import de.schildbach.pte.dto.QueryDeparturesResult;
import de.schildbach.pte.dto.QueryTripsResult;
@ -47,16 +47,14 @@ public class SbbProviderLiveTest extends AbstractProviderLiveTest
@Test
public void nearbyStations() throws Exception
{
final NearbyStationsResult result = queryNearbyStations(new Location(LocationType.STATION, "8500010"));
final NearbyLocationsResult result = queryNearbyStations(new Location(LocationType.STATION, "8500010"));
print(result);
}
@Test
public void nearbyStationsByCoordinate() throws Exception
{
final NearbyStationsResult result = queryNearbyStations(new Location(LocationType.ADDRESS, 52525589, 13369548));
final NearbyLocationsResult result = queryNearbyStations(new Location(LocationType.ADDRESS, 52525589, 13369548));
print(result);
}
@ -64,7 +62,6 @@ public class SbbProviderLiveTest extends AbstractProviderLiveTest
public void queryDepartures() throws Exception
{
final QueryDeparturesResult result = queryDepartures("8500010", false);
print(result);
}
@ -72,7 +69,6 @@ public class SbbProviderLiveTest extends AbstractProviderLiveTest
public void queryDeparturesInvalidStation() throws Exception
{
final QueryDeparturesResult result = queryDepartures("999999", false);
assertEquals(QueryDeparturesResult.Status.INVALID_STATION, result.status);
}
@ -80,7 +76,6 @@ public class SbbProviderLiveTest extends AbstractProviderLiveTest
public void suggestLocations() throws Exception
{
final SuggestLocationsResult result = suggestLocations("haupt");
print(result);
}
@ -88,7 +83,6 @@ public class SbbProviderLiveTest extends AbstractProviderLiveTest
public void suggestLocationsUmlaut() throws Exception
{
final SuggestLocationsResult result = suggestLocations("Höhle");
print(result);
}
@ -96,7 +90,6 @@ public class SbbProviderLiveTest extends AbstractProviderLiveTest
public void suggestLocationsAddress() throws Exception
{
final SuggestLocationsResult result = suggestLocations("Dorfstrasse 10, Dällikon, Schweiz");
print(result);
}