mirrors/oeffi
1
0
Fork 0
mirror of https://gitlab.com/oeffi/oeffi.git synced 2025-07-07 18:38:48 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

GeocoderThread: Prefer parsing address from individual fields.

Browse source
This commit is contained in:
Andreas Schildbach 2020-03-23 19:59:26 +01:00
parent 46e70d02a7
commit ee99146c97
1 changed files with 8 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

14
oeffi/src/de/schildbach/oeffi/util/GeocoderThread.java
View file

@ -114,16 +114,18 @@ public class GeocoderThread extends Thread {
else
coord = null;
final Location location;
final int maxAddressLineIndex = address.getMaxAddressLineIndex();
if (maxAddressLineIndex >= 2 && Strings.emptyToNull(address.getAddressLine(2)) != null) {
location = new Location(LocationType.ADDRESS, null, coord, address.getAddressLine(1),
address.getAddressLine(0));
} else if (address.getThoroughfare() != null) {
final Location location;
if (Strings.emptyToNull(address.getFeatureName()) != null && Strings.emptyToNull(address.getLocality()) != null
&& Strings.emptyToNull(address.getPostalCode()) != null) {
final Joiner joiner = Joiner.on(' ').skipNulls();
final String thoroughfare = Strings.emptyToNull(address.getThoroughfare());
location = new Location(LocationType.ADDRESS, null, coord,
joiner.join(address.getPostalCode(), address.getLocality()),
joiner.join(address.getThoroughfare(), address.getFeatureName()));
joiner.join(thoroughfare, address.getFeatureName()));
} else if (maxAddressLineIndex >= 2 && Strings.emptyToNull(address.getAddressLine(2)) != null) {
location = new Location(LocationType.ADDRESS, null, coord, address.getAddressLine(1),
address.getAddressLine(0));
} else {
location = new Location(LocationType.ADDRESS, null, coord);
}