#549 changed place strategy
This commit is contained in:
parent
cf47ebebed
commit
9820d32b66
1 changed files with 5 additions and 13 deletions
|
@ -53,21 +53,13 @@ extension ExtraAvesEntryLocation on AvesEntry {
|
||||||
)
|
)
|
||||||
: call());
|
: call());
|
||||||
if (addresses.isNotEmpty) {
|
if (addresses.isNotEmpty) {
|
||||||
final address = addresses.first;
|
final v = addresses.first;
|
||||||
final cc = address.countryCode?.toUpperCase();
|
|
||||||
final cn = address.countryName;
|
|
||||||
final aa = address.adminArea;
|
|
||||||
final l = address.locality;
|
|
||||||
final sl = address.subLocality;
|
|
||||||
final saa = address.subAdminArea;
|
|
||||||
addressDetails = AddressDetails(
|
addressDetails = AddressDetails(
|
||||||
id: id,
|
id: id,
|
||||||
countryCode: cc,
|
countryCode: v.countryCode?.toUpperCase(),
|
||||||
countryName: cn,
|
countryName: v.countryName,
|
||||||
adminArea: aa,
|
adminArea: v.adminArea,
|
||||||
// if country & admin fields are null, it is likely the ocean,
|
locality: v.locality ?? v.subLocality ?? v.featureName ?? v.subAdminArea ?? v.addressLine,
|
||||||
// which is identified by `featureName` but we default to the address line anyway
|
|
||||||
locality: l ?? sl ?? saa ?? (cc == null && cn == null && aa == null ? address.addressLine : null),
|
|
||||||
);
|
);
|
||||||
}
|
}
|
||||||
} catch (error, stack) {
|
} catch (error, stack) {
|
||||||
|
|
Loading…
Reference in a new issue