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

AbstractHafasClientInterfaceProvider: Fix parseLoc() could return STATION type for non-station locations.

Browse source
This commit is contained in:
Andreas Schildbach 2019-01-21 16:18:02 +01:00
parent f7a436c370
commit 6c78edea09
1 changed files with 5 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -1023,6 +1023,7 @@ public abstract class AbstractHafasClientInterfaceProvider extends AbstractHafas
throw new RuntimeException("Unknown type " + type + ": " + loc); throw new RuntimeException("Unknown type " + type + ": " + loc);
} }
final Point coord;
final JSONObject crd = loc.optJSONObject("crd"); final JSONObject crd = loc.optJSONObject("crd");
if (crd != null) { if (crd != null) {
final int crdSysX = loc.optInt("crdSysX", -1); final int crdSysX = loc.optInt("crdSysX", -1);
@ -1031,11 +1032,12 @@ public abstract class AbstractHafasClientInterfaceProvider extends AbstractHafas
if (!"WGS84".equals(crdSysType)) if (!"WGS84".equals(crdSysType))
throw new RuntimeException("unknown type: " + crdSysType); throw new RuntimeException("unknown type: " + crdSysType);
} }
return new Location(locationType, id, Point.from1E6(crd.getInt("y"), crd.getInt("x")), placeAndName[0], coord = Point.from1E6(crd.getInt("y"), crd.getInt("x"));
placeAndName[1], products);
} else { } else {
return new Location(LocationType.STATION, id, null, placeAndName[0], placeAndName[1], products); coord = null;
} }
return new Location(locationType, id, coord, placeAndName[0], placeAndName[1], products);
} }
private List<String> parseOpList(final JSONArray opList) throws JSONException { private List<String> parseOpList(final JSONArray opList) throws JSONException {