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

AbstractHafasClientInterfaceProvider: Split unidentified destination as if it were a station.

Browse source
This commit is contained in:
Andreas Schildbach 2018-11-17 10:51:06 +01:00
parent 1d7006e837
commit 874198b621
1 changed files with 15 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

22
enabler/src/de/schildbach/pte/AbstractHafasClientInterfaceProvider.java
View file

@ -311,17 +311,19 @@ public abstract class AbstractHafasClientInterfaceProvider extends AbstractHafas
final Position position = normalizePosition(stbStopPlatformS);
final String jnyDirTxt = jny.getString("dirTxt");
Location destination = null;
// if last entry in stopL happens to be our destination, use it
final JSONArray stopList = jny.optJSONArray("stopL");
final Location destination;
if (stopList != null) {
final int lastStopIdx = stopList.getJSONObject(stopList.length() - 1).getInt("locX");
final String lastStopName = locList.getJSONObject(lastStopIdx).getString("name");
if (jnyDirTxt.equals(lastStopName))
destination = parseLoc(locList, lastStopIdx, null);
else
destination = new Location(LocationType.ANY, null, null, jnyDirTxt);
} else {
destination = new Location(LocationType.ANY, null, null, jnyDirTxt);
}
// otherwise split unidentified destination as if it was a station and use it
if (destination == null) {
final String[] splitJnyDirTxt = splitStationName(jnyDirTxt);
destination = new Location(LocationType.ANY, null, splitJnyDirTxt[0], splitJnyDirTxt[1]);
}
final JSONArray remList = jny.optJSONArray("remL");
@ -547,8 +549,14 @@ public abstract class AbstractHafasClientInterfaceProvider extends AbstractHafas
final JSONObject jny = sec.getJSONObject("jny");
final Line line = lines.get(jny.getInt("prodX"));
final String dirTxt = jny.optString("dirTxt", null);
final Location destination = dirTxt != null ? new Location(LocationType.ANY, null, null, dirTxt)
: null;
final Location destination;
if (dirTxt != null) {
final String[] splitDirTxt = splitStationName(dirTxt);
destination = new Location(LocationType.ANY, null, splitDirTxt[0], splitDirTxt[1]);
} else {
destination = null;
}
final JSONArray stopList = jny.optJSONArray("stopL");
final List<Stop> intermediateStops;