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

rudimentary connections for all efa based providers

Browse source 
git-svn-id: https://public-transport-enabler.googlecode.com/svn/trunk@246 0924bc21-9374-b0fa-ee44-9ff1593b38f0
This commit is contained in:
andreas.schildbach 2010-10-08 17:43:57 +00:00
parent b4bf75d875
commit 875bd1d651
15 changed files with 725 additions and 193 deletions
Download patch file Download diff file Expand all files Collapse all files

14
src/de/schildbach/pte/SbbProvider.java
View file

@ -162,9 +162,9 @@ public class SbbProvider extends AbstractHafasProvider
return QueryConnectionsResult.INVALID_DATE;
}
List<String> fromAddresses = null;
List<String> viaAddresses = null;
List<String> toAddresses = null;
List<Autocomplete> fromAddresses = null;
List<Autocomplete> viaAddresses = null;
List<Autocomplete> toAddresses = null;
final Matcher mPreAddress = P_PRE_ADDRESS.matcher(page);
while (mPreAddress.find())
@ -173,12 +173,12 @@ public class SbbProvider extends AbstractHafasProvider
final String options = mPreAddress.group(2);
final Matcher mAddresses = P_ADDRESSES.matcher(options);
final List<String> addresses = new ArrayList<String>();
final List<Autocomplete> addresses = new ArrayList<Autocomplete>();
while (mAddresses.find())
{
final String address = ParserUtils.resolveEntities(mAddresses.group(1)).trim();
if (!addresses.contains(address))
addresses.add(address);
addresses.add(new Autocomplete(LocationType.ANY, 0, address));
}
if (type.equals("REQ0JourneyStopsS0K"))
@ -192,7 +192,7 @@ public class SbbProvider extends AbstractHafasProvider
}
if (fromAddresses != null || viaAddresses != null || toAddresses != null)
return new QueryConnectionsResult(QueryConnectionsResult.Status.AMBIGUOUS, fromAddresses, viaAddresses, toAddresses);
return new QueryConnectionsResult(fromAddresses, viaAddresses, toAddresses);
else
return queryConnections(uri, page);
}
@ -340,7 +340,7 @@ public class SbbProvider extends AbstractHafasProvider
final String arrivalPosition = mDetFine.group(13) != null ? ParserUtils.resolveEntities(mDetFine.group(13)) : null;
final Connection.Trip trip = new Connection.Trip(line, lineColors(line), null, departureTime, departurePosition,
final Connection.Trip trip = new Connection.Trip(line, lineColors(line), 0, null, departureTime, departurePosition,
departureId, departure, arrivalTime, arrivalPosition, arrivalId, arrival);
connection.parts.add(trip);
}