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

Hafas: If binary connections query returns only one single individual leg, don't query for more.

Browse source
This commit is contained in:
Andreas Schildbach 2014-12-15 17:00:09 +01:00
parent 9976995137
commit b596ba6f3a
2 changed files with 34 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

14
enabler/src/de/schildbach/pte/AbstractHafasProvider.java
View file

@ -128,23 +128,25 @@ public abstract class AbstractHafasProvider extends AbstractNetworkProvider
public final int seqNr;
public final String ld;
public final int usedBufferSize;
private final boolean canQueryMore;
public QueryTripsBinaryContext(final String ident, final int seqNr, final String ld, final int usedBufferSize)
public QueryTripsBinaryContext(final String ident, final int seqNr, final String ld, final int usedBufferSize, final boolean canQueryMore)
{
this.ident = ident;
this.seqNr = seqNr;
this.ld = ld;
this.usedBufferSize = usedBufferSize;
this.canQueryMore = canQueryMore;
}
public boolean canQueryLater()
{
return true;
return canQueryMore;
}
public boolean canQueryEarlier()
{
return true;
return canQueryMore;
}
}
@ -2008,8 +2010,12 @@ public abstract class AbstractHafasProvider extends AbstractNetworkProvider
trips.add(trip);
}
// if result is only one single individual leg, don't query for more
final boolean canQueryMore = trips.size() != 1 || trips.get(0).legs.size() != 1
|| !(trips.get(0).legs.get(0) instanceof Trip.Individual);
final QueryTripsResult result = new QueryTripsResult(header, uri, from, via, to, new QueryTripsBinaryContext(requestId, seqNr, ld,
bis.getCount()), trips);
bis.getCount(), canQueryMore), trips);
return result;
}