From 708f1310e4eb9c97d1855f44a283d50ece6fd889 Mon Sep 17 00:00:00 2001
From: Thibault Deckers <thibault.deckers@gmail.com>
Date: Wed, 22 Mar 2023 10:47:53 +0100
Subject: [PATCH] #549 changed place strategy

---
 CHANGELOG.md                             | 1 +
 lib/model/entry/extensions/location.dart | 6 +++++-
 2 files changed, 6 insertions(+), 1 deletion(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 6fad04e99..3840ef342 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -6,6 +6,7 @@ All notable changes to this project will be documented in this file.
 
 ### Added
 
+- Info: improved state/place display (requires rescan, limited to AU/GB/EN)
 - improved support for system font scale
 
 ### Fixed
diff --git a/lib/model/entry/extensions/location.dart b/lib/model/entry/extensions/location.dart
index d729d1eff..8defcb811 100644
--- a/lib/model/entry/extensions/location.dart
+++ b/lib/model/entry/extensions/location.dart
@@ -54,12 +54,16 @@ extension ExtraAvesEntryLocation on AvesEntry {
           : call());
       if (addresses.isNotEmpty) {
         final v = addresses.first;
+        var locality = v.locality ?? v.subLocality ?? v.featureName;
+        if (locality == null || locality == v.subThoroughfare) {
+          locality = v.subAdminArea ?? v.addressLine;
+        }
         addressDetails = AddressDetails(
           id: id,
           countryCode: v.countryCode?.toUpperCase(),
           countryName: v.countryName,
           adminArea: v.adminArea,
-          locality: v.locality ?? v.subLocality ?? v.featureName ?? v.subAdminArea ?? v.addressLine,
+          locality: locality,
         );
       }
     } catch (error, stack) {