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

Navitia: Fix departures query when using equiv=false

Browse source 
When querying departures from a stop_area with equiv=false
the query URI was wrong and returned no results.
This was especially problematic, because the suggestLocation query
returns only stop_areas at the moment.
This commit is contained in:
Torsten Grote 2016-02-06 16:10:02 -02:00 • committed by Andreas Schildbach
parent bc7c0c8bcc
commit 16c85476b1
1 changed files with 24 additions and 13 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -862,24 +862,35 @@ public abstract class AbstractNavitiaProvider extends AbstractNetworkProvider
// to stop_point and query departures.
final StringBuilder queryUri = new StringBuilder();
queryUri.append(uri());
if (equivs)
final String header = stationId.substring(0, stationId.indexOf(":"));
if (equivs && header.equals("stop_point"))
{
final String header = stationId.substring(0, stationId.indexOf(":"));
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 + "/");
}
final String stopAreaId = getStopAreaId(stationId);
queryUri.append("stop_areas/");
queryUri.append(stopAreaId);
queryUri.append("/");
}
else
{
queryUri.append("stop_points/" + stationId + "/");
if (header.equals("stop_area"))
{
queryUri.append("stop_areas/");
queryUri.append(stationId);
queryUri.append("/");
}
else
{
queryUri.append("stop_points/");
queryUri.append(stationId);
queryUri.append("/");
}
}
queryUri.append("departures?from_datetime=" + dateTime + "&count=" + maxDepartures + "&duration=86400" + "&depth=0");
queryUri.append("departures?from_datetime=");
queryUri.append(dateTime);
queryUri.append("&count=");
queryUri.append(maxDepartures);
queryUri.append("&duration=86400");
queryUri.append("&depth=0");
final CharSequence page = httpClient.get(queryUri.toString());