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

AbstractHafasClientInterfaceProvider: Fix parsing of locations without type.

Browse source
This commit is contained in:
Andreas Schildbach 2021-06-14 22:32:17 +02:00
parent 0f55b9bb67
commit 676dccea01
1 changed files with 8 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

11
src/de/schildbach/pte/AbstractHafasClientInterfaceProvider.java
View file

@ -1017,15 +1017,20 @@ public abstract class AbstractHafasClientInterfaceProvider extends AbstractHafas
private List<Location> parseLocList(final JSONArray locList, final JSONArray crdSysList) throws JSONException { private List<Location> parseLocList(final JSONArray locList, final JSONArray crdSysList) throws JSONException {
final List<Location> locations = new ArrayList<>(locList.length()); final List<Location> locations = new ArrayList<>(locList.length());
for (int iLoc = 0; iLoc < locList.length(); iLoc++) for (int iLoc = 0; iLoc < locList.length(); iLoc++) {
locations.add(parseLoc(locList, iLoc, new HashSet<Integer>(), crdSysList)); final Location location = parseLoc(locList, iLoc, new HashSet<Integer>(), crdSysList);
if (location != null)
locations.add(location);
}
return locations; return locations;
} }
private Location parseLoc(final JSONArray locList, final int locListIndex, private Location parseLoc(final JSONArray locList, final int locListIndex,
@Nullable Set<Integer> previousLocListIndexes, final JSONArray crdSysList) throws JSONException { @Nullable Set<Integer> previousLocListIndexes, final JSONArray crdSysList) throws JSONException {
final JSONObject loc = locList.getJSONObject(locListIndex); final JSONObject loc = locList.getJSONObject(locListIndex);
final String type = loc.getString("type"); final String type = loc.optString("type", null);
if (type == null)
return null;
final LocationType locationType; final LocationType locationType;
final String id; final String id;