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

Include network ID in result header.

Browse source
This commit is contained in:
Andreas Schildbach 2015-02-09 10:06:35 +01:00
parent cf651676d2
commit 322e7cf8cb
7 changed files with 46 additions and 36 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -436,7 +436,7 @@ public abstract class AbstractHafasProvider extends AbstractNetworkProvider
}
}
return new SuggestLocationsResult(new ResultHeader(SERVER_PRODUCT), locations);
return new SuggestLocationsResult(new ResultHeader(network, SERVER_PRODUCT), locations);
}
catch (final JSONException x)
{
@ -523,7 +523,7 @@ public abstract class AbstractHafasProvider extends AbstractNetworkProvider
pp.nextTag();
final ResultHeader header = new ResultHeader(SERVER_PRODUCT);
final ResultHeader header = new ResultHeader(network, SERVER_PRODUCT);
final QueryDeparturesResult result = new QueryDeparturesResult(header);
if (XmlPullUtil.test(pp, "Err"))
@ -770,7 +770,7 @@ public abstract class AbstractHafasProvider extends AbstractNetworkProvider
final @Nullable Collection<Product> products, final @Nullable WalkSpeed walkSpeed, final @Nullable Accessibility accessibility,
final @Nullable Set<Option> options) throws IOException
{
final ResultHeader header = new ResultHeader(SERVER_PRODUCT);
final ResultHeader header = new ResultHeader(network, SERVER_PRODUCT);
if (!from.isIdentified())
{
@ -890,7 +890,7 @@ public abstract class AbstractHafasProvider extends AbstractNetworkProvider
XmlPullUtil.require(pp, "ResC");
final String product = XmlPullUtil.attr(pp, "prod").split(" ")[0];
final ResultHeader header = new ResultHeader(SERVER_PRODUCT, product, 0, null);
final ResultHeader header = new ResultHeader(network, SERVER_PRODUCT, product, 0, null);
XmlPullUtil.enter(pp, "ResC");
if (XmlPullUtil.test(pp, "Err"))
@ -1441,7 +1441,7 @@ public abstract class AbstractHafasProvider extends AbstractNetworkProvider
final @Nullable Collection<Product> products, final @Nullable WalkSpeed walkSpeed, final @Nullable Accessibility accessibility,
final @Nullable Set<Option> options) throws IOException
{
final ResultHeader header = new ResultHeader(SERVER_PRODUCT);
final ResultHeader header = new ResultHeader(network, SERVER_PRODUCT);
if (!from.isIdentified())
{
@ -1537,7 +1537,7 @@ public abstract class AbstractHafasProvider extends AbstractNetworkProvider
final int version = is.readShortReverse();
if (version != 6 && version != 5)
throw new IllegalStateException("unknown version: " + version + ", first chars: " + firstChars);
final ResultHeader header = new ResultHeader(SERVER_PRODUCT, Integer.toString(version), 0, null);
final ResultHeader header = new ResultHeader(network, SERVER_PRODUCT, Integer.toString(version), 0, null);
// quick seek for pointers
is.reset();