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

AbstractEfaProvider: Improve anyType 'loc' parsing.

Browse source
This commit is contained in:
Andreas Schildbach 2018-08-05 22:19:14 +02:00
parent 5d0366d5f9
commit e5dcf67801
1 changed files with 10 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

14
enabler/src/de/schildbach/pte/AbstractEfaProvider.java
View file

@ -779,14 +779,20 @@ public abstract class AbstractEfaProvider extends AbstractNetworkProvider {
place = locality != null ? locality : defaultPlace;
name = objectName != null ? objectName : nameElem;
} else if ("loc".equals(type)) {
if (coord != null) {
if (locality != null) {
locationType = LocationType.ADDRESS;
place = null;
name = locality;
} else if (nameElem != null) {
locationType = LocationType.ADDRESS;
place = null;
name = nameElem;
} else if (coord != null) {
locationType = LocationType.COORD;
place = null;
name = null;
} else {
locationType = LocationType.ADDRESS;
place = null;
name = locality;
throw new IllegalArgumentException("not enough data for type/anyType: " + type);
}
} else if ("address".equals(type) || "singlehouse".equals(type)) {
locationType = LocationType.ADDRESS;