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

Sort departures by time when querying station board (Hafas).

Browse source
This commit is contained in:
Andreas Schildbach 2014-11-07 20:25:36 +01:00
parent f0a665076a
commit 8895e1695f
2 changed files with 23 additions and 0 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -715,6 +715,10 @@ public abstract class AbstractHafasProvider extends AbstractNetworkProvider
XmlPullUtil.requireEndDocument(pp); XmlPullUtil.requireEndDocument(pp);
// sort departures
for (final StationDepartures stationDepartures : result.stationDepartures)
Collections.sort(stationDepartures.departures, Departure.TIME_COMPARATOR);
return result; return result;
} }
catch (final XmlPullParserException x) catch (final XmlPullParserException x)

19
enabler/src/de/schildbach/pte/dto/Departure.java
View file

@ -18,6 +18,7 @@
package de.schildbach.pte.dto; package de.schildbach.pte.dto;
import java.io.Serializable; import java.io.Serializable;
import java.util.Comparator;
import java.util.Date; import java.util.Date;
/** /**
@ -45,6 +46,16 @@ public final class Departure implements Serializable
this.message = message; this.message = message;
} }
public Date getTime()
{
if (predictedTime != null)
return predictedTime;
else if (plannedTime != null)
return plannedTime;
else
return null;
}
@Override @Override
public String toString() public String toString()
{ {
@ -110,4 +121,12 @@ public final class Departure implements Serializable
return 0; return 0;
return o.hashCode(); return o.hashCode();
} }
public static final Comparator<Departure> TIME_COMPARATOR = new Comparator<Departure>()
{
public int compare(final Departure departure0, final Departure departure1)
{
return departure0.getTime().compareTo(departure1.getTime());
}
};
} }