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

LocationView: When parsing Geocoder result, extract postal code too.

Browse source
This commit is contained in:
Andreas Schildbach 2018-12-21 18:55:11 +01:00
parent c87100498d
commit 0586301002
1 changed files with 9 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

14
oeffi/src/de/schildbach/oeffi/directions/LocationView.java
View file

@ -19,6 +19,7 @@ package de.schildbach.oeffi.directions;
import java.util.Locale;
import com.google.common.base.Joiner;
import com.google.common.base.Strings;
import de.schildbach.oeffi.Constants;
@ -454,14 +455,17 @@ public class LocationView extends FrameLayout implements LocationHelper.Callback
final Location location;
final int maxAddressLineIndex = address.getMaxAddressLineIndex();
if (maxAddressLineIndex >= 2 && Strings.emptyToNull(address.getAddressLine(2)) != null)
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)
location = new Location(LocationType.ADDRESS, null, coord, address.getLocality(), address.getThoroughfare()
+ (address.getFeatureName() != null ? " " + address.getFeatureName() : ""));
else
} else if (address.getThoroughfare() != null) {
final Joiner joiner = Joiner.on(' ').skipNulls();
location = new Location(LocationType.ADDRESS, null, coord,
joiner.join(address.getPostalCode(), address.getLocality()),
joiner.join(address.getThoroughfare(), address.getFeatureName()));
} else {
location = new Location(LocationType.ADDRESS, null, coord);
}
return location;
}