diff --git a/src/components/ItaliaTheme/View/Commons/LocationItem.jsx b/src/components/ItaliaTheme/View/Commons/LocationItem.jsx index 91113039c..69a98f786 100644 --- a/src/components/ItaliaTheme/View/Commons/LocationItem.jsx +++ b/src/components/ItaliaTheme/View/Commons/LocationItem.jsx @@ -64,9 +64,9 @@ const LocationItem = ({
{(location_fo.nome_sede || location_fo.title) && ( <> - {(location_fo['@type'] === 'Venue' || - location_fo['@type'] === 'UnitaOrganizzativa') && - show_title_link ? ( + {location_fo['@type'] === 'Venue' || + (location_fo['@type'] === 'UnitaOrganizzativa' && + show_title_link) ? ( { const intl = useIntl(); + let location_items = []; + let locations = content?.sede ?? []; + if ( + content?.nome_sede || + content.street || + content.city || + content.zip_code || + content.quartiere || + content.circoscrizione + ) { + location_items.push(content); + } + + location_items = [...location_items, ...locations]; + return (content.geolocation?.latitude && content.geolocation?.longitude) || content.street || content.zip_code || @@ -36,17 +57,42 @@ const VenueWhere = ({ content }) => { content.quartiere || richTextHasContent(content.notes) ? ( - {content.geolocation?.latitude && content.geolocation?.longitude && ( - - )} + + + + +
{content.title}
+
+ +

+ {[content.street, content.city] + .filter((v) => v !== null) + .join(' - ')} + {(content.street || content.city) && + (content.zip_code || content.country) &&
} + {[content.zip_code, content.country?.title] + .filter((v) => v !== null) + .join(' - ')} +

+
+
+
+ + {content.circoscrizione && ( +
+
+ {intl.formatMessage(messages.circoscrizione)}: +
+
{content.circoscrizione}
+
+ )} + {content.quartiere && ( +
+
{intl.formatMessage(messages.quartiere)}:
+
{content.quartiere}
+
+ )} {richTextHasContent(content.notes) && (