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

Navitia: Fix queryDepartures() for stop_area when equivs is set to true.

Browse source
This commit is contained in:
Antonio El Khoury 2015-02-21 15:40:22 +01:00 • committed by Andreas Schildbach
parent 0267c655bf
commit 3e92246ff8
2 changed files with 31 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -854,8 +854,16 @@ public abstract class AbstractNavitiaProvider extends AbstractNetworkProvider
queryUri.append(uri()); queryUri.append(uri());
if (equivs) if (equivs)
{ {
final String stopAreaId = getStopAreaId(stationId); final String header = stationId.substring(0, stationId.indexOf(":"));
queryUri.append("stop_areas/" + stopAreaId + "/"); if (header.equals("stop_point"))
{
final String stopAreaId = getStopAreaId(stationId);
queryUri.append("stop_areas/" + stopAreaId + "/");
}
else if (header.equals("stop_area"))
{
queryUri.append("stop_areas/" + stationId + "/");
}
} }
else else
{ {

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

@ -112,6 +112,27 @@ public class ParisProviderLiveTest extends AbstractProviderLiveTest
print(result); print(result);
} }
@Test
public void queryDeparturesStopArea() throws Exception
{
final int maxDepartures = 5;
final QueryDeparturesResult result = queryDepartures("stop_area:RTP:SA:1958", maxDepartures, true);
assertEquals(QueryDeparturesResult.Status.OK, result.status);
assertTrue(result.stationDepartures.size() > 1);
int nbDepartures = 0;
int nbLines = 0;
for (final StationDepartures stationDepartures : result.stationDepartures)
{
nbDepartures += stationDepartures.departures.size();
final List<LineDestination> lines = stationDepartures.lines;
if (lines != null)
nbLines += lines.size();
}
assertTrue(nbDepartures <= maxDepartures);
assertTrue(nbLines >= 2);
print(result);
}
@Test @Test
public void queryDeparturesEquivsTrue() throws Exception public void queryDeparturesEquivsTrue() throws Exception
{ {