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

queryNearbyStations() has ResultHeader as well

Browse source 
git-svn-id: https://public-transport-enabler.googlecode.com/svn/trunk@787 0924bc21-9374-b0fa-ee44-9ff1593b38f0
This commit is contained in:
andreas.schildbach@gmail.com 2011-09-18 13:25:37 +00:00
parent 2b6090bdea
commit 5cbbd7f175
5 changed files with 26 additions and 23 deletions
Download patch file Download diff file Expand all files Collapse all files

22
src/de/schildbach/pte/AbstractEfaProvider.java
View file

@ -188,7 +188,7 @@ public abstract class AbstractEfaProvider implements NetworkProvider
}
}
protected List<Location> xmlCoordRequest(final int lat, final int lon, final int maxDistance, final int maxStations) throws IOException
protected NearbyStationsResult xmlCoordRequest(final int lat, final int lon, final int maxDistance, final int maxStations) throws IOException
{
final StringBuilder uri = new StringBuilder(apiBase);
uri.append("XML_COORD_REQUEST");
@ -206,7 +206,7 @@ public abstract class AbstractEfaProvider implements NetworkProvider
final XmlPullParser pp = parserFactory.newPullParser();
pp.setInput(is, null);
enterItdRequest(pp);
final ResultHeader header = enterItdRequest(pp);
XmlPullUtil.enter(pp, "itdCoordInfoRequest");
@ -215,7 +215,7 @@ public abstract class AbstractEfaProvider implements NetworkProvider
XmlPullUtil.enter(pp, "coordInfoRequest");
XmlPullUtil.exit(pp, "coordInfoRequest");
final List<Location> results = new ArrayList<Location>();
final List<Location> stations = new ArrayList<Location>();
if (XmlPullUtil.test(pp, "coordInfoItemList"))
{
@ -237,13 +237,13 @@ public abstract class AbstractEfaProvider implements NetworkProvider
XmlPullUtil.exit(pp, "coordInfoItem");
results.add(new Location(LocationType.STATION, id, coord.lat, coord.lon, place, name));
stations.add(new Location(LocationType.STATION, id, coord.lat, coord.lon, place, name));
}
XmlPullUtil.exit(pp, "coordInfoItemList");
}
return results;
return new NearbyStationsResult(header, stations);
}
catch (final XmlPullParserException x)
{
@ -438,7 +438,7 @@ public abstract class AbstractEfaProvider implements NetworkProvider
public NearbyStationsResult queryNearbyStations(final Location location, final int maxDistance, final int maxStations) throws IOException
{
if (location.hasLocation())
return new NearbyStationsResult(xmlCoordRequest(location.lat, location.lon, maxDistance, maxStations));
return xmlCoordRequest(location.lat, location.lon, maxDistance, maxStations);
if (location.type != LocationType.STATION)
throw new IllegalArgumentException("cannot handle: " + location.type);
@ -455,7 +455,7 @@ public abstract class AbstractEfaProvider implements NetworkProvider
final XmlPullParser pp = parserFactory.newPullParser();
pp.setInput(is, null);
enterItdRequest(pp);
final ResultHeader header = enterItdRequest(pp);
if (!XmlPullUtil.jumpToStartTag(pp, null, "itdOdv") || !"dm".equals(pp.getAttributeValue(null, "usage")))
throw new IllegalStateException("cannot find <itdOdv usage=\"dm\" />");
@ -518,9 +518,9 @@ public abstract class AbstractEfaProvider implements NetworkProvider
stations.add(ownStation);
if (maxStations == 0 || maxStations >= stations.size())
return new NearbyStationsResult(stations);
return new NearbyStationsResult(header, stations);
else
return new NearbyStationsResult(stations.subList(0, maxStations));
return new NearbyStationsResult(header, stations.subList(0, maxStations));
}
else if ("list".equals(nameState))
{
@ -535,11 +535,11 @@ public abstract class AbstractEfaProvider implements NetworkProvider
stations.add(newLocation);
}
return new NearbyStationsResult(stations);
return new NearbyStationsResult(header, stations);
}
else if ("notidentified".equals(nameState))
{
return new NearbyStationsResult(NearbyStationsResult.Status.INVALID_STATION);
return new NearbyStationsResult(header, NearbyStationsResult.Status.INVALID_STATION);
}
else
{