[STTNHUB-219] fix(locations): Format address using city and state att…

…ributes (#266) * [STTNHUB-219] fix(locations): Format address using city and state attributes * fix flake8 * Remove useless brackets * Remove duplicate function
superdesk · Jan 12, 2023 · b2398b7 · b2398b7
1 parent 28898c7
commit b2398b7
Show file tree

Hide file tree

Showing 4 changed files with 5 additions and 23 deletions.
diff --git a/assets/agenda/utils.js b/assets/agenda/utils.js
@@ -226,8 +226,8 @@ export function getLocationString(item) {
     return [
         get(item, 'location.0.name', get(item, 'location.0.address.title')),
         get(item, 'location.0.address.line.0'),
-        get(item, 'location.0.address.area'),
-        get(item, 'location.0.address.locality'),
+        get(item, 'location.0.address.city') || get(item, 'location.0.address.area'),
+        get(item, 'location.0.address.state') || get(item, 'location.0.address.locality'),
         get(item, 'location.0.address.postal_code'),
         get(item, 'location.0.address.country'),
     ].filter((d) => d).join(', ');

diff --git a/assets/maps/utils.js b/assets/maps/utils.js
@@ -54,7 +54,7 @@ export function getAddressLine(location) {
  * @param {Object} location
  */
 export function getAddressState(location) {
-    return get(location, 'address.locality');
+    return get(location, 'address.state') || get(location, 'address.locality');
 }
 
 /**

diff --git a/newsroom/agenda/utils.py b/newsroom/agenda/utils.py
@@ -47,24 +47,6 @@ def get_agenda_dates(agenda):
     return "{} - {}, {}".format(time_short(start), time_short(end), date_short(start))
 
 
-def get_location_string(agenda):
-    location = agenda.get("location", [])
-
-    if not location:
-        return ""
-
-    location_items = [
-        location[0].get("name"),
-        location[0].get("address", {}).get("line", [""])[0],
-        location[0].get("address", {}).get("area"),
-        location[0].get("address", {}).get("locality"),
-        location[0].get("address", {}).get("postal_code"),
-        location[0].get("address", {}).get("country"),
-    ]
-
-    return ", ".join([location_part for location_part in location_items if location_part])
-
-
 def get_public_contacts(agenda):
     contacts = agenda.get("event", {}).get("event_contact_info", [])
     public_contacts = []

diff --git a/newsroom/utils.py b/newsroom/utils.py
@@ -216,8 +216,8 @@ def get_location_string(agenda):
     location_items = [
         location[0].get("name"),
         location[0].get("address", {}).get("line", [""])[0],
-        location[0].get("address", {}).get("area"),
-        location[0].get("address", {}).get("locality"),
+        location[0].get("address", {}).get("city") or location[0].get("address", {}).get("area"),
+        location[0].get("address", {}).get("state") or location[0].get("address", {}).get("locality"),
         location[0].get("address", {}).get("postal_code"),
         location[0].get("address", {}).get("country"),
     ]